diff --git a/aider/coders/__init__.py b/aider/coders/__init__.py index 8f3929e85..edce98129 100644 --- a/aider/coders/__init__.py +++ b/aider/coders/__init__.py @@ -4,7 +4,7 @@ from .editblock_coder import EditBlockCoder from .editblock_fenced_coder import EditBlockFencedCoder from .help_coder import HelpCoder from .junior_editblock_coder import JuniorEditBlockCoder -from .junior_wholefile_coder import JuniorWholeFileCoder +from .junior_whole_coder import JuniorWholeFileCoder from .senior_coder import SeniorCoder from .udiff_coder import UnifiedDiffCoder from .wholefile_coder import WholeFileCoder diff --git a/aider/coders/junior_whole_coder.py b/aider/coders/junior_whole_coder.py index c11544560..d864cfab9 100644 --- a/aider/coders/junior_whole_coder.py +++ b/aider/coders/junior_whole_coder.py @@ -1,7 +1,7 @@ -from .junior_whole_prompts import JuniorWholePrompts -from .whole_coder import WholeCoder +from .junior_whole_prompts import JuniorWholeFilePrompts +from .wholefile_coder import WholeFileCoder -class JuniorWholeCoder(WholeCoder): +class JuniorWholeFileCoder(WholeFileCoder): edit_format = "junior-whole" - gpt_prompts = JuniorWholePrompts() + gpt_prompts = JuniorWholeFilePrompts() diff --git a/aider/coders/junior_whole_prompts.py b/aider/coders/junior_whole_prompts.py index 90f03d100..4441b76be 100644 --- a/aider/coders/junior_whole_prompts.py +++ b/aider/coders/junior_whole_prompts.py @@ -3,7 +3,7 @@ from .wholefile_prompts import WholeFilePrompts -class WholeFilePrompts(WholeFilePrompts): +class JuniorWholeFilePrompts(WholeFilePrompts): main_system = """Act as an expert software developer and make changes to source code. {lazy_prompt} Output a copy of each file that needs changes. diff --git a/aider/models.py b/aider/models.py index dbecfe52b..f8e9eb557 100644 --- a/aider/models.py +++ b/aider/models.py @@ -469,7 +469,7 @@ MODEL_SETTINGS = [ "openai/o1-mini", "whole", weak_model_name="openai/gpt-4o-mini", - junior_model_name="gpt-4o", + junior_model_name="openai/gpt-4o", junior_edit_format="junior-diff", use_repo_map=True, reminder="user", @@ -515,6 +515,8 @@ MODEL_SETTINGS = [ "openrouter/openai/o1-mini", "whole", weak_model_name="openrouter/openai/gpt-4o-mini", + junior_model_name="openrouter/openai/gpt-4o", + junior_edit_format="junior-diff", use_repo_map=True, reminder="user", use_system_prompt=False,