From 6cb8f4e762dc9badb0f4e4e2123b5ac295afa3f5 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 20 Jul 2023 09:41:38 -0300 Subject: [PATCH] stop passing content to update_cur_messages --- aider/coders/base_coder.py | 7 +++---- aider/coders/single_wholefile_func_coder.py | 4 ++-- aider/coders/wholefile_coder.py | 4 ++-- aider/coders/wholefile_func_coder.py | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index f401e38b4..3e7321520 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -532,11 +532,10 @@ class Coder: edited, edit_error = self.apply_updates() if edit_error: - self.update_cur_messages(content, set()) + self.update_cur_messages(set()) return edit_error - # TODO: this shouldn't use content, should use self.partial_.... - self.update_cur_messages(content, edited) + self.update_cur_messages(edited) if edited: if self.repo and self.auto_commits and not self.dry_run: @@ -552,7 +551,7 @@ class Coder: if add_rel_files_message: return add_rel_files_message - def update_cur_messages(self, content, edited): + def update_cur_messages(self, edited): if self.partial_response_content: self.cur_messages += [dict(role="assistant", content=self.partial_response_content)] if self.partial_response_function_call: diff --git a/aider/coders/single_wholefile_func_coder.py b/aider/coders/single_wholefile_func_coder.py index dc74b9ef0..2835c5f7c 100644 --- a/aider/coders/single_wholefile_func_coder.py +++ b/aider/coders/single_wholefile_func_coder.py @@ -34,13 +34,13 @@ class SingleWholeFileFunctionCoder(Coder): self.gpt_prompts = SingleWholeFileFunctionPrompts() super().__init__(*args, **kwargs) - def update_cur_messages(self, content, edited): + def update_cur_messages(self, edited): if edited: self.cur_messages += [ dict(role="assistant", content=self.gpt_prompts.redacted_edit_message) ] else: - self.cur_messages += [dict(role="assistant", content=content)] + self.cur_messages += [dict(role="assistant", content=self.partial_response_content)] def get_context_from_history(self, history): context = "" diff --git a/aider/coders/wholefile_coder.py b/aider/coders/wholefile_coder.py index d99e05dab..3ccd0dac5 100644 --- a/aider/coders/wholefile_coder.py +++ b/aider/coders/wholefile_coder.py @@ -12,13 +12,13 @@ class WholeFileCoder(Coder): self.gpt_prompts = WholeFilePrompts() super().__init__(*args, **kwargs) - def update_cur_messages(self, content, edited): + def update_cur_messages(self, edited): if edited: self.cur_messages += [ dict(role="assistant", content=self.gpt_prompts.redacted_edit_message) ] else: - self.cur_messages += [dict(role="assistant", content=content)] + self.cur_messages += [dict(role="assistant", content=self.partial_response_content)] def get_context_from_history(self, history): context = "" diff --git a/aider/coders/wholefile_func_coder.py b/aider/coders/wholefile_func_coder.py index 94c827305..e51150482 100644 --- a/aider/coders/wholefile_func_coder.py +++ b/aider/coders/wholefile_func_coder.py @@ -47,13 +47,13 @@ class WholeFileFunctionCoder(Coder): self.gpt_prompts = WholeFileFunctionPrompts() super().__init__(*args, **kwargs) - def update_cur_messages(self, content, edited): + def update_cur_messages(self, edited): if edited: self.cur_messages += [ dict(role="assistant", content=self.gpt_prompts.redacted_edit_message) ] else: - self.cur_messages += [dict(role="assistant", content=content)] + self.cur_messages += [dict(role="assistant", content=self.partial_response_content)] def get_context_from_history(self, history): context = ""