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

fixed regex

Browse source
This commit is contained in:
Paul Gauthier 2023-04-11 12:42:55 -07:00
parent aebdb332a0
commit bfbf6e3e96
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
coder.py
View file

@ -140,6 +140,8 @@ class Coder:
] ]
content = self.send(messages) content = self.send(messages)
dump(repr(content))
cur_messages += [ cur_messages += [
dict(role = 'assistant', content = content), dict(role = 'assistant', content = content),
] ]
@ -172,16 +174,16 @@ class Coder:
def show_messages(self, messages, title= None): def show_messages(self, messages, title):
if title:
print(title.upper(), '*' * 50) print(title.upper(), '*' * 50)
for msg in messages: for msg in messages:
print() print()
print('-' * 50) print('-' * 50)
role = msg['role'].upper() role = msg['role'].upper()
content = msg['content'] content = msg['content'].splitlines()
print(f'{role}: {content.strip()}') for line in content:
print(role, line)
def send(self, messages, show_progress = 0): def send(self, messages, show_progress = 0):
#self.show_messages(messages, "all") #self.show_messages(messages, "all")
@ -294,7 +296,7 @@ class Coder:
return ''.join(resp) return ''.join(resp)
pattern = re.compile(r'^(\S+)\s+<<<<<<< ORIGINAL\n(.*?)\n=======\n(.*?)\n>>>>>>> UPDATED$', re.MULTILINE | re.DOTALL) pattern = re.compile(r'(\S+)\s+<<<<<<< ORIGINAL\n(.*?)\n=======\n(.*\n?)>>>>>>> UPDATED$', re.MULTILINE | re.DOTALL)
def update_files(self, content, inp): def update_files(self, content, inp):
@ -375,5 +377,7 @@ for fname in sys.argv[1:]:
coder.add_file(fname) coder.add_file(fname)
#coder.update_files(Path('tmp.commands').read_text()) ; sys.exit() #coder.update_files(Path('tmp.commands').read_text()) ; sys.exit()
content = 'new.py\n<<<<<<< ORIGINAL\n# Removed the nth_prime endpoint\n=======\n>>>>>>> UPDATED'
coder.update_files(content, 'remove the prime comment'); sys.exit()
coder.run() coder.run()