From fa7255cbf533b2ed36e0f56a38b3dfbf4f81b75b Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 27 Jun 2024 10:34:48 -0700 Subject: [PATCH] moved --llm-history-file in args --- aider/args.py | 12 +++++------ website/assets/sample.aider.conf.yml | 6 +++--- website/assets/sample.env | 6 +++--- website/docs/config/aider_conf.md | 6 +++--- website/docs/config/dotenv.md | 6 +++--- website/docs/config/options.md | 31 ++++++++++++++-------------- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/aider/args.py b/aider/args.py index 473a9dc2e..474fb2257 100644 --- a/aider/args.py +++ b/aider/args.py @@ -29,12 +29,6 @@ def get_parser(default_config_files, git_root): auto_env_var_prefix="AIDER_", ) group = parser.add_argument_group("Main") - group.add_argument( - "--llm-history-file", - metavar="LLM_HISTORY_FILE", - default=None, - help="Log the conversation with the LLM to this file (for example, .aider.llm.history)", - ) group.add_argument( "files", metavar="FILE", nargs="*", help="files to edit with an LLM (optional)" ) @@ -236,6 +230,12 @@ def get_parser(default_config_files, git_root): default=False, help="Restore the previous chat history messages (default: False)", ) + group.add_argument( + "--llm-history-file", + metavar="LLM_HISTORY_FILE", + default=None, + help="Log the conversation with the LLM to this file (for example, .aider.llm.history)", + ) ########## group = parser.add_argument_group("Output Settings") diff --git a/website/assets/sample.aider.conf.yml b/website/assets/sample.aider.conf.yml index 6d401fe24..66a24dc33 100644 --- a/website/assets/sample.aider.conf.yml +++ b/website/assets/sample.aider.conf.yml @@ -13,9 +13,6 @@ ####### # Main: -## Log the conversation with the LLM to this file (for example, .aider.llm.history) -#llm-history-file: - ## Specify the OpenAI API key #openai-api-key: @@ -103,6 +100,9 @@ ## Restore the previous chat history messages (default: False) #restore-chat-history: false +## Log the conversation with the LLM to this file (for example, .aider.llm.history) +#llm-history-file: + ################## # Output Settings: diff --git a/website/assets/sample.env b/website/assets/sample.env index 1f3420254..154a722c9 100644 --- a/website/assets/sample.env +++ b/website/assets/sample.env @@ -21,9 +21,6 @@ ####### # Main: -## Log the conversation with the LLM to this file (for example, .aider.llm.history) -#AIDER_LLM_HISTORY_FILE= - ## Specify the OpenAI API key #OPENAI_API_KEY= @@ -111,6 +108,9 @@ ## Restore the previous chat history messages (default: False) #AIDER_RESTORE_CHAT_HISTORY=false +## Log the conversation with the LLM to this file (for example, .aider.llm.history) +#AIDER_LLM_HISTORY_FILE= + ################## # Output Settings: diff --git a/website/docs/config/aider_conf.md b/website/docs/config/aider_conf.md index fe80efe36..58c452fb8 100644 --- a/website/docs/config/aider_conf.md +++ b/website/docs/config/aider_conf.md @@ -41,9 +41,6 @@ cog.outl("```") ####### # Main: -## Log the conversation with the LLM to this file (for example, .aider.llm.history) -#llm-history-file: - ## Specify the OpenAI API key #openai-api-key: @@ -131,6 +128,9 @@ cog.outl("```") ## Restore the previous chat history messages (default: False) #restore-chat-history: false +## Log the conversation with the LLM to this file (for example, .aider.llm.history) +#llm-history-file: + ################## # Output Settings: diff --git a/website/docs/config/dotenv.md b/website/docs/config/dotenv.md index 2c201dc2c..9aae6011b 100644 --- a/website/docs/config/dotenv.md +++ b/website/docs/config/dotenv.md @@ -54,9 +54,6 @@ cog.outl("```") ####### # Main: -## Log the conversation with the LLM to this file (for example, .aider.llm.history) -#AIDER_LLM_HISTORY_FILE= - ## Specify the OpenAI API key #OPENAI_API_KEY= @@ -144,6 +141,9 @@ cog.outl("```") ## Restore the previous chat history messages (default: False) #AIDER_RESTORE_CHAT_HISTORY=false +## Log the conversation with the LLM to this file (for example, .aider.llm.history) +#AIDER_LLM_HISTORY_FILE= + ################## # Output Settings: diff --git a/website/docs/config/options.md b/website/docs/config/options.md index d8bea2979..557d0cf53 100644 --- a/website/docs/config/options.md +++ b/website/docs/config/options.md @@ -20,24 +20,23 @@ from aider.args import get_md_help cog.out(get_md_help()) ]]]--> ``` -usage: aider [-h] [--llm-history-file] [--openai-api-key] - [--anthropic-api-key] [--model] [--opus] [--sonnet] - [--4] [--4o] [--4-turbo] [--35turbo] [--models] - [--openai-api-base] [--openai-api-type] - [--openai-api-version] [--openai-api-deployment-id] - [--openai-organization-id] [--model-settings-file] - [--model-metadata-file] +usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model] + [--opus] [--sonnet] [--4] [--4o] [--4-turbo] + [--35turbo] [--models] [--openai-api-base] + [--openai-api-type] [--openai-api-version] + [--openai-api-deployment-id] [--openai-organization-id] + [--model-settings-file] [--model-metadata-file] [--verify-ssl | --no-verify-ssl] [--edit-format] [--weak-model] [--show-model-warnings | --no-show-model-warnings] [--map-tokens] [--max-chat-history-tokens] [--env-file] [--input-history-file] [--chat-history-file] [--restore-chat-history | --no-restore-chat-history] - [--dark-mode] [--light-mode] [--pretty | --no-pretty] - [--stream | --no-stream] [--user-input-color] - [--tool-output-color] [--tool-error-color] - [--assistant-output-color] [--code-theme] - [--show-diffs] [--git | --no-git] + [--llm-history-file] [--dark-mode] [--light-mode] + [--pretty | --no-pretty] [--stream | --no-stream] + [--user-input-color] [--tool-output-color] + [--tool-error-color] [--assistant-output-color] + [--code-theme] [--show-diffs] [--git | --no-git] [--gitignore | --no-gitignore] [--aiderignore] [--auto-commits | --no-auto-commits] [--dirty-commits | --no-dirty-commits] @@ -64,10 +63,6 @@ Aliases: ## Main: -### `--llm-history-file LLM_HISTORY_FILE` -Log the conversation with the LLM to this file (for example, .aider.llm.history) -Environment variable: `AIDER_LLM_HISTORY_FILE` - ### `--openai-api-key OPENAI_API_KEY` Specify the OpenAI API key Environment variable: `OPENAI_API_KEY` @@ -205,6 +200,10 @@ Aliases: - `--restore-chat-history` - `--no-restore-chat-history` +### `--llm-history-file LLM_HISTORY_FILE` +Log the conversation with the LLM to this file (for example, .aider.llm.history) +Environment variable: `AIDER_LLM_HISTORY_FILE` + ## Output Settings: ### `--dark-mode`