gptdiff 0.1.18__py3-none-any.whl → 0.1.21__py3-none-any.whl

gptdiff/gptdiff.py

@@ -202,7 +202,7 @@ def call_llm_for_diff(system_prompt, user_prompt, files_content, model, temperat
     tool_prompt = formatter.usage_prompt(toolbox)
     system_prompt += "\n"+tool_prompt
 
-    if model == "gemini-2.0-flash-thinking-exp-01-21":
+    if 'gemini' in model:
         user_prompt = system_prompt+"\n"+user_prompt
 
     messages = [
@@ -241,6 +241,9 @@ def call_llm_for_diff(system_prompt, user_prompt, files_content, model, temperat
     cost = (prompt_tokens / 1_000_000 * cost_per_million_prompt_tokens) + (completion_tokens / 1_000_000 * cost_per_million_completion_tokens)
 
     full_response = response.choices[0].message.content.strip()
+    full_response, reasoning = swallow_reasoning(full_response)
+    if reasoning and len(reasoning) > 0:
+        print("Swallowed reasoning", reasoning)
 
     events = parser.parse(full_response)
     for event in events:
@@ -643,6 +646,9 @@ def call_llm_for_apply_with_think_tool_available(file_path, original_content, fi
     formatter = FlatXMLPromptFormatter(tag="think")
     toolbox = create_think_toolbox()
     full_response = call_llm_for_apply(file_path, original_content, file_diff, model, api_key=api_key, base_url=base_url, extra_prompt=extra_prompt, max_tokens=max_tokens)
+    full_response, reasoning = swallow_reasoning(full_response)
+    if reasoning and len(reasoning) > 0:
+        print("Swallowed reasoning", reasoning)
     notool_response = ""
     events = parser.parse(full_response)
     is_in_tool = False
@@ -707,7 +713,7 @@ Diff to apply:
 ```"""
     if extra_prompt:
         user_prompt += f"\n\n{extra_prompt}"
-    if model == "gemini-2.0-flash-thinking-exp-01-21":
+    if 'gemini' in model:
         user_prompt = system_prompt+"\n"+user_prompt
     messages = [
         {"role": "system", "content": system_prompt},
@@ -967,5 +973,35 @@ def main():
     print(f"Total tokens: {total_tokens}")
     #print(f"Total cost: ${cost:.4f}")
 
+def swallow_reasoning(full_response: str) -> (str, str):
+    """
+    Extracts and swallows the chain-of-thought reasoning section from the full LLM response.
+    Assumes the reasoning block starts with a line beginning with "> Reasoning"
+    and ends with a line matching 'Reasoned for <number> seconds'.
+
+    Returns:
+        A tuple (final_content, reasoning) where:
+         - final_content: The response with the reasoning block removed.
+         - reasoning: The extracted reasoning block, or an empty string if not found.
+    """
+    pattern = re.compile(
+        r"(?P<reasoning>>\s*Reasoning.*?Reasoned.*?seconds)",
+        re.DOTALL
+    )
+    match = pattern.search(full_response)
+    if match:
+        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
+
 if __name__ == "__main__":
-    main()
+    main()

{gptdiff-0.1.18.dist-info → gptdiff-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.18
+Version: 0.1.21
 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.21.dist-info/RECORD

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

gptdiff-0.1.18.dist-info/RECORD

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