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

diff merge conflict format

Browse source
This commit is contained in:
Paul Gauthier 2023-04-07 23:01:25 -07:00
parent 263aa19695
commit cfc7b060df
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
coder.py
View file

@ -26,17 +26,19 @@ Your job is to:
- Understand what the user wants. Ask questions if needed. - Understand what the user wants. Ask questions if needed.
- Suggest changes to the code. - Suggest changes to the code.
ONLY SUGGEST CODE CHANGES BY USING THIS EXACT BEFORE/AFTER COMMAND FORMAT: FOR EACH CHANGE TO THE CODE, DESCRIBE IT USING THIS FORMAT:
path/to/filename.ext path/to/filename.ext
```BEFORE <<<<<<< ORIGINAL
... unchanged lines from the original file ... a chunk of the original file
... only include lines around needed changes! ... that needs to be changed
... NEVER INCLUDE AN ENTIRE FILE! ... =======
``` new lines to replace
```AFTER the original chunk
... new lines to replace them with ... >>>>>>> UPDATED
```
NEVER REPLY WITH AN ENTIRE FILE!
ONLY USE THE ABOVE ORIGINAL/UPDATED FORMAT TO DESCRIBE CODE CHANGES!
''' '''
prompt_comments = ''' prompt_comments = '''
@ -152,7 +154,7 @@ class Coder:
def get_files_message(self): def get_files_message(self):
prompt = '' prompt = 'Here are the files. NEVER USE THIS FORMAT FOR OUTPUT!\n'
for fname in self.fnames: for fname in self.fnames:
prompt += self.quoted_file(fname) prompt += self.quoted_file(fname)
return prompt return prompt
@ -197,7 +199,7 @@ The ``` delimiters are very important!
prompt = '' prompt = ''
prompt += inp prompt += inp
prompt += '\n###\n' prompt += '\n###\n'
prompt += 'Here is the content of the files. DO NOT OUTPUT CODE USING THIS FORMAT\n' prompt += 'Here is the content of the files. DO NOT OUTPUT CODE USING THIS FORMAT!!\n'
prompt += self.get_files_message() prompt += self.get_files_message()
messages = [ messages = [
@ -249,6 +251,8 @@ The ``` delimiters are very important!
def send(self, messages): def send(self, messages):
dump(messages)
completion = openai.ChatCompletion.create( completion = openai.ChatCompletion.create(
model="gpt-3.5-turbo", model="gpt-3.5-turbo",
#model="gpt-4", #model="gpt-4",
@ -373,7 +377,7 @@ coder.system(prompt_webdev)
for fname in sys.argv[1:]: 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()
coder.run() coder.run()