diff --git a/HISTORY.md b/HISTORY.md index 248825ccb..c1333ceda 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -8,7 +8,9 @@ - Added `--line-endings` for file writing, by Titusz Pan. - Added examples_as_sys_msg=True for GPT-4o models, improves benchmark scores. - Bumped all dependencies, to pick up litellm support for o1 system messages. -- Aider wrote 70% of the code in this release. +- Bugfix for turn taking when reflecting lint/test errors. +- Improved message validation with better error reporting for malformed chat turns. +- Aider wrote 58% of the code in this release. ### Aider v0.71.1 diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index f8c402a78..03c678784 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -25,15 +25,20 @@ cog.out(text) ### main branch +- Support for DeepSeek R1. + - Use shortcut: `--model r1` + - Also via OpenRouter: `--model openrouter/deepseek/deepseek-r1` - Added `--line-endings` for file writing, by Titusz Pan. - Added examples_as_sys_msg=True for GPT-4o models, improves benchmark scores. - Bumped all dependencies, to pick up litellm support for o1 system messages. -- Aider wrote 70% of the code in this release. +- Bugfix for turn taking when reflecting lint/test errors. +- Improved message validation with better error reporting for malformed chat turns. +- Aider wrote 58% of the code in this release. ### Aider v0.71.1 - Fix permissions issue in Docker images. -- Added read-only file announcements to chat. +- Added read-only file announcements. - Bugfix: ASCII fallback for unicode errors. - Bugfix: integer indices for list slicing in repomap calculations. diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index ea41f20ab..e6d8a8856 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,11 +1,3 @@ -{"event": "message_send", "properties": {"main_model": "o1", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff", "prompt_tokens": 2409, "completion_tokens": 181, "total_tokens": 2590, "cost": 0.046995, "total_cost": 0.04733365999999804}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544703} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544709} -{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544711} -{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544715} -{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544760} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544939} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544945} -{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544946} {"event": "cli session", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544946} {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544957} {"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 4798, "completion_tokens": 130, "total_tokens": 4928, "cost": 0.0007081199999980401, "total_cost": 0.0007081199999980401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736544963} @@ -998,3 +990,11 @@ {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737395183} {"event": "message_send", "properties": {"main_model": "gpt-4o", "weak_model": "gpt-4o-mini", "editor_model": "None", "edit_format": "editor-diff", "prompt_tokens": 1734, "completion_tokens": 41, "total_tokens": 1775, "cost": 0.004745, "total_cost": 0.009035000000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737395184} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737395184} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737396361} +{"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737396362} +{"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737396362} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737401397} +{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737401399} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737401399} +{"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 12552, "completion_tokens": 375, "total_tokens": 12927, "cost": 0.0018622800000000002, "total_cost": 0.0018622800000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737401412} +{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737401412} diff --git a/aider/website/docs/config/adv-model-settings.md b/aider/website/docs/config/adv-model-settings.md index 2367713be..2099c3a99 100644 --- a/aider/website/docs/config/adv-model-settings.md +++ b/aider/website/docs/config/adv-model-settings.md @@ -1080,7 +1080,41 @@ cog.out("```\n") use_temperature: true weak_model_name: null - cache_control: false - caches_by_default: false + caches_by_default: true + edit_format: diff + editor_edit_format: editor-diff + editor_model_name: openrouter/deepseek/deepseek-chat + examples_as_sys_msg: true + extra_params: + max_tokens: 8192 + lazy: false + name: openrouter/deepseek/deepseek-r1 + reminder: user + send_undo_reply: false + streaming: true + use_repo_map: true + use_system_prompt: true + use_temperature: false + weak_model_name: openrouter/deepseek/deepseek-chat +- cache_control: false + caches_by_default: true + edit_format: diff + editor_edit_format: editor-diff + editor_model_name: deepseek/deepseek-chat + examples_as_sys_msg: true + extra_params: + max_tokens: 8192 + lazy: false + name: deepseek/deepseek-reasoner + reminder: user + send_undo_reply: false + streaming: true + use_repo_map: true + use_system_prompt: true + use_temperature: false + weak_model_name: deepseek/deepseek-chat +- cache_control: false + caches_by_default: true edit_format: diff editor_edit_format: null editor_model_name: null diff --git a/aider/website/docs/config/model-aliases.md b/aider/website/docs/config/model-aliases.md index b805dce57..ae32c80b1 100644 --- a/aider/website/docs/config/model-aliases.md +++ b/aider/website/docs/config/model-aliases.md @@ -59,6 +59,7 @@ for alias, model in sorted(MODEL_ALIASES.items()): - `flash`: gemini/gemini-2.0-flash-exp - `haiku`: claude-3-5-haiku-20241022 - `opus`: claude-3-opus-20240229 +- `r1`: deepseek/deepseek-reasoner - `sonnet`: claude-3-5-sonnet-20241022 diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 751adf404..26d3291e1 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -249,9 +249,9 @@ tr:hover { background-color: #f5f5f5; } - - - + + + diff --git a/aider/website/docs/leaderboards/index.md b/aider/website/docs/leaderboards/index.md index b7b72b48b..4085d04c8 100644 --- a/aider/website/docs/leaderboards/index.md +++ b/aider/website/docs/leaderboards/index.md @@ -121,6 +121,6 @@ mod_dates = [get_last_modified_date(file) for file in files] latest_mod_date = max(mod_dates) cog.out(f"{latest_mod_date.strftime('%B %d, %Y.')}") ]]]--> -January 17, 2025. +January 20, 2025.

Model NameTotal TokensPercent
deepseek/deepseek-chat1,126,98259.6%
claude-3-5-sonnet-20241022699,67637.0%
o127,7111.5%
deepseek/deepseek-chat1,139,90959.9%
claude-3-5-sonnet-20241022699,67636.8%
o125,1211.3%
claude-3-5-haiku-2024102210,0830.5%
gemini/gemini-exp-120610,0680.5%
mistral/codestral-latest8,1370.4%