gptdiff 0.1.15__tar.gz → 0.1.18__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.15
+Version: 0.1.18
 Summary: A tool to generate and apply git diffs using LLMs
 Author: 255labs
 Classifier: License :: OSI Approved :: MIT License
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: openai>=1.0.0
 Requires-Dist: tiktoken>=0.5.0
-Requires-Dist: ai_agent_toolbox>=0.1.11
+Requires-Dist: ai_agent_toolbox>=0.1.13
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
@@ -175,7 +175,38 @@ OpenAI will not be called unless you specify `--call` or `--apply`
 
 Prevent files being appended to the prompt by adding them to `.gitignore` or `.gptignore`
 
-### Command Line Usage
+## Command Line Usage
+
+## gptpatch: Apply Diffs Directly
+
+`gptpatch` is a companion command-line tool to [GPTDiff](https://github.com/255BITS/gptdiff) that applies unified diffs directly to your project.
+
+### Usage
+
+Apply a diff provided directly:
+
+```bash
+gptpatch --diff "<diff text>"
+```
+
+Or apply a diff from a file:
+
+```bash
+gptpatch path/to/diff.patch
+```
+
+### Options
+
+- **--project-dir**: Specify the target project directory (default: current directory)
+- **--model**: (Optional) Specify the LLM model for advanced conflict resolution
+- **--max_tokens**: (Optional) Define the maximum token count for LLM responses during patch application
+- **--nobeep**: Disable the completion beep notification
+
+### Workflow
+
+`gptpatch` first attempts to apply the diff using standard patch logic. If that fails, it automatically falls back to a smart apply mechanism that leverages AI-powered conflict resolution.
+
+For more details, see the [gptpatch documentation](https://gptdiff.255labs.xyz) on our docs site.
 
 After installing the package, use the `gptdiff` command in your terminal. Change directory into your codebase and run:
 

{gptdiff-0.1.15 → gptdiff-0.1.18}/README.md

@@ -148,7 +148,38 @@ OpenAI will not be called unless you specify `--call` or `--apply`
 
 Prevent files being appended to the prompt by adding them to `.gitignore` or `.gptignore`
 
-### Command Line Usage
+## Command Line Usage
+
+## gptpatch: Apply Diffs Directly
+
+`gptpatch` is a companion command-line tool to [GPTDiff](https://github.com/255BITS/gptdiff) that applies unified diffs directly to your project.
+
+### Usage
+
+Apply a diff provided directly:
+
+```bash
+gptpatch --diff "<diff text>"
+```
+
+Or apply a diff from a file:
+
+```bash
+gptpatch path/to/diff.patch
+```
+
+### Options
+
+- **--project-dir**: Specify the target project directory (default: current directory)
+- **--model**: (Optional) Specify the LLM model for advanced conflict resolution
+- **--max_tokens**: (Optional) Define the maximum token count for LLM responses during patch application
+- **--nobeep**: Disable the completion beep notification
+
+### Workflow
+
+`gptpatch` first attempts to apply the diff using standard patch logic. If that fails, it automatically falls back to a smart apply mechanism that leverages AI-powered conflict resolution.
+
+For more details, see the [gptpatch documentation](https://gptdiff.255labs.xyz) on our docs site.
 
 After installing the package, use the `gptdiff` command in your terminal. Change directory into your codebase and run:
 

gptdiff-0.1.18/gptdiff/__init__.py

@@ -0,0 +1,3 @@
+from .gptdiff import generate_diff, smartapply, load_project_files, build_environment, save_files
+
+__all__ = ['generate_diff', 'smartapply', 'load_project_files', 'build_environment', 'save_files']

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

@@ -21,7 +21,7 @@ import argparse
 import pkgutil
 import re
 import contextvars
-from ai_agent_toolbox import FlatXMLParser, FlatXMLPromptFormatter, Toolbox
+from ai_agent_toolbox import MarkdownParser, MarkdownPromptFormatter, Toolbox, FlatXMLParser, FlatXMLPromptFormatter
 import threading
 from pkgutil import get_data
 
@@ -165,7 +165,7 @@ def load_project_files(project_dir, cwd):
         Prints skipped files to stdout for visibility
     """
     ignore_paths = [Path(cwd) / ".gitignore", Path(cwd) / ".gptignore"]
-    gitignore_patterns = [".gitignore", "diff.patch", "prompt.txt", ".gptignore", "*.pdf", "*.docx", ".git", "*.orig", "*.rej"]
+    gitignore_patterns = [".gitignore", "diff.patch", "prompt.txt", ".gptignore", "*.pdf", "*.docx", ".git", "*.orig", "*.rej", "*.diff"]
 
     for p in ignore_paths:
         if p.exists():
@@ -196,8 +196,8 @@ def call_llm_for_diff(system_prompt, user_prompt, files_content, model, temperat
     enc = tiktoken.get_encoding("o200k_base")
     start_time = time.time()
 
-    parser = FlatXMLParser("diff")
-    formatter = FlatXMLPromptFormatter(tag="diff")
+    parser = MarkdownParser()
+    formatter = MarkdownPromptFormatter()
     toolbox = create_diff_toolbox()
     tool_prompt = formatter.usage_prompt(toolbox)
     system_prompt += "\n"+tool_prompt
@@ -273,11 +273,12 @@ prepended to the system prompt.
             with urllib.request.urlopen(prepend) as response:
                 prepend = response.read().decode('utf-8')
         else:
-            prepend = load_prepend_file(prepend)
+            prepend = load_prepend_file(prepend)+"\n"
     else:
         prepend = ""
     
-    system_prompt = prepend+f"Output a git diff into a <diff> block."
+    diff_tag = "```diff"
+    system_prompt = prepend + f"Output a git diff into a \"{diff_tag}\" block."
     _, diff_text, _, _, _, _ = call_llm_for_diff(
         system_prompt, 
         goal, 
@@ -696,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":
@@ -810,6 +811,32 @@ def smart_apply_patch(project_dir, diff_text, user_prompt, args):
     if args.beep:
         print("\a")
 
+def save_files(files_dict, target_directory):
+    """
+    Save files from a dictionary mapping relative file paths to file contents
+    into the specified target directory.
+
+    Args:
+        files_dict (dict): A dictionary where keys are file paths (relative)
+                           and values are the corresponding file contents.
+        target_directory (str or Path): The directory where files will be saved.
+    """
+    target_directory = Path(target_directory)
+    # Create the target directory if it doesn't exist.
+    target_directory.mkdir(parents=True, exist_ok=True)
+    
+    for file_path, content in files_dict.items():
+        # Create the full path for the file.
+        full_path = target_directory / file_path
+        
+        # Ensure parent directories exist.
+        full_path.parent.mkdir(parents=True, exist_ok=True)
+        
+        # Write the file content.
+        with full_path.open('w', encoding='utf-8') as f:
+            f.write(content)
+        print(f"Saved: {full_path}")
+
 def main():
     # Adding color support for Windows CMD
     if os.name == 'nt':
@@ -840,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 = ""
 
@@ -858,8 +885,10 @@ def main():
         # If the specified prepend path does not exist, treat the value as literal content.
         prepend = prepend
 
-    # Prepare system prompt
-    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:
@@ -874,9 +903,8 @@ def main():
         args.model = os.getenv('GPTDIFF_MODEL', 'deepseek-reasoner')
 
     if not args.call and not args.apply:
-        append = "\nInstead of using <diff> tags, use ```diff backticks."
         with open('prompt.txt', 'w') as f:
-            f.write(full_prompt+append)
+            f.write(full_prompt)
         print(f"Total tokens: {token_count:5d}")
         print(f"\033[1;32mNot calling GPT-4.\033[0m")  # Green color for success message
         print('Instead, wrote full prompt to prompt.txt. Use `xclip -selection clipboard < prompt.txt` then paste into chatgpt')

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.15
+Version: 0.1.18
 Summary: A tool to generate and apply git diffs using LLMs
 Author: 255labs
 Classifier: License :: OSI Approved :: MIT License
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: openai>=1.0.0
 Requires-Dist: tiktoken>=0.5.0
-Requires-Dist: ai_agent_toolbox>=0.1.11
+Requires-Dist: ai_agent_toolbox>=0.1.13
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
@@ -175,7 +175,38 @@ OpenAI will not be called unless you specify `--call` or `--apply`
 
 Prevent files being appended to the prompt by adding them to `.gitignore` or `.gptignore`
 
-### Command Line Usage
+## Command Line Usage
+
+## gptpatch: Apply Diffs Directly
+
+`gptpatch` is a companion command-line tool to [GPTDiff](https://github.com/255BITS/gptdiff) that applies unified diffs directly to your project.
+
+### Usage
+
+Apply a diff provided directly:
+
+```bash
+gptpatch --diff "<diff text>"
+```
+
+Or apply a diff from a file:
+
+```bash
+gptpatch path/to/diff.patch
+```
+
+### Options
+
+- **--project-dir**: Specify the target project directory (default: current directory)
+- **--model**: (Optional) Specify the LLM model for advanced conflict resolution
+- **--max_tokens**: (Optional) Define the maximum token count for LLM responses during patch application
+- **--nobeep**: Disable the completion beep notification
+
+### Workflow
+
+`gptpatch` first attempts to apply the diff using standard patch logic. If that fails, it automatically falls back to a smart apply mechanism that leverages AI-powered conflict resolution.
+
+For more details, see the [gptpatch documentation](https://gptdiff.255labs.xyz) on our docs site.
 
 After installing the package, use the `gptdiff` command in your terminal. Change directory into your codebase and run:
 

{gptdiff-0.1.15 → 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.15 → gptdiff-0.1.18}/gptdiff.egg-info/requires.txt

@@ -1,6 +1,6 @@
 openai>=1.0.0
 tiktoken>=0.5.0
-ai_agent_toolbox>=0.1.11
+ai_agent_toolbox>=0.1.13
 
 [docs]
 mkdocs

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='gptdiff',
-    version='0.1.15',
+    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
@@ -12,7 +12,7 @@ setup(
     install_requires=[
         'openai>=1.0.0',
         'tiktoken>=0.5.0',
-        'ai_agent_toolbox>=0.1.11'
+        'ai_agent_toolbox>=0.1.13'
     ],
     extras_require={
         'test': ['pytest', 'pytest-mock'],

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", ""))

gptdiff-0.1.15/gptdiff/__init__.py

@@ -1,3 +0,0 @@
-from .gptdiff import generate_diff, smartapply
-
-__all__ = ['generate_diff', 'smartapply']