mirror of
https://github.com/Aider-AI/aider.git
synced 2025-06-01 18:25:00 +00:00
Tell o1 & o3-mini to use markdown
This commit is contained in:
parent
21e96df85a
commit
cf0710225c
3 changed files with 14 additions and 0 deletions
|
@ -1077,6 +1077,10 @@ class Coder:
|
||||||
shell_cmd_reminder=shell_cmd_reminder,
|
shell_cmd_reminder=shell_cmd_reminder,
|
||||||
language=language,
|
language=language,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if self.main_model.system_prompt_prefix:
|
||||||
|
prompt = self.main_model.system_prompt_prefix + prompt
|
||||||
|
|
||||||
return prompt
|
return prompt
|
||||||
|
|
||||||
def format_chat_chunks(self):
|
def format_chat_chunks(self):
|
||||||
|
|
|
@ -114,6 +114,7 @@ class ModelSettings:
|
||||||
editor_model_name: Optional[str] = None
|
editor_model_name: Optional[str] = None
|
||||||
editor_edit_format: Optional[str] = None
|
editor_edit_format: Optional[str] = None
|
||||||
remove_reasoning: Optional[str] = None
|
remove_reasoning: Optional[str] = None
|
||||||
|
system_prompt_prefix: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
# Load model settings from package resource
|
# Load model settings from package resource
|
||||||
|
@ -294,6 +295,7 @@ class Model(ModelSettings):
|
||||||
self.edit_format = "diff"
|
self.edit_format = "diff"
|
||||||
self.use_repo_map = True
|
self.use_repo_map = True
|
||||||
self.use_temperature = False
|
self.use_temperature = False
|
||||||
|
self.system_prompt_prefix = "Formatting re-enabled. "
|
||||||
return # <--
|
return # <--
|
||||||
|
|
||||||
if "/o1-mini" in model:
|
if "/o1-mini" in model:
|
||||||
|
@ -314,6 +316,7 @@ class Model(ModelSettings):
|
||||||
self.use_repo_map = True
|
self.use_repo_map = True
|
||||||
self.use_temperature = False
|
self.use_temperature = False
|
||||||
self.streaming = False
|
self.streaming = False
|
||||||
|
self.system_prompt_prefix = "Formatting re-enabled. "
|
||||||
return # <--
|
return # <--
|
||||||
|
|
||||||
if "deepseek" in model and "v3" in model:
|
if "deepseek" in model and "v3" in model:
|
||||||
|
|
|
@ -569,6 +569,7 @@
|
||||||
streaming: false
|
streaming: false
|
||||||
editor_model_name: openrouter/openai/gpt-4o
|
editor_model_name: openrouter/openai/gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: openai/o1
|
- name: openai/o1
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -578,6 +579,7 @@
|
||||||
streaming: false
|
streaming: false
|
||||||
editor_model_name: openai/gpt-4o
|
editor_model_name: openai/gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: o1
|
- name: o1
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -587,6 +589,7 @@
|
||||||
streaming: false
|
streaming: false
|
||||||
editor_model_name: gpt-4o
|
editor_model_name: gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: openrouter/qwen/qwen-2.5-coder-32b-instruct
|
- name: openrouter/qwen/qwen-2.5-coder-32b-instruct
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -634,6 +637,7 @@
|
||||||
use_temperature: false
|
use_temperature: false
|
||||||
editor_model_name: gpt-4o
|
editor_model_name: gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: o3-mini
|
- name: o3-mini
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -642,6 +646,7 @@
|
||||||
use_temperature: false
|
use_temperature: false
|
||||||
editor_model_name: gpt-4o
|
editor_model_name: gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: openrouter/openai/o3-mini
|
- name: openrouter/openai/o3-mini
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -650,6 +655,7 @@
|
||||||
use_temperature: false
|
use_temperature: false
|
||||||
editor_model_name: openrouter/openai/gpt-4o
|
editor_model_name: openrouter/openai/gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
- name: azure/o3-mini
|
- name: azure/o3-mini
|
||||||
edit_format: diff
|
edit_format: diff
|
||||||
|
@ -658,5 +664,6 @@
|
||||||
use_temperature: false
|
use_temperature: false
|
||||||
editor_model_name: azure/gpt-4o
|
editor_model_name: azure/gpt-4o
|
||||||
editor_edit_format: editor-diff
|
editor_edit_format: editor-diff
|
||||||
|
system_prompt_prefix: "Formatting re-enabled. "
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue