pdd-cli 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

pdd/auto_update.py

@@ -1,4 +1,4 @@
-import pkg_resources
+import importlib.metadata
 import requests
 import semver
 import subprocess
@@ -14,7 +14,7 @@ def auto_update(package_name: str = "pdd-cli", latest_version: str = None) -> No
     """
     try:
         # Get current installed version
-        current_version = pkg_resources.get_distribution(package_name).version
+        current_version = importlib.metadata.version(package_name)
 
         # If latest_version is not provided, fetch from PyPI
         if latest_version is None:
@@ -63,7 +63,7 @@ def auto_update(package_name: str = "pdd-cli", latest_version: str = None) -> No
             else:
                 print("Please answer 'y' or 'n'")
 
-    except pkg_resources.DistributionNotFound:
+    except importlib.metadata.PackageNotFoundError:
         print(f"Package {package_name} is not installed")
     except Exception as e:
         print(f"Error checking for updates: {str(e)}")

pdd/cli.py

@@ -46,7 +46,7 @@ console = Console()
 @click.option("--review-examples", is_flag=True,
               help="Review and optionally exclude few-shot examples before command execution.")
 @click.option('--local', is_flag=True, help='Run commands locally instead of in the cloud.')
-@click.version_option(version="0.0.14")
+@click.version_option(version="0.0.15")
 @click.pass_context
 def cli(
     ctx,

pdd/data/llm_model.csv

@@ -12,6 +12,6 @@ Ollama,"deepseek-r1:70b-llama-distill-q8_0",0.0,0.0,1315,,PWD,,,,,False
 Ollama,deepseek-r1:32b-qwen-distill-fp16,0.0,0.0,1316,,PWD,,,,,False
 OpenAI,"o3-mini",1.1,4.4,1319,,OPENAI_API_KEY,tiktoken,o200k_base,,100000,True
 OpenAI,"o1-2024-12-17",15,60,1331,,OPENAI_API_KEY,tiktoken,o200k_base,,32768,True
-OpenAI,"gpt-4o",2.5,10,1332,,OPENAI_API_KEY,tiktoken,o200k_base,16384,,True
+OpenAI,"gpt-4o-2024-11-20",2.5,10,1332,,OPENAI_API_KEY,tiktoken,o200k_base,16384,,True
 OpenAI,"deepseek-reasoner",0.55,2.19,1336,https://api.deepseek.com/beta,DEEPSEEK_API_KEY,autotokenizer,deepseek-coder-7b-instruct-v1.5,8192,,False
 Fireworks,accounts/fireworks/models/deepseek-r1,3,8,1338,,FIREWORKS_API_KEY,,,8192,,False

pdd/fix_error_loop.py

@@ -4,6 +4,7 @@ import sys
 import subprocess
 import shutil
 from datetime import datetime
+import json
 
 # Added for the new pytest-based reporting:
 # import pytest
@@ -23,57 +24,34 @@ def escape_brackets(text: str) -> str:
 
 def run_pytest_on_file(test_file: str) -> (int, int, int, str):
     """
-    Run pytest on the specified test file using a custom plugin to capture results.
+    Run pytest on the specified test file using subprocess.
     Returns a tuple: (failures, errors, warnings, logs)
     """
-    import pytest
-    import io
-    # import sys
-
-    class TestResultCollector:
-        def __init__(self):
-            self.failures = 0
-            self.errors = 0
-            self.warnings = 0
-            self.logs = io.StringIO()  # Capture logs in memory
-
-        def pytest_runtest_logreport(self, report):
-            """Capture test failures and errors"""
-            if report.when == "call":
-                if report.failed:
-                    self.failures += 1
-                elif report.outcome == "error":
-                    self.errors += 1
-            if report.when == "setup" and report.failed:
-                self.errors += 1
-            if report.when == "teardown" and report.failed:
-                self.errors += 1
-
-        def pytest_sessionfinish(self, session):
-            """Capture warnings from pytest session"""
-            terminal_reporter = session.config.pluginmanager.get_plugin("terminalreporter")
-            if terminal_reporter:
-                self.warnings = len(terminal_reporter.stats.get("warnings", []))
-
-        def capture_logs(self):
-            """Redirect stdout and stderr to capture logs"""
-            sys.stdout = self.logs
-            sys.stderr = self.logs
-
-        def get_logs(self):
-            """Return captured logs and reset stdout/stderr"""
-            sys.stdout = sys.__stdout__
-            sys.stderr = sys.__stderr__
-            return self.logs.getvalue()
-
-    collector = TestResultCollector()
-    collector.capture_logs()
     try:
-        # Run pytest on the given test file.
-        pytest.main(["-vv", test_file], plugins=[collector])
-    finally:
-        logs = collector.get_logs()
-    return collector.failures, collector.errors, collector.warnings, logs
+        # Include "--json-only" to ensure only valid JSON is printed.
+        cmd = [sys.executable, "-m", "pdd.pytest_output", "--json-only", test_file]
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        
+        # Parse the JSON output from stdout
+        try:
+            output = json.loads(result.stdout)
+            test_results = output.get('test_results', [{}])[0]
+            
+            failures = test_results.get('failures', 0)
+            errors = test_results.get('errors', 0)
+            warnings = test_results.get('warnings', 0)
+            
+            # Combine stdout and stderr from the test results
+            logs = test_results.get('standard_output', '') + '\n' + test_results.get('standard_error', '')
+            
+            return failures, errors, warnings, logs
+            
+        except json.JSONDecodeError:
+            # If JSON parsing fails, return the raw output
+            return 1, 1, 0, f"Failed to parse pytest output:\n{result.stdout}\n{result.stderr}"
+            
+    except Exception as e:
+        return 1, 1, 0, f"Error running pytest: {str(e)}"
 
 def fix_error_loop(unit_test_file: str,
                    code_file: str,

pdd/pytest_output.py

@@ -0,0 +1,150 @@
+import argparse
+import json
+import io
+import sys
+import pytest
+from rich.console import Console
+from rich.pretty import pprint
+import os
+
+console = Console()
+
+class TestResultCollector:
+    __test__ = False  # Prevent pytest from collecting this plugin as a test
+
+    def __init__(self):
+        self.failures = 0
+        self.errors = 0
+        self.warnings = 0
+        self.passed = 0
+        self.logs = io.StringIO()
+        self.stdout = ""
+        self.stderr = ""
+
+    def pytest_runtest_logreport(self, report):
+        """
+        Treat any failing 'call' phase as a test failure (matching what Pytest calls 'failed'),
+        and only count setup/teardown failures (or 'report.outcome == "error"') as errors.
+        """
+        # 'report.when' can be "setup", "call", or "teardown"
+        if report.when == "call":
+            if report.passed:
+                self.passed += 1
+            elif report.failed:
+                # All exceptions that occur in the test body are 'failures'
+                self.failures += 1
+            elif report.outcome == "error":
+                # Not frequently used, but included for completeness
+                self.errors += 1
+        elif report.when in ("setup", "teardown") and report.failed:
+            # Setup/teardown failures are 'errors'
+            self.errors += 1
+
+    def pytest_sessionfinish(self, session):
+        """Capture warnings from pytest session."""
+        if hasattr(session.config, 'pluginmanager'):
+            terminal_reporter = session.config.pluginmanager.get_plugin("terminalreporter")
+            if terminal_reporter:
+                self.warnings = len(terminal_reporter.stats.get("warnings", []))
+
+    def capture_logs(self):
+        """Redirect stdout and stderr to capture logs."""
+        sys.stdout = self.logs
+        sys.stderr = self.logs
+
+    def get_logs(self):
+        """Return captured logs and reset stdout/stderr."""
+        self.stdout = self.logs.getvalue()
+        self.stderr = self.logs.getvalue()
+        sys.stdout = sys.__stdout__
+        sys.stderr = sys.__stderr__
+        return self.stdout, self.stderr
+
+def run_pytest_and_capture_output(test_file: str) -> dict:
+    """
+    Runs pytest on the given test file and captures the output.
+
+    Args:
+        test_file: The path to the test file.
+
+    Returns:
+        A dictionary containing the pytest output.
+    """
+    if not os.path.exists(test_file):
+        console.print(f"[bold red]Error: Test file '{test_file}' not found.[/]")
+        return {}
+
+    if not test_file.endswith(".py"):
+        console.print(
+            f"[bold red]Error: Test file '{test_file}' must be a Python file (.py).[/]"
+        )
+        return {}
+
+    collector = TestResultCollector()
+    try:
+        collector.capture_logs()
+        result = pytest.main([test_file], plugins=[collector])
+    finally:
+        stdout, stderr = collector.get_logs()
+
+    return {
+        "test_file": test_file,
+        "test_results": [
+            {
+                "standard_output": stdout,
+                "standard_error": stderr,
+                "return_code": int(result),
+                "warnings": collector.warnings,
+                "errors": collector.errors,
+                "failures": collector.failures,
+                "passed": collector.passed,
+            }
+        ],
+    }
+
+def save_output_to_json(output: dict, output_file: str = "pytest.json"):
+    """
+    Saves the pytest output to a JSON file.
+
+    Args:
+        output: The dictionary containing the pytest output.
+        output_file: The name of the output JSON file. Defaults to "pytest.json".
+    """
+    try:
+        with open(output_file, "w", encoding="utf-8") as f:
+            json.dump(output, f, indent=4)
+        console.print(
+            f"[green]Pytest output saved to '{output_file}'.[/green]"
+        )
+    except Exception as e:
+        console.print(
+            f"[bold red]Error saving output to JSON: {e}[/]"
+        )
+
+def main():
+    """
+    Main function for the pytest_output CLI tool.
+    """
+    parser = argparse.ArgumentParser(
+        description="Capture pytest output and save it to a JSON file."
+    )
+    parser.add_argument(
+        "test_file", type=str, help="Path to the test file."
+    )
+    parser.add_argument(
+        "--json-only", action="store_true", help="Output only JSON to stdout."
+    )
+    args = parser.parse_args()
+
+    pytest_output = run_pytest_and_capture_output(args.test_file)
+
+    if args.json_only:
+        # Print only valid JSON to stdout.
+        print(json.dumps(pytest_output))
+    else:
+        console.print(f"Running pytest on: [blue]{args.test_file}[/blue]")
+        pprint(pytest_output, console=console)  # Pretty print the output
+        save_output_to_json(pytest_output)
+
+if __name__ == "__main__":
+    main()

{pdd_cli-0.0.14.dist-info → pdd_cli-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pdd-cli
-Version: 0.0.14
+Version: 0.0.15
 Summary: PDD (Prompt-Driven Development) Command Line Interface
 Author: Greg Tanaka
 Author-email: glt@alumni.caltech.edu
@@ -40,7 +40,7 @@ Requires-Dist: semver==3.0.2
 Requires-Dist: setuptools==75.1.0
 Requires-Dist: python-Levenshtein
 
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.14-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.15-blue
    :alt: PDD-CLI Version
 
 PDD (Prompt-Driven Development) Command Line Interface
@@ -101,7 +101,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.14).
+You'll see the current PDD version (e.g., 0.0.15).
 
 Advanced Installation Tips
 --------------------------

{pdd_cli-0.0.14.dist-info → pdd_cli-0.0.15.dist-info}/RECORD

@@ -1,12 +1,12 @@
 pdd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pdd/auto_deps_main.py,sha256=2lZ-8WqzrPVMnzuVC-O7y1gazRLbY66fbmOdKnkYKNg,3630
 pdd/auto_include.py,sha256=aCa2QXDlOdKbh4vS3uDjWptkHB_Qv3QBNCbZe6mGWoo,6074
-pdd/auto_update.py,sha256=IFqHx19GvUY3RTdd-AX3fj9RPigZflizbAzzfF3HixQ,2891
+pdd/auto_update.py,sha256=Pfav1hrqQIDjZIPuIvryBeM7k-Rc72feVUTJZPtigaU,2889
 pdd/bug_main.py,sha256=myKU9--QWdkV4Wf3mD2PoLPJFNgRjwf4z8s7TC28G_s,3720
 pdd/bug_to_unit_test.py,sha256=dsJNm6qAwx-m7RvFF5RquFJRzxzZGCWT4IKYnzVCUws,5569
 pdd/change.py,sha256=iqjWS5DrQ73yMkuUQlwIRIFlofmKdaK6t6-v3zHKL-4,4985
 pdd/change_main.py,sha256=yL_i1Ws5vt4vAkWiC826csNi2cHP6wKbwe_PfMqbbPY,11407
-pdd/cli.py,sha256=nFfCGvuBI6CNYj9GYM8xhOOcgkwcQknX1dQt5Cbsc9Y,16593
+pdd/cli.py,sha256=bIFpSQUzv9lHgkxD6PXnk1RZbq7mMATsJ0VjezENE40,16593
 pdd/cmd_test_main.py,sha256=aSCxRnSurg15AvPcJDAPp9xy8p_qqnjU1oV14Hi2R54,5301
 pdd/code_generator.py,sha256=n5akrX7VPe71X4RsD6kKqAVvzBLMlciJI4RtJA1PcgA,4375
 pdd/code_generator_main.py,sha256=G2eRBPXc1cGszkk0PbIPmJZHPaf_dw5d2yZbsvQZA3c,4793
@@ -23,7 +23,7 @@ pdd/detect_change_main.py,sha256=1Z4ymhjJaVr2aliGyqkqeqSmQ7QMgcl23p0wdsmBas0,365
 pdd/find_section.py,sha256=lz_FPY4KDCRAGlL1pWVZiutUNv7E4KsDFK-ymDWA_Ec,962
 pdd/fix_code_loop.py,sha256=L0yxq2yAziPIyFGb8lIP2mvufu8a_gtc5nnN2LuMuKs,8596
 pdd/fix_code_module_errors.py,sha256=M6AnlR2jF5LI-nNg6gIO5LvSkxiaLIUGyTvfnUfe1cU,4625
-pdd/fix_error_loop.py,sha256=D6lcWKCYXblpOLASiaj7bWL-Uv6T2u2VyXHObvZuJsw,17520
+pdd/fix_error_loop.py,sha256=sIIaQcWi-0gUSEFmnwQWDwP70lGEx8uR7QQODa4JD0M,16902
 pdd/fix_errors_from_unit_tests.py,sha256=8qCEyHZ6lUSBtV9vhQyhgAxDuhngmOy7vVy2HObckd0,8934
 pdd/fix_main.py,sha256=02OIViH12BcsykpDp4Osxw2ndEeThnNakMFkzdpYr48,5333
 pdd/generate_output_paths.py,sha256=zz42GTx9eGyWIYSl3jcWvtJRGnieC3eoPM6DIVcWz2k,7219
@@ -46,6 +46,7 @@ pdd/postprocess_0.py,sha256=OW17GyCFLYErCyWh2tL4syuho3q2yFf2wyekQ4BLdPM,2168
 pdd/preprocess.py,sha256=7_mkREBFlWjIUIyZsYBlnCvIGtpVgPeToHUpaq_ZHC0,8177
 pdd/preprocess_main.py,sha256=dAgFGmjuJB1taZl31c1sY2jMGtQgjnWLbpeB7EFtojY,2977
 pdd/process_csv_change.py,sha256=10XTzVFQ0rE4lPSF93yhIW7VJmxmfe-hk1B7ui_qxJI,8415
+pdd/pytest_output.py,sha256=kmKiMHaQItrDVi_hTCtM5pfCgBuyZVEVRbxdchpS5CY,4796
 pdd/split.py,sha256=aISO7DcD8UkE_r7w1Ii466RgxSlVDFfTCymJ7IWUhsw,4692
 pdd/split_main.py,sha256=dV9G2YJDp12ik6x1a_dgBtyu27BSt4Fyd2trgxL7qFI,4123
 pdd/summarize_directory.py,sha256=3KUOP30RgkBXpz0_btmpubnO1vWAQ3tKyVI84Zp-E9Q,9041
@@ -57,7 +58,7 @@ pdd/update_main.py,sha256=5a4nsOOaAXULdk0BS9pj4blZ_QHBFeET37uaAqoJI2g,3912
 pdd/update_prompt.py,sha256=OdPRIAMu7OBx7E4SOU95hWgdtBY4oO8XOe1dvPChMlU,4351
 pdd/xml_tagger.py,sha256=NcyWacoXarRi6_16pchMhh1M7V-Gfz1cQImO_If2ia4,4241
 pdd/data/language_format.csv,sha256=xUTmFHXSBVBRfPV-NKG3oWo5_ped5ukP-ekFcIlVzJk,877
-pdd/data/llm_model.csv,sha256=TXQpHGuRntkDIifFOdSwT07trYSphULydjjWu2LaVME,1691
+pdd/data/llm_model.csv,sha256=B240BLwwcweHFrkYT4FA-yBcz7YgVnx4dQopSedQG9I,1702
 pdd/prompts/auto_include_LLM.prompt,sha256=0t-Jmm5o6vVTmqsISTUiewqPT8bB389UZnJoHZvgtu4,13967
 pdd/prompts/bug_to_unit_test_LLM.prompt,sha256=--ysObDv9WzOEyJMuaKEdDHkRrR_1j0dmOtlAFr4YRg,1205
 pdd/prompts/change_LLM.prompt,sha256=W3sE6XZ2fb35XdqOykK1hDPtqkHSv9MZGD3sT8B8WjY,2083
@@ -89,9 +90,9 @@ pdd/prompts/trim_results_start_LLM.prompt,sha256=WwFlOHha4wzMLtRHDMI6GtcNdl2toE8
 pdd/prompts/unfinished_prompt_LLM.prompt,sha256=-JgBpiPTQZdWOAwOG1XpfpD9waynFTAT3Jo84eQ4bTw,1543
 pdd/prompts/update_prompt_LLM.prompt,sha256=_lGaxeVP4oF8yGqiN6yj6UE0j79lxfGdjsYr5w5KSYk,1261
 pdd/prompts/xml_convertor_LLM.prompt,sha256=YGRGXJeg6EhM9690f-SKqQrKqSJjLFD51UrPOlO0Frg,2786
-pdd_cli-0.0.14.dist-info/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
-pdd_cli-0.0.14.dist-info/METADATA,sha256=GhFCBBWPSLEgXkVJokItqOxM6tZFMYmXTTJNvKAronU,6808
-pdd_cli-0.0.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pdd_cli-0.0.14.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
-pdd_cli-0.0.14.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
-pdd_cli-0.0.14.dist-info/RECORD,,
+pdd_cli-0.0.15.dist-info/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
+pdd_cli-0.0.15.dist-info/METADATA,sha256=y3Ro0BThGEaW7iLsbzQQFC64cC90QFinQczvZW6L-tY,6808
+pdd_cli-0.0.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pdd_cli-0.0.15.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
+pdd_cli-0.0.15.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
+pdd_cli-0.0.15.dist-info/RECORD,,