gptdiff 0.1.11__py3-none-any.whl → 0.1.14__py3-none-any.whl

gptdiff/gptdiff.py

@@ -747,6 +747,69 @@ def build_environment_from_filelist(file_list, cwd):
             continue
     return build_environment(files_dict)
 
+def smart_apply_patch(project_dir, diff_text, user_prompt, args):
+    """
+    Attempt to apply a diff via smartapply: process each file concurrently using the LLM.
+    """
+    from pathlib import Path
+    parsed_diffs = parse_diff_per_file(diff_text)
+    print("Found", len(parsed_diffs), "files in diff, processing smart apply concurrently:")
+    if len(parsed_diffs) == 0:
+        print("\033[1;33mThere were no entries in this diff. The LLM may have returned something invalid.\033[0m")
+        if args.beep:
+            print("\a")
+        return
+    threads = []
+
+    def process_file(file_path, file_diff):
+        full_path = Path(project_dir) / file_path
+        print(f"Processing file: {file_path}")
+        if '+++ /dev/null' in file_diff:
+            if full_path.exists():
+                full_path.unlink()
+                print(f"\033[1;32mDeleted file {file_path}.\033[0m")
+            else:
+                print(f"\033[1;33mFile {file_path} not found - skipping deletion\033[0m")
+            return
+        original_content = ''
+        if full_path.exists():
+            try:
+                original_content = full_path.read_text()
+            except UnicodeDecodeError:
+                print(f"Skipping binary file {file_path}")
+                return
+        if not hasattr(args, "applymodel") or args.applymodel is None:
+            args.applymodel = args.model
+        if args.applymodel is None:
+            args.applymodel = os.getenv("GPTDIFF_MODEL")
+
+        print("-" * 40)
+        print("Running smartapply with", args.applymodel,"on",file_path)
+        print("-" * 40)
+        try:
+            updated_content = call_llm_for_apply_with_think_tool_available(
+                file_path, original_content, file_diff, args.applymodel,
+                extra_prompt=f"This changeset is from the following instructions:\n{user_prompt}",
+                max_tokens=args.max_tokens)
+            if updated_content.strip() == "":
+                print("Cowardly refusing to write empty file to", file_path, "merge failed")
+                return
+            full_path.parent.mkdir(parents=True, exist_ok=True)
+            full_path.write_text(updated_content)
+            print(f"\033[1;32mSuccessful 'smartapply' update {file_path}.\033[0m")
+        except Exception as e:
+            print(f"\033[1;31mFailed to process {file_path}: {str(e)}\033[0m")
+
+    for file_path, file_diff in parsed_diffs:
+        thread = threading.Thread(target=process_file, args=(file_path, file_diff))
+        thread.start()
+        threads.append(thread)
+    for thread in threads:
+        thread.join()
+
+    if args.beep:
+        print("\a")
+
 def main():
     # Adding color support for Windows CMD
     if os.name == 'nt':
@@ -754,7 +817,6 @@ def main():
 
     args = parse_arguments()
 
-    # TODO: The 'openai.api_base' option isn't read in the client API. You will need to pass it when you instantiate the client, e.g. 'OpenAI(base_url="https://nano-gpt.com/api/v1/")'
     # openai.api_base = "https://nano-gpt.com/api/v1/"
     if len(sys.argv) < 2:
         print("Usage: python script.py '<user_prompt>' [--apply]")
@@ -778,11 +840,24 @@ def main():
                 project_files.extend(load_project_files(additional_path, project_dir))
 
     if args.prepend:
-        prepend = load_prepend_file(args.prepend)
-        print("Including prepend",len(enc.encode(json.dumps(prepend))), "tokens")
+        prepend = args.prepend
     else:
         prepend = ""
 
+    if prepend.startswith("http://") or prepend.startswith("https://"):
+        try:
+            import urllib.request
+            with urllib.request.urlopen(prepend) as response:
+                prepend = response.read().decode('utf-8')
+        except Exception as e:
+            print(f"Error fetching prepend content from URL {prepend}: {e}")
+            prepend = ""
+    elif os.path.exists(prepend):
+        prepend = load_prepend_file(prepend)
+    else:
+        # 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."
 
@@ -851,73 +926,11 @@ def main():
         print("\n</diff>")
         print("Saved to patch.diff")
         if apply_diff(project_dir, diff_text):
-            print(f"\033[1;32mPatch applied successfully with 'git apply'.\033[0m")  # Green color for success message
+            print(f"\033[1;32mPatch applied successfully with 'git apply'.\033[0m")
         else:
             print("Apply failed, attempting smart apply.")
-            parsed_diffs = parse_diff_per_file(diff_text)
-            print("Found", len(parsed_diffs), " files in diff, calling smartdiff for each file concurrently:")
-
-            if(len(parsed_diffs) == 0):
-                print(f"\033[1;33mThere were no entries in this diff. The LLM may have returned something invalid.\033[0m")
-                if args.beep:
-                    print("\a")  # Terminal bell for completion notification
-                return
-
-            threads = []
-
-            def process_file(file_path, file_diff):
-                full_path = Path(project_dir) / file_path
-                print(f"Processing file: {file_path}")
-                
-                # Handle file deletions from diff
-                if '+++ /dev/null' in file_diff:
-                    if full_path.exists():
-                        full_path.unlink()
-                        print(f"\033[1;32mDeleted file {file_path}.\033[0m")
-                    else:
-                        print(f"\033[1;33mFile {file_path} not found - skipping deletion\033[0m")
-                    return
-
-                original_content = ''
-                if full_path.exists():
-                    try:
-                        original_content = full_path.read_text()
-                    except UnicodeDecodeError:
-                        print(f"Skipping binary file {file_path}")
-                        return
-
-                print("-" * 40)
-                print("SMARTAPPLY")
-                print(file_diff)
-                print("-" * 40)
-                if args.applymodel is None:
-                    args.applymodel = args.model
-
-                try:
-                    updated_content = call_llm_for_apply_with_think_tool_available(file_path, original_content, file_diff, args.applymodel, extra_prompt=f"This changeset is from the following instructions:\n{user_prompt}", max_tokens=args.max_tokens)
-
-                    if updated_content.strip() == "":
-                        print("Cowardly refusing to write empty file to", file_path, "merge failed")
-                        return
-
-                    full_path.parent.mkdir(parents=True, exist_ok=True)
-                    full_path.write_text(updated_content)
-                    print(f"\033[1;32mSuccessful 'smartapply' update {file_path}.\033[0m")
-                except Exception as e:
-                    print(f"\033[1;31mFailed to process {file_path}: {str(e)}\033[0m")
-
-            threads = []
-            for file_path, file_diff in parsed_diffs:
-                thread = threading.Thread(
-                    target=process_file,
-                    args=(file_path, file_diff)
-                )
-                thread.start()
-                threads.append(thread)
-            for thread in threads:
-                thread.join()
+            smart_apply_patch(project_dir, diff_text, user_prompt, args)
 
-    
     if args.beep:
         print("\a")  # Terminal bell for completion notification
 
@@ -927,4 +940,4 @@ def main():
     #print(f"Total cost: ${cost:.4f}")
 
 if __name__ == "__main__":
-    main()
+    main()

gptdiff/gptpatch.py

@@ -0,0 +1,76 @@
+#!/usr/bin/env python3
+"""
+Command line tool to apply a unified diff directly to a file system.
+
+Usage:
+    gptpatch --diff "<diff text>"
+    or
+    gptpatch path/to/diff.patch
+
+This tool uses the same patch-application logic as gptdiff.
+"""
+
+import sys
+import argparse
+from pathlib import Path
+from gptdiff.gptdiff import apply_diff
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(
+        description="Apply a unified diff to the file system using GPTDiff's patch logic."
+    )
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument(
+        "--diff",
+        type=str,
+        help="Unified diff text to apply (provide as a string)."
+    )
+    group.add_argument(
+        "diff_file",
+        nargs="?",
+        help="Path to a file containing the unified diff."
+    )
+    parser.add_argument(
+        "--project-dir",
+        type=str,
+        default=".",
+        help="Project directory where the diff should be applied (default: current directory)."
+    )
+    parser.add_argument('--nobeep', action='store_false', dest='beep', default=True, help='Disable completion notification beep')
+    parser.add_argument(
+        "--model",
+        type=str,
+        default=None,
+        help="Model to use for applying the diff"
+    )
+    parser.add_argument(
+        "--max_tokens",
+        type=int,
+        default=30000,
+        help="Maximum tokens to use for LLM responses"
+    )
+    return parser.parse_args()
+
+def main():
+    args = parse_arguments()
+    if args.diff:
+        diff_text = args.diff
+    else:
+        diff_path = Path(args.diff_file)
+        if not diff_path.exists():
+            print(f"Error: Diff file '{args.diff_file}' does not exist.")
+            sys.exit(1)
+        diff_text = diff_path.read_text(encoding="utf8")
+
+    project_dir = args.project_dir
+    success = apply_diff(project_dir, diff_text)
+    if success:
+        print("✅ Diff applied successfully.")
+    else:
+        print("❌ Failed to apply diff using git apply. Attempting smart apply.")
+        from gptdiff.gptdiff import smart_apply_patch
+        smart_apply_patch(project_dir, diff_text, "", args)
+        
+if __name__ == "__main__":
+    main()

{gptdiff-0.1.11.dist-info → gptdiff-0.1.14.dist-info}/METADATA

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

gptdiff-0.1.14.dist-info/RECORD

@@ -0,0 +1,9 @@
+gptdiff/__init__.py,sha256=yGjgwv7tNvH1ZLPsQyoo1CxpTOl1iCAwwDBp-_17ksQ,89
+gptdiff/gptdiff.py,sha256=JWdlnnMZPmDOsg6jD2QQandaKZhpNlk8lQEgs2KmmM0,36872
+gptdiff/gptpatch.py,sha256=Z8CWWIfIL2o7xPLVdhzN5GSyJq0vsK4XQRzu4hMWNQk,2194
+gptdiff-0.1.14.dist-info/LICENSE.txt,sha256=zCJk7yUYpMjFvlipi1dKtaljF8WdZ2NASndBYYbU8BY,1228
+gptdiff-0.1.14.dist-info/METADATA,sha256=imeKq8Q_B_PS4S0lMFvWAkoPxqWCZZW6OciaEKDsA3Q,7799
+gptdiff-0.1.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gptdiff-0.1.14.dist-info/entry_points.txt,sha256=0VlVNr-gc04a3SZD5_qKIBbtg_L5P2x3xlKE5ftcdkc,82
+gptdiff-0.1.14.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
+gptdiff-0.1.14.dist-info/RECORD,,

{gptdiff-0.1.11.dist-info → gptdiff-0.1.14.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 gptdiff = gptdiff.gptdiff:main
+gptpatch = gptdiff.gptpatch:main

gptdiff-0.1.11.dist-info/RECORD

@@ -1,8 +0,0 @@
-gptdiff/__init__.py,sha256=yGjgwv7tNvH1ZLPsQyoo1CxpTOl1iCAwwDBp-_17ksQ,89
-gptdiff/gptdiff.py,sha256=HbnFkP1o5jQ-WIC99y-et_X6BeBsArtKqiFb2FG6X28,36694
-gptdiff-0.1.11.dist-info/LICENSE.txt,sha256=zCJk7yUYpMjFvlipi1dKtaljF8WdZ2NASndBYYbU8BY,1228
-gptdiff-0.1.11.dist-info/METADATA,sha256=pCTb2Mu4w0Y6HSAY5A8F8jwrJrLfq_SQw80PyQvRIXA,7799
-gptdiff-0.1.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gptdiff-0.1.11.dist-info/entry_points.txt,sha256=0yvXYEVAZFI-p32kQ4-h3qKVWS0a86jsM9FAwF89t9w,49
-gptdiff-0.1.11.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
-gptdiff-0.1.11.dist-info/RECORD,,