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

ugh

Browse source
This commit is contained in:
Paul Gauthier 2023-04-11 11:56:50 -07:00
parent 4b516868ed
commit 1dfe6b31f1
2 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
coder.py
View file

@ -133,6 +133,17 @@ class Coder:
) )
content = self.send(messages) content = self.send(messages)
if '```' in content:
messages += [
dict(role = 'assistant', content = content),
dict(role = 'system', content = prompts.returned_code),
]
content = self.send(messages)
cur_messages += [
dict(role = 'assistant', content = content),
]
print() print()
print() print()
try: try:
@ -144,15 +155,13 @@ class Coder:
edited = None edited = None
if not edited: if not edited:
cur_messages += [
dict(role = 'assistant', content = content),
]
continue continue
files_messages = self.get_files_messages(True) files_messages = self.get_files_messages(True)
edited_message = 'You need to edit these files: ' edited_message = 'You need to edit these files: '
edited_message += ', '.join(edited) edited_message += ', '.join(edited)
cur_messages.pop()
cur_messages += [ cur_messages += [
dict(role = 'assistant', content = edited_message), dict(role = 'assistant', content = edited_message),
] ]
@ -187,7 +196,7 @@ class Coder:
if show_progress: if show_progress:
return self.show_send_progress(completion, show_progress) return self.show_send_progress(completion, show_progress)
else: else:
return self.show_send_output_color(completion) return self.show_send_output_plain(completion)
def show_send_progress(self, completion, show_progress): def show_send_progress(self, completion, show_progress):
resp = [] resp = []
@ -208,7 +217,7 @@ class Coder:
return resp return resp
def show_send_output_plain(self, completion): def show_send_output_plain(self, completion):
resp = [] resp = ''
in_diff = False in_diff = False
diff_lines = [] diff_lines = []
@ -217,14 +226,17 @@ class Coder:
for chunk in completion: for chunk in completion:
try: try:
text = chunk.choices[0].delta.content text = chunk.choices[0].delta.content
resp.append(text) resp += text
except AttributeError: except AttributeError:
continue continue
sys.stdout.write(text) sys.stdout.write(text)
sys.stdout.flush() sys.stdout.flush()
return ''.join(resp) if '```' in resp:
return resp
return resp
def show_send_output_color(self, completion): def show_send_output_color(self, completion):
resp = [] resp = []

31
prompts.py
View file

@ -33,6 +33,37 @@ example.py
>>>>>>> UPDATED >>>>>>> UPDATED
''' '''
returned_code = '''
It looks like you tried to return code. Don't do that!
Only return code using the specific ORIGINAL/UPDATED format shown in the examples below.
First line is the full filename, including path
Next line is exactly: <<<<<<< ORIGINAL
Followed by a chunk of lines from the original file which need to change
Next line is exactly: =======
Followed by the new lines to replace the original chunk
Last line is exactly: >>>>>>> UPDATED
Here are examples:
path/to/filename.ext
<<<<<<< ORIGINAL
original lines
to search for
=======
new lines to replace
the original chunk
>>>>>>> UPDATED
example.py
<<<<<<< ORIGINAL
# Function to multiply two numbers
=======
# Function to multiply two numbers using the standard algorithm
>>>>>>> UPDATED
'''
system_reminder = 'REMEMBER, ONLY RETURN CODE USING THE ORIGINAL/UPDATED FORMAT!' system_reminder = 'REMEMBER, ONLY RETURN CODE USING THE ORIGINAL/UPDATED FORMAT!'
### FILES ### FILES