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

feat: Improve senior coder's edit format handling

Browse source
This commit is contained in:
Paul Gauthier 2024-09-25 11:42:09 -07:00 • committed by Paul Gauthier (aider)
parent 856d617610
commit 15cc709322
2 changed files with 14 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aider/coders/senior_coder.py
View file

@ -19,7 +19,7 @@ class SeniorCoder(AskCoder):
junior_model = self.main_model.junior_model or self.main_model junior_model = self.main_model.junior_model or self.main_model
kwargs["main_model"] = junior_model kwargs["main_model"] = junior_model
kwargs["edit_format"] = junior_model.edit_format kwargs["edit_format"] = self.main_model.junior_edit_format
kwargs["suggest_shell_commands"] = False kwargs["suggest_shell_commands"] = False
kwargs["map_tokens"] = 0 kwargs["map_tokens"] = 0
kwargs["total_cost"] = self.total_cost kwargs["total_cost"] = self.total_cost

59
benchmark/benchmark.py
View file

@ -545,36 +545,25 @@ def run_test_real(
io = InputOutput( io = InputOutput(
pretty=True, pretty=True,
yes=False, yes=True,
chat_history_file=history_fname, chat_history_file=history_fname,
) )
# senior_model = models.Model("o1-mini") # weak_model_name = model_name
# senior_model = models.Model("o1-preview") weak_model_name = None
# senior_model = models.Model("gpt-4o")
senior_model = models.Model("openrouter/anthropic/claude-3.5-sonnet")
# senior_model = models.Model("openrouter/deepseek/deepseek-chat")
# junior_model = models.Model("gemini/gemini-1.5-flash-8b-exp-0924") main_model = models.Model(model_name, weak_model=weak_model_name)
# junior_model = models.Model("gpt-4o") edit_format = edit_format or main_model.edit_format
# junior_model = models.Model("openrouter/anthropic/claude-3.5-sonnet")
# junior_model = models.Model("openrouter/deepseek/deepseek-chat")
junior_model = models.Model("openrouter/anthropic/claude-3-haiku-20240307")
# junior_model = models.Model("gpt-4o")
# junior_model = models.Model("gpt-4o-mini")
# junior_model = models.Model("openrouter/meta-llama/llama-3.1-8b-instruct")
# junior_model = models.Model("openrouter/meta-llama/llama-3-70b-instruct")
junior_edit_format = "whole"
edit_format = "senior-junior-" + junior_edit_format
show_model_name = senior_model.name + "--" + junior_model.name
dump(main_model)
dump(edit_format)
show_fnames = ",".join(map(str, fnames)) show_fnames = ",".join(map(str, fnames))
print("fnames:", show_fnames) print("fnames:", show_fnames)
coder_kwargs = dict( coder = Coder.create(
io=io, main_model,
edit_format,
io,
fnames=fnames, fnames=fnames,
use_git=False, use_git=False,
stream=False, stream=False,
@ -583,13 +572,8 @@ def run_test_real(
cache_prompts=True, cache_prompts=True,
suggest_shell_commands=False, suggest_shell_commands=False,
) )
coder = Coder.create(
main_model=senior_model,
edit_format="ask",
**coder_kwargs,
)
coder.max_apply_update_errors = max_apply_update_errors coder.max_apply_update_errors = max_apply_update_errors
coder.show_announcements()
timeouts = 0 timeouts = 0
@ -613,24 +597,7 @@ def run_test_real(
coder.apply_updates() coder.apply_updates()
else: else:
"""
coder = Coder.create(
from_coder=coder,
main_model=senior_model,
edit_format="ask",
**coder_kwargs,
)
"""
response = coder.run(with_message=instructions, preproc=False) response = coder.run(with_message=instructions, preproc=False)
junior_coder = Coder.create(
# from_coder=coder,
main_model=junior_model,
edit_format=junior_edit_format,
**coder_kwargs,
)
response = junior_coder.run(with_message=response, preproc=False)
coder.move_back_cur_messages("I made those changes to the files.")
dur += time.time() - start dur += time.time() - start
if not no_aider: if not no_aider:
@ -675,7 +642,7 @@ def run_test_real(
results = dict( results = dict(
testdir=str(testdir), testdir=str(testdir),
testcase=testdir.name, testcase=testdir.name,
model=show_model_name, model=main_model.name,
edit_format=edit_format, edit_format=edit_format,
tests_outcomes=test_outcomes, tests_outcomes=test_outcomes,
cost=coder.total_cost, cost=coder.total_cost,