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

SwitchModel -> SwitchCoder

Browse source
This commit is contained in:
Your Name 2024-07-28 17:49:02 -03:00
parent 4537e6c16a
commit f440479c48
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aider/commands.py
View file

@ -15,7 +15,7 @@ from aider.utils import is_image_file
from .dump import dump # noqa: F401 from .dump import dump # noqa: F401
class SwitchModel(Exception): class SwitchCoder(Exception):
def __init__(self, model=None, edit_format=None): def __init__(self, model=None, edit_format=None):
self.model = model self.model = model
self.edit_format = edit_format self.edit_format = edit_format
@ -43,7 +43,7 @@ class Commands:
model_name = args.strip() model_name = args.strip()
model = models.Model(model_name) model = models.Model(model_name)
models.sanity_check_models(self.io, model) models.sanity_check_models(self.io, model)
raise SwitchModel(model=model) raise SwitchCoder(model=model)
def cmd_mode(self, args): def cmd_mode(self, args):
"Switch to a new editing mode" "Switch to a new editing mode"
@ -52,10 +52,12 @@ class Commands:
valid_formats = "diff udiff whole".split() valid_formats = "diff udiff whole".split()
if ef not in valid_formats: if ef not in valid_formats:
self.io.tool_error(f"Invalid edit format: {ef}. Valid formats are: {', '.join(valid_formats)}") self.io.tool_error(
f"Invalid edit format: {ef}. Valid formats are: {', '.join(valid_formats)}"
)
return return
raise SwitchModel(edit_format=ef) raise SwitchCoder(edit_format=ef)
def completions_model(self): def completions_model(self):
models = litellm.model_cost.keys() models = litellm.model_cost.keys()

11
aider/main.py
View file

@ -12,7 +12,7 @@ from prompt_toolkit.enums import EditingMode
from aider import __version__, models, utils from aider import __version__, models, utils
from aider.args import get_parser from aider.args import get_parser
from aider.coders import Coder from aider.coders import Coder
from aider.commands import SwitchModel from aider.commands import SwitchCoder
from aider.io import InputOutput from aider.io import InputOutput
from aider.llm import litellm # noqa: F401; properly init litellm on launch from aider.llm import litellm # noqa: F401; properly init litellm on launch
from aider.repo import GitRepo from aider.repo import GitRepo
@ -587,8 +587,13 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
try: try:
coder.run() coder.run()
return return
except SwitchModel as switch: except SwitchCoder as switch:
coder = Coder.create(main_model=switch.model, io=io, from_coder=coder) coder = Coder.create(
main_model=switch.model,
edit_format=switch.edit_format,
io=io,
from_coder=coder,
)
coder.show_announcements() coder.show_announcements()