dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 18:25:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

refactor: Restructure model settings application with early returns and simplified logic

Browse source
This commit is contained in:
Paul Gauthier 2024-11-19 10:02:24 -08:00 • committed by Paul Gauthier (aider)
parent c51a013109
commit 76f8791f3c
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
aider/models.py
View file

@ -858,17 +858,18 @@ class Model(ModelSettings):
model = model.lower() model = model.lower()
# Apply override settings last if they exist
if self.override_model_settings:
self._copy_fields(self.override_model_settings)
return
def apply_generic_model_settings(self, model):
if ("llama3" in model or "llama-3" in model) and "70b" in model: if ("llama3" in model or "llama-3" in model) and "70b" in model:
self.edit_format = "diff" self.edit_format = "diff"
self.use_repo_map = True self.use_repo_map = True
self.send_undo_reply = True self.send_undo_reply = True
self.examples_as_sys_msg = True self.examples_as_sys_msg = True
pass # Continue to apply overrides return # <--
# Apply override settings last if they exist
if self.override_model_settings:
self._copy_fields(self.override_model_settings)
return
if "gpt-4-turbo" in model or ("gpt-4-" in model and "-preview" in model): if "gpt-4-turbo" in model or ("gpt-4-" in model and "-preview" in model):
self.edit_format = "udiff" self.edit_format = "udiff"
@ -884,16 +885,19 @@ class Model(ModelSettings):
if "gpt-3.5" in model or "gpt-4" in model: if "gpt-3.5" in model or "gpt-4" in model:
self.reminder = "sys" self.reminder = "sys"
return # <--
if "3.5-sonnet" in model or "3-5-sonnet" in model: if "3.5-sonnet" in model or "3-5-sonnet" in model:
self.edit_format = "diff" self.edit_format = "diff"
self.use_repo_map = True self.use_repo_map = True
self.examples_as_sys_msg = True self.examples_as_sys_msg = True
self.reminder = "user" self.reminder = "user"
return # <--
if model.startswith("o1-") or "/o1-" in model: if model.startswith("o1-") or "/o1-" in model:
self.use_system_prompt = False self.use_system_prompt = False
self.use_temperature = False self.use_temperature = False
return # <--
if ( if (
"qwen" in model "qwen" in model
@ -905,10 +909,12 @@ class Model(ModelSettings):
self.edit_format = "diff" self.edit_format = "diff"
self.editor_edit_format = "editor-diff" self.editor_edit_format = "editor-diff"
self.use_repo_map = True self.use_repo_map = True
return # <--
# use the defaults # use the defaults
if self.edit_format == "diff": if self.edit_format == "diff":
self.use_repo_map = True self.use_repo_map = True
return # <--
def __str__(self): def __str__(self):
return self.name return self.name