From 5a4871155ad99dd41b0012fb4046118b5b0e3200 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Fri, 10 Jan 2025 14:54:42 -0800 Subject: [PATCH] copy --- HISTORY.md | 2 +- aider/website/HISTORY.md | 2 +- aider/website/assets/sample-analytics.jsonl | 46 ++++++++++----------- aider/website/docs/faq.md | 6 +-- aider/website/docs/usage/commands.md | 9 ++-- aider/website/docs/usage/modes.md | 8 ++++ 6 files changed, 42 insertions(+), 31 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3c6699a47..756b6ad60 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,6 @@ # Release history -### main branch +### Aider v0.71.0 - Prompts to help DeepSeek work better when alternating between `/ask` and `/code`. - Streaming pretty LLM responses is smoother and faster for long replies. diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index b6f3d0f29..b8277d59d 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -23,7 +23,7 @@ cog.out(text) ]]]--> -### main branch +### Aider v0.71.0 - Prompts to help DeepSeek work better when alternating between `/ask` and `/code`. - Streaming pretty LLM responses is smoother and faster for long replies. diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index 7be60b671..a988157f5 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,26 +1,3 @@ -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270145} -{"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 10602, "completion_tokens": 526, "total_tokens": 11128, "cost": 0.0016315600000000002, "total_cost": 0.0016315600000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270311} -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270419} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270429} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270430} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270430} -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270439} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270474} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270475} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270475} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270475} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270476} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270476} -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270483} -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270484} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270501} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270502} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270502} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270502} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270503} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270503} -{"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 10755, "completion_tokens": 546, "total_tokens": 11301, "cost": 0.00169442, "total_cost": 0.00169442}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270670} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270670} {"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 10648, "completion_tokens": 669, "total_tokens": 11317, "cost": 0.00167804, "total_cost": 0.00167804}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270672} {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270672} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736270677} @@ -998,3 +975,26 @@ {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736548965} {"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 27953, "completion_tokens": 820, "total_tokens": 28773, "cost": 0.0041430199999980405, "total_cost": 0.0041430199999980405}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736548990} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736548990} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549095} +{"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549095} +{"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549095} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549200} +{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549202} +{"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": 1736549202} +{"event": "command_run", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549212} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549224} +{"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 13281, "completion_tokens": 183, "total_tokens": 13464, "cost": 0.00191057999999804, "total_cost": 0.00191057999999804}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549232} +{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549338} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549351} +{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549352} +{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549356} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549431} +{"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549431} +{"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549431} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549444} +{"event": "repo", "properties": {"num_files": 423}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549445} +{"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": 1736549445} +{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549447} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549470} +{"event": "message_send", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff", "prompt_tokens": 17467, "completion_tokens": 323, "total_tokens": 17790, "cost": 0.00253581999999804, "total_cost": 0.00253581999999804}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549483} +{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1736549673} diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index fc64aba17..883993fd7 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -237,10 +237,10 @@ tr:hover { background-color: #f5f5f5; } - - + + - +
Model NameTotal TokensPercent
deepseek/deepseek-coder554,25850.2%
deepseek/deepseek-chat473,17742.8%
deepseek/deepseek-coder554,25849.8%
deepseek/deepseek-chat482,00243.3%
claude-3-5-sonnet-2024102261,0935.5%
gemini/gemini-1.5-flash-8b8,2970.8%
gemini/gemini-1.5-flash-8b8,2970.7%
gemini/gemini-1.5-flash-0024,9640.4%
o12,5900.2%
diff --git a/aider/website/docs/usage/commands.md b/aider/website/docs/usage/commands.md index 5fdf8ee20..8b400f908 100644 --- a/aider/website/docs/usage/commands.md +++ b/aider/website/docs/usage/commands.md @@ -22,11 +22,14 @@ cog.out(get_help_md()) |Command|Description| |:------|:----------| | **/add** | Add files to the chat so aider can edit them or review them in detail | -| **/architect** | Enter architect mode to discuss high-level design and architecture | -| **/ask** | Ask questions about the code base without editing any files | +| **/architect** | Enter architect mode to discuss high-level design and architecture. + If no prompt is provided, switches to architect mode. | +| **/ask** | Ask questions about the code base without editing any files. + If no prompt is provided, switches to ask mode. | | **/chat-mode** | Switch to a new chat mode | | **/clear** | Clear the chat history | -| **/code** | Ask for changes to your code | +| **/code** | Ask for changes to your code. + If no prompt is provided, switches to code mode. | | **/commit** | Commit edits to the repo made outside the chat (commit message optional) | | **/copy** | Copy the last assistant message to the clipboard | | **/copy-context** | Copy the current chat context as markdown, suitable to paste into a web UI | diff --git a/aider/website/docs/usage/modes.md b/aider/website/docs/usage/modes.md index 1818a9589..f3d9a3359 100644 --- a/aider/website/docs/usage/modes.md +++ b/aider/website/docs/usage/modes.md @@ -29,6 +29,14 @@ with the `/chat-mode ` command: /chat-mode help ``` +Or you can switch between coding modes using these commands without arguments: + +``` +/code +/architect +/ask +``` + Or you can launch aider in one of the modes with the `--chat-mode ` switch. There is also a special shortcut `--architect` to launch in `--chat-mode architect`.