gptdiff 0.1.16__py3-none-any.whl → 0.1.20__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
@@ -697,17 +703,17 @@ 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":
+    if 'gemini' in model:
         user_prompt = system_prompt+"\n"+user_prompt
     messages = [
         {"role": "system", "content": system_prompt},
@@ -867,7 +873,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 +891,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:
@@ -967,5 +973,29 @@ 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 for \d+\s*seconds)",
+        re.DOTALL
+    )
+    match = pattern.search(full_response)
+    if match:
+        reasoning = match.group("reasoning").strip()
+        final_content = full_response.replace(reasoning, "").strip()
+    else:
+        reasoning = ""
+        final_content = full_response.strip()
+    return final_content, reasoning
+
 if __name__ == "__main__":
     main()

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

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

gptdiff-0.1.20.dist-info/RECORD

@@ -0,0 +1,9 @@
+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,,

gptdiff-0.1.16.dist-info/RECORD

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