From 1dfe6b31f17164c002918fde20424a067c0c6540 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@geomagical.com>
Date: Tue, 11 Apr 2023 11:56:50 -0700
Subject: [PATCH] ugh

---
 coder.py   | 26 +++++++++++++++++++-------
 prompts.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/coder.py b/coder.py
index e99a571b3..aec576661 100755
--- a/coder.py
+++ b/coder.py
@@ -133,6 +133,17 @@ class Coder:
             )
             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()
             try:
@@ -144,15 +155,13 @@ class Coder:
                 edited = None
 
             if not edited:
-                cur_messages += [
-                    dict(role = 'assistant', content = content),
-                ]
                 continue
 
             files_messages = self.get_files_messages(True)
 
             edited_message = 'You need to edit these files: '
             edited_message += ', '.join(edited)
+            cur_messages.pop()
             cur_messages += [
                 dict(role = 'assistant', content = edited_message),
             ]
@@ -187,7 +196,7 @@ class Coder:
         if show_progress:
             return self.show_send_progress(completion, show_progress)
         else:
-            return self.show_send_output_color(completion)
+            return self.show_send_output_plain(completion)
 
     def show_send_progress(self, completion, show_progress):
         resp = []
@@ -208,7 +217,7 @@ class Coder:
         return resp
 
     def show_send_output_plain(self, completion):
-        resp = []
+        resp = ''
 
         in_diff = False
         diff_lines = []
@@ -217,14 +226,17 @@ class Coder:
         for chunk in completion:
             try:
                 text = chunk.choices[0].delta.content
-                resp.append(text)
+                resp += text
             except AttributeError:
                 continue
 
             sys.stdout.write(text)
             sys.stdout.flush()
 
-        return ''.join(resp)
+            if '```' in resp:
+                return resp
+
+        return resp
 
     def show_send_output_color(self, completion):
         resp = []
diff --git a/prompts.py b/prompts.py
index fa5debf79..abae6d065 100644
--- a/prompts.py
+++ b/prompts.py
@@ -33,6 +33,37 @@ example.py
 >>>>>>> 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!'
 
 ### FILES