Commit Graph

5738 Commits

Author SHA1 Message Date
Caleb Owens
9ac44479a5 Pass model_kind to API 2024-03-18 19:20:18 +01:00
Caleb Owens
2cc474d2f9 Test toast error messages 2024-03-18 19:20:18 +01:00
Caleb Owens
4a36585f0d return undefined when git config value is null 2024-03-18 19:20:18 +01:00
Caleb Owens
5e524f4ed0 Fix regex and refactor
`/\n+(.*?)\w*/s` wasn't behaving correctly so I used `/\n+(.*)/s` from CommitDialog.svelte.
I want to consolidate this logic at some point because we've
got similar logic multiple times.

The ORing to empty strings isn't required and we can use the falsey nature of "" to
see if we should be showing just the summary or both
2024-03-18 19:20:18 +01:00
Caleb Owens
ff6f9a73e7 use ConfigKeys enum for dummy GitConfig keys
Change git config access to use the ConfigKeys enum instead of
string literals.

Also update import paths to use the new $lib alias for better modularity.
2024-03-18 19:20:18 +01:00
Mattias Granlund
c90d887ab7 Some suggestions for improvement 2024-03-18 19:20:18 +01:00
Caleb Owens
6c2d98d2f4 Refactor to use new context patterns 2024-03-18 19:20:18 +01:00
Caleb Owens
8b9b573b98 Added some tests to cover the aiService 2024-03-18 19:20:18 +01:00
Caleb Owens
d80a334bbd Improve AI client error handling 2024-03-18 19:20:18 +01:00
Caleb Owens
2a1ab3cdec Use default paramaters rather than doing an OR 2024-03-18 19:20:18 +01:00
Caleb Owens
721b9d13fa Add test:watch script to package.json files
Add a test:watch script to the package.json files in the root
and ui directories. This script runs vitest in watch mode for
the development environment, allowing developers to run tests
continuously while making changes to the codebase.
2024-03-18 19:20:18 +01:00
Caleb Owens
1e5c418bd2 Add support for Anthropic's Haiku model
Add a new enum value for Anthropic's Haiku model, which was released
on 2023-03-07. Update the default model to Haiku in the loadConfig
function. Add Haiku to the list of available models in the
configureAnthropicModel function.
2024-03-18 19:20:18 +01:00
Caleb Owens
f50dd13844 Rename model to modelName 2024-03-18 19:20:18 +01:00
Caleb Owens
52427bbed8 Rename AI Provider to AI Client 2024-03-18 19:20:18 +01:00
Caleb Owens
74e3d475ac initial pass of aiService as discussed 2024-03-18 19:20:18 +01:00
Caleb Owens
5457068e3e Small tweaks 2024-03-18 19:20:18 +01:00
Caleb Owens
8fee75762d Ensure set isn't called after initial load 2024-03-18 19:20:18 +01:00
Caleb Owens
5ece49ad41 Fix formatting issues 2024-03-18 19:20:18 +01:00
Caleb Owens
b86b46662c feat: use aiService for commit message generation
Refactor commit message generation to use the summarizer from the
aiService context instead of building it locally. This allows the
summarizer to be shared across components and avoids unnecessary
rebuilds.

Also update the branch name generation in the branch view to use the
summarizer from the aiService context.

Add the aiService to the page context and retrieve the summarizer
observable in the components that need it.

No leaked keys found in the provided git diff.
2024-03-18 19:20:18 +01:00
Caleb Owens
8ddfbd0ffd (non atomic) Moved to storing gitConfig settings with a writable 2024-03-18 19:20:18 +01:00
Caleb Owens
0ca1d9a895 refactor: Refactor code to use onMount for asynchronous data retrieval and setting properties in SummarizerSettings class. Update setters for OpenAIModel in SummarizerSettings class. 2024-03-18 19:20:18 +01:00
Caleb Owens
2774b81381 feat: Skip instrumenting _handle parameter in git_set_global_config and git_get_global_config
This commit skips instrumenting the _handle parameter in the functions git_set_global_config and git_get_global_config for cleaner logs and improved clarity in the code.
2024-03-18 19:20:18 +01:00
Caleb Owens
cfe7369661 refactor: Extracted configuration keys into constants 2024-03-18 19:20:18 +01:00
Caleb Owens
c34a0047ee Spread comment on multiple lines 2024-03-18 19:20:18 +01:00
Caleb Owens
5cd2368236 Fix JSON formatting 2024-03-18 19:20:18 +01:00
Caleb Owens
32854787fb Remove typecast 2024-03-18 19:20:18 +01:00
Caleb Owens
7437b2f860 refactor: extract summarizer settings to use gitConfig
The summarizer settings are extracted to a new class
`SummarizerSettings` that takes a `GitConfig` instance in its
constructor. This allows the settings to be built using the
`GitConfig` methods, removing the need for individual functions to
get and set each setting. The `GitConfig` instance is injected in
the `+page.svelte` file.
2024-03-18 19:20:18 +01:00
Caleb Owens
58b0eb2324 fix: Changed icon name from "stat" to "search" in AI Options button
Updated the icon displayed in the AI Options button from "stat" to "search" to accurately represent the functionality.
2024-03-18 19:20:18 +01:00
Caleb Owens
c22cef4631 feat: improve AI settings UI and copy
* Update "Yes, I'll use my own key" to "Yes, I'll provide my own key"
in the AI settings
* Add copy explaining GitButler's AI provider support and the
requirement to be logged in to use the GitButler API
* Remove unnecessary line breaks and simplify JSX in the AI settings
* Add copy about Anthropic's Opus and Sonnet models
2024-03-18 19:20:18 +01:00
Caleb Owens
bdcd2a47f0 feat: add radio buttons for model selection
- Change model kind selection from a dropdown to radio buttons
- Update copy for key option selection
- Conditionally show model version and API key inputs based on 
  selected model kind
- Add form element to handle model kind changes
- Update layout and styling of settings page

The most significant changes are:
- Switching from a dropdown to radio buttons for selecting the model 
  kind (OpenAI or Anthropic)
- Conditionally rendering the model version and API key inputs based
  on the selected model kind
- Adding a form to handle changes to the selected model kind

This refactors the settings page to improve the user experience when
selecting the model configuration. The radio buttons make the options
clearer, and conditionally showing fields reduces clutter.
2024-03-18 19:20:18 +01:00
Caleb Owens
3ded414a5a Code review updates
- Use await instead of then when calling the summarizer.branch
method to get the branch message
- Update the condition to check the currentSection value using ==
instead of ===
2024-03-18 19:20:18 +01:00
Caleb Owens
6b61b068a7 Update imports 2024-03-18 19:20:18 +01:00
Caleb Owens
305f17accc feat: Improve key leak warning in commit message instructions
Update the instructions for generating commit messages to clarify
that a warning should be given if any leaked keys are found in the
provided git diff, rather than a more general warning about leaked
keys.

This change improves the specificity and accuracy of the instructions,
making it clear that a warning is only necessary if keys are actually
detected in the diff under analysis.
2024-03-18 19:20:18 +01:00
Caleb Owens
1a059d885d refactor: rename summarizer_settings → summarizerSettings 2024-03-18 19:20:18 +01:00
Caleb Owens
7b6e92f22d refactor: remove cloud object from branch and commit components
The main changes in this commit are:

- Remove the `cloud` object from various branch and commit
  components, including:
  - BranchList.svelte
  - Branch.svelte
  - MiniCommitInfo.svelte
  - CommitMessageBox.svelte
- Update the corresponding type imports to only import the `User` type
  instead of also importing `getCloudApiClient`
- Remove the `cloud` prop from the usages of these components
- Adjust the indentation of the `<AiSettings>` component in the
  settings page

These changes were made to remove the unused `cloud` object from
several components related to branches and commits. The `cloud` prop
was being passed down to these components but was not actually being
used within them. Removing this unnecessary prop helps simplify the
components and their usage.
2024-03-18 19:20:18 +01:00
Caleb Owens
12aefe73a3 feat: add model and key configuration options
Add UI components for configuring the model kind (OpenAI or
Anthropic), key option (Butler API or bring your own key),
and associated settings.

The model kind can be set to either OpenAI or Anthropic. The
key option allows using the Butler API proxy or providing
your own API key.

When using your own key, the API key and model version can
be specified for the selected model kind (OpenAI or
Anthropic).

The selected options are persisted and loaded from the
backend settings.
2024-03-18 19:20:18 +01:00
Caleb Owens
15956c0729 refactor: Update AIProvider classes and add model options
Refactor AIProvider classes to include model options for OpenAIProvider
and AnthropicAIProvider. Also, add functions to get and set the model
for both providers to allow for more flexibility in model selection.
2024-03-18 19:20:18 +01:00
Caleb Owens
7890f3cf56 Updated Summarizer to use different AI providers based on settings
- Modified Summarizer to use different AI providers based on the selected model
  kind and token option.
- Added functionality to build Summarizer contextually based on user and settings.
- Introduced OpenAIProvider and AnthropicAIProvider for specific AI services.
- Integrated gitGetConfig and gitSetConfig functions for potential future use.
2024-03-18 19:20:18 +01:00
Caleb Owens
a43cdb4060 Set up dependencies for anthropics and open AI in client
I've been able to use the OpenAI library as they support being in the browser if you pass the "dangerouslyAllowBrowser" flag.

Anthropics don't have any interest in supporting browers making API calls and causes sugnificant CORS problems, so I've made use of the Tauri HTTP library, so this commit also sets that up
2024-03-18 19:20:18 +01:00
Caleb Owens
8b58ab3c54 Generate commit messages from diff
Add instructions to only respond with the commit message and to warn
about any leaked keys. This improves the specificity and security of
the assistant's output.
2024-03-18 19:20:18 +01:00
Mattias Granlund
4522bd76ab Recompute hunk hash when updating ownership file
- was never done, but probably should be
2024-03-18 18:56:24 +01:00
Mattias Granlund
98a0229e1b Fix mistake that broke previewing stashed branches 2024-03-18 18:25:49 +01:00
Kiril Videlov
786d63e601 refactor: Remove unnecessary println statement in get_applied_status function. 2024-03-18 18:14:21 +01:00
Mattias Granlund
1fd449bc8f Rename/refactor a few things related to list_virtual_branches
- make `diff_file_to_hunks` take borrowed `FileDiff`
- improve readability of `get_applied_status`
- rename git::diff::Hunk -> git::diff::GitHunk to avoid confusion
- remove bubbling of hunk ownership (we don't use it)
- drop test for bubbling ownership
2024-03-18 17:58:35 +01:00
Josh Junon
e0bb58a475
Merge pull request #3192 from gitbutlerapp/fix-reverted-allowed-skips-configuration
fix reverted allowed skips configuration
2024-03-18 16:59:35 +01:00
Josh Junon
b9e55c3142 fix reverted allowed skips configuration 2024-03-18 16:56:03 +01:00
Pavel Laptev
f887c6d4c8
Merge pull request #3191 from gitbutlerapp/ui-fix
UI tweak: Profile sidebar paddings
2024-03-18 16:51:53 +01:00
Pavel Laptev
16bc897442 UI tweak: Profile sidebar paddings 2024-03-18 16:50:21 +01:00
Josh Junon
2625ccd0d5
Merge pull request #3189 from gitbutlerapp/remove-core
remove core crate in favor of more granule crates
2024-03-18 15:23:20 +01:00
Josh Junon
65f9fbb21d
Merge pull request #3190 from gitbutlerapp/normalize-workspace-imports
normalize workspace imports
2024-03-18 15:21:30 +01:00