hud-python 0.4.11__py3-none-any.whl → 0.4.13__py3-none-any.whl

hud/cli/list_func.py

@@ -2,9 +2,7 @@
 
 from __future__ import annotations
 
-import re
 from datetime import datetime
-from pathlib import Path
 
 import typer
 import yaml
@@ -12,30 +10,33 @@ from rich.table import Table
 
 from hud.utils.design import HUDDesign
 
-from .registry import get_registry_dir, list_registry_entries, extract_name_and_tag
+from .utils.registry import extract_name_and_tag, get_registry_dir, list_registry_entries
 
 
 def format_timestamp(timestamp: float | None) -> str:
     """Format timestamp to human-readable relative time."""
     if not timestamp:
         return "unknown"
-    
+
     dt = datetime.fromtimestamp(timestamp)
     now = datetime.now()
     delta = now - dt
-    
-    if delta.days > 365:
-        return f"{delta.days // 365}y ago"
-    elif delta.days > 30:
-        return f"{delta.days // 30}mo ago"
-    elif delta.days > 0:
+
+    # Get total seconds to handle edge cases properly
+    total_seconds = delta.total_seconds()
+
+    if total_seconds < 60:
+        return "just now"
+    elif total_seconds < 3600:
+        return f"{int(total_seconds // 60)}m ago"
+    elif total_seconds < 86400:  # Less than 24 hours
+        return f"{int(total_seconds // 3600)}h ago"
+    elif delta.days < 30:
         return f"{delta.days}d ago"
-    elif delta.seconds > 3600:
-        return f"{delta.seconds // 3600}h ago"
-    elif delta.seconds > 60:
-        return f"{delta.seconds // 60}m ago"
+    elif delta.days < 365:
+        return f"{delta.days // 30}mo ago"
     else:
-        return "just now"
+        return f"{delta.days // 365}y ago"
 
 
 def list_environments(
@@ -46,71 +47,73 @@ def list_environments(
 ) -> None:
     """List all HUD environments in the local registry."""
     design = HUDDesign()
-    
+
     if not json_output:
         design.header("HUD Environment Registry")
-    
+
     # Check for environment directory
     env_dir = get_registry_dir()
     if not env_dir.exists():
         if json_output:
-            print("[]")
+            print("[]")  # noqa: T201
         else:
             design.info("No environments found in local registry.")
             design.info("")
             design.info("Pull environments with: [cyan]hud pull <org/name:tag>[/cyan]")
             design.info("Build environments with: [cyan]hud build[/cyan]")
         return
-    
+
     # Collect all environments using the registry helper
     environments = []
-    
+
     for digest, lock_file in list_registry_entries():
         try:
             # Read lock file
             with open(lock_file) as f:
                 lock_data = yaml.safe_load(f)
-            
+
             # Extract metadata
             image = lock_data.get("image", "unknown")
             name, tag = extract_name_and_tag(image)
-            
+
             # Apply filter if specified
             if filter_name and filter_name.lower() not in name.lower():
                 continue
-            
+
             # Get additional metadata
             metadata = lock_data.get("metadata", {})
             description = metadata.get("description", "")
             tools_count = len(metadata.get("tools", []))
-            
+
             # Get file modification time as pulled time
             pulled_time = lock_file.stat().st_mtime
-            
-            environments.append({
-                "name": name,
-                "tag": tag,
-                "digest": digest,
-                "description": description,
-                "tools_count": tools_count,
-                "pulled_time": pulled_time,
-                "image": image,
-                "path": str(lock_file),
-            })
-            
+
+            environments.append(
+                {
+                    "name": name,
+                    "tag": tag,
+                    "digest": digest,
+                    "description": description,
+                    "tools_count": tools_count,
+                    "pulled_time": pulled_time,
+                    "image": image,
+                    "path": str(lock_file),
+                }
+            )
+
         except Exception as e:
             if verbose:
                 design.warning(f"Failed to read {lock_file}: {e}")
-    
+
     # Sort by pulled time (newest first)
     environments.sort(key=lambda x: x["pulled_time"], reverse=True)
-    
+
     if json_output:
         # Output as JSON
         import json
-        json_data = []
-        for env in environments:
-            json_data.append({
+
+        json_data = [
+            {
                 "name": env["name"],
                 "tag": env["tag"],
                 "digest": env["digest"],
@@ -118,67 +121,71 @@ def list_environments(
                 "tools_count": env["tools_count"],
                 "pulled_time": env["pulled_time"],
                 "image": env["image"],
-                "path": env["path"],
-            })
-        print(json.dumps(json_data, indent=2))
+                "path": str(env["path"]).replace("\\", "/"),  # Normalize path separators for JSON
+            }
+            for env in environments
+        ]
+        print(json.dumps(json_data, indent=2))  # noqa: T201
         return
-    
+
     if not environments:
         design.info("No environments found matching criteria.")
         design.info("")
         design.info("Pull environments with: [cyan]hud pull <org/name:tag>[/cyan]")
         design.info("Build environments with: [cyan]hud build[/cyan]")
         return
-    
+
     # Create table
-    table = Table(title=f"Found {len(environments)} environment{'s' if len(environments) != 1 else ''}")
+    table = Table(
+        title=f"Found {len(environments)} environment{'s' if len(environments) != 1 else ''}"
+    )
     table.add_column("Environment", style="cyan", no_wrap=True)
     table.add_column("Description", style="white")
     table.add_column("Tools", justify="right", style="yellow")
     table.add_column("Pulled", style="dim")
-    
+
     if show_all or verbose:
         table.add_column("Digest", style="dim")
-    
+
     # Add rows
     for env in environments:
         # Truncate description if too long
         desc = env["description"]
         if desc and len(desc) > 50 and not verbose:
             desc = desc[:47] + "..."
-        
+
         # Combine name and tag for easy copying
         full_ref = f"{env['name']}:{env['tag']}"
-        
+
         row = [
             full_ref,
             desc or "[dim]No description[/dim]",
             str(env["tools_count"]),
             format_timestamp(env["pulled_time"]),
         ]
-        
+
         if show_all or verbose:
             row.append(env["digest"][:12])
-        
+
         table.add_row(*row)
-    
-    design.print(table)
+
+    design.print(table)  # type: ignore
     design.info("")
-    
+
     # Show usage hints
     design.section_title("Usage")
     if environments:
         # Use the most recently pulled environment as example
         example_env = environments[0]
         example_ref = f"{example_env['name']}:{example_env['tag']}"
-        
+
         design.info(f"Run an environment: [cyan]hud run {example_ref}[/cyan]")
         design.info(f"Analyze tools: [cyan]hud analyze {example_ref}[/cyan]")
         design.info(f"Debug server: [cyan]hud debug {example_ref}[/cyan]")
-    
+
     design.info("Pull more environments: [cyan]hud pull <org/name:tag>[/cyan]")
     design.info("Build new environments: [cyan]hud build[/cyan]")
-    
+
     if verbose:
         design.info("")
         design.info(f"[dim]Registry location: {env_dir}[/dim]")
@@ -188,21 +195,15 @@ def list_command(
     filter_name: str | None = typer.Option(
         None, "--filter", "-f", help="Filter environments by name (case-insensitive)"
     ),
-    json_output: bool = typer.Option(
-        False, "--json", help="Output as JSON"
-    ),
-    show_all: bool = typer.Option(
-        False, "--all", "-a", help="Show all columns including digest"
-    ),
-    verbose: bool = typer.Option(
-        False, "--verbose", "-v", help="Show detailed output"
-    ),
+    json_output: bool = typer.Option(False, "--json", help="Output as JSON"),
+    show_all: bool = typer.Option(False, "--all", "-a", help="Show all columns including digest"),
+    verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed output"),
 ) -> None:
     """📋 List all HUD environments in local registry.
-    
+
     Shows environments pulled with 'hud pull' or built with 'hud build',
     stored in ~/.hud/envs/
-    
+
     Examples:
         hud list                    # List all environments
         hud list --filter text      # Filter by name
@@ -210,4 +211,4 @@ def list_command(
         hud list --all             # Show digest column
         hud list --verbose         # Show full descriptions
     """
-    list_environments(filter_name, json_output, show_all, verbose)
+    list_environments(filter_name, json_output, show_all, verbose)

hud/cli/pull.py

@@ -6,7 +6,6 @@ import subprocess
 from pathlib import Path
 from urllib.parse import quote
 
-import click
 import requests
 import typer
 import yaml
@@ -15,7 +14,7 @@ from rich.table import Table
 from hud.settings import settings
 from hud.utils.design import HUDDesign
 
-from .registry import save_to_registry
+from .utils.registry import save_to_registry
 
 
 def get_docker_manifest(image: str) -> dict | None:

hud/cli/push.py

@@ -21,6 +21,7 @@ def _get_response_text(response: requests.Response) -> str:
     except Exception:
         return response.text
 
+
 def get_docker_username() -> str | None:
     """Get the current Docker username if logged in."""
     try:
@@ -53,10 +54,10 @@ def get_docker_username() -> str | None:
                                 username = decoded.split(":", 1)[0]
                                 if username and username != "token":  # Skip token-based auth
                                     return username
-                            except Exception:
-                                pass  # Silent failure, try other methods
-                except Exception:
-                    pass  # Silent failure, try other methods
+                            except Exception:  # noqa: S110
+                                pass
+                except Exception:  # noqa: S110
+                    pass
 
         # Alternative: Check credsStore/credHelpers
         for config_path in config_paths:
@@ -91,12 +92,12 @@ def get_docker_username() -> str | None:
                                             username = cred_data.get("Username", "")
                                             if username and username != "token":
                                                 return username
-                        except Exception:
-                            pass  # Silent failure, try other methods
-                except Exception:
-                    pass  # Silent failure, try other methods
-    except Exception:
-        pass  # Silent failure, try other methods
+                        except Exception:  # noqa: S110
+                            pass
+                except Exception:  # noqa: S110
+                    pass
+    except Exception:  # noqa: S110
+        pass
     return None
 
 
@@ -155,7 +156,7 @@ def push_environment(
     if not local_image and "build" in lock_data:
         # New format might have image elsewhere
         local_image = lock_data.get("image", "")
-    
+
     # Get internal version from lock file
     internal_version = lock_data.get("build", {}).get("version", None)
 
@@ -206,21 +207,25 @@ def push_environment(
         # Handle tag when image is provided
         # Prefer explicit tag over internal version
         final_tag = tag if tag else internal_version
-        
+
         if ":" in image:
             # Image already has a tag
             existing_tag = image.split(":")[-1]
             if existing_tag != final_tag:
                 if tag:
-                    design.warning(f"Image already has tag '{existing_tag}', overriding with '{final_tag}'")
+                    design.warning(
+                        f"Image already has tag '{existing_tag}', overriding with '{final_tag}'"
+                    )
                 else:
-                    design.info(f"Image has tag '{existing_tag}', but using internal version '{final_tag}'")
+                    design.info(
+                        f"Image has tag '{existing_tag}', but using internal version '{final_tag}'"
+                    )
                 image = image.rsplit(":", 1)[0] + f":{final_tag}"
             # else: tags match, no action needed
         else:
             # Image has no tag, append the appropriate one
             image = f"{image}:{final_tag}"
-            
+
         if tag:
             design.info(f"Using specified tag: {tag}")
         else:
@@ -230,7 +235,7 @@ def push_environment(
     # Verify local image exists
     # Extract the tag part (before @sha256:...) for Docker operations
     local_tag = local_image.split("@")[0] if "@" in local_image else local_image
-    
+
     # Also check for version-tagged image if we have internal version
     version_tag = None
     if internal_version and ":" in local_tag:
@@ -246,7 +251,7 @@ def push_environment(
             design.info(f"Found version-tagged image: {version_tag}")
         except subprocess.CalledProcessError:
             pass
-    
+
     if not image_to_push:
         try:
             subprocess.run(["docker", "inspect", local_tag], capture_output=True, check=True)  # noqa: S603, S607
@@ -319,7 +324,7 @@ def push_environment(
     lock_data["image"] = pushed_digest
 
     # Add push information
-    from datetime import datetime, UTC
+    from datetime import UTC, datetime
 
     lock_data["push"] = {
         "source": local_image,
@@ -340,13 +345,20 @@ def push_environment(
         # e.g., "hudpython/test_init:v1.0" -> "hudpython/test_init:v1.0"
         # Use the original image name for the registry path, not the digest
         # The digest might not contain the tag information
-        registry_image = image  # This is the image we tagged and pushed (e.g., hudpython/hud-text-2048:0.1.2)
-        
+        registry_image = (
+            image  # This is the image we tagged and pushed (e.g., hudpython/hud-text-2048:0.1.2)
+        )
+
         # Remove any registry prefix for the HUD registry path
         registry_parts = registry_image.split("/")
         if len(registry_parts) >= 2:
             # Handle docker.io/org/name or just org/name
-            if registry_parts[0] in ["docker.io", "registry-1.docker.io", "index.docker.io", "ghcr.io"]:
+            if registry_parts[0] in [
+                "docker.io",
+                "registry-1.docker.io",
+                "index.docker.io",
+                "ghcr.io",
+            ]:
                 # Remove registry prefix
                 name_with_tag = "/".join(registry_parts[1:])
             elif "." in registry_parts[0] or ":" in registry_parts[0]:
@@ -359,12 +371,12 @@ def push_environment(
             name_with_tag = registry_image
 
         # The image variable already has the tag, no need to add :latest
-        
+
         # Validate the image format
         if not name_with_tag:
             design.warning("Could not determine image name for registry upload")
             raise typer.Exit(0)
-        
+
         # For HUD registry, we need org/name format
         if "/" not in name_with_tag:
             design.warning("Image name must include organization/namespace for HUD registry")

hud/cli/remove.py

@@ -3,14 +3,12 @@
 from __future__ import annotations
 
 import shutil
-from pathlib import Path
 
 import typer
-import yaml
 
 from hud.utils.design import HUDDesign
 
-from .registry import get_registry_dir, list_registry_entries, load_from_registry
+from .utils.registry import get_registry_dir, list_registry_entries, load_from_registry
 
 
 def remove_environment(
@@ -21,18 +19,18 @@ def remove_environment(
     """Remove an environment from the local registry."""
     design = HUDDesign()
     design.header("HUD Environment Removal")
-    
+
     # Find the environment to remove
     found_entry = None
     found_digest = None
-    
+
     # First check if target is a digest
     for digest, lock_file in list_registry_entries():
         if digest.startswith(target):
             found_entry = lock_file
             found_digest = digest
             break
-    
+
     # If not found by digest, search by name
     if not found_entry:
         for digest, lock_file in list_registry_entries():
@@ -42,28 +40,29 @@ def remove_environment(
                     image = lock_data["image"]
                     # Extract name and tag
                     name = image.split("@")[0] if "@" in image else image
-                    if "/" in name:
-                        # Match by repo/name or just name
-                        if target in name or name.endswith(f"/{target}"):
-                            found_entry = lock_file
-                            found_digest = digest
-                            break
-            except Exception:
+                    if "/" in name and (target in name or name.endswith(f"/{target}")):
+                        found_entry = lock_file
+                        found_digest = digest
+                        break
+            except Exception as e:
+                design.error(f"Error loading lock file: {e}")
                 continue
-    
+
     if not found_entry:
         design.error(f"Environment not found: {target}")
         design.info("Use 'hud list' to see available environments")
         raise typer.Exit(1)
-    
+
     # Load and display environment info
     try:
+        if found_digest is None:
+            raise ValueError("Found digest is None")
         lock_data = load_from_registry(found_digest)
         if lock_data:
             image = lock_data.get("image", "unknown")
             metadata = lock_data.get("metadata", {})
             description = metadata.get("description", "No description")
-            
+
             design.section_title("Environment Details")
             design.status_item("Image", image)
             design.status_item("Digest", found_digest)
@@ -72,20 +71,20 @@ def remove_environment(
     except Exception as e:
         if verbose:
             design.warning(f"Could not read environment details: {e}")
-    
+
     # Confirm deletion
     if not yes:
         design.info("")
         if not typer.confirm(f"Remove environment {found_digest}?"):
             design.info("Aborted")
             raise typer.Exit(0)
-    
+
     # Remove the environment directory
     try:
         env_dir = found_entry.parent
         shutil.rmtree(env_dir)
         design.success(f"Removed environment: {found_digest}")
-        
+
         # Check if the image is still available locally
         if lock_data:
             image = lock_data.get("image", "")
@@ -95,7 +94,7 @@ def remove_environment(
                 design.info(f"To remove it, run: [cyan]docker rmi {image.split('@')[0]}[/cyan]")
     except Exception as e:
         design.error(f"Failed to remove environment: {e}")
-        raise typer.Exit(1)
+        raise typer.Exit(1) from e
 
 
 def remove_all_environments(
@@ -105,23 +104,23 @@ def remove_all_environments(
     """Remove all environments from the local registry."""
     design = HUDDesign()
     design.header("Remove All HUD Environments")
-    
+
     registry_dir = get_registry_dir()
     if not registry_dir.exists():
         design.info("No environments found in local registry.")
         return
-    
+
     # Count environments
     entries = list(list_registry_entries())
     if not entries:
         design.info("No environments found in local registry.")
         return
-    
+
     design.warning(f"This will remove {len(entries)} environment(s) from the local registry!")
-    
+
     # List environments that will be removed
     design.section_title("Environments to Remove")
-    for digest, lock_file in entries:
+    for digest, _ in entries:
         try:
             lock_data = load_from_registry(digest)
             if lock_data:
@@ -129,18 +128,18 @@ def remove_all_environments(
                 design.info(f"  • {digest[:12]} - {image}")
         except Exception:
             design.info(f"  • {digest[:12]}")
-    
+
     # Confirm deletion
     if not yes:
         design.info("")
         if not typer.confirm("Remove ALL environments?", default=False):
             design.info("Aborted")
             raise typer.Exit(0)
-    
+
     # Remove all environments
     removed = 0
     failed = 0
-    
+
     for digest, lock_file in entries:
         try:
             env_dir = lock_file.parent
@@ -152,13 +151,13 @@ def remove_all_environments(
             failed += 1
             if verbose:
                 design.error(f"Failed to remove {digest}: {e}")
-    
+
     design.info("")
     if failed == 0:
         design.success(f"Successfully removed {removed} environment(s)")
     else:
         design.warning(f"Removed {removed} environment(s), failed to remove {failed}")
-    
+
     design.info("")
     design.info("Note: Docker images may still exist locally.")
     design.info("To remove them, use: [cyan]docker image prune[/cyan]")
@@ -166,21 +165,16 @@ def remove_all_environments(
 
 def remove_command(
     target: str | None = typer.Argument(
-        None, 
-        help="Environment to remove (digest, name, or 'all' for all environments)"
-    ),
-    yes: bool = typer.Option(
-        False, "--yes", "-y", help="Skip confirmation prompt"
-    ),
-    verbose: bool = typer.Option(
-        False, "--verbose", "-v", help="Show detailed output"
+        None, help="Environment to remove (digest, name, or 'all' for all environments)"
     ),
+    yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompt"),
+    verbose: bool = typer.Option(False, "--verbose", "-v", help="Show detailed output"),
 ) -> None:
     """🗑️ Remove HUD environments from local registry.
-    
+
     Removes environment metadata from ~/.hud/envs/
     Note: This does not remove the Docker images.
-    
+
     Examples:
         hud remove abc123              # Remove by digest
         hud remove text_2048           # Remove by name
@@ -193,7 +187,7 @@ def remove_command(
         design.error("Please specify an environment to remove or 'all'")
         design.info("Use 'hud list' to see available environments")
         raise typer.Exit(1)
-    
+
     if target.lower() == "all":
         remove_all_environments(yes, verbose)
     else:

hud/cli/tests/test_analyze.py

@@ -82,6 +82,7 @@ class TestAnalyzeEnvironment:
         with (
             patch("hud.cli.analyze.MCPClient") as MockClient,
             patch("hud.cli.analyze.console") as mock_console,
+            patch("platform.system", return_value="Windows"),
         ):
             # Setup mock client that will raise exception during initialization
             mock_client = MagicMock()
@@ -100,7 +101,7 @@ class TestAnalyzeEnvironment:
             mock_client.initialize.assert_called_once()
             mock_client.shutdown.assert_called_once()
 
-            # Check console printed error hints
+            # Check console printed Windows-specific error hints
             calls = mock_console.print.call_args_list
             assert any("Docker logs may not show on Windows" in str(call) for call in calls)