pdd-cli 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

pdd/cli.py

@@ -10,32 +10,10 @@ from rich import print as rprint
 from rich.console import Console
 from rich.panel import Panel
 
-# ----------------------------------------------------------------------
-# Dynamically determine PDD_PATH at runtime.
-# ----------------------------------------------------------------------
-def get_local_pdd_path() -> str:
-    """
-    Return the PDD_PATH directory.
-    First check the environment variable. If not set, attempt to
-    deduce it via importlib.resources. If that fails, abort.
-    """
-    if "PDD_PATH" in os.environ:
-        return os.environ["PDD_PATH"]
-    else:
-        try:
-            with importlib.resources.path("pdd", "cli.py") as p:
-                fallback_path = str(p.parent)
-                # Also set it back into the environment for consistency
-                os.environ["PDD_PATH"] = fallback_path
-                return fallback_path
-        except ImportError:
-            rprint(
-                "[red]Error: Could not determine the path to the 'pdd' package. "
-                "Please set the PDD_PATH environment variable manually.[/red]"
-            )
-            sys.exit(1)
-
-get_local_pdd_path()
+from .install_completion import install_completion as install_completion_main
+import pdd.install_completion
+
+pdd.install_completion.get_local_pdd_path()
 # ----------------------------------------------------------------------
 # Import sub-command modules
 # ----------------------------------------------------------------------
@@ -67,7 +45,8 @@ console = Console()
 @click.option("--output-cost", type=click.Path(), help="Enable cost tracking and output a CSV file with usage details.")
 @click.option("--review-examples", is_flag=True,
               help="Review and optionally exclude few-shot examples before command execution.")
-@click.version_option(version="0.0.5")
+@click.option('--local', is_flag=True, help='Run commands locally instead of in the cloud.')
+@click.version_option(version="0.0.7")
 @click.pass_context
 def cli(
     ctx,
@@ -78,6 +57,7 @@ def cli(
     quiet: bool,
     output_cost: Optional[str],
     review_examples: bool,
+    local: bool
 ):
     """
     PDD (Prompt-Driven Development) Command Line Interface
@@ -90,6 +70,7 @@ def cli(
     ctx.obj["quiet"] = quiet
     ctx.obj["output_cost"] = output_cost or os.environ.get("PDD_OUTPUT_COST_PATH")
     ctx.obj["review_examples"] = review_examples
+    ctx.obj['local'] = local
 
     # Auto-update check, but handle EOF errors so tests do not crash.
     auto_update_enabled = os.environ.get("PDD_AUTO_UPDATE", "true").lower() == "true"
@@ -390,63 +371,6 @@ def crash(
         budget,
     )
 
-# ----------------------------------------------------------------------
-# Simplified shell RC path logic
-# ----------------------------------------------------------------------
-def get_shell_rc_path(shell: str) -> Optional[str]:
-    """Return the default RC file path for a given shell name."""
-    home = os.path.expanduser("~")
-    if shell == "bash":
-        return os.path.join(home, ".bashrc")
-    elif shell == "zsh":
-        return os.path.join(home, ".zshrc")
-    elif shell == "fish":
-        return os.path.join(home, ".config", "fish", "config.fish")
-    return None
-
-
-def get_current_shell() -> Optional[str]:
-
-
-    """Determine the currently running shell more reliably."""
-    if not os.environ.get('PYTEST_CURRENT_TEST'):
-        # Method 1: Check process name using 'ps'
-        try:
-            import subprocess
-            result = subprocess.run(['ps', '-p', str(os.getppid()), '-o', 'comm='], 
-                                capture_output=True, text=True)
-            if result.returncode == 0:
-                # Strip whitespace and get basename without path
-                shell = os.path.basename(result.stdout.strip())
-                # Remove leading dash if present (login shell)
-                return shell.lstrip('-')
-        except (subprocess.SubprocessError, FileNotFoundError):
-            pass
-
-        # Method 2: Check $0 special parameter
-        try:
-            result = subprocess.run(['sh', '-c', 'echo "$0"'], 
-                                capture_output=True, text=True)
-            if result.returncode == 0:
-                shell = os.path.basename(result.stdout.strip())
-                return shell.lstrip('-')
-        except (subprocess.SubprocessError, FileNotFoundError):
-            pass
-
-    # Fallback to SHELL env var if all else fails
-    return os.path.basename(os.environ.get("SHELL", ""))
-
-
-def get_completion_script_extension(shell: str) -> str:
-    """Get the appropriate file extension for shell completion scripts."""
-    mapping = {
-        "bash": "sh",
-        "zsh": "zsh",
-        "fish": "fish"
-    }
-    return mapping.get(shell, shell)
-
-
 @cli.command(name="install_completion")
 def install_completion():
     """
@@ -454,46 +378,7 @@ def install_completion():
     copying the relevant completion script, and appending a source command
     to the user’s shell RC file if not already present.
     """
-    shell = get_current_shell()
-    rc_file = get_shell_rc_path(shell)
-    if not rc_file:
-        rprint(f"[red]Unsupported shell: {shell}[/red]")
-        raise click.Abort()
-
-    ext = get_completion_script_extension(shell)
-
-    # Dynamically look up the local path at runtime:
-    local_pdd_path = get_local_pdd_path()
-    completion_script_path = os.path.join(local_pdd_path, f"pdd_completion.{ext}")
-
-    if not os.path.exists(completion_script_path):
-        rprint(f"[red]Completion script not found: {completion_script_path}[/red]")
-        raise click.Abort()
-
-    source_command = f"source {completion_script_path}"
-
-    try:
-        # Ensure the RC file exists (create if missing).
-        if not os.path.exists(rc_file):
-            os.makedirs(os.path.dirname(rc_file), exist_ok=True)
-            with open(rc_file, "w", encoding="utf-8") as cf:
-                cf.write("")
-
-        # Read existing content
-        with open(rc_file, "r", encoding="utf-8") as cf:
-            content = cf.read()
-
-        if source_command not in content:
-            with open(rc_file, "a", encoding="utf-8") as rf:
-                rf.write(f"\n# PDD CLI completion\n{source_command}\n")
-
-            rprint(f"[green]Shell completion installed for {shell}.[/green]")
-            rprint(f"Please restart your shell or run 'source {rc_file}' to enable completion.")
-        else:
-            rprint(f"[yellow]Shell completion already installed for {shell}.[/yellow]")
-    except OSError as exc:
-        rprint(f"[red]Failed to install shell completion: {exc}[/red]")
-        raise click.Abort()
+    return install_completion_main()
 
 
 @cli.command()

pdd/code_generator.py

@@ -13,7 +13,8 @@ def code_generator(
     language: str,
     strength: float,
     temperature: float = 0.0,
-    verbose: bool = False
+    verbose: bool = False,
+    preprocess_prompt: bool = True,
 ) -> Tuple[str, float, str]:
     """
     Generate code from a prompt using a language model.
@@ -47,9 +48,13 @@ def code_generator(
         model_name = ""
 
         # Step 1: Preprocess the prompt
-        if verbose:
-            console.print("[bold blue]Step 1: Preprocessing prompt[/bold blue]")
-        processed_prompt = preprocess(prompt, recursive=False, double_curly_brackets=True)
+        if preprocess_prompt:
+            if verbose:
+                console.print("[bold blue]Step 1: Preprocessing prompt[/bold blue]")
+
+            processed_prompt = preprocess(prompt, recursive=False, double_curly_brackets=True)
+        else:
+            processed_prompt = prompt
 
         # Step 2: Generate initial response
         if verbose:
@@ -99,7 +104,7 @@ def code_generator(
         runnable_code, postprocess_cost, model_name_post = postprocess(
             llm_output=final_output,
             language=language,
-            strength=0.895,
+            strength=0.89,
             temperature=0.0,
             verbose=verbose
         )

pdd/code_generator_main.py

@@ -3,8 +3,12 @@ from typing import Tuple, Optional
 import click
 from rich import print as rprint
 
+import requests   # <── Added at top level so the tests can patch pdd.code_generator_main.requests
+
 from .construct_paths import construct_paths
 from .code_generator import code_generator
+from .get_jwt_token import get_jwt_token
+from .preprocess import preprocess
 
 def code_generator_main(ctx: click.Context, prompt_file: str, output: Optional[str]) -> Tuple[str, float, str]:
     """
@@ -37,13 +41,67 @@ def code_generator_main(ctx: click.Context, prompt_file: str, output: Optional[s
         # Generate code
         strength = ctx.obj.get('strength', 0.5)
         temperature = ctx.obj.get('temperature', 0.0)
-        generated_code, total_cost, model_name = code_generator(
-            prompt_content,
-            language,
-            strength,
-            temperature,
-            verbose=not ctx.obj.get('quiet', False)
-        )
+        verbose = not ctx.obj.get('quiet', False)
+        local = ctx.obj.get('local', False)
+
+        if local:
+            print("Running in local mode")
+            # Local execution
+            generated_code, total_cost, model_name = code_generator(
+                prompt_content,
+                language,
+                strength,
+                temperature,
+                verbose=verbose
+            )
+        else:
+            # Cloud execution
+            try:
+                import asyncio
+                import os
+                # Get JWT token for cloud authentication
+                jwt_token = asyncio.run(get_jwt_token(
+                    firebase_api_key=os.environ.get("REACT_APP_FIREBASE_API_KEY"),
+                    github_client_id=os.environ.get("GITHUB_CLIENT_ID"),
+                    app_name="PDD Code Generator"
+                ))
+                # Call cloud code generator
+                headers = {
+                    "Authorization": f"Bearer {jwt_token}",
+                    "Content-Type": "application/json"
+                }
+                # Preprocess the prompt
+                processed_prompt = preprocess(prompt_content, recursive=False, double_curly_brackets=True)
+                if verbose:
+                    print(f"Processed prompt: {processed_prompt}")
+                data = {
+                    "promptContent": processed_prompt,
+                    "language": language,
+                    "strength": strength,
+                    "temperature": temperature,
+                    "verbose": verbose
+                }
+                response = requests.post(
+                    "https://us-central1-prompt-driven-development.cloudfunctions.net/generateCode",
+                    headers=headers,
+                    json=data
+                )
+                response.raise_for_status()
+                result = response.json()
+                generated_code = result["generatedCode"]
+                total_cost = result["totalCost"]
+                model_name = result["modelName"]
+
+            except Exception as e:
+                if not ctx.obj.get('quiet', False):
+                    rprint("[bold red]Cloud execution failed, falling back to local mode[/bold red]")
+                generated_code, total_cost, model_name = code_generator(
+                    prompt_content,
+                    language,
+                    strength,
+                    temperature,
+                    verbose=verbose
+                )
 
         # Save results
         if output_file_paths["output"]:

pdd/context_generator.py

@@ -109,7 +109,7 @@ def context_generator(code_module: str, prompt: str, language: str = "python", s
         example_code, postprocess_cost, postprocess_model = postprocess(
             llm_output=final_llm_output,
             language=language,
-            strength=0.9,
+            strength=0.89,
             temperature=temperature,
             verbose=verbose
         )

pdd/crash_main.py

@@ -85,7 +85,7 @@ def crash_main(
         else:
             # Use single fix attempt
             from .fix_code_module_errors import fix_code_module_errors
-            _, _, final_program, final_code, cost, model = fix_code_module_errors(
+            update_program, update_code, final_program, final_code, cost, model = fix_code_module_errors(
                 program=program_content,
                 prompt=prompt_content,
                 code=code_content,
@@ -97,11 +97,15 @@ def crash_main(
             success = True
             attempts = 1
 
-        # Save results
-        if output_file_paths.get("output"):
+        # Determine if contents were actually updated
+        update_code = final_code != code_content
+        update_program = final_program != program_content
+
+        # Save results if contents changed
+        if update_code and output_file_paths.get("output"):
             with open(output_file_paths["output"], 'w') as f:
                 f.write(final_code)
-        if output_file_paths.get("output_program"):
+        if update_program and output_file_paths.get("output_program"):
             with open(output_file_paths["output_program"], 'w') as f:
                 f.write(final_program)
 
@@ -114,9 +118,9 @@ def crash_main(
             rprint(f"[bold]Model used:[/bold] {model}")
             rprint(f"[bold]Total attempts:[/bold] {attempts}")
             rprint(f"[bold]Total cost:[/bold] ${cost:.6f}")
-            if output:
+            if update_code and output:
                 rprint(f"[bold]Fixed code saved to:[/bold] {output_file_paths['output']}")
-            if output_program:
+            if update_program and output_program:
                 rprint(f"[bold]Fixed program saved to:[/bold] {output_file_paths['output_program']}")
 
         return success, final_code, final_program, attempts, cost, model

pdd/data/llm_model.csv

@@ -1,15 +1,17 @@
 provider,model,input,output,coding_arena_elo,base_url,api_key,counter,encoder,max_tokens,max_completion_tokens,structured_output
-OpenAI,"o1-mini-2024-09-12",3,12,1301,,,tiktoken,o200k_base,,65536,False
-OpenAI,"deepseek-coder",0.14,0.28,1256,"https://api.deepseek.com/beta","DEEPSEEK_API_KEY",autotokenizer,deepseek-coder-7b-instruct-v1.5,8192,,False
-Ollama,"qwen2.5-coder:32b-instruct-fp16",0.0,0.0,1227,,,,,,,False
-Ollama,"athene-v2:72b-q8_0",0.0,0.0,1253,,,,,,,False
-Anthropic,"claude-3-5-sonnet-20241022",3,15,1309,,,anthropic,claude-3-sonnet-20240229,8192,,False
-Google,"gemini-2.0-flash-exp",0.15,0.60,1281,,,,,8192,,False
-Fireworks,"accounts/fireworks/models/llama-v3p3-70b-instruct",3,3,1280,,,,,16384,,False
-Fireworks,"accounts/fireworks/models/qwen2p5-coder-32b-instruct",.9,.9,1226,,,,,2048,,False
-OpenAI,"gpt-4o-mini",0.15,0.60,1246,,,tiktoken,o200k_base,16384,,True
-OpenAI,"gpt-4o-2024-11-20",2.5,10,1306,,,tiktoken,o200k_base,16384,,True
-OpenAI,"o1-2024-12-17",15,60,1311,,,tiktoken,o200k_base,,32768,False
-OpenAI,"grok-beta",5,15,1255,"https://api.x.ai/v1","XAI_API_KEY",tiktoken,o200k_base,4096,,False
-Google,"gemini-exp-1206",0.15,0.60,1321,,,,,8192,,False
-Anthropic,"claude-3-5-haiku-20241022",1,5,1265,,,anthropic,claude-3-sonnet-20240229,8192,,False
+OpenAI,"o3-mini",1.1,4.4,1301,,OPENAI_API_KEY,tiktoken,o200k_base,,100000,True
+OpenAI,"deepseek-coder",0.14,0.28,1256,"https://api.deepseek.com/beta",DEEPSEEK_API_KEY,autotokenizer,deepseek-coder-7b-instruct-v1.5,8192,,False
+OpenAI,"deepseek-reasoner",0.55,2.19,1309,"https://api.deepseek.com/beta",DEEPSEEK_API_KEY,autotokenizer,deepseek-coder-7b-instruct-v1.5,8192,,False
+Ollama,"qwen2.5-coder:32b-instruct-fp16",0.0,0.0,1227,,PWD,,,,,False
+Ollama,"athene-v2:72b-q8_0",0.0,0.0,1253,,PWD,,,,,False
+Anthropic,"claude-3-5-sonnet-20241022",3,15,1308,,ANTHROPIC_API_KEY,anthropic,claude-3-sonnet-20240229,8192,,False
+Google,"gemini-2.0-flash-exp",0.15,0.60,1281,,GOOGLE_API_KEY,,,8192,,False
+Fireworks,"accounts/fireworks/models/llama-v3p3-70b-instruct",3,3,1280,,FIREWORKS_API_KEY,,,16384,,False
+Fireworks,"accounts/fireworks/models/qwen2p5-coder-32b-instruct",.9,.9,1226,,FIREWORKS_API_KEY,,,2048,,False
+OpenAI,"gpt-4o-mini",0.15,0.60,1246,,OPENAI_API_KEY,tiktoken,o200k_base,16384,,True
+OpenAI,"gpt-4o-2024-11-20",2.5,10,1306,,OPENAI_API_KEY,tiktoken,o200k_base,16384,,True
+OpenAI,"o1-2024-12-17",15,60,1311,,OPENAI_API_KEY,tiktoken,o200k_base,,32768,True
+OpenAI,"grok-beta",5,15,1255,"https://api.x.ai/v1",XAI_API_KEY,tiktoken,o200k_base,4096,,False
+Anthropic,"claude-3-5-haiku-20241022",1,5,1265,,ANTHROPIC_API_KEY,anthropic,claude-3-sonnet-20240229,8192,,False
+GoogleVertexAI,gemini-2.0-pro-exp-02-05,0.14,.59,1321,,VERTEX_AI_API_KEY,,,8192,,False
+Google,gemini-exp-1206,0.15,0.60,1320,,GOOGLE_API_KEY,,,8192,,False

pdd/generate_test.py

@@ -76,7 +76,7 @@ def generate_test(
         last_600_chars = result[-600:] if len(result) > 600 else result
         reasoning, is_finished, check_cost, check_model = unfinished_prompt(
             prompt_text=last_600_chars,
-            strength=0.895,
+            strength=0.89,
             temperature=temperature,
             verbose=verbose
         )
@@ -101,7 +101,7 @@ def generate_test(
         processed_result, post_cost, post_model = postprocess(
             result,
             language=language,
-            strength=0.895,
+            strength=0.89,
             temperature=temperature,
             verbose=verbose
         )