gptdiff 0.1.16__tar.gz → 0.1.18__tar.gz

{gptdiff-0.1.16 → gptdiff-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.16
+Version: 0.1.18
 Summary: A tool to generate and apply git diffs using LLMs
 Author: 255labs
 Classifier: License :: OSI Approved :: MIT License

{gptdiff-0.1.16 → gptdiff-0.1.18}/gptdiff/gptdiff.py

@@ -697,14 +697,14 @@ def call_llm_for_apply(file_path, original_content, file_diff, model, api_key=No
 4. You must return the entire file. It overwrites the existing file."""
     user_prompt = f"""File: {file_path}
 File contents:
-<filecontents>
+```
 {original_content}
-</filecontents>
+```
 
 Diff to apply:
-<diff>
+```diff
 {file_diff}
-</diff>"""
+```"""
     if extra_prompt:
         user_prompt += f"\n\n{extra_prompt}"
     if model == "gemini-2.0-flash-thinking-exp-01-21":
@@ -867,7 +867,7 @@ def main():
                 project_files.extend(load_project_files(additional_path, project_dir))
 
     if args.prepend:
-        prepend = args.prepend
+        prepend = args.prepend+"\n"
     else:
         prepend = ""
 
@@ -885,10 +885,10 @@ def main():
         # If the specified prepend path does not exist, treat the value as literal content.
         prepend = prepend
 
-    if not args.call and not args.apply:
-        system_prompt = prepend + f"Output a git diff into a ```diff block"
-    else:
-        system_prompt = prepend + f"Output a git diff into a <diff> block."
+    if prepend != "":
+        prepend += "\n"
+
+    system_prompt = prepend + f"Output a git diff into a ```diff block"
 
     files_content = ""
     for file, content in project_files:

{gptdiff-0.1.16 → gptdiff-0.1.18}/gptdiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.16
+Version: 0.1.18
 Summary: A tool to generate and apply git diffs using LLMs
 Author: 255labs
 Classifier: License :: OSI Approved :: MIT License

{gptdiff-0.1.16 → gptdiff-0.1.18}/gptdiff.egg-info/SOURCES.txt

@@ -13,5 +13,6 @@ gptdiff.egg-info/top_level.txt
 tests/test_applydiff.py
 tests/test_applydiff_edgecases.py
 tests/test_diff_parse.py
+tests/test_failing_case.py
 tests/test_parse_diff_per_file.py
 tests/test_smartapply.py

{gptdiff-0.1.16 → gptdiff-0.1.18}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='gptdiff',
-    version='0.1.16',
+    version='0.1.18',
     description='A tool to generate and apply git diffs using LLMs',
     author='255labs',
     packages=find_packages(),  # Use find_packages() to automatically discover packages

gptdiff-0.1.18/tests/test_failing_case.py

@@ -0,0 +1,25 @@
+import unittest
+from gptdiff.gptdiff import smartapply
+
+class TestSmartApplyEdgeCase(unittest.TestCase):
+    def test_smartapply_think_tag_stripping(self):
+        """
+        This test verifies that if an LLM response includes extraneous wrapping (e.g.
+        ), these tags are stripped from the final applied diff.
+        """
+        diff_text = '''diff --git a/hello.py b/hello.py
+--- a/hello.py
+++++ b/hello.py
+@@ -1,2 +1,5 @@
+ def hello():
+     print('Hello')
+++
+++def goodbye():
+++    print('Goodbye')'''
+        original_files = {"hello.py": "def hello():\n    print('Hello')\n"}
+
+        from unittest.mock import patch
+        with patch('gptdiff.gptdiff.call_llm_for_apply', return_value="\ndef goodbye():\n    print('Goodbye')"):
+            updated_files = smartapply(diff_text, original_files)
+
+        self.assertIn("def goodbye():", updated_files.get("hello.py", ""))