pdd-cli 0.0.32__py3-none-any.whl → 0.0.33__py3-none-any.whl

pdd/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.32"
+__version__ = "0.0.33"
 
 # Strength parameter used for LLM extraction across the codebase
 # Used in postprocessing, XML tagging, code generation, and other extraction operations. The module should have a large context window and be affordable.

pdd/code_generator_main.py

@@ -27,7 +27,7 @@ PDD_APP_NAME = "PDD Code Generator"
 
 # Cloud function URL
 CLOUD_GENERATE_URL = "https://us-central1-prompt-driven-development.cloudfunctions.net/generateCode"
-CLOUD_REQUEST_TIMEOUT = 200  # seconds
+CLOUD_REQUEST_TIMEOUT = 400  # seconds
 
 console = Console()
 
@@ -59,8 +59,8 @@ def is_git_repository(path: Optional[str] = None) -> bool:
     return False
 
 
-def get_git_committed_content(file_path: str) -> Optional[str]:
-    """Gets the content of the file as it was in the last commit (HEAD)."""
+def get_git_content_at_ref(file_path: str, git_ref: str = "HEAD") -> Optional[str]:
+    """Gets the content of the file as it was at the specified git_ref."""
     abs_file_path = pathlib.Path(file_path).resolve()
     if not is_git_repository(str(abs_file_path.parent)):
         return None
@@ -77,13 +77,13 @@ def get_git_committed_content(file_path: str) -> Optional[str]:
         # console.print(f"[yellow]File {file_path} is not under git root {git_root}.[/yellow]")
         return None
 
-    returncode, stdout, stderr = _run_git_command(["git", "show", f"HEAD:{relative_path.as_posix()}"], cwd=str(git_root))
+    returncode, stdout, stderr = _run_git_command(["git", "show", f"{git_ref}:{relative_path.as_posix()}"], cwd=str(git_root))
     if returncode == 0:
         return stdout
     else:
-        # File might be new, or other git error. Not necessarily an error for this function's purpose.
-        # if "does not exist" not in stderr and "exists on disk, but not in 'HEAD'" not in stderr and console.is_terminal:
-        #     console.print(f"[yellow]Git (show) warning for {file_path}: {stderr}[/yellow]")
+        # File might not exist at that ref, or other git error.
+        # if "does not exist" not in stderr and "exists on disk, but not in" not in stderr and console.is_terminal: # Be less noisy for common cases
+        #     console.print(f"[yellow]Git (show) warning for {file_path} at {git_ref}: {stderr}[/yellow]")
         return None
 
 def get_file_git_status(file_path: str) -> str:
@@ -192,14 +192,98 @@ def code_generator_main(
                 if verbose:
                     console.print(f"Using specified original prompt: [cyan]{original_prompt_file_path}[/cyan]")
             elif is_git_repository(str(pathlib.Path(prompt_file).parent)):
-                original_prompt_git_content = get_git_committed_content(prompt_file)
-                if original_prompt_git_content is not None:
-                    original_prompt_content_for_incremental = original_prompt_git_content
-                    can_attempt_incremental = True
+                # prompt_content is the current on-disk version
+                head_prompt_content = get_git_content_at_ref(prompt_file, git_ref="HEAD")
+
+                if head_prompt_content is not None:
+                    # Compare on-disk content (prompt_content) with HEAD content
+                    if prompt_content.strip() != head_prompt_content.strip():
+                        # Uncommitted changes exist. Original is HEAD, new is on-disk.
+                        original_prompt_content_for_incremental = head_prompt_content
+                        can_attempt_incremental = True
+                        if verbose:
+                            console.print(f"On-disk [cyan]{prompt_file}[/cyan] has uncommitted changes. Using HEAD version as original prompt.")
+                    else:
+                        # On-disk is identical to HEAD. Search for a prior *different* version.
+                        if verbose:
+                            console.print(f"On-disk [cyan]{prompt_file}[/cyan] matches HEAD. Searching for a prior *different* version as original prompt.")
+
+                        new_prompt_candidate = head_prompt_content # This is also prompt_content (on-disk)
+                        found_different_prior = False
+                        
+                        git_root_path_obj: Optional[pathlib.Path] = None
+                        prompt_file_rel_to_root_str: Optional[str] = None
+
+                        try:
+                            abs_prompt_file_path = pathlib.Path(prompt_file).resolve()
+                            temp_git_root_rc, temp_git_root_str, temp_git_root_stderr = _run_git_command(
+                                ["git", "rev-parse", "--show-toplevel"], 
+                                cwd=str(abs_prompt_file_path.parent)
+                            )
+                            if temp_git_root_rc == 0:
+                                git_root_path_obj = pathlib.Path(temp_git_root_str)
+                                prompt_file_rel_to_root_str = abs_prompt_file_path.relative_to(git_root_path_obj).as_posix()
+                            elif verbose:
+                                console.print(f"[yellow]Git (rev-parse) failed for {prompt_file}: {temp_git_root_stderr}. Cannot search history for prior different version.[/yellow]")
+                        
+                        except ValueError: # If file is not under git root
+                             if verbose:
+                                console.print(f"[yellow]File {prompt_file} not under a detected git root. Cannot search history.[/yellow]")
+                        except Exception as e_git_setup:
+                            if verbose:
+                                console.print(f"[yellow]Error setting up git info for {prompt_file}: {e_git_setup}. Cannot search history.[/yellow]")
+
+                        if git_root_path_obj and prompt_file_rel_to_root_str:
+                            MAX_COMMITS_TO_SEARCH = 10  # How far back to look
+                            log_cmd = ["git", "log", f"--pretty=format:%H", f"-n{MAX_COMMITS_TO_SEARCH}", "--", prompt_file_rel_to_root_str]
+                            
+                            log_rc, log_stdout, log_stderr = _run_git_command(log_cmd, cwd=str(git_root_path_obj))
+
+                            if log_rc == 0 and log_stdout.strip():
+                                shas = log_stdout.strip().split('\\n')
+                                if verbose:
+                                     console.print(f"Found {len(shas)} commits for [cyan]{prompt_file_rel_to_root_str}[/cyan] in recent history (up to {MAX_COMMITS_TO_SEARCH}).")
+
+                                if len(shas) > 1: # Need at least one commit before the one matching head_prompt_content
+                                    for prior_sha in shas[1:]: # Iterate starting from the commit *before* HEAD's version of the file
+                                        if verbose:
+                                            console.print(f"  Checking commit {prior_sha[:7]} for content of [cyan]{prompt_file}[/cyan]...")
+                                        
+                                        # get_git_content_at_ref uses the original prompt_file path, 
+                                        # which it resolves internally relative to the git root.
+                                        prior_content = get_git_content_at_ref(prompt_file, prior_sha) 
+                                        
+                                        if prior_content is not None:
+                                            if prior_content.strip() != new_prompt_candidate.strip():
+                                                original_prompt_content_for_incremental = prior_content
+                                                can_attempt_incremental = True
+                                                found_different_prior = True
+                                                if verbose:
+                                                    console.print(f"    [green]Found prior different version at commit {prior_sha[:7]}. Using as original prompt.[/green]")
+                                                break 
+                                            elif verbose:
+                                                 console.print(f"    Content at {prior_sha[:7]} is identical to current HEAD. Skipping.")
+                                        elif verbose:
+                                            console.print(f"    Could not retrieve content for [cyan]{prompt_file}[/cyan] at commit {prior_sha[:7]}.")
+                                else: 
+                                    if verbose:
+                                        console.print(f"  File [cyan]{prompt_file_rel_to_root_str}[/cyan] has less than 2 versions in recent history at this path.")
+                            elif verbose:
+                                console.print(f"[yellow]Git (log) failed for {prompt_file_rel_to_root_str} or no history found: {log_stderr}[/yellow]")
+                        
+                        if not found_different_prior:
+                            original_prompt_content_for_incremental = new_prompt_candidate 
+                            can_attempt_incremental = True 
+                            if verbose:
+                                console.print(
+                                    f"[yellow]Warning: Could not find a prior *different* version of {prompt_file} "
+                                    f"within the last {MAX_COMMITS_TO_SEARCH if git_root_path_obj else 'N/A'} relevant commits. "
+                                    f"Using current HEAD version as original (prompts will be identical).[/yellow]"
+                                )
+                else:
+                    # File not in HEAD, cannot determine git-based original prompt.
                     if verbose:
-                        console.print(f"Using last committed version of [cyan]{prompt_file}[/cyan] as original prompt.")
-                elif verbose:
-                    console.print(f"[yellow]Warning: Could not find committed version of {prompt_file} in git for incremental generation.[/yellow]")
+                        console.print(f"[yellow]Warning: Could not find committed version of {prompt_file} in git (HEAD) for incremental generation.[/yellow]")
             
             if force_incremental_flag and existing_code_content:
                 if not (original_prompt_content_for_incremental or "original_prompt_file" in input_strings): # Check if original prompt is actually available

pdd/context_generator.py

@@ -33,11 +33,6 @@ def context_generator(code_module: str, prompt: str, language: str = "python", s
             print("[red]Error: prompt is missing.[/red]")
         return None, 0.0, None
 
-    supported_languages = ["python", "javascript", "java"]
-    if language not in supported_languages:
-        if verbose:
-            print(f"[red]Error: Unsupported language '{language}'.[/red]")
-        return None, 0.0, None
 
     if not (0 <= strength <= 1):
         if verbose:

pdd/context_generator_main.py

@@ -25,7 +25,7 @@ def context_generator_main(ctx: click.Context, prompt_file: str, code_file: str,
         command_options = {
             "output": output
         }
-        input_strings, output_file_paths, _ = construct_paths(
+        input_strings, output_file_paths, language = construct_paths(
             input_file_paths=input_file_paths,
             force=ctx.obj.get('force', False),
             quiet=ctx.obj.get('quiet', False),
@@ -41,6 +41,7 @@ def context_generator_main(ctx: click.Context, prompt_file: str, code_file: str,
         strength = ctx.obj.get('strength', 0.5)
         temperature = ctx.obj.get('temperature', 0)
         example_code, total_cost, model_name = context_generator(
+            language=language,
             code_module=code_content,
             prompt=prompt_content,
             strength=strength,

pdd/data/language_format.csv

@@ -12,6 +12,7 @@ Go,//,.go
 Rust,//,.rs
 Kotlin,//,.kt
 TypeScript,//,.ts
+TypeScriptReact,//,.tsx
 C#,//,.cs
 SQL,--,.sql
 Shell,#,.sh

pdd/postprocess.py

@@ -3,6 +3,7 @@ from rich import print
 from pydantic import BaseModel, Field
 from .load_prompt_template import load_prompt_template
 from .llm_invoke import llm_invoke
+from . import DEFAULT_TIME
 
 class ExtractedCode(BaseModel):
     """Pydantic model for the extracted code."""
@@ -18,12 +19,13 @@ def postprocess_0(text: str) -> str:
     in_code_block = False
     
     for line in lines:
-        if line.startswith('```'):
+        if '```' in line: # MODIFIED: Was line.startswith('```')
             if not in_code_block:
-                # Skip the language identifier line
+                # Skip the language identifier line / content on opening delimiter line
                 in_code_block = True
                 continue
             else:
+                # Content on closing delimiter line is skipped
                 in_code_block = False
                 continue
         if in_code_block:
@@ -36,6 +38,7 @@ def postprocess(
     language: str,
     strength: float = 0.9,
     temperature: float = 0,
+    time: float = DEFAULT_TIME,
     verbose: bool = False
 ) -> Tuple[str, float, str]:
     """
@@ -46,6 +49,7 @@ def postprocess(
         language (str): The programming language of the code to extract
         strength (float): The strength of the LLM model to use (0-1)
         temperature (float): The temperature parameter for the LLM (0-1)
+        time (float): The thinking effort for the LLM model (0-1)
         verbose (bool): Whether to print detailed processing information
     
     Returns:
@@ -87,6 +91,7 @@ def postprocess(
             input_json=input_json,
             strength=strength,
             temperature=temperature,
+            time=time,
             verbose=verbose,
             output_pydantic=ExtractedCode
         )
@@ -94,14 +99,14 @@ def postprocess(
         if not response or 'result' not in response:
             raise ValueError("Failed to get valid response from LLM")
 
-        extracted_code: ExtractedCode = response['result']
-        code_text = extracted_code.extracted_code
+        extracted_code_obj: ExtractedCode = response['result'] # Renamed for clarity
+        code_text = extracted_code_obj.extracted_code
 
         # Step 3c: Remove triple backticks and language identifier if present
         lines = code_text.split('\n')
         if lines and lines[0].startswith('```'):
             lines = lines[1:]
-        if lines and lines[-1].startswith('```'):
+        if lines and lines[-1].startswith('```'): # Check if lines is not empty again after potentially removing first line
             lines = lines[:-1]
         
         final_code = '\n'.join(lines)

{pdd_cli-0.0.32.dist-info → pdd_cli-0.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdd-cli
-Version: 0.0.32
+Version: 0.0.33
 Summary: PDD (Prompt-Driven Development) Command Line Interface
 Author: Greg Tanaka
 Author-email: glt@alumni.caltech.edu
@@ -46,7 +46,7 @@ Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: z3-solver; extra == "dev"
 Dynamic: license-file
 
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.32-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.33-blue
    :alt: PDD-CLI Version
 
 PDD (Prompt-Driven Development) Command Line Interface
@@ -130,7 +130,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.32).
+You'll see the current PDD version (e.g., 0.0.33).
 
 Advanced Installation Tips
 --------------------------

{pdd_cli-0.0.32.dist-info → pdd_cli-0.0.33.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pdd/__init__.py,sha256=oBlK2EdKLxWULcsuHgrlD34jImz8M12FUeCXxTkbxIk,632
+pdd/__init__.py,sha256=Dz0E3y_UahIvzJmwRPuYlso-fufI57LqGEq8bmJDJEE,632
 pdd/auto_deps_main.py,sha256=NVLqL5FHxe2eorViXTuh8z2zH9Sb-b6MNN9aZ1hqevY,3552
 pdd/auto_include.py,sha256=aCa2QXDlOdKbh4vS3uDjWptkHB_Qv3QBNCbZe6mGWoo,6074
 pdd/auto_update.py,sha256=Pfav1hrqQIDjZIPuIvryBeM7k-Rc72feVUTJZPtigaU,2889
@@ -9,13 +9,13 @@ pdd/change_main.py,sha256=Tk0aHY8Z2d-d0m7lLfc_HqgOqs4x_dJD1IrVZSxuxIM,25580
 pdd/cli.py,sha256=VFoyx3iJmFeHCc4HhOc_7tiz3FY9oJjCUtS9PR1wwl0,38341
 pdd/cmd_test_main.py,sha256=aSCxRnSurg15AvPcJDAPp9xy8p_qqnjU1oV14Hi2R54,5301
 pdd/code_generator.py,sha256=DqQNN6jCNjSJvHi0IFyqkSfak6LeDG-yQHPYnvd4AJQ,4424
-pdd/code_generator_main.py,sha256=wup3O2dVh9JzlGsWtXvypqAHgHyBZHOWAe3NJuV_-g4,18648
+pdd/code_generator_main.py,sha256=oCI35RqQ7gBov8mncVg1mhdDNX-0jTsoIeSzrz7WpAk,25109
 pdd/comment_line.py,sha256=sX2hf4bG1fILi_rvI9MkkwCZ2IitgKkW7nOiw8aQKPY,1845
 pdd/conflicts_in_prompts.py,sha256=XaEm9jIMcbENTyhphD8NXs2EmRxuPu1EI8GHrsiRwq0,4687
 pdd/conflicts_main.py,sha256=O87s9baSa9DJMndxPIdsnYO_spoajcv9jii3XYt_-fM,3473
 pdd/construct_paths.py,sha256=AE3vblj2v21ZdReM40pz47gvmXg-RZjuR_2FALj_9fs,17672
-pdd/context_generator.py,sha256=MO483MqtMR5EUanllD7Ru5U9idcVMIMutntcWMn31cI,5847
-pdd/context_generator_main.py,sha256=TtsY3jHictdEjmB4cHyNwXmZW_LfHJp3KW3UXyzR2cU,2735
+pdd/context_generator.py,sha256=KQAaJRwVpsPOF4y5lhP3DpIrlxhR39C0hNyTAi1Kx2U,5618
+pdd/context_generator_main.py,sha256=WSS7uRkS2wi8HCixDA3_xzFuPqFRF_X2tGe6K3loUZc,2773
 pdd/continue_generation.py,sha256=upZw77fKqHZ5IS8Ful7eioTi9VTqeuY1V9vzIwHeOJQ,5419
 pdd/crash_main.py,sha256=yveWWJWxCOzRLxPk1m1rgm4tNwpAk5jYRvYyItAaU2w,7262
 pdd/detect_change.py,sha256=t70NAgakVc2u7XiI-lZjuR2RZ8Mrd3lJwRPu8I8s_P4,5310
@@ -47,7 +47,7 @@ pdd/mcp_config.json,sha256=D3ctWHlShvltbtH37zbYb6smVE0V80_lGjDKDIqsSBE,124
 pdd/pdd_completion.fish,sha256=rs-43fa3kcDBN1uy4oxiofLAWmaqW0U2j5Mu4wCHh5M,6121
 pdd/pdd_completion.sh,sha256=qurWrEksqptjryBZszxHv6i0MqgnIqJenMBDrzMgI98,4535
 pdd/pdd_completion.zsh,sha256=-yz69Rs4lnJ-bRAF8H2Tzk0GuDUo-BWjytE3fv5wTS8,13458
-pdd/postprocess.py,sha256=7Dt4C7hZZbqCpYK0LG2Ui_vIUYw9UTN3w5Wgd_JZYBs,4021
+pdd/postprocess.py,sha256=jWJSUPP7bDChyTEek35UOdy6fhU6c5EoDSoMypGwIdE,4402
 pdd/postprocess_0.py,sha256=OW17GyCFLYErCyWh2tL4syuho3q2yFf2wyekQ4BLdPM,2168
 pdd/preprocess.py,sha256=UB1rqSNscUC-JHujvGb11LJ5OadZ3GVD1Qeq1dI6HMc,9508
 pdd/preprocess_main.py,sha256=dAgFGmjuJB1taZl31c1sY2jMGtQgjnWLbpeB7EFtojY,2977
@@ -64,7 +64,7 @@ pdd/update_main.py,sha256=5a4nsOOaAXULdk0BS9pj4blZ_QHBFeET37uaAqoJI2g,3912
 pdd/update_model_costs.py,sha256=zfGqWoVIjBppKUt1Naq2ZsIdiucwfH6at2DflcwkJf8,22998
 pdd/update_prompt.py,sha256=OdPRIAMu7OBx7E4SOU95hWgdtBY4oO8XOe1dvPChMlU,4351
 pdd/xml_tagger.py,sha256=5AWzOboNuXMJmmIpi1hhPPAB6nxbBOkRqgoPLpoGYT8,4292
-pdd/data/language_format.csv,sha256=xUTmFHXSBVBRfPV-NKG3oWo5_ped5ukP-ekFcIlVzJk,877
+pdd/data/language_format.csv,sha256=X7jj_clC6dA93ij0TUPNd9oJ2tHyKUKXlWo1XVhP6zo,901
 pdd/data/llm_model.csv,sha256=BZioMyxUlDuJdcxFCDV2BTw1ssiHKZBf4OxELIy4JGY,1487
 pdd/prompts/auto_include_LLM.prompt,sha256=0t-Jmm5o6vVTmqsISTUiewqPT8bB389UZnJoHZvgtu4,13967
 pdd/prompts/bug_to_unit_test_LLM.prompt,sha256=KdMkvRVnjVSf0NTYIaDXIMT93xPttXEwkMpjWx5leLs,1588
@@ -101,9 +101,9 @@ pdd/prompts/trim_results_start_LLM.prompt,sha256=OKz8fAf1cYWKWgslFOHEkUpfaUDARh3
 pdd/prompts/unfinished_prompt_LLM.prompt,sha256=-JgBpiPTQZdWOAwOG1XpfpD9waynFTAT3Jo84eQ4bTw,1543
 pdd/prompts/update_prompt_LLM.prompt,sha256=prIc8uLp2jqnLTHt6JvWDZGanPZipivhhYeXe0lVaYw,1328
 pdd/prompts/xml_convertor_LLM.prompt,sha256=YGRGXJeg6EhM9690f-SKqQrKqSJjLFD51UrPOlO0Frg,2786
-pdd_cli-0.0.32.dist-info/licenses/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
-pdd_cli-0.0.32.dist-info/METADATA,sha256=gnrubUf69rPVr3t01FvagrPuxrJ3B6JRbHXjYQYB3OQ,7778
-pdd_cli-0.0.32.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pdd_cli-0.0.32.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
-pdd_cli-0.0.32.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
-pdd_cli-0.0.32.dist-info/RECORD,,
+pdd_cli-0.0.33.dist-info/licenses/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
+pdd_cli-0.0.33.dist-info/METADATA,sha256=3YpnYiyxVO4po25BTjUXzs-ara96spnI4RSnoOMx3X0,7778
+pdd_cli-0.0.33.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pdd_cli-0.0.33.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
+pdd_cli-0.0.33.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
+pdd_cli-0.0.33.dist-info/RECORD,,