From 212ff1674eba9125fbffe914a63a4f364f550a80 Mon Sep 17 00:00:00 2001 From: sigoden Date: Sun, 28 Apr 2024 06:15:10 +0000 Subject: [PATCH] refactor: minor improvements - config.example.yaml comments - `--serve` description - No model error --- config.example.yaml | 10 +++++----- scripts/completions/aichat.fish | 2 +- scripts/completions/aichat.nu | 2 +- scripts/completions/aichat.ps1 | 2 +- scripts/completions/aichat.zsh | 2 +- src/cli.rs | 2 +- src/config/mod.rs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config.example.yaml b/config.example.yaml index e0a4689..523771f 100644 --- a/config.example.yaml +++ b/config.example.yaml @@ -79,7 +79,7 @@ clients: api_base: http://localhost:8080/v1 api_key: sk-xxx # ENV: {client_name}_API_BASE chat_endpoint: /chat/completions # Optional - models: + models: # Required - name: llama3 max_input_tokens: 8192 @@ -88,16 +88,16 @@ clients: api_base: http://localhost:11434 api_auth: Basic xxx # ENV: {client_name}_API_AUTH chat_endpoint: /api/chat # Optional - models: + models: # Required - name: llama3 max_input_tokens: 8192 # See https://learn.microsoft.com/en-us/azure/ai-services/openai/chatgpt-quickstart - type: azure-openai api_base: https://{RESOURCE}.openai.azure.com - api_key: xxx # ENV: {client_name}_API_BASE - models: - - name: gpt-35-turbo # Model deployment name + api_key: xxx # ENV: {client_name}_API_BASE + models: # Required + - name: gpt-35-turbo # Model deployment name max_input_tokens: 8192 # See https://cloud.google.com/vertex-ai diff --git a/scripts/completions/aichat.fish b/scripts/completions/aichat.fish index 586b745..47f3c6b 100644 --- a/scripts/completions/aichat.fish +++ b/scripts/completions/aichat.fish @@ -4,7 +4,7 @@ complete -c aichat -s s -l session -x -a"(aichat --list-sessions)" -d 'Start or complete -c aichat -s f -l file -d 'Include files with the message' -r -F complete -c aichat -s w -l wrap -d 'Control text wrapping (no, auto, )' complete -c aichat -l save-session -d 'Forces the session to be saved' -complete -c aichat -l serve -d 'Serve all LLMs as OpenAI-compatible API' +complete -c aichat -l serve -d 'Serve all LLMs via an OpenAI-compatible API' complete -c aichat -s e -l execute -d 'Execute commands in natural language' complete -c aichat -s c -l code -d 'Output code only' complete -c aichat -s H -l no-highlight -d 'Turn off syntax highlighting' diff --git a/scripts/completions/aichat.nu b/scripts/completions/aichat.nu index 95cda81..a8ac4bf 100644 --- a/scripts/completions/aichat.nu +++ b/scripts/completions/aichat.nu @@ -28,7 +28,7 @@ module completions { --role(-r): string@"nu-complete aichat role" # Select a role --session(-s): string@"nu-complete aichat role" # Start or join a session --save-session # Forces the session to be saved - --serve # Serve all LLMs as OpenAI-compatible API + --serve # Serve all LLMs via an OpenAI-compatible API --execute(-e) # Execute commands in natural language --code(-c) # Output code only --file(-f): string # Include files with the message diff --git a/scripts/completions/aichat.ps1 b/scripts/completions/aichat.ps1 index 7be4bcf..c3e8e96 100644 --- a/scripts/completions/aichat.ps1 +++ b/scripts/completions/aichat.ps1 @@ -31,7 +31,7 @@ Register-ArgumentCompleter -Native -CommandName 'aichat' -ScriptBlock { [CompletionResult]::new('-w', '-w', [CompletionResultType]::ParameterName, 'Control text wrapping (no, auto, )') [CompletionResult]::new('--wrap', '--wrap', [CompletionResultType]::ParameterName, 'Control text wrapping (no, auto, )') [CompletionResult]::new('--save-session', '--save-session', [CompletionResultType]::ParameterName, 'Forces the session to be saved') - [CompletionResult]::new('--serve', '--serve', [CompletionResultType]::ParameterName, 'Serve all LLMs as OpenAI-compatible API') + [CompletionResult]::new('--serve', '--serve', [CompletionResultType]::ParameterName, 'Serve all LLMs via an OpenAI-compatible API') [CompletionResult]::new('-e', '-e', [CompletionResultType]::ParameterName, 'Execute commands in natural language') [CompletionResult]::new('--execute', '--execute', [CompletionResultType]::ParameterName, 'Execute commands in natural language') [CompletionResult]::new('-c', '-c', [CompletionResultType]::ParameterName, 'Output code only') diff --git a/scripts/completions/aichat.zsh b/scripts/completions/aichat.zsh index 5f7a74b..378caf6 100644 --- a/scripts/completions/aichat.zsh +++ b/scripts/completions/aichat.zsh @@ -26,7 +26,7 @@ _aichat() { '-w+[Control text wrapping (no, auto, )]:WRAP: ' \ '--wrap=[Control text wrapping (no, auto, )]:WRAP: ' \ '--save-session[Forces the session to be saved]' \ -'--serve[Serve all LLMs as OpenAI-compatible API]' \ +'--serve[Serve all LLMs via an OpenAI-compatible API]' \ '-e[Execute commands in natural language]' \ '--execute[Execute commands in natural language]' \ '-c[Output code only]' \ diff --git a/src/cli.rs b/src/cli.rs index aff608a..f6e12ab 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -15,7 +15,7 @@ pub struct Cli { /// Forces the session to be saved #[clap(long)] pub save_session: bool, - /// Serve all LLMs as OpenAI-compatible API + /// Serve all LLMs via an OpenAI-compatible API #[clap(long, value_name = "ADDRESS")] pub serve: Option>, /// Execute commands in natural language diff --git a/src/config/mod.rs b/src/config/mod.rs index 7807204..56f3122 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -396,7 +396,7 @@ impl Config { let models = list_models(self); let model = Model::find(&models, value); match model { - None => bail!("Invalid model '{}'", value), + None => bail!("No model '{}'", value), Some(model) => { if let Some(session) = self.session.as_mut() { session.set_model(model.clone())?;