pdd-cli 0.0.56__py3-none-any.whl → 0.0.57__py3-none-any.whl

pdd/trace.py

@@ -1,4 +1,4 @@
-from typing import Tuple, Optional
+from typing import Tuple, Optional, List
 from rich import print
 from rich.console import Console
 from pydantic import BaseModel, Field
@@ -10,6 +10,39 @@ from .llm_invoke import llm_invoke
 from . import DEFAULT_TIME, DEFAULT_STRENGTH
 console = Console()
 
+
+def _normalize_text(value: str) -> str:
+    if value is None:
+        return ""
+    value = value.replace("\u201c", '"').replace("\u201d", '"')
+    value = value.replace("\u2018", "'").replace("\u2019", "'")
+    value = value.replace("\u00A0", " ")
+    value = re.sub(r"\s+", " ", value.strip())
+    return value
+
+
+def _fallback_prompt_line(prompt_lines: List[str], code_str: str) -> int:
+    """Best-effort deterministic fallback to select a prompt line."""
+    normalized_code = _normalize_text(code_str).casefold()
+    tokens = [tok for tok in re.split(r"\W+", normalized_code) if len(tok) >= 3]
+
+    token_best_idx: Optional[int] = None
+    token_best_hits = 0
+    if tokens:
+        for i, line in enumerate(prompt_lines, 1):
+            normalized_line = _normalize_text(line).casefold()
+            hits = sum(1 for tok in tokens if tok in normalized_line)
+            if hits > token_best_hits:
+                token_best_hits = hits
+                token_best_idx = i
+    if token_best_idx is not None and token_best_hits > 0:
+        return token_best_idx
+
+    for i, line in enumerate(prompt_lines, 1):
+        if _normalize_text(line):
+            return i
+    return 1
+
 class PromptLineOutput(BaseModel):
     prompt_line: str = Field(description="The line from the prompt file that matches the code")
 
@@ -109,15 +142,6 @@ def trace(
             console.print(f"Searching for line: {prompt_line_str}")
 
         # Robust normalization for comparison
-        def normalize_text(s: str) -> str:
-            if s is None:
-                return ""
-            s = s.replace("\u201c", '"').replace("\u201d", '"')  # smart double quotes → straight
-            s = s.replace("\u2018", "'").replace("\u2019", "'")  # smart single quotes → straight
-            s = s.replace("\u00A0", " ")  # non-breaking space → space
-            s = re.sub(r"\s+", " ", s.strip())  # collapse whitespace
-            return s
-
         # If the model echoed wrapper tags like <llm_output>...</llm_output>, extract inner text
         raw_search = prompt_line_str
         try:
@@ -127,12 +151,12 @@ def trace(
         except Exception:
             pass
 
-        normalized_search = normalize_text(raw_search).casefold()
+        normalized_search = _normalize_text(raw_search).casefold()
         best_candidate_idx = None
         best_candidate_len = 0
 
         for i, line in enumerate(prompt_lines, 1):
-            normalized_line = normalize_text(line).casefold()
+            normalized_line = _normalize_text(line).casefold()
             line_len = len(normalized_line)
 
             # Base similarity
@@ -246,14 +270,26 @@ def trace(
                             f"[yellow]Low-confidence multi-line match selected (ratio={win_best_ratio:.3f}).[/yellow]"
                         )
 
+        # Step 7c: Deterministic fallback when LLM output cannot be matched reliably
+        fallback_used = False
+        if best_match is None:
+            best_match = _fallback_prompt_line(prompt_lines, code_str)
+            fallback_used = True
+
         # Step 8: Return results
         if verbose:
             console.print(f"[green]Found matching line: {best_match}[/green]")
             console.print(f"[green]Total cost: ${total_cost:.6f}[/green]")
             console.print(f"[green]Model used: {model_name}[/green]")
+            if fallback_used:
+                console.print("[yellow]Fallback matching heuristic was used.[/yellow]")
 
         return best_match, total_cost, model_name
 
     except Exception as e:
         console.print(f"[bold red]Error in trace function: {str(e)}[/bold red]")
-        return None, 0.0, ""
+        try:
+            fallback_line = _fallback_prompt_line(prompt_file.splitlines(), code_file.splitlines()[code_line - 1] if 0 < code_line <= len(code_file.splitlines()) else "")
+        except Exception:
+            fallback_line = 1
+        return fallback_line, 0.0, "fallback"

{pdd_cli-0.0.56.dist-info → pdd_cli-0.0.57.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdd-cli
-Version: 0.0.56
+Version: 0.0.57
 Summary: PDD (Prompt-Driven Development) Command Line Interface
 Author: Greg Tanaka
 Author-email: glt@alumni.caltech.edu
@@ -51,7 +51,7 @@ Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 Dynamic: license-file
 
-.. image:: https://img.shields.io/badge/pdd--cli-v0.0.56-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.57-blue
    :alt: PDD-CLI Version
 
 .. image:: https://img.shields.io/badge/Discord-join%20chat-7289DA.svg?logo=discord&logoColor=white&link=https://discord.gg/Yp4RTh8bG7
@@ -128,7 +128,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.56).
+You'll see the current PDD version (e.g., 0.0.57).
 
 Getting Started with Examples
 -----------------------------

{pdd_cli-0.0.56.dist-info → pdd_cli-0.0.57.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pdd/__init__.py,sha256=ca8MfVovv1zfjBoDhLPWEWu1bOMwbT7XY3CcRF635Sg,633
+pdd/__init__.py,sha256=c7_rZfVUGfMl_L9YRmXqSUq_hMgTOjG1KknWvXAR0JQ,633
 pdd/auto_deps_main.py,sha256=cpP3bbzVL3jomrGinpzTxzIDIC8tmDDYOwUAC1TKRaw,3970
 pdd/auto_include.py,sha256=OJcdcwTwJNqHPHKG9P4m9Ij-PiLex0EbuwJP0uiQi_Y,7484
 pdd/auto_update.py,sha256=w6jzTnMiYRNpwQHQxWNiIAwQ0d6xh1iOB3xgDsabWtc,5236
@@ -6,14 +6,14 @@ pdd/bug_main.py,sha256=EtaGTuucQ7VgqOhyg4o6GFG7_QtTsDPTrRdGJWT648M,4841
 pdd/bug_to_unit_test.py,sha256=BoQqNyKQpBQDW8-JwBH_RX4RHRSiU8Kk3EplFrkECt0,6665
 pdd/change.py,sha256=Hg_x0pa370-e6oDiczaTgFAy3Am9ReCPkqFrvqv4U38,6114
 pdd/change_main.py,sha256=04VHiO_D-jlfeRn6rrVH7ZTA5agXPoJGm1StGI8--XY,27804
-pdd/cli.py,sha256=njGVezstZGTeinhrUdOQ2K21Wpt1jiA5jU6BT7OZpaY,46782
+pdd/cli.py,sha256=kLmJZ-2ETIbbpclwM7cQuaVfAiUNTBxJ9RtB0CsF2h0,55355
 pdd/cmd_test_main.py,sha256=M-i5x26ORXurt_pu8x1sgLAyVIItbuRThiux4wBg3Ls,7768
 pdd/code_generator.py,sha256=AxMRZKGIlLh9xWdn2FA6b3zSoZ-5TIZNIAzqjFboAQs,4718
-pdd/code_generator_main.py,sha256=RwyjzrC1NHOfJJkfxdwWwJf_UNAy2lCWjSyasucG2KU,27997
+pdd/code_generator_main.py,sha256=UtoskalEPpMAvCO-zd6xmr1lbQqSWQ7BvYgNJCybqok,35151
 pdd/comment_line.py,sha256=sX2hf4bG1fILi_rvI9MkkwCZ2IitgKkW7nOiw8aQKPY,1845
 pdd/conflicts_in_prompts.py,sha256=9N3rZWdJUGayOTOgnHW9G_Jm1C9G4Y8hSLhnURc1BkY,4890
 pdd/conflicts_main.py,sha256=SK8eljbAY_wWT4dieRSsQwBrU1Dm90MImry3AGL-Dj4,3704
-pdd/construct_paths.py,sha256=BDXDazbMOwgSLbYhCmgUwYIg0QPrjj8AVRbmFGJQIm4,33966
+pdd/construct_paths.py,sha256=JT0Mk-rkHoMaRdEdIbXy4sPYfg-eI3SWuxLh983_ACc,34252
 pdd/context_generator.py,sha256=HAptXNSFTGu4rHw2SceiCcoCunIemESNCMVNqY1w6hU,6107
 pdd/context_generator_main.py,sha256=ORpokRM9ZToBdMhFpM76iXkCGySyv2wsbQiyl4Ir5lQ,4147
 pdd/continue_generation.py,sha256=nEkAKZd9lM7OelQkffP99Y-JLxTFZeY3AH9VLRQCjHg,7854
@@ -50,7 +50,7 @@ pdd/pdd_completion.sh,sha256=DI2gJc7IxqjgKyEgjmoi8ev3f9Gs3LJrRgSQ-u2T6ms,5844
 pdd/pdd_completion.zsh,sha256=f4BxXrLZUEcFeIUmXWdnFOTnTpJBFZ8KGpnIdjDdKFo,15353
 pdd/postprocess.py,sha256=mNw3iSDxE-eTYo3QwJCj_EmdEnnB5ysUN62YPapC_IM,4433
 pdd/postprocess_0.py,sha256=OW17GyCFLYErCyWh2tL4syuho3q2yFf2wyekQ4BLdPM,2168
-pdd/preprocess.py,sha256=XdMSJDqkMQk_wO7ysOYELIpIXEIig-9pBqiEhm9QdsU,10108
+pdd/preprocess.py,sha256=75-J1smdi1Uq7gRQRLtVdkIfwltkeIvIZE-TkxxxCz0,12326
 pdd/preprocess_main.py,sha256=WGhOB9qEu7MmFoyXNml_AmqGii73LJWngx4kTlZ526k,3262
 pdd/process_csv_change.py,sha256=ckNqVPRooWVyIvmqjdEgo2PDLnpoQ6Taa2dUaWGRlzU,27926
 pdd/pytest_output.py,sha256=IrRKYneW_F6zv9WaJwKFGnOBLFBFjk1CnhO_EVAjb9E,6612
@@ -62,7 +62,8 @@ pdd/sync_animation.py,sha256=e7Qb4m70BHYpl37CuuF-95j-APctPL4Zm_o1PSTTRFQ,28070
 pdd/sync_determine_operation.py,sha256=o4wQSaOP3rGzkPuB5aVySdzhYdHiMWQvXFZPHZl99pc,60248
 pdd/sync_main.py,sha256=MrQldtBDeClNPtBECRR4Sy5LM_-TkPSNSnuNXdTxb10,13744
 pdd/sync_orchestration.py,sha256=tQydUxozSikHbXWBb8GtZMEDR3aRwePKdEGZukuH6uM,69966
-pdd/trace.py,sha256=Ty-r3ZQC5k3PUCUacgfzg4sO8RgcH8kquSDau-jHkec,10874
+pdd/template_registry.py,sha256=L8ZQ-apmdDe7Jj_JlgHv7fUoIiJnGDuE0V64Y-MO9vA,8099
+pdd/trace.py,sha256=ArdyOuMqm1dZDEDCLF6UsTOyKeAwoPLpPwaE5HHIgIE,12232
 pdd/trace_main.py,sha256=SOnMEHta9WaMAxulMrk6aFojma4ti61ILvJp3NVhpbg,4992
 pdd/track_cost.py,sha256=vsLrQmipjG1BW4P9Wl33qoS8XFJDYBVY4ruQqKjPEx0,4238
 pdd/unfinished_prompt.py,sha256=8En5NZqg6eCL6b451T_ndJx5ln1XDtFJyieW4pKRakE,5955
@@ -70,7 +71,7 @@ pdd/update_main.py,sha256=SWCd7Us3YatrDR7B66dQCpRCIgQoMHysPzxa4dedVmk,4385
 pdd/update_model_costs.py,sha256=RfeOlAHtc1FCx47A7CjrH2t5WXQclQ_9uYtNjtQh75I,22998
 pdd/update_prompt.py,sha256=zc-HiI1cwGBkJHVmNDyoSZa13lZH90VdB9l8ajdj6Kk,4543
 pdd/xml_tagger.py,sha256=5Bc3HRm7iz_XjBdzQIcMb8KocUQ8PELI2NN5Gw4amd4,4825
-pdd/data/language_format.csv,sha256=pWF3yCh6xOFNmrr2TxTnye7EPKT3c-LPjmYV3Qc0a-Y,933
+pdd/data/language_format.csv,sha256=shimgYTHMJtfKQ1wpjjLto27TaMKU4OzNJ4hLeoXHms,957
 pdd/data/llm_model.csv,sha256=UxllgS0btSpCKpPgPnaTFAtZsAynBhLeZyoIVo0Tpwc,1698
 pdd/prompts/auto_include_LLM.prompt,sha256=sNF2rdJu9wJ8c0lwjCfZ9ZReX8zGXRUNehRs1ZiyDoc,12108
 pdd/prompts/bug_to_unit_test_LLM.prompt,sha256=KdMkvRVnjVSf0NTYIaDXIMT93xPttXEwkMpjWx5leLs,1588
@@ -89,7 +90,7 @@ pdd/prompts/extract_program_code_fix_LLM.prompt,sha256=bXxYrVtxnjWKrmidVi3bT-o6w
 pdd/prompts/extract_prompt_change_LLM.prompt,sha256=1e3AxcVpZ85t7pVvXqCpBUJzGI995MIimXicClagSvw,366
 pdd/prompts/extract_prompt_split_LLM.prompt,sha256=rhStDroVxDYRcCjYq7XCCub8B-KmfCFj5_7PxhgMmz0,1097
 pdd/prompts/extract_prompt_update_LLM.prompt,sha256=htttAp-QC6YycnfhFVsLhTM0uvhyEz9TEoGdFyZS8Yw,910
-pdd/prompts/extract_promptline_LLM.prompt,sha256=owIBRaF2bWwg3S64uyMKzOFMdvvmI_EEGoF97Pa9118,813
+pdd/prompts/extract_promptline_LLM.prompt,sha256=mPeTjVaYJtgz2ygO0TVeO3vgmoBvWOWFSrwd1wKXJ74,831
 pdd/prompts/extract_unit_code_fix_LLM.prompt,sha256=c4l6twMLC2YqDDvOj_DcaKmJQF8kIupeqvkueK_OQng,14301
 pdd/prompts/extract_xml_LLM.prompt,sha256=eRcHaL-khShpb7C1_b7wmBJHfo2Kh1Wvjo_aOcWZovU,561
 pdd/prompts/find_verification_errors_LLM.prompt,sha256=NwmJbAFkNwSWaJOsewznb7hbOljc9AJ-Sf6fB7xIACI,2863
@@ -102,15 +103,16 @@ pdd/prompts/insert_includes_LLM.prompt,sha256=g-p2gXKENsqvfK5Q9FYbqFsIJ5CP7rbxmd
 pdd/prompts/split_LLM.prompt,sha256=cMVyazsue6eerOPYeueqpSNRiITy1ht0HgGytPFiQIk,6244
 pdd/prompts/summarize_file_LLM.prompt,sha256=qb9K61XMVFy7hgGITglI37Xg7yLPAGQBm0rUBEqRnEc,387
 pdd/prompts/sync_analysis_LLM.prompt,sha256=tU_0MlvmS5OT2zMCaldkaL-kX2x6pzZSa3uuKHLwUg0,3925
-pdd/prompts/trace_LLM.prompt,sha256=XTPoQQpKrF7BtWkCJPIrinn448VyBGXJieibMsMP-y0,1231
+pdd/prompts/trace_LLM.prompt,sha256=0fHSXQbUAqQ7ABRcyYxesA1SVPbDQWCDwcW4VLPuTBA,1233
 pdd/prompts/trim_results_LLM.prompt,sha256=w4aL0S7v7fPSi3L9XeQR3mUOgNv3hpTDqi4rOtu7L7I,4033
 pdd/prompts/trim_results_start_LLM.prompt,sha256=OKz8fAf1cYWKWgslFOHEkUpfaUDARh3DD9L7ud9FOVE,2177
 pdd/prompts/unfinished_prompt_LLM.prompt,sha256=vud_G9PlVv9Ig64uBC-hPEVFRk5lwpc8pW6tOIxJM4I,5082
 pdd/prompts/update_prompt_LLM.prompt,sha256=prIc8uLp2jqnLTHt6JvWDZGanPZipivhhYeXe0lVaYw,1328
 pdd/prompts/xml_convertor_LLM.prompt,sha256=YGRGXJeg6EhM9690f-SKqQrKqSJjLFD51UrPOlO0Frg,2786
-pdd_cli-0.0.56.dist-info/licenses/LICENSE,sha256=kvTJnnxPVTYlGKSY4ZN1kzdmJ0lxRdNWxgupaB27zsU,1066
-pdd_cli-0.0.56.dist-info/METADATA,sha256=xVQb-QcyhglRDa-RDyTZ4EuSvQccTUcdlfaL5L8PR9s,12597
-pdd_cli-0.0.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pdd_cli-0.0.56.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
-pdd_cli-0.0.56.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
-pdd_cli-0.0.56.dist-info/RECORD,,
+pdd/templates/architecture/architecture_json.prompt,sha256=uSNSsKTL-cuMMhi5a4GSpC94DKkOFAlXh7R0CUlo-hg,8126
+pdd_cli-0.0.57.dist-info/licenses/LICENSE,sha256=kvTJnnxPVTYlGKSY4ZN1kzdmJ0lxRdNWxgupaB27zsU,1066
+pdd_cli-0.0.57.dist-info/METADATA,sha256=5c-XFXqAOnpojCQwch2BmM4JsxO3YrgVhPGq-bduSOU,12597
+pdd_cli-0.0.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pdd_cli-0.0.57.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
+pdd_cli-0.0.57.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
+pdd_cli-0.0.57.dist-info/RECORD,,