pdd-cli 0.0.23__py3-none-any.whl → 0.0.25__py3-none-any.whl

pdd/fix_code_module_errors.py

@@ -4,6 +4,7 @@ from rich import print
 from rich.markdown import Markdown
 from .load_prompt_template import load_prompt_template
 from .llm_invoke import llm_invoke
+from . import EXTRACTION_STRENGTH
 import json
 
 class CodeFix(BaseModel):
@@ -37,7 +38,7 @@ def fix_code_module_errors(
     strength: float,
     temperature: float = 0,
     verbose: bool = False
-) -> Tuple[bool, bool, str, str, float, str]:
+) -> Tuple[bool, bool, str, str, str, float, str]:
     """
     Fix errors in a code module that caused a program to crash and/or have errors.
     """
@@ -76,15 +77,16 @@ def fix_code_module_errors(
 
         total_cost += first_response.get('cost', 0)
         model_name = first_response.get('model_name', '')
+        program_code_fix = first_response['result']
 
         if verbose:
             print("[green]Error analysis complete[/green]")
-            print(Markdown(first_response['result']))
+            print(Markdown(program_code_fix))
             print(f"[yellow]Current cost: ${total_cost:.6f}[/yellow]")
 
         # Step 4: Second LLM invoke for code extraction
         extract_input = {
-            "program_code_fix": first_response['result'],
+            "program_code_fix": program_code_fix,
             "program": program,
             "code": code
         }
@@ -95,7 +97,7 @@ def fix_code_module_errors(
         second_response = llm_invoke(
             prompt=extract_prompt,
             input_json=extract_input,
-            strength=0.97,  # Fixed strength as specified
+            strength=EXTRACTION_STRENGTH,  # Fixed strength for extraction
             temperature=temperature,
             verbose=verbose,
             output_pydantic=CodeFix
@@ -128,6 +130,7 @@ def fix_code_module_errors(
             result.update_code,
             result.fixed_program,
             result.fixed_code,
+            program_code_fix,
             total_cost,
             model_name
         )

pdd/fix_error_loop.py

@@ -18,7 +18,7 @@ def escape_brackets(text: str) -> str:
     """Escape square brackets so Rich doesn't misinterpret them."""
     return text.replace("[", "\\[").replace("]", "\\]")
 
-def run_pytest_on_file(test_file: str) -> (int, int, int, str):
+def run_pytest_on_file(test_file: str) -> tuple[int, int, int, str]:
     """
     Run pytest on the specified test file using subprocess.
     Returns a tuple: (failures, errors, warnings, logs)
@@ -63,9 +63,9 @@ def format_log_for_output(log_structure):
     
     # Initial test output (only for first iteration)
     if log_structure["iterations"] and "initial_test_output" in log_structure["iterations"][0]:
-        formatted_text += f"<pytest_output iteration=1>\n"
+        formatted_text += "<pytest_output iteration=1>\n"
         formatted_text += f"{log_structure['iterations'][0]['initial_test_output']}\n"
-        formatted_text += f"</pytest_output>\n\n"
+        formatted_text += "</pytest_output>\n\n"
     
     for i, iteration in enumerate(log_structure["iterations"]):
         formatted_text += f"=== Attempt iteration {iteration['number']} ===\n\n"
@@ -74,23 +74,23 @@ def format_log_for_output(log_structure):
         if iteration.get("fix_attempt"):
             formatted_text += f"<fix_attempt iteration={iteration['number']}>\n"
             formatted_text += f"{iteration['fix_attempt']}\n"
-            formatted_text += f"</fix_attempt>\n\n"
+            formatted_text += "</fix_attempt>\n\n"
         
         # Verification with XML tags
         if iteration.get("verification"):
             formatted_text += f"<verification_output iteration={iteration['number']}>\n"
             formatted_text += f"{iteration['verification']}\n"
-            formatted_text += f"</verification_output>\n\n"
+            formatted_text += "</verification_output>\n\n"
         
         # Post-fix test results (except for last iteration to avoid duplication)
         if i < len(log_structure["iterations"]) - 1 and iteration.get("post_test_output"):
             formatted_text += f"<pytest_output iteration={iteration['number']+1}>\n"
             formatted_text += f"{iteration['post_test_output']}\n"
-            formatted_text += f"</pytest_output>\n\n"
+            formatted_text += "</pytest_output>\n\n"
     
     # Final run (using last iteration's post-test output)
     if log_structure["iterations"] and log_structure["iterations"][-1].get("post_test_output"):
-        formatted_text += f"=== Final Pytest Run ===\n"
+        formatted_text += "=== Final Pytest Run ===\n"
         formatted_text += f"{log_structure['iterations'][-1]['post_test_output']}\n"
     
     return formatted_text
@@ -343,7 +343,7 @@ def fix_error_loop(unit_test_file: str,
         fix_attempts += 1  # We used one fix attempt
         total_cost += cost
         if verbose:
-            rprint(f"[cyan]Iteration fix cost: ${cost:.6f}, Total cost: ${total_cost:.6f}[/cyan]")
+            rprint(f"[cyan]Iteration {iteration} Fix Cost: ${cost:.6f}, Cumulative Total Cost: ${total_cost:.6f}[/cyan]")
         if total_cost > budget:
             rprint(f"[red]Exceeded the budget of ${budget:.6f}. Ending fixing loop.[/red]")
             break
@@ -539,7 +539,7 @@ if __name__ == "__main__":
         verbose
     )
 
-    rprint(f"\n[bold]Process complete.[/bold]")
+    rprint("\n[bold]Process complete.[/bold]")
     rprint(f"Success: {success}")
     rprint(f"Attempts: {attempts}")
     rprint(f"Total cost: ${total_cost:.6f}")