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

properly render the main sys prompt

Browse source
This commit is contained in:
Paul Gauthier 2023-11-14 11:07:35 -08:00
parent bbc174a8fb
commit 60ca8f8c0d
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
aider/coders/base_coder.py
View file

@ -411,15 +411,14 @@ class Coder:
return self.send_new_user_message(inp) return self.send_new_user_message(inp)
def fmt_system_reminder(self): def fmt_system_prompt(self, prompt):
prompt = self.gpt_prompts.system_reminder
prompt = prompt.format(fence=self.fence) prompt = prompt.format(fence=self.fence)
return prompt return prompt
def format_messages(self): def format_messages(self):
self.choose_fence() self.choose_fence()
main_sys = self.gpt_prompts.main_system main_sys = self.fmt_system_prompt(self.gpt_prompts.main_system)
main_sys += "\n" + self.fmt_system_reminder() main_sys += "\n" + self.fmt_system_prompt(self.gpt_prompts.system_reminder)
messages = [ messages = [
dict(role="system", content=main_sys), dict(role="system", content=main_sys),
@ -430,7 +429,7 @@ class Coder:
messages += self.get_files_messages() messages += self.get_files_messages()
reminder_message = [ reminder_message = [
dict(role="system", content=self.fmt_system_reminder()), dict(role="system", content=self.fmt_system_prompt(self.gpt_prompts.system_reminder)),
] ]
messages_tokens = self.main_model.token_count(messages) messages_tokens = self.main_model.token_count(messages)

15
aider/commands.py
View file

@ -106,18 +106,13 @@ class Commands:
self.coder.choose_fence() self.coder.choose_fence()
# system messages # system messages
main_sys = self.fmt_system_prompt(self.gpt_prompts.main_system)
main_sys += "\n" + self.fmt_system_prompt(self.gpt_prompts.system_reminder)
msgs = [ msgs = [
dict( dict(role="system", content=main_sys),
role="system", dict(role="system", content=self.fmt_system_prompt(self.gpt_prompts.system_reminder)),
content=self.coder.gpt_prompts.main_system
+ "\n"
+ self.coder.fmt_system_reminder(),
),
dict(
role="system",
content=self.coder.fmt_system_reminder(),
),
] ]
tokens = self.coder.main_model.token_count(msgs) tokens = self.coder.main_model.token_count(msgs)
res.append((tokens, "system messages", "")) res.append((tokens, "system messages", ""))