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

move cur_messages->done_messages, even with --no-auto-commit

Browse source
This commit is contained in:
Paul Gauthier 2023-06-05 22:30:52 -07:00
parent 8abff61aff
commit 05c08b36a7
1 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aider/coder.py
View file

@ -267,6 +267,15 @@ class Coder:
return return
return True return True
def move_back_cur_messages(self, message):
self.done_messages += self.cur_messages
if message:
self.done_messages += [
dict(role="user", content=message),
dict(role="assistant", content="Ok."),
]
self.cur_messages = []
def run_loop(self): def run_loop(self):
inp = self.io.get_input( inp = self.io.get_input(
self.root, self.root,
@ -281,12 +290,7 @@ class Coder:
self.commit(ask=True, which="repo_files") self.commit(ask=True, which="repo_files")
# files changed, move cur messages back behind the files messages # files changed, move cur messages back behind the files messages
self.done_messages += self.cur_messages self.move_back_cur_messages(self.gpt_prompts.files_content_local_edits)
self.done_messages += [
dict(role="user", content=self.gpt_prompts.files_content_local_edits),
dict(role="assistant", content="Ok."),
]
self.cur_messages = []
if inp.strip(): if inp.strip():
self.io.tool_output("Use up-arrow to retry previous command:", inp) self.io.tool_output("Use up-arrow to retry previous command:", inp)
@ -315,8 +319,7 @@ class Coder:
dict(role="system", content=main_sys), dict(role="system", content=main_sys),
] ]
if self.main_model == Models.GPT4: messages += self.done_messages
messages += self.done_messages
messages += self.get_files_messages() messages += self.get_files_messages()
messages += self.cur_messages messages += self.cur_messages
@ -348,8 +351,12 @@ class Coder:
dict(role="assistant", content=self.gpt_prompts.redacted_edit_message) dict(role="assistant", content=self.gpt_prompts.redacted_edit_message)
] ]
if edited and self.auto_commits: if edited:
self.auto_commit() if self.auto_commits:
saved_message = self.auto_commit()
else:
saved_message = None
self.move_back_cur_messages(saved_message)
add_rel_files_message = self.check_for_file_mentions(content) add_rel_files_message = self.check_for_file_mentions(content)
if add_rel_files_message: if add_rel_files_message:
@ -370,13 +377,7 @@ class Coder:
self.io.tool_error("Warning: no changes found in tracked files.") self.io.tool_error("Warning: no changes found in tracked files.")
saved_message = self.gpt_prompts.files_content_gpt_no_edits saved_message = self.gpt_prompts.files_content_gpt_no_edits
self.done_messages += self.cur_messages return saved_message
self.done_messages += [
dict(role="user", content=saved_message),
dict(role="assistant", content="Ok."),
]
self.cur_messages = []
return
def check_for_file_mentions(self, content): def check_for_file_mentions(self, content):
words = set(word for word in content.split()) words = set(word for word in content.split())