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

fix: Break apart get_files_messages into separate methods

Browse source 
feat: Refactor ChatChunks class to include new attributes
This commit is contained in:
Paul Gauthier (aider) 2024-08-16 16:42:34 -07:00
parent 52b6e76434
commit 1daee69f15
1 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

66
aider/coders/base_coder.py
View file

@ -56,12 +56,15 @@ class ChatChunks:
system: List = field(default_factory=list) system: List = field(default_factory=list)
examples: List = field(default_factory=list) examples: List = field(default_factory=list)
done: List = field(default_factory=list) done: List = field(default_factory=list)
files: List = field(default_factory=list) repo: List = field(default_factory=list)
readonly_files: List = field(default_factory=list)
chat_files: List = field(default_factory=list)
cur: List = field(default_factory=list) cur: List = field(default_factory=list)
reminder: List = field(default_factory=list) reminder: List = field(default_factory=list)
def all_messages(self): def all_messages(self):
return self.system + self.examples + self.done + self.files + self.cur + self.reminder return (self.system + self.examples + self.done + self.repo +
self.readonly_files + self.chat_files + self.cur + self.reminder)
class Coder: class Coder:
@ -610,40 +613,24 @@ class Coder:
return repo_content return repo_content
def get_files_messages(self): def get_repo_messages(self):
files_messages = [] repo_messages = []
repo_content = self.get_repo_map() repo_content = self.get_repo_map()
if repo_content: if repo_content:
files_messages += [ repo_messages += [
dict(role="user", content=repo_content), dict(role="user", content=repo_content),
dict( dict(
role="assistant", role="assistant",
content="Ok, I won't try and edit those files without asking first.", content="Ok, I won't try and edit those files without asking first.",
), ),
] ]
return repo_messages
if self.abs_fnames: def get_readonly_files_messages(self):
files_content = self.gpt_prompts.files_content_prefix readonly_messages = []
files_content += self.get_files_content()
files_reply = "Ok, any changes I propose will be to those files."
elif repo_content and self.gpt_prompts.files_no_full_files_with_repo_map:
files_content = self.gpt_prompts.files_no_full_files_with_repo_map
files_reply = self.gpt_prompts.files_no_full_files_with_repo_map_reply
else:
files_content = self.gpt_prompts.files_no_full_files
files_reply = "Ok."
images_message = self.get_images_message()
if images_message is not None:
files_messages += [
images_message,
dict(role="assistant", content="Ok."),
]
read_only_content = self.get_read_only_files_content() read_only_content = self.get_read_only_files_content()
if read_only_content: if read_only_content:
files_messages += [ readonly_messages += [
dict( dict(
role="user", content=self.gpt_prompts.read_only_files_prefix + read_only_content role="user", content=self.gpt_prompts.read_only_files_prefix + read_only_content
), ),
@ -652,14 +639,35 @@ class Coder:
content="Ok, I will use these files as references.", content="Ok, I will use these files as references.",
), ),
] ]
return readonly_messages
def get_chat_files_messages(self):
chat_files_messages = []
if self.abs_fnames:
files_content = self.gpt_prompts.files_content_prefix
files_content += self.get_files_content()
files_reply = "Ok, any changes I propose will be to those files."
elif self.get_repo_map() and self.gpt_prompts.files_no_full_files_with_repo_map:
files_content = self.gpt_prompts.files_no_full_files_with_repo_map
files_reply = self.gpt_prompts.files_no_full_files_with_repo_map_reply
else:
files_content = self.gpt_prompts.files_no_full_files
files_reply = "Ok."
if files_content: if files_content:
files_messages += [ chat_files_messages += [
dict(role="user", content=files_content), dict(role="user", content=files_content),
dict(role="assistant", content=files_reply), dict(role="assistant", content=files_reply),
] ]
return files_messages images_message = self.get_images_message()
if images_message is not None:
chat_files_messages += [
images_message,
dict(role="assistant", content="Ok."),
]
return chat_files_messages
def get_images_message(self): def get_images_message(self):
if not self.main_model.accepts_images: if not self.main_model.accepts_images:
@ -920,7 +928,9 @@ class Coder:
self.summarize_end() self.summarize_end()
chunks.done = self.done_messages chunks.done = self.done_messages
chunks.files = self.get_files_messages() chunks.repo = self.get_repo_messages()
chunks.readonly_files = self.get_readonly_files_messages()
chunks.chat_files = self.get_chat_files_messages()
if self.gpt_prompts.system_reminder: if self.gpt_prompts.system_reminder:
reminder_message = [ reminder_message = [