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

pdd/fix_main.py

@@ -2,10 +2,12 @@ import sys
 from typing import Tuple, Optional
 import click
 from rich import print as rprint
+from rich.markup import MarkupError, escape
 
 import requests
 import asyncio
 import os
+from pathlib import Path
 
 from .preprocess import preprocess
 
@@ -15,6 +17,9 @@ from .fix_error_loop import fix_error_loop
 from .get_jwt_token import get_jwt_token
 from .get_language import get_language
 
+# Import DEFAULT_STRENGTH from the package
+from . import DEFAULT_STRENGTH
+
 def fix_main(
     ctx: click.Context,
     prompt_file: str,
@@ -65,6 +70,12 @@ def fix_main(
     analysis_results = None
 
     try:
+        # Verify error file exists if not in loop mode
+        if not loop:
+            error_path = Path(error_file)
+            if not error_path.exists():
+                raise FileNotFoundError(f"Error file '{error_file}' does not exist.")
+                
         # Construct file paths
         input_file_paths = {
             "prompt_file": prompt_file,
@@ -85,11 +96,12 @@ def fix_main(
             force=ctx.obj.get('force', False),
             quiet=ctx.obj.get('quiet', False),
             command="fix",
-            command_options=command_options
+            command_options=command_options,
+            create_error_file=loop  # Only create error file if in loop mode
         )
 
         # Get parameters from context
-        strength = ctx.obj.get('strength', 0.9)
+        strength = ctx.obj.get('strength', DEFAULT_STRENGTH)
         temperature = ctx.obj.get('temperature', 0)
         verbose = ctx.obj.get('verbose', False)
         if loop:
@@ -139,7 +151,16 @@ def fix_main(
             if verbose and analysis_results:
                 # Log the first 200 characters of analysis if in verbose mode
                 analysis_preview = analysis_results[:200] + "..." if len(analysis_results) > 200 else analysis_results
-                rprint(f"[bold]Analysis preview:[/bold] {analysis_preview}")
+                try:
+                    # Attempt to print the preview using rich markup parsing
+                    rprint(f"[bold]Analysis preview:[/bold] {analysis_preview}")
+                except MarkupError as me:
+                    # If markup fails, print a warning and the escaped preview
+                    rprint(f"[bold yellow]Warning:[/bold yellow] Analysis preview contained invalid markup: {me}")
+                    rprint(f"[bold]Raw Analysis preview (escaped):[/bold] {escape(analysis_preview)}")
+                except Exception as e:
+                    # Handle other potential errors during preview printing
+                    rprint(f"[bold red]Error printing analysis preview: {e}[/bold red]")
             if success:
                 rprint("[bold green]Fixed files saved:[/bold green]")
                 rprint(f"  Test file: {output_file_paths['output_test']}")
@@ -263,5 +284,11 @@ def fix_main(
 
     except Exception as e:
         if not ctx.obj.get('quiet', False):
-            rprint(f"[bold red]Error:[/bold red] {str(e)}")
+            # Safely handle and print MarkupError
+            if isinstance(e, MarkupError):
+                 rprint(f"[bold red]Markup Error in fix_main:[/bold red]")
+                 rprint(escape(str(e)))
+            else:
+                 # Print other errors normally (might still fail if they contain markup)
+                 rprint(f"[bold red]Error:[/bold red] {str(e)}")
         sys.exit(1)

pdd/fix_verification_errors.py

@@ -45,12 +45,14 @@ def fix_verification_errors(
     fixed_code = code
     final_explanation = None
 
-    if not all([program, prompt, code, output]):
-        rprint("[bold red]Error:[/bold red] Missing one or more required inputs (program, prompt, code, output).")
+    # Check only essential inputs, allow empty output
+    if not all([program, prompt, code]):
+        # Keep the error print for program, prompt, code missing
+        rprint("[bold red]Error:[/bold red] Missing one or more required inputs (program, prompt, code).")
         return {
             "explanation": None,
-            "fixed_program": program,
-            "fixed_code": code,
+            "fixed_program": program, # Return original if possible
+            "fixed_code": code,       # Return original if possible
             "total_cost": 0.0,
             "model_name": None,
             "verification_issues_count": 0,
@@ -102,7 +104,7 @@ def fix_verification_errors(
             input_json=verification_input_json,
             strength=strength,
             temperature=temperature,
-            verbose=False,
+            verbose=False, # Keep internal llm_invoke verbose off unless needed
         )
         total_cost += verification_response.get('cost', 0.0)
         model_name = verification_response.get('model_name', model_name)
@@ -126,17 +128,36 @@ def fix_verification_errors(
 
     if verbose:
         rprint("\n[blue]Verification Result:[/blue]")
+        # Markdown object handles its own rendering, no extra needed here
         rprint(Markdown(verification_result))
 
     issues_found = False
     try:
+        # Attempt to match and extract digits directly
         count_match = re.search(r"<issues_count>(\d+)</issues_count>", verification_result)
         if count_match:
-            verification_issues_count = int(count_match.group(1))
+            verification_issues_count = int(count_match.group(1)) # Safe due to \d+
         else:
-            rprint("[yellow]Warning:[/yellow] Could not find <issues_count> tag in verification result. Assuming 0 issues.")
-            verification_issues_count = 0
+            # Specific match failed, check if tag exists with invalid content or is missing
+            generic_count_match = re.search(r"<issues_count>(.*?)</issues_count>", verification_result, re.DOTALL)
+            if generic_count_match:
+                # Tag found, but content is not \d+ -> Parsing Error
+                rprint("[bold red]Error:[/bold red] Could not parse integer value from <issues_count> tag.")
+                # Return the specific error structure for parsing errors after verification call
+                return {
+                    "explanation": None,
+                    "fixed_program": program,
+                    "fixed_code": code,
+                    "total_cost": total_cost, # Cost incurred so far
+                    "model_name": model_name, # Model used so far
+                    "verification_issues_count": 0, # Reset count on parsing error
+                }
+            else:
+                # Tag truly not found -> Warning
+                rprint("[yellow]Warning:[/yellow] Could not find <issues_count> tag in verification result. Assuming 0 issues.")
+                verification_issues_count = 0
 
+        # Proceed to check for details tag if count > 0
         if verification_issues_count > 0:
             details_match = re.search(r"<details>(.*?)</details>", verification_result, re.DOTALL)
             if details_match:
@@ -146,26 +167,21 @@ def fix_verification_errors(
                     if verbose:
                         rprint(f"\n[yellow]Found {verification_issues_count} potential issues. Proceeding to fix step.[/yellow]")
                 else:
+                    # Count > 0, but details empty -> Warning
                     rprint("[yellow]Warning:[/yellow] <issues_count> is > 0, but <details> tag is empty. Treating as no issues found.")
-                    verification_issues_count = 0
+                    verification_issues_count = 0 # Reset count
             else:
+                # Count > 0, but no details tag -> Warning
                 rprint("[yellow]Warning:[/yellow] <issues_count> is > 0, but could not find <details> tag. Treating as no issues found.")
-                verification_issues_count = 0
+                verification_issues_count = 0 # Reset count
         else:
+            # verification_issues_count is 0 (either parsed as 0 or defaulted after warning)
             if verbose:
                 rprint("\n[green]No issues found during verification.[/green]")
 
-    except ValueError:
-        rprint("[bold red]Error:[/bold red] Could not parse integer value from <issues_count> tag.")
-        return {
-            "explanation": None,
-            "fixed_program": program,
-            "fixed_code": code,
-            "total_cost": total_cost,
-            "model_name": model_name,
-            "verification_issues_count": 0,
-        }
+    # Removed ValueError catch as it's handled by the logic above
     except Exception as e:
+        # Generic catch for other potential parsing issues
         rprint(f"[bold red]Error parsing verification result:[/bold red] {e}")
         return {
             "explanation": None,
@@ -173,7 +189,7 @@ def fix_verification_errors(
             "fixed_code": code,
             "total_cost": total_cost,
             "model_name": model_name,
-            "verification_issues_count": 0,
+            "verification_issues_count": 0, # Reset count on parsing error
         }
 
     if issues_found and verification_details:
@@ -194,10 +210,10 @@ def fix_verification_errors(
                 input_json=fix_input_json,
                 strength=strength,
                 temperature=temperature,
-                verbose=False,
+                verbose=False, # Keep internal llm_invoke verbose off unless needed
             )
             total_cost += fix_response.get('cost', 0.0)
-            model_name = fix_response.get('model_name', model_name)
+            model_name = fix_response.get('model_name', model_name) # Update model name to the last one used
             fix_result = fix_response.get('result', '')
 
             if verbose:
@@ -205,6 +221,7 @@ def fix_verification_errors(
                 rprint(f"  [dim]Model Used:[/dim] {fix_response.get('model_name', 'N/A')}")
                 rprint(f"  [dim]Cost:[/dim] ${fix_response.get('cost', 0.0):.6f}")
                 rprint("\n[blue]Fix Result:[/blue]")
+                # Markdown object handles its own rendering, no extra needed here
                 rprint(Markdown(fix_result))
 
             fixed_program_match = re.search(r"<fixed_program>(.*?)</fixed_program>", fix_result, re.DOTALL)
@@ -232,22 +249,31 @@ def fix_verification_errors(
 
         except Exception as e:
             rprint(f"[bold red]Error during fix LLM call or extraction:[/bold red] {e}")
-            if verification_details and fix_explanation is None:
+            # Combine verification details with the error message if fix failed
+            final_explanation = f"<error>Error during fix generation: {str(e)}</error>\n"
+            if verification_details:
                 fix_explanation = f"[Error during fix generation: {e}]"
+            # Note: verification_issues_count should retain its value from the verification step
 
     if verbose:
         rprint(f"\n[bold blue]Total Cost for fix_verification_errors run:[/bold blue] ${total_cost:.6f}")
 
-    if issues_found and verification_details and fix_explanation:
-        final_explanation = (
-            f"<verification_details>{verification_details}</verification_details>\n"
-            f"<fix_explanation>{fix_explanation}</fix_explanation>"
-        )
-    elif issues_found and verification_details:
-        final_explanation = (
-            f"<verification_details>{verification_details}</verification_details>\n"
-            f"<fix_explanation>[Fix explanation not available or extraction failed]</fix_explanation>"
-        )
+    # Construct final explanation only if issues were initially found and processed
+    if verification_details:
+        if fix_explanation:
+             final_explanation = (
+                 f"<verification_details>{verification_details}</verification_details>\n"
+                 f"<fix_explanation>{fix_explanation}</fix_explanation>"
+             )
+        else:
+             # This case might occur if fix step wasn't run due to parsing issues after verification,
+             # or if fix_explanation extraction failed silently (though we added a default).
+             # Let's ensure we always provide some context if details were found.
+             final_explanation = (
+                 f"<verification_details>{verification_details}</verification_details>\n"
+                 f"<fix_explanation>[Fix explanation not available or fix step skipped]</fix_explanation>"
+             )
+    # If no issues were found initially (verification_details is None), final_explanation remains None
 
     return {
         "explanation": final_explanation,