From 5c3cca157d2801e33fc0f6948b2c870ce6cd26c1 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 26 Dec 2024 19:40:06 -0400 Subject: [PATCH] switch to deepseek-chat instead of deepseek-coder --- aider/args.py | 2 +- aider/models.py | 2 +- aider/website/assets/sample-analytics.jsonl | 54 ++++++++++----------- aider/website/assets/sample.aider.conf.yml | 2 +- aider/website/assets/sample.env | 2 +- aider/website/docs/config/aider_conf.md | 2 +- aider/website/docs/config/dotenv.md | 2 +- aider/website/docs/config/model-aliases.md | 2 +- aider/website/docs/config/options.md | 2 +- aider/website/docs/faq.md | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/aider/args.py b/aider/args.py index 2ba98853dae..32f2a07bb6c 100644 --- a/aider/args.py +++ b/aider/args.py @@ -106,7 +106,7 @@ def get_parser(default_config_files, git_root): const=gpt_3_model_name, help=f"Use {gpt_3_model_name} model for the main chat", ) - deepseek_model = "deepseek/deepseek-coder" + deepseek_model = "deepseek/deepseek-chat" group.add_argument( "--deepseek", action="store_const", diff --git a/aider/models.py b/aider/models.py index 885fef5f64b..cef4503fa4a 100644 --- a/aider/models.py +++ b/aider/models.py @@ -75,7 +75,7 @@ "35-turbo": "gpt-3.5-turbo", "3": "gpt-3.5-turbo", # Other models - "deepseek": "deepseek/deepseek-coder", + "deepseek": "deepseek/deepseek-chat", "flash": "gemini/gemini-2.0-flash-exp", } diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index 7b09ae66039..a6da48fc2e1 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,30 +1,3 @@ -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "ask", "prompt_tokens": 7246, "completion_tokens": 557, "total_tokens": 7803, "cost": 0.030093, "total_cost": 1.083309}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734481072} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734481078} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 10204, "completion_tokens": 519, "total_tokens": 10723, "cost": 0.038397, "total_cost": 1.121706}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734481089} -{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482083} -{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482083} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482093} -{"event": "repo", "properties": {"num_files": 413}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482095} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482108} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 9591, "completion_tokens": 228, "total_tokens": 9819, "cost": 0.032193, "total_cost": 0.032193}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482115} -{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482120} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482275} -{"event": "repo", "properties": {"num_files": 413}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482277} -{"event": "cli session", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482277} -{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482285} -{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482296} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482296} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "ask", "prompt_tokens": 1276, "completion_tokens": 259, "total_tokens": 1535, "cost": 0.007713, "total_cost": 0.007713}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482301} -{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482325} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482325} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "ask", "prompt_tokens": 1552, "completion_tokens": 396, "total_tokens": 1948, "cost": 0.010596000000000001, "total_cost": 0.018309000000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482334} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482359} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 4148, "completion_tokens": 467, "total_tokens": 4615, "cost": 0.019449, "total_cost": 0.037758}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482368} -{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482903} -{"event": "ai-comments execute", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482903} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482903} -{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 10907, "completion_tokens": 286, "total_tokens": 11193, "cost": 0.037011, "total_cost": 0.074769}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482910} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482947} {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482970} {"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/REDACTED", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 11508, "completion_tokens": 325, "total_tokens": 11833, "cost": 0.039398999999999997, "total_cost": 0.11416799999999999}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482977} {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1734482977} @@ -998,3 +971,30 @@ {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255171} {"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255171} {"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255171} +{"event": "command_reset", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255830} +{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255835} +{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255862} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255862} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "ask", "prompt_tokens": 2170, "completion_tokens": 1200, "total_tokens": 3370, "cost": 0.024510000000000004, "total_cost": 0.4787100000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255880} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255893} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 5347, "completion_tokens": 622, "total_tokens": 5969, "cost": 0.025370999999999998, "total_cost": 0.5040810000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255904} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255981} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 5338, "completion_tokens": 171, "total_tokens": 5509, "cost": 0.018579000000000002, "total_cost": 0.5226600000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735255986} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256067} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 5587, "completion_tokens": 468, "total_tokens": 6055, "cost": 0.023781000000000004, "total_cost": 0.5464410000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256075} +{"event": "command_paste", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256142} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256154} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 7791, "completion_tokens": 564, "total_tokens": 8355, "cost": 0.031833, "total_cost": 0.5782740000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256166} +{"event": "command_drop", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256195} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256196} +{"event": "command_clear", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256201} +{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256202} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256212} +{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256220} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256221} +{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256343} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256351} +{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256353} +{"event": "cli session", "properties": {"main_model": "openrouter/REDACTED", "weak_model": "gemini/gemini-2.0-flash-exp", "editor_model": "openrouter/openai/gpt-4o", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256353} +{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256356} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1735256357} diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 2bd0419304a..b859b131723 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -44,7 +44,7 @@ ## Use gpt-3.5-turbo model for the main chat #35turbo: false -## Use deepseek/deepseek-coder model for the main chat +## Use deepseek/deepseek-chat model for the main chat #deepseek: false ## Use o1-mini model for the main chat diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env index 56f449e4115..dfd065f41a1 100644 --- a/aider/website/assets/sample.env +++ b/aider/website/assets/sample.env @@ -48,7 +48,7 @@ ## Use gpt-3.5-turbo model for the main chat #AIDER_35TURBO= -## Use deepseek/deepseek-coder model for the main chat +## Use deepseek/deepseek-chat model for the main chat #AIDER_DEEPSEEK= ## Use o1-mini model for the main chat diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index cb42c1b2efa..e3a944e05aa 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -96,7 +96,7 @@ cog.outl("```") ## Use gpt-3.5-turbo model for the main chat #35turbo: false -## Use deepseek/deepseek-coder model for the main chat +## Use deepseek/deepseek-chat model for the main chat #deepseek: false ## Use o1-mini model for the main chat diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md index 1005dd974eb..4583b7e8a57 100644 --- a/aider/website/docs/config/dotenv.md +++ b/aider/website/docs/config/dotenv.md @@ -88,7 +88,7 @@ cog.outl("```") ## Use gpt-3.5-turbo model for the main chat #AIDER_35TURBO= -## Use deepseek/deepseek-coder model for the main chat +## Use deepseek/deepseek-chat model for the main chat #AIDER_DEEPSEEK= ## Use o1-mini model for the main chat diff --git a/aider/website/docs/config/model-aliases.md b/aider/website/docs/config/model-aliases.md index 421df3e2104..b805dce5721 100644 --- a/aider/website/docs/config/model-aliases.md +++ b/aider/website/docs/config/model-aliases.md @@ -55,7 +55,7 @@ for alias, model in sorted(MODEL_ALIASES.items()): - `4`: gpt-4-0613 - `4-turbo`: gpt-4-1106-preview - `4o`: gpt-4o -- `deepseek`: deepseek/deepseek-coder +- `deepseek`: deepseek/deepseek-chat - `flash`: gemini/gemini-2.0-flash-exp - `haiku`: claude-3-5-haiku-20241022 - `opus`: claude-3-opus-20240229 diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md index 459678a5f0d..920b2a3a87a 100644 --- a/aider/website/docs/config/options.md +++ b/aider/website/docs/config/options.md @@ -136,7 +136,7 @@ Aliases: - `-3` ### `--deepseek` -Use deepseek/deepseek-coder model for the main chat +Use deepseek/deepseek-chat model for the main chat Environment variable: `AIDER_DEEPSEEK` ### `--o1-mini` diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 5102144245e..90991364e5a 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -237,7 +237,7 @@ tr:hover { background-color: #f5f5f5; } - +
Model NameTotal TokensPercent
claude-3-5-sonnet-202410221,759,51398.9%
claude-3-5-sonnet-202410221,741,13598.9%
claude-3-5-haiku-2024102214,0080.8%
gpt-4o4,2730.2%
openrouter/REDACTED1,2340.1%