Merge pull request #930 from ATheorell/fix#928

potential fix for some/dir/ bug #928

gpt_engineer/preprompts/improve

@@ -8,7 +8,7 @@ Take requests for changes to the supplied code, and then you MUST
 
 You MUST format EVERY code change with an *edit block* like this:
 ```python
-some/dir/example.py
+example.py
 <<<<<<< HEAD
     # some comment
     # Func to multiply
@@ -29,7 +29,7 @@ Also, in the class `DB`, we need to update the "SOMETHING"
 
 OUTPUT:
 ```python
-some/dir/example_1.py
+example_1.py
 <<<<<<< HEAD
     def mul(a,b)
 =======
@@ -38,7 +38,7 @@ some/dir/example_1.py
 ```
 
 ```python
-some/dir/example_1.py
+example_1.py
 <<<<<<< HEAD
     def add_one(a,b):
         a = a+2
@@ -49,7 +49,7 @@ some/dir/example_1.py
 ```
 
 ```python
-some/dir/example_2.py
+example_1.py
 <<<<<<< HEAD
     class DBS:
         db = 'aaa'
@@ -65,6 +65,8 @@ So edit blocks must be precise and unambiguous!
 
 Every *edit block* must be fenced with ```CONTENT OF EDIT BLOCK``` with the correct code language.
 
+The file name at the top of the edit block (example_1.py in the examples) is the relative path to the file.
+
 The `HEAD` section must be an *exact set of sequential lines* from the file! This is very important. Otherwise the parser won't work.
 NEVER SKIP LINES in the `HEAD` section!
 NEVER ELIDE LINES AND REPLACE THEM WITH A COMMENT!

tests/core/test_chat_to_files.py

@@ -183,12 +183,19 @@ class DBS:
     assert parsed == expected
 
 
+def test_apply_overwrite_existing_file(log_capture):
+    edits = [Edit("existing_file.py", "", "print('Hello, World!')")]
+    code = {"existing_file.py": "some content"}
+    apply_edits(edits, code)
+    assert code == {"existing_file.py": "print('Hello, World!')"}
+    assert "file will be overwritten" in log_capture.messages[0]
+
+
 def test_apply_edit_new_file(log_capture):
     edits = [Edit("new_file.py", "", "print('Hello, World!')")]
-    code = {"new_file.py": "some content"}
+    code = {}
     apply_edits(edits, code)
     assert code == {"new_file.py": "print('Hello, World!')"}
-    assert "file will be overwritten" in log_capture.messages[0]
 
 
 def test_apply_edit_no_match(log_capture):