From fbc4a49c24e1c4fdc8a1485880b8c7d5ec9b5979 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 17 Aug 2023 11:19:49 -0700 Subject: [PATCH] Removed support for func based coders --- aider/coders/base_coder.py | 16 +--------------- aider/coders/editblock_func_coder.py | 3 ++- aider/coders/single_wholefile_func_coder.py | 3 ++- aider/coders/wholefile_func_coder.py | 4 +++- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index e5cc3f2a0..188778866 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -58,13 +58,7 @@ class Coder: io, **kwargs, ): - from . import ( - EditBlockCoder, - EditBlockFunctionCoder, - SingleWholeFileFunctionCoder, - WholeFileCoder, - WholeFileFunctionCoder, - ) + from . import EditBlockCoder, WholeFileCoder if not main_model: main_model = models.GPT35_16k @@ -85,14 +79,6 @@ class Coder: return EditBlockCoder(main_model, io, **kwargs) elif edit_format == "whole": return WholeFileCoder(main_model, io, **kwargs) - elif edit_format == "whole-func": - return WholeFileFunctionCoder(main_model, io, **kwargs) - elif edit_format == "single-whole-func": - return SingleWholeFileFunctionCoder(main_model, io, **kwargs) - elif edit_format == "diff-func-list": - return EditBlockFunctionCoder("list", main_model, io, **kwargs) - elif edit_format in ("diff-func", "diff-func-string"): - return EditBlockFunctionCoder("string", main_model, io, **kwargs) else: raise ValueError(f"Unknown edit format {edit_format}") diff --git a/aider/coders/editblock_func_coder.py b/aider/coders/editblock_func_coder.py index 3f7acbaf5..42bbb20f3 100644 --- a/aider/coders/editblock_func_coder.py +++ b/aider/coders/editblock_func_coder.py @@ -58,6 +58,7 @@ class EditBlockFunctionCoder(Coder): ] def __init__(self, code_format, *args, **kwargs): + raise RuntimeError("Deprecated, needs to be refactored to support get_edits/apply_edits") self.code_format = code_format if code_format == "string": @@ -91,7 +92,7 @@ class EditBlockFunctionCoder(Coder): res = json.dumps(args, indent=4) return res - def update_files(self): + def _update_files(self): name = self.partial_response_function_call.get("name") if name and name != "replace_lines": diff --git a/aider/coders/single_wholefile_func_coder.py b/aider/coders/single_wholefile_func_coder.py index 2d99c3645..ef1680e97 100644 --- a/aider/coders/single_wholefile_func_coder.py +++ b/aider/coders/single_wholefile_func_coder.py @@ -31,6 +31,7 @@ class SingleWholeFileFunctionCoder(Coder): ] def __init__(self, *args, **kwargs): + raise RuntimeError("Deprecated, needs to be refactored to support get_edits/apply_edits") self.gpt_prompts = SingleWholeFileFunctionPrompts() super().__init__(*args, **kwargs) @@ -94,7 +95,7 @@ class SingleWholeFileFunctionCoder(Coder): return "\n".join(show_diff) - def update_files(self): + def _update_files(self): name = self.partial_response_function_call.get("name") if name and name != "write_file": raise ValueError(f'Unknown function_call name="{name}", use name="write_file"') diff --git a/aider/coders/wholefile_func_coder.py b/aider/coders/wholefile_func_coder.py index ebf10764d..987010ea7 100644 --- a/aider/coders/wholefile_func_coder.py +++ b/aider/coders/wholefile_func_coder.py @@ -44,6 +44,8 @@ class WholeFileFunctionCoder(Coder): ] def __init__(self, *args, **kwargs): + raise RuntimeError("Deprecated, needs to be refactored to support get_edits/apply_edits") + self.gpt_prompts = WholeFileFunctionPrompts() super().__init__(*args, **kwargs) @@ -105,7 +107,7 @@ class WholeFileFunctionCoder(Coder): return "\n".join(show_diff) - def update_files(self): + def _update_files(self): name = self.partial_response_function_call.get("name") if name and name != "write_file": raise ValueError(f'Unknown function_call name="{name}", use name="write_file"')