This commit is contained in:
Paul Gauthier 2025-03-08 17:27:01 -08:00
parent 3ed16fb796
commit 1903542f11
7 changed files with 1239 additions and 1202 deletions

File diff suppressed because it is too large Load diff

View file

@ -20,39 +20,6 @@
## Specify the model to use for the main chat
#model: xxx
## Use claude-3-opus-20240229 model for the main chat
#opus: false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat
#sonnet: false
## Use claude-3-5-haiku-20241022 model for the main chat
#haiku: false
## Use gpt-4-0613 model for the main chat
#4: false
## Use gpt-4o model for the main chat
#4o: false
## Use gpt-4o-mini model for the main chat
#mini: false
## Use gpt-4-1106-preview model for the main chat
#4-turbo: false
## Use gpt-3.5-turbo model for the main chat
#35turbo: false
## Use deepseek/deepseek-chat model for the main chat
#deepseek: false
## Use o1-mini model for the main chat
#o1-mini: false
## Use o1-preview model for the main chat
#o1-preview: false
########################
# API Keys and settings:
@ -116,6 +83,9 @@
## Set the reasoning_effort API parameter (default: not set)
#reasoning-effort: xxx
## Set the thinking token budget for models that support it (default: not set)
#thinking-tokens: xxx
## Verify the SSL cert when connecting to models (default: True)
#verify-ssl: true
@ -442,3 +412,39 @@
## Specify which editor to use for the /editor command
#editor: xxx
############################
# Deprecated model settings:
## Use claude-3-opus-20240229 model for the main chat (deprecated, use --model)
#opus: false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat (deprecated, use --model)
#sonnet: false
## Use claude-3-5-haiku-20241022 model for the main chat (deprecated, use --model)
#haiku: false
## Use gpt-4-0613 model for the main chat (deprecated, use --model)
#4: false
## Use gpt-4o model for the main chat (deprecated, use --model)
#4o: false
## Use gpt-4o-mini model for the main chat (deprecated, use --model)
#mini: false
## Use gpt-4-1106-preview model for the main chat (deprecated, use --model)
#4-turbo: false
## Use gpt-3.5-turbo model for the main chat (deprecated, use --model)
#35turbo: false
## Use deepseek/deepseek-chat model for the main chat (deprecated, use --model)
#deepseek: false
## Use o1-mini model for the main chat (deprecated, use --model)
#o1-mini: false
## Use o1-preview model for the main chat (deprecated, use --model)
#o1-preview: false

View file

@ -24,39 +24,6 @@
## Specify the model to use for the main chat
#AIDER_MODEL=
## Use claude-3-opus-20240229 model for the main chat
#AIDER_OPUS=
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat
#AIDER_SONNET=
## Use claude-3-5-haiku-20241022 model for the main chat
#AIDER_HAIKU=
## Use gpt-4-0613 model for the main chat
#AIDER_4=
## Use gpt-4o model for the main chat
#AIDER_4O=
## Use gpt-4o-mini model for the main chat
#AIDER_MINI=
## Use gpt-4-1106-preview model for the main chat
#AIDER_4_TURBO=
## Use gpt-3.5-turbo model for the main chat
#AIDER_35TURBO=
## Use deepseek/deepseek-chat model for the main chat
#AIDER_DEEPSEEK=
## Use o1-mini model for the main chat
#AIDER_O1_MINI=
## Use o1-preview model for the main chat
#AIDER_O1_PREVIEW=
########################
# API Keys and settings:
@ -105,6 +72,9 @@
## Set the reasoning_effort API parameter (default: not set)
#AIDER_REASONING_EFFORT=
## Set the thinking token budget for models that support it (default: not set)
#AIDER_THINKING_TOKENS=
## Verify the SSL cert when connecting to models (default: True)
#AIDER_VERIFY_SSL=true
@ -410,3 +380,39 @@
## Specify which editor to use for the /editor command
#AIDER_EDITOR=
############################
# Deprecated model settings:
## Use claude-3-opus-20240229 model for the main chat (deprecated, use --model)
#AIDER_OPUS=false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat (deprecated, use --model)
#AIDER_SONNET=false
## Use claude-3-5-haiku-20241022 model for the main chat (deprecated, use --model)
#AIDER_HAIKU=false
## Use gpt-4-0613 model for the main chat (deprecated, use --model)
#AIDER_4=false
## Use gpt-4o model for the main chat (deprecated, use --model)
#AIDER_4O=false
## Use gpt-4o-mini model for the main chat (deprecated, use --model)
#AIDER_MINI=false
## Use gpt-4-1106-preview model for the main chat (deprecated, use --model)
#AIDER_4_TURBO=false
## Use gpt-3.5-turbo model for the main chat (deprecated, use --model)
#AIDER_35TURBO=false
## Use deepseek/deepseek-chat model for the main chat (deprecated, use --model)
#AIDER_DEEPSEEK=false
## Use o1-mini model for the main chat (deprecated, use --model)
#AIDER_O1_MINI=false
## Use o1-preview model for the main chat (deprecated, use --model)
#AIDER_O1_PREVIEW=false

View file

@ -74,39 +74,6 @@ cog.outl("```")
## Specify the model to use for the main chat
#model: xxx
## Use claude-3-opus-20240229 model for the main chat
#opus: false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat
#sonnet: false
## Use claude-3-5-haiku-20241022 model for the main chat
#haiku: false
## Use gpt-4-0613 model for the main chat
#4: false
## Use gpt-4o model for the main chat
#4o: false
## Use gpt-4o-mini model for the main chat
#mini: false
## Use gpt-4-1106-preview model for the main chat
#4-turbo: false
## Use gpt-3.5-turbo model for the main chat
#35turbo: false
## Use deepseek/deepseek-chat model for the main chat
#deepseek: false
## Use o1-mini model for the main chat
#o1-mini: false
## Use o1-preview model for the main chat
#o1-preview: false
########################
# API Keys and settings:
@ -170,6 +137,9 @@ cog.outl("```")
## Set the reasoning_effort API parameter (default: not set)
#reasoning-effort: xxx
## Set the thinking token budget for models that support it (default: not set)
#thinking-tokens: xxx
## Verify the SSL cert when connecting to models (default: True)
#verify-ssl: true
@ -496,5 +466,41 @@ cog.outl("```")
## Specify which editor to use for the /editor command
#editor: xxx
############################
# Deprecated model settings:
## Use claude-3-opus-20240229 model for the main chat (deprecated, use --model)
#opus: false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat (deprecated, use --model)
#sonnet: false
## Use claude-3-5-haiku-20241022 model for the main chat (deprecated, use --model)
#haiku: false
## Use gpt-4-0613 model for the main chat (deprecated, use --model)
#4: false
## Use gpt-4o model for the main chat (deprecated, use --model)
#4o: false
## Use gpt-4o-mini model for the main chat (deprecated, use --model)
#mini: false
## Use gpt-4-1106-preview model for the main chat (deprecated, use --model)
#4-turbo: false
## Use gpt-3.5-turbo model for the main chat (deprecated, use --model)
#35turbo: false
## Use deepseek/deepseek-chat model for the main chat (deprecated, use --model)
#deepseek: false
## Use o1-mini model for the main chat (deprecated, use --model)
#o1-mini: false
## Use o1-preview model for the main chat (deprecated, use --model)
#o1-preview: false
```
<!--[[[end]]]-->

View file

@ -64,39 +64,6 @@ cog.outl("```")
## Specify the model to use for the main chat
#AIDER_MODEL=
## Use claude-3-opus-20240229 model for the main chat
#AIDER_OPUS=
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat
#AIDER_SONNET=
## Use claude-3-5-haiku-20241022 model for the main chat
#AIDER_HAIKU=
## Use gpt-4-0613 model for the main chat
#AIDER_4=
## Use gpt-4o model for the main chat
#AIDER_4O=
## Use gpt-4o-mini model for the main chat
#AIDER_MINI=
## Use gpt-4-1106-preview model for the main chat
#AIDER_4_TURBO=
## Use gpt-3.5-turbo model for the main chat
#AIDER_35TURBO=
## Use deepseek/deepseek-chat model for the main chat
#AIDER_DEEPSEEK=
## Use o1-mini model for the main chat
#AIDER_O1_MINI=
## Use o1-preview model for the main chat
#AIDER_O1_PREVIEW=
########################
# API Keys and settings:
@ -145,6 +112,9 @@ cog.outl("```")
## Set the reasoning_effort API parameter (default: not set)
#AIDER_REASONING_EFFORT=
## Set the thinking token budget for models that support it (default: not set)
#AIDER_THINKING_TOKENS=
## Verify the SSL cert when connecting to models (default: True)
#AIDER_VERIFY_SSL=true
@ -450,5 +420,41 @@ cog.outl("```")
## Specify which editor to use for the /editor command
#AIDER_EDITOR=
############################
# Deprecated model settings:
## Use claude-3-opus-20240229 model for the main chat (deprecated, use --model)
#AIDER_OPUS=false
## Use anthropic/claude-3-7-sonnet-20250219 model for the main chat (deprecated, use --model)
#AIDER_SONNET=false
## Use claude-3-5-haiku-20241022 model for the main chat (deprecated, use --model)
#AIDER_HAIKU=false
## Use gpt-4-0613 model for the main chat (deprecated, use --model)
#AIDER_4=false
## Use gpt-4o model for the main chat (deprecated, use --model)
#AIDER_4O=false
## Use gpt-4o-mini model for the main chat (deprecated, use --model)
#AIDER_MINI=false
## Use gpt-4-1106-preview model for the main chat (deprecated, use --model)
#AIDER_4_TURBO=false
## Use gpt-3.5-turbo model for the main chat (deprecated, use --model)
#AIDER_35TURBO=false
## Use deepseek/deepseek-chat model for the main chat (deprecated, use --model)
#AIDER_DEEPSEEK=false
## Use o1-mini model for the main chat (deprecated, use --model)
#AIDER_O1_MINI=false
## Use o1-preview model for the main chat (deprecated, use --model)
#AIDER_O1_PREVIEW=false
```
<!--[[[end]]]-->

View file

@ -22,18 +22,15 @@ from aider.args import get_md_help
cog.out(get_md_help())
]]]-->
```
usage: aider [-h] [--model] [--opus] [--sonnet] [--haiku] [--4]
[--4o] [--mini] [--4-turbo] [--35turbo] [--deepseek]
[--o1-mini] [--o1-preview] [--openai-api-key]
[--anthropic-api-key] [--openai-api-base]
[--openai-api-type] [--openai-api-version]
[--openai-api-deployment-id] [--openai-organization-id]
[--set-env] [--api-key] [--list-models]
[--model-settings-file] [--model-metadata-file]
[--alias] [--reasoning-effort]
[--verify-ssl | --no-verify-ssl] [--timeout]
[--edit-format] [--architect] [--weak-model]
[--editor-model] [--editor-edit-format]
usage: aider [-h] [--model] [--openai-api-key] [--anthropic-api-key]
[--openai-api-base] [--openai-api-type]
[--openai-api-version] [--openai-api-deployment-id]
[--openai-organization-id] [--set-env] [--api-key]
[--list-models] [--model-settings-file]
[--model-metadata-file] [--alias] [--reasoning-effort]
[--thinking-tokens] [--verify-ssl | --no-verify-ssl]
[--timeout] [--edit-format] [--architect]
[--weak-model] [--editor-model] [--editor-edit-format]
[--show-model-warnings | --no-show-model-warnings]
[--max-chat-history-tokens]
[--cache-prompts | --no-cache-prompts]
@ -80,7 +77,9 @@ usage: aider [-h] [--model] [--opus] [--sonnet] [--haiku] [--4]
[--multiline | --no-multiline]
[--notifications | --no-notifications]
[--notifications-command]
[--detect-urls | --no-detect-urls] [--editor]
[--detect-urls | --no-detect-urls] [--editor] [--opus]
[--sonnet] [--haiku] [--4] [--4o] [--mini] [--4-turbo]
[--35turbo] [--deepseek] [--o1-mini] [--o1-preview]
```
@ -98,58 +97,6 @@ Aliases:
Specify the model to use for the main chat
Environment variable: `AIDER_MODEL`
### `--opus`
Use claude-3-opus-20240229 model for the main chat
Environment variable: `AIDER_OPUS`
### `--sonnet`
Use anthropic/claude-3-7-sonnet-20250219 model for the main chat
Environment variable: `AIDER_SONNET`
### `--haiku`
Use claude-3-5-haiku-20241022 model for the main chat
Environment variable: `AIDER_HAIKU`
### `--4`
Use gpt-4-0613 model for the main chat
Environment variable: `AIDER_4`
Aliases:
- `--4`
- `-4`
### `--4o`
Use gpt-4o model for the main chat
Environment variable: `AIDER_4O`
### `--mini`
Use gpt-4o-mini model for the main chat
Environment variable: `AIDER_MINI`
### `--4-turbo`
Use gpt-4-1106-preview model for the main chat
Environment variable: `AIDER_4_TURBO`
### `--35turbo`
Use gpt-3.5-turbo model for the main chat
Environment variable: `AIDER_35TURBO`
Aliases:
- `--35turbo`
- `--35-turbo`
- `--3`
- `-3`
### `--deepseek`
Use deepseek/deepseek-chat model for the main chat
Environment variable: `AIDER_DEEPSEEK`
### `--o1-mini`
Use o1-mini model for the main chat
Environment variable: `AIDER_O1_MINI`
### `--o1-preview`
Use o1-preview model for the main chat
Environment variable: `AIDER_O1_PREVIEW`
## API Keys and settings:
### `--openai-api-key VALUE`
@ -217,6 +164,10 @@ Environment variable: `AIDER_ALIAS`
Set the reasoning_effort API parameter (default: not set)
Environment variable: `AIDER_REASONING_EFFORT`
### `--thinking-tokens VALUE`
Set the thinking token budget for models that support it (default: not set)
Environment variable: `AIDER_THINKING_TOKENS`
### `--verify-ssl`
Verify the SSL cert when connecting to models (default: True)
Default: True
@ -775,4 +726,69 @@ Aliases:
### `--editor VALUE`
Specify which editor to use for the /editor command
Environment variable: `AIDER_EDITOR`
## Deprecated model settings:
### `--opus`
Use claude-3-opus-20240229 model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_OPUS`
### `--sonnet`
Use anthropic/claude-3-7-sonnet-20250219 model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_SONNET`
### `--haiku`
Use claude-3-5-haiku-20241022 model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_HAIKU`
### `--4`
Use gpt-4-0613 model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_4`
Aliases:
- `--4`
- `-4`
### `--4o`
Use gpt-4o model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_4O`
### `--mini`
Use gpt-4o-mini model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_MINI`
### `--4-turbo`
Use gpt-4-1106-preview model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_4_TURBO`
### `--35turbo`
Use gpt-3.5-turbo model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_35TURBO`
Aliases:
- `--35turbo`
- `--35-turbo`
- `--3`
- `-3`
### `--deepseek`
Use deepseek/deepseek-chat model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_DEEPSEEK`
### `--o1-mini`
Use o1-mini model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_O1_MINI`
### `--o1-preview`
Use o1-preview model for the main chat (deprecated, use --model)
Default: False
Environment variable: `AIDER_O1_PREVIEW`
<!--[[[end]]]-->

View file

@ -249,11 +249,8 @@ tr:hover { background-color: #f5f5f5; }
</style>
<table>
<tr><th>Model Name</th><th class='right'>Total Tokens</th><th class='right'>Percent</th></tr>
<tr><td>anthropic/claude-3-7-sonnet-20250219</td><td class='right'>1,948,550</td><td class='right'>99.0%</td></tr>
<tr><td>fireworks_ai/accounts/fireworks/models/deepseek-r1</td><td class='right'>14,961</td><td class='right'>0.8%</td></tr>
<tr><td>deepseek/deepseek-reasoner</td><td class='right'>4,430</td><td class='right'>0.2%</td></tr>
<tr><td>o3-mini</td><td class='right'>97</td><td class='right'>0.0%</td></tr>
<tr><td>claude-3-7-sonnet-20250219</td><td class='right'>93</td><td class='right'>0.0%</td></tr>
<tr><td>anthropic/claude-3-7-sonnet-20250219</td><td class='right'>496,358</td><td class='right'>99.8%</td></tr>
<tr><td>fireworks_ai/accounts/fireworks/models/deepseek-r1</td><td class='right'>976</td><td class='right'>0.2%</td></tr>
</table>
<!--[[[end]]]-->