gptdiff 0.1.20__py3-none-any.whl → 0.1.22__py3-none-any.whl

gptdiff/gptdiff.py

@@ -345,7 +345,8 @@ def smartapply(diff_text, files, model=None, api_key=None, base_url=None):
                 del files[path]
         else:
             updated = call_llm_for_apply_with_think_tool_available(path, original, patch, model, api_key=api_key, base_url=base_url)
-            files[path] = updated.strip()
+            cleaned = strip_bad_output(updated, original)
+            files[path] = cleaned
 
     threads = []
 
@@ -585,7 +586,7 @@ def parse_diff_per_file(diff_text):
         for line in lines:
             if header_line_re.match(line):
                 if current_file is not None and current_lines:
-                    if deletion_mode and not any(l.startswith("+++ ") for l in current_lines):
+                    if deletion_mode and not any(l.startswith("+++ /dev/null") for l in current_lines):
                         current_lines.append("+++ /dev/null")
                     diffs.append((current_file, "\n".join(current_lines)))
                 current_lines = [line]
@@ -778,24 +779,41 @@ def smart_apply_patch(project_dir, diff_text, user_prompt, args):
             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")
+
+        try:
+            original_content = full_path.read_text()
+        except (UnicodeDecodeError, IOError):
+            print(f"Skipping file {file_path} due to read error")
+            return
+
+        # Use SMARTAPPLY-specific environment variables if set, otherwise fallback.
+        smart_apply_model = os.getenv("GPTDIFF_SMARTAPPLY_MODEL")
+        if smart_apply_model and smart_apply_model.strip():
+            model = smart_apply_model
+        elif hasattr(args, "applymodel") and args.applymodel:
+            model = args.applymodel
+        else:
+            model = os.getenv("GPTDIFF_MODEL", "deepseek-reasoner")
+
+        smart_api_key = os.getenv("GPTDIFF_SMARTAPPLY_API_KEY")
+        if smart_api_key and smart_api_key.strip():
+            api_key = smart_api_key
+        else:
+            api_key = os.getenv("GPTDIFF_LLM_API_KEY")
+
+        smart_base_url = os.getenv("GPTDIFF_SMARTAPPLY_BASE_URL")
+        if smart_base_url and smart_base_url.strip():
+            base_url = smart_base_url
+        else:
+            base_url = os.getenv("GPTDIFF_LLM_BASE_URL", "https://nano-gpt.com/api/v1/")
 
         print("-" * 40)
-        print("Running smartapply with", args.applymodel,"on",file_path)
+        print("Running smartapply with", model, "on", file_path)
         print("-" * 40)
         try:
             updated_content = call_llm_for_apply_with_think_tool_available(
-                file_path, original_content, file_diff, args.applymodel,
+                file_path, original_content, file_diff, model,
+                api_key=api_key, base_url=base_url,
                 extra_prompt=f"This changeset is from the following instructions:\n{user_prompt}",
                 max_tokens=args.max_tokens)
             if updated_content.strip() == "":
@@ -985,17 +1003,47 @@ def swallow_reasoning(full_response: str) -> (str, str):
          - reasoning: The extracted reasoning block, or an empty string if not found.
     """
     pattern = re.compile(
-        r"(?P<reasoning>>\s*Reasoning.*?Reasoned for \d+\s*seconds)",
+        r"(?P<reasoning>>\s*Reasoning.*?Reasoned.*?seconds)",
         re.DOTALL
     )
     match = pattern.search(full_response)
     if match:
-        reasoning = match.group("reasoning").strip()
-        final_content = full_response.replace(reasoning, "").strip()
+        raw_reasoning = match.group("reasoning")
+        # Remove any leading '+' characters and extra whitespace from each line
+        reasoning_lines = [line.lstrip('+').strip() for line in raw_reasoning.splitlines()]
+        reasoning = "\n".join(reasoning_lines).strip()
+
+        # Remove the reasoning block from the response using its exact span
+        final_content = full_response[:match.start()] + full_response[match.end():]
+        final_content = final_content.strip()
     else:
         reasoning = ""
         final_content = full_response.strip()
     return final_content, reasoning
 
+def strip_bad_output(updated: str, original: str) -> str:
+    """
+    If the original file content does not start with a code fence but the LLM’s updated output
+    starts with triple backticks (possibly with an introductory message), extract and return only
+    the content within the first code block.
+    """
+    updated_stripped = updated.strip()
+    # If the original file does not start with a code fence, but the updated output contains a code block,
+    # extract and return only the content inside the first code block.
+    if not original.lstrip().startswith("```"):
+        # Search for the first code block in the updated output.
+        m = re.search(r"```(.*?)```", updated_stripped, re.DOTALL)
+        if m:
+            content = m.group(1).strip()
+            lines = content.splitlines()
+            if len(lines) > 1:
+                first_line = lines[0].strip()
+                # If the first line appears to be a language specifier (i.e., a single word)
+                # and is not "diff", then drop it.
+                if " " not in first_line and first_line.lower() != "diff":
+                    content = "\n".join(lines[1:]).strip()
+            return content
+    return updated_stripped
+
 if __name__ == "__main__":
     main()

{gptdiff-0.1.20.dist-info → gptdiff-0.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.20
+Version: 0.1.22
 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.13
+Requires-Dist: ai-agent-toolbox>=0.1.15
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"

gptdiff-0.1.22.dist-info/RECORD

@@ -0,0 +1,9 @@
+gptdiff/__init__.py,sha256=o1hrK4GFvbfKcHPlLVArz4OunE3euIicEBYaLrdDo0k,198
+gptdiff/gptdiff.py,sha256=AuZwZ1pg52RPheAzdhtZXSTjBGH4t4KRm7r9ziGHJVQ,41388
+gptdiff/gptpatch.py,sha256=Z8CWWIfIL2o7xPLVdhzN5GSyJq0vsK4XQRzu4hMWNQk,2194
+gptdiff-0.1.22.dist-info/LICENSE.txt,sha256=zCJk7yUYpMjFvlipi1dKtaljF8WdZ2NASndBYYbU8BY,1228
+gptdiff-0.1.22.dist-info/METADATA,sha256=_RspqYV4VPaRrpYTQXNVecFirrxzZq7MelPpZLV3O9Q,8785
+gptdiff-0.1.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gptdiff-0.1.22.dist-info/entry_points.txt,sha256=0VlVNr-gc04a3SZD5_qKIBbtg_L5P2x3xlKE5ftcdkc,82
+gptdiff-0.1.22.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
+gptdiff-0.1.22.dist-info/RECORD,,

gptdiff-0.1.20.dist-info/RECORD

@@ -1,9 +0,0 @@
-gptdiff/__init__.py,sha256=o1hrK4GFvbfKcHPlLVArz4OunE3euIicEBYaLrdDo0k,198
-gptdiff/gptdiff.py,sha256=LKBq_E9GanyDv-2FBbbWvP7JUl2Ignb6zvkD2GqmdPo,39074
-gptdiff/gptpatch.py,sha256=Z8CWWIfIL2o7xPLVdhzN5GSyJq0vsK4XQRzu4hMWNQk,2194
-gptdiff-0.1.20.dist-info/LICENSE.txt,sha256=zCJk7yUYpMjFvlipi1dKtaljF8WdZ2NASndBYYbU8BY,1228
-gptdiff-0.1.20.dist-info/METADATA,sha256=v8-LTu-NVLikIexMY5RDEf2t2VTAh7t_3hch379VzFA,8785
-gptdiff-0.1.20.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gptdiff-0.1.20.dist-info/entry_points.txt,sha256=0VlVNr-gc04a3SZD5_qKIBbtg_L5P2x3xlKE5ftcdkc,82
-gptdiff-0.1.20.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
-gptdiff-0.1.20.dist-info/RECORD,,