diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index a539a3afa..4686b9ccd 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,20 +1,3 @@ -{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703041} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703041} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703041} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "ask", "prompt_tokens": 6251, "completion_tokens": 216, "total_tokens": 6467, "cost": 0.0058203, "total_cost": 0.0058203}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703056} -{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "ask", "prompt_tokens": 7237, "completion_tokens": 289, "total_tokens": 7526, "cost": 0.0092323, "total_cost": 0.0293645}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703056} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703060} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703067} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703086} -{"event": "repo", "properties": {"num_files": 119}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703088} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703088} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703120} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703122} -{"event": "repo", "properties": {"num_files": 119}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703123} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703123} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703180} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703183} -{"event": "repo", "properties": {"num_files": 119}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703184} {"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703184} {"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703199} {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738703201} @@ -998,3 +981,20 @@ {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738881386} {"event": "gui session", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738881386} {"event": "exit", "properties": {"reason": "GUI session ended"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738881386} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884252} +{"event": "repo", "properties": {"num_files": 435}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884252} +{"event": "cli session", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884252} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884254} +{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff", "prompt_tokens": 10012, "completion_tokens": 32, "total_tokens": 10044, "cost": 0.011154, "total_cost": 0.011154}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884259} +{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884260} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884263} +{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884263} +{"event": "cli session", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884263} +{"event": "exit", "properties": {"reason": "Completed main CLI coder.run"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884265} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884269} +{"event": "repo", "properties": {"num_files": 435}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884269} +{"event": "cli session", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884269} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884280} +{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "gpt-4o-mini", "editor_model": "gpt-4o", "edit_format": "diff", "prompt_tokens": 9985, "completion_tokens": 180, "total_tokens": 10165, "cost": 0.0117755, "total_cost": 0.0117755}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884287} +{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884373} +{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738884373} diff --git a/aider/website/docs/config/adv-model-settings.md b/aider/website/docs/config/adv-model-settings.md index 6b6e81444..212bdbae5 100644 --- a/aider/website/docs/config/adv-model-settings.md +++ b/aider/website/docs/config/adv-model-settings.md @@ -173,6 +173,7 @@ cog.out("```\n") editor_model_name: null editor_edit_format: null remove_reasoning: null + system_prompt_prefix: null - name: anthropic/claude-3-5-haiku-20241022 edit_format: diff @@ -263,6 +264,7 @@ cog.out("```\n") use_temperature: false editor_model_name: azure/gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0 edit_format: diff @@ -573,6 +575,7 @@ cog.out("```\n") streaming: false editor_model_name: gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: o1-mini weak_model_name: gpt-4o-mini @@ -598,6 +601,7 @@ cog.out("```\n") use_temperature: false editor_model_name: gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: openai/gpt-4o edit_format: diff @@ -637,6 +641,7 @@ cog.out("```\n") streaming: false editor_model_name: openai/gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: openai/o1-mini weak_model_name: openai/gpt-4o-mini @@ -662,6 +667,7 @@ cog.out("```\n") use_temperature: false editor_model_name: gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: openrouter/anthropic/claude-3-opus edit_format: diff @@ -760,6 +766,7 @@ cog.out("```\n") streaming: false editor_model_name: openrouter/openai/gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: openrouter/openai/o1-mini weak_model_name: openrouter/openai/gpt-4o-mini @@ -787,6 +794,7 @@ cog.out("```\n") use_temperature: false editor_model_name: openrouter/openai/gpt-4o editor_edit_format: editor-diff + system_prompt_prefix: 'Formatting re-enabled. ' - name: openrouter/qwen/qwen-2.5-coder-32b-instruct edit_format: diff diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 5a9bf7807..32a143ba3 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -249,9 +249,9 @@ tr:hover { background-color: #f5f5f5; } - - - + + +
Model NameTotal TokensPercent
claude-3-5-sonnet-20241022654,18345.8%
fireworks_ai/accounts/fireworks/models/deepseek-v3289,87420.3%
o3-mini274,56419.2%
claude-3-5-sonnet-20241022654,18345.6%
o3-mini287,24720.0%
fireworks_ai/accounts/fireworks/models/deepseek-v3283,40719.8%
deepseek/deepseek-chat97,7456.8%
fireworks_ai/REDACTED45,2333.2%
fireworks_ai/accounts/fireworks/models/deepseek-r144,0693.1%