diff --git a/aider/models.py b/aider/models.py index 8ab4eb8c9..5a42f9e8f 100644 --- a/aider/models.py +++ b/aider/models.py @@ -496,6 +496,8 @@ MODEL_SETTINGS = [ "openai/o1-preview", "diff", weak_model_name="openai/gpt-4o-mini", + junior_model_name="openai/gpt-4o", + junior_edit_format="junior-diff", use_repo_map=True, reminder="user", use_system_prompt=False, @@ -530,6 +532,8 @@ MODEL_SETTINGS = [ "openrouter/openai/o1-preview", "diff", 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, diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py index 43c6595ef..0f5f1b14d 100755 --- a/benchmark/benchmark.py +++ b/benchmark/benchmark.py @@ -378,7 +378,7 @@ def summarize_results(dirname): res.syntax_errors += results.get("syntax_errors", 0) res.indentation_errors += results.get("indentation_errors", 0) - for key in "model edit_format commit_hash".split(): + for key in "model edit_format commit_hash junior_model junior_edit_format".split(): val = results.get(key) if val: variants[key].add(val) @@ -679,8 +679,8 @@ def run_test_real( testcase=testdir.name, model=main_model.name, edit_format=edit_format, - junior_model=junior_model, - junior_edit_format=junior_edit_format, + junior_model=main_model.junior_model.name if main_model.junior_model else None, + junior_edit_format=main_model.junior_edit_format, tests_outcomes=test_outcomes, cost=coder.total_cost, duration=dur,