pdd-cli 0.0.34__py3-none-any.whl → 0.0.35__py3-none-any.whl

pdd/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.34"
+__version__ = "0.0.35"
 
 # 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/auto_update.py

@@ -3,14 +3,57 @@ import requests
 import semver
 import subprocess
 import sys
+import shutil
+
+def detect_installation_method(sys_executable):
+    """
+    Detect if package is installed via UV or pip.
+    
+    Args:
+        sys_executable (str): Path to the Python executable
+    
+    Returns:
+        str: "uv" if installed via UV, "pip" otherwise
+    """
+    # Check if executable path contains UV paths
+    if any(marker in sys_executable for marker in ["/uv/tools/", ".local/share/uv/"]):
+        return "uv"
+    return "pip"  # Default to pip for all other cases
+
+
+def get_upgrade_command(package_name, installation_method):
+    """
+    Return appropriate upgrade command based on installation method.
+    
+    Args:
+        package_name (str): Name of the package to upgrade
+        installation_method (str): "uv" or "pip"
+    
+    Returns:
+        tuple: (command_list, shell_mode) where command_list is the command to run
+               and shell_mode is a boolean indicating if shell=True should be used
+    """
+    if installation_method == "uv":
+        # For UV commands, we need the full path if available
+        uv_path = shutil.which("uv")
+        if uv_path:
+            return ([uv_path, "tool", "upgrade", package_name], False)
+        else:
+            # If uv isn't in PATH, use shell=True
+            return (["uv", "tool", "upgrade", package_name], True)
+    else:
+        # Default pip method
+        return ([sys.executable, "-m", "pip", "install", "--upgrade", package_name], False)
+
 
 def auto_update(package_name: str = "pdd-cli", latest_version: str = None) -> None:
     """
     Check if there's a new version of the package available and prompt for upgrade.
+    Handles both UV and pip installations automatically.
     
     Args:
         latest_version (str): Known latest version (default: None)
-        package_name (str): Name of the package to check (default: "pdd")
+        package_name (str): Name of the package to check (default: "pdd-cli")
     """
     try:
         # Get current installed version
@@ -47,15 +90,39 @@ def auto_update(package_name: str = "pdd-cli", latest_version: str = None) -> No
         while True:
             response = input("Would you like to upgrade? [y/N]: ").lower().strip()
             if response in ['y', 'yes']:
-                # Construct pip command
-                pip_command = f"{sys.executable} -m pip install --upgrade {package_name}"
-                print(f"\nUpgrading with command: {pip_command}")
+                # Detect installation method
+                installation_method = detect_installation_method(sys.executable)
+                cmd, use_shell = get_upgrade_command(package_name, installation_method)
+                
+                cmd_str = " ".join(cmd)
+                print(f"\nDetected installation method: {installation_method}")
+                print(f"Upgrading with command: {cmd_str}")
                 
                 try:
-                    subprocess.check_call(pip_command.split())
-                    print(f"\nSuccessfully upgraded {package_name} to version {latest_version}")
-                except subprocess.CalledProcessError as e:
-                    print(f"\nFailed to upgrade: {str(e)}")
+                    result = subprocess.run(cmd, shell=use_shell, capture_output=True, text=True)
+                    
+                    if result.returncode == 0:
+                        print(f"\nSuccessfully upgraded {package_name} to version {latest_version}")
+                    else:
+                        print(f"\nUpgrade command failed: {result.stderr}")
+                        
+                        # If UV failed and we're not already in fallback mode, try pip as fallback
+                        if installation_method == "uv":
+                            print("\nAttempting fallback to pip...")
+                            fallback_cmd, fallback_shell = get_upgrade_command(package_name, "pip")
+                            fallback_str = " ".join(fallback_cmd)
+                            print(f"Fallback command: {fallback_str}")
+                            
+                            try:
+                                fallback_result = subprocess.run(fallback_cmd, shell=fallback_shell, capture_output=True, text=True)
+                                if fallback_result.returncode == 0:
+                                    print(f"\nSuccessfully upgraded {package_name} using fallback method")
+                                else:
+                                    print(f"\nFallback upgrade failed: {fallback_result.stderr}")
+                            except Exception as fallback_err:
+                                print(f"\nError during fallback upgrade: {str(fallback_err)}")
+                except Exception as e:
+                    print(f"\nError during upgrade: {str(e)}")
                 break
             elif response in ['n', 'no', '']:
                 print("\nUpgrade cancelled")

pdd/construct_paths.py

@@ -16,6 +16,9 @@ from .generate_output_paths import generate_output_paths
 
 # Assume generate_output_paths raises ValueError on unknown command
 
+# Add csv import for the new helper function
+import csv
+
 console = Console(theme=Theme({"info": "cyan", "warning": "yellow", "error": "bold red"}))
 
 
@@ -65,6 +68,62 @@ def _candidate_prompt_path(input_files: Dict[str, Path]) -> Path | None:
     return None
 
 
+# New helper function to check if a language is known
+def _is_known_language(language_name: str) -> bool:
+    """Checks if a language name is present in the language_format.csv."""
+    pdd_path_str = os.getenv('PDD_PATH')
+    if not pdd_path_str:
+        # Consistent with get_extension, raise ValueError if PDD_PATH is not set.
+        # Or, for an internal helper, we might decide to log and return False,
+        # but raising an error for missing config is generally safer.
+        # However, _determine_language (the caller) already raises ValueError
+        # if language cannot be found, so this path might not be strictly necessary
+        # if we assume PDD_PATH is validated earlier or by other get_extension/get_language calls.
+        # For robustness here, let's keep a check but perhaps make it less severe if called internally.
+        # For now, align with how get_extension might handle it.
+        # console.print("[error]PDD_PATH environment variable is not set. Cannot validate language.", style="error")
+        # return False # Or raise error
+        # Given this is internal and other functions (get_extension) already depend on PDD_PATH,
+        # we can assume if those ran, PDD_PATH is set. If not, they'd fail first.
+        # So, we can simplify or rely on that pre-condition.
+        # Let's assume PDD_PATH will be set if other language functions are working.
+        # If it's critical, an explicit check and raise ValueError is better.
+        # For now, let's proceed assuming PDD_PATH is available if this point is reached.
+        pass # Assuming PDD_PATH is checked by get_extension/get_language if they are called
+
+    # If PDD_PATH is not set, this will likely fail earlier if get_extension/get_language are used.
+    # If we want this helper to be fully independent, it needs robust PDD_PATH handling.
+    # Let's assume for now, PDD_PATH is available if this point is reached through normal flow.
+    
+    # Re-evaluate: PDD_PATH is critical for this function. Let's keep the check.
+    if not pdd_path_str:
+        # This helper might be called before get_extension in some logic paths
+        # if _determine_language prioritizes suffix checking first.
+        # So, it needs its own PDD_PATH check.
+        # Raise ValueError to be consistent with get_extension's behavior.
+        raise ValueError("PDD_PATH environment variable is not set. Cannot validate language.")
+
+    csv_file_path = Path(pdd_path_str) / 'data' / 'language_format.csv'
+    
+    if not csv_file_path.is_file():
+        # Raise FileNotFoundError if CSV is missing, consistent with get_extension
+        raise FileNotFoundError(f"The language format CSV file does not exist: {csv_file_path}")
+            
+    language_name_lower = language_name.lower()
+    
+    try:
+        with open(csv_file_path, mode='r', encoding='utf-8', newline='') as csvfile:
+            reader = csv.DictReader(csvfile)
+            for row in reader:
+                if row.get('language', '').lower() == language_name_lower:
+                    return True
+    except csv.Error as e:
+        # Log and return False or raise a custom error
+        console.print(f"[error]CSV Error reading {csv_file_path}: {e}", style="error")
+        return False # Indicates language could not be confirmed due to CSV issue
+    return False
+
+
 def _strip_language_suffix(path_like: os.PathLike[str]) -> str:
     """
     Remove trailing '_<language>.prompt' or '_<language>' from a filename stem
@@ -84,7 +143,7 @@ def _strip_language_suffix(path_like: os.PathLike[str]) -> str:
     candidate_lang = parts[-1]
 
     # Check if the last part is a known language
-    if get_extension(candidate_lang) != "": # recognised language
+    if _is_known_language(candidate_lang):
         # If the last part is a language, strip it
         return "_".join(parts[:-1])
     else:
@@ -183,8 +242,8 @@ def _determine_language(
             parts = stem.split("_")
             if len(parts) >= 2:
                 token = parts[-1]
-                # Check if the token is a known language
-                if get_extension(token) != "":
+                # Check if the token is a known language using the new helper
+                if _is_known_language(token):
                     return token.lower()
 
     # 4 - Special handling for detect command - default to prompt for LLM prompts

{pdd_cli-0.0.34.dist-info → pdd_cli-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdd-cli
-Version: 0.0.34
+Version: 0.0.35
 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.34-blue
+.. image:: https://img.shields.io/badge/pdd--cli-v0.0.35-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
@@ -134,7 +134,7 @@ After installation, verify:
 
    pdd --version
 
-You'll see the current PDD version (e.g., 0.0.34).
+You'll see the current PDD version (e.g., 0.0.35).
 
 Advanced Installation Tips
 --------------------------

{pdd_cli-0.0.34.dist-info → pdd_cli-0.0.35.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pdd/__init__.py,sha256=bBnNpQn3DLgqp8-jon-Ht7N0S9jfAWVFwaoxPpKzEPI,632
+pdd/__init__.py,sha256=Xtbm5MVbAzRicWQuHfgb041CmfSMTkF8KDyf60vTwZg,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
+pdd/auto_update.py,sha256=oxessVoa9IHPhFF9TP-A6y3r_OZobeu047BRjNWwi3c,5937
 pdd/bug_main.py,sha256=cSGBnHmFIA8WrkGiohJFVRuM2086v-wlPvTJqTv00WQ,4631
 pdd/bug_to_unit_test.py,sha256=oejqoKomLseKknYDFlQKQ04TNT3soqOjMPghxty8Guo,6311
 pdd/change.py,sha256=EKmv7WvXNX24rjLCnrcaoo4xOVkNhCa9HLRbpMAxQSw,5036
@@ -13,7 +13,7 @@ pdd/code_generator_main.py,sha256=oCI35RqQ7gBov8mncVg1mhdDNX-0jTsoIeSzrz7WpAk,25
 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/construct_paths.py,sha256=hu1LFDnFfUcYyGz20Lgk_4jf40GcNOJAxWVIDUEAsz8,21046
 pdd/context_generator.py,sha256=KQAaJRwVpsPOF4y5lhP3DpIrlxhR39C0hNyTAi1Kx2U,5618
 pdd/context_generator_main.py,sha256=WSS7uRkS2wi8HCixDA3_xzFuPqFRF_X2tGe6K3loUZc,2773
 pdd/continue_generation.py,sha256=upZw77fKqHZ5IS8Ful7eioTi9VTqeuY1V9vzIwHeOJQ,5419
@@ -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.34.dist-info/licenses/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
-pdd_cli-0.0.34.dist-info/METADATA,sha256=rU1Yu_F0B5Z0eR7ms1PPzZPlVTY6CQ2L3lLsjuvw4wY,7984
-pdd_cli-0.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pdd_cli-0.0.34.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
-pdd_cli-0.0.34.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
-pdd_cli-0.0.34.dist-info/RECORD,,
+pdd_cli-0.0.35.dist-info/licenses/LICENSE,sha256=-1bjYH-CEjGEQ8VixtnRYuu37kN6F9NxmZSDkBuUQ9o,1062
+pdd_cli-0.0.35.dist-info/METADATA,sha256=J8jVM5c2lDFLb70DRoKveBmJIofG649nOl9W36OoMrg,7984
+pdd_cli-0.0.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pdd_cli-0.0.35.dist-info/entry_points.txt,sha256=Kr8HtNVb8uHZtQJNH4DnF8j7WNgWQbb7_Pw5hECSR-I,36
+pdd_cli-0.0.35.dist-info/top_level.txt,sha256=xjnhIACeMcMeDfVNREgQZl4EbTni2T11QkL5r7E-sbE,4
+pdd_cli-0.0.35.dist-info/RECORD,,