Merge branch 'main' of github.com:Aider-AI/aider

aider/resources/model-metadata.json

@@ -47,4 +47,22 @@
         //"supports_tool_choice": true,
         "supports_prompt_caching": true
     },
+    "fireworks_ai/accounts/fireworks/models/deepseek-r1": {
+        "max_tokens": 160000,
+        "max_input_tokens": 128000,
+        "max_output_tokens": 20480,
+        "litellm_provider": "fireworks_ai",
+        "input_cost_per_token": 0.000008,
+        "output_cost_per_token": 0.000008,
+        "mode": "chat",
+    },
+    "fireworks_ai/accounts/fireworks/models/deepseek-v3": {
+        "max_tokens": 128000,
+        "max_input_tokens": 100000,
+        "max_output_tokens": 8192,
+        "litellm_provider": "fireworks_ai",
+        "input_cost_per_token": 0.0000009,
+        "output_cost_per_token": 0.0000009,
+        "mode": "chat",
+    },
 }

aider/resources/model-settings.yml

@@ -591,7 +591,6 @@
   editor_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
   editor_edit_format: editor-diff
 
-
 - name: openrouter/deepseek/deepseek-r1-distill-llama-70b
   edit_format: diff
   weak_model_name: openrouter/deepseek/deepseek-chat
@@ -603,4 +602,23 @@
   use_temperature: false
   editor_model_name: openrouter/deepseek/deepseek-chat
   editor_edit_format: editor-diff
-  
+  
+- name: fireworks_ai/accounts/fireworks/models/deepseek-r1
+  edit_format: diff
+  weak_model_name: fireworks_ai/accounts/fireworks/models/deepseek-v3
+  use_repo_map: true
+  use_temperature: false
+  streaming: true
+  editor_model_name: fireworks_ai/accounts/fireworks/models/deepseek-v3
+  editor_edit_format: editor-diff
+  remove_reasoning: false
+  extra_params:
+      max_tokens: 160000
+
+- name: fireworks_ai/accounts/fireworks/models/deepseek-v3
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+      max_tokens: 128000