hud-python 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

hud/agents/langchain.py

@@ -9,13 +9,18 @@ import mcp.types as types
 from langchain.agents import AgentExecutor, create_tool_calling_agent
 from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain.schema import AIMessage, BaseMessage, HumanMessage, SystemMessage
-from mcp_use.adapters.langchain_adapter import LangChainAdapter
 
 import hud
 
 if TYPE_CHECKING:
     from langchain.schema.language_model import BaseLanguageModel
     from langchain_core.tools import BaseTool
+    from mcp_use.adapters.langchain_adapter import LangChainAdapter
+
+try:
+    from mcp_use.adapters.langchain_adapter import LangChainAdapter
+except ImportError:
+    LangChainAdapter = None  # type: ignore[misc, assignment]
 
 from hud.types import AgentResponse, MCPToolCall, MCPToolResult
 
@@ -51,6 +56,12 @@ class LangChainAgent(MCPAgent):
         """
         super().__init__(**kwargs)
 
+        if LangChainAdapter is None:
+            raise ImportError(
+                "LangChainAdapter is not available. "
+                "Please install the optional agent dependencies: pip install 'hud-python[agent]'"
+            )
+
         self.llm = llm
         self.adapter = LangChainAdapter(disallowed_tools=self.disallowed_tools)
         self._langchain_tools: list[BaseTool] | None = None

hud/agents/misc/response_agent.py

@@ -5,6 +5,8 @@ from typing import Literal
 
 from openai import AsyncOpenAI
 
+from hud.settings import settings
+
 ResponseType = Literal["STOP", "CONTINUE"]
 
 
@@ -15,7 +17,7 @@ class ResponseAgent:
     """
 
     def __init__(self, api_key: str | None = None) -> None:
-        self.api_key = api_key or os.environ.get("OPENAI_API_KEY")
+        self.api_key = api_key or settings.openai_api_key or os.environ.get("OPENAI_API_KEY")
         if not self.api_key:
             raise ValueError(
                 "OpenAI API key must be provided or set as OPENAI_API_KEY environment variable"

hud/cli/build.py

@@ -12,13 +12,54 @@ from typing import Any
 
 import typer
 import yaml
-from rich.console import Console
 
 from hud.clients import MCPClient
 from hud.utils.design import HUDDesign
 from hud.version import __version__ as hud_version
 
-console = Console()
+
+def parse_version(version_str: str) -> tuple[int, int, int]:
+    """Parse version string like '1.0.0' or '1.0' into tuple of integers."""
+    # Remove 'v' prefix if present
+    version_str = version_str.lstrip('v')
+    
+    # Split by dots and pad with zeros if needed
+    parts = version_str.split('.')
+    parts.extend(['0'] * (3 - len(parts)))  # Ensure we have at least 3 parts
+    
+    try:
+        return (int(parts[0]), int(parts[1]), int(parts[2]))
+    except (ValueError, IndexError):
+        # Default to 0.0.0 if parsing fails
+        return (0, 0, 0)
+
+
+def increment_version(version_str: str, increment_type: str = "patch") -> str:
+    """Increment version string. increment_type can be 'major', 'minor', or 'patch'."""
+    major, minor, patch = parse_version(version_str)
+    
+    if increment_type == "major":
+        return f"{major + 1}.0.0"
+    elif increment_type == "minor":
+        return f"{major}.{minor + 1}.0"
+    else:  # patch
+        return f"{major}.{minor}.{patch + 1}"
+
+
+def get_existing_version(lock_path: Path) -> str | None:
+    """Get the internal version from existing lock file if it exists."""
+    if not lock_path.exists():
+        return None
+        
+    try:
+        with open(lock_path) as f:
+            lock_data = yaml.safe_load(f)
+            
+        # Look for internal version in build metadata
+        build_data = lock_data.get("build", {})
+        return build_data.get("version", None)
+    except Exception:
+        return None
 
 
 def get_docker_image_digest(image: str) -> str | None:
@@ -39,7 +80,8 @@ def get_docker_image_digest(image: str) -> str | None:
                 # Return full image reference with digest
                 return digest_list[0]
     except Exception:
-        console.print("Failed to get Docker image digest")
+        # Don't print error here, let calling code handle it
+        pass
     return None
 
 
@@ -272,17 +314,17 @@ def build_environment(
 
         # Provide helpful debugging tips
         design.section_title("Debugging Tips")
-        console.print("1. Test your server directly:")
-        console.print(f"   [cyan]docker run --rm -it {temp_tag}[/cyan]")
-        console.print("   (Should see MCP initialization output)")
-        console.print("")
-        console.print("2. Check for common issues:")
-        console.print("   - Server crashes on startup")
-        console.print("   - Missing dependencies")
-        console.print("   - Syntax errors in server.py")
-        console.print("")
-        console.print("3. Run with verbose mode:")
-        console.print("   [cyan]hud build . --verbose[/cyan]")
+        design.info("1. Test your server directly:")
+        design.command_example(f"docker run --rm -it {temp_tag}")
+        design.dim_info("   Expected output", "MCP initialization messages")
+        design.info("")
+        design.info("2. Check for common issues:")
+        design.info("   - Server crashes on startup")
+        design.info("   - Missing dependencies")
+        design.info("   - Syntax errors in server.py")
+        design.info("")
+        design.info("3. Run with verbose mode:")
+        design.command_example("hud build . --verbose")
 
         raise typer.Exit(1)
 
@@ -292,6 +334,19 @@ def build_environment(
     dockerfile_path = env_dir / "Dockerfile"
     required_env, optional_env = extract_env_vars_from_dockerfile(dockerfile_path)
 
+    # Check for existing version and increment
+    lock_path = env_dir / "hud.lock.yaml"
+    existing_version = get_existing_version(lock_path)
+    
+    if existing_version:
+        # Increment existing version
+        new_version = increment_version(existing_version)
+        design.info(f"Incrementing version: {existing_version} → {new_version}")
+    else:
+        # Start with 0.1.0 for new environments
+        new_version = "0.1.0"
+        design.info(f"Setting initial version: {new_version}")
+
     # Create lock file content - minimal and useful
     lock_content = {
         "version": "1.0",  # Lock file format version
@@ -300,6 +355,7 @@ def build_environment(
             "generatedAt": datetime.utcnow().isoformat() + "Z",
             "hudVersion": hud_version,
             "directory": str(env_dir.name),
+            "version": new_version,  # Internal environment version
         },
         "environment": {
             "initializeMs": analysis["initializeMs"],
@@ -338,13 +394,21 @@ def build_environment(
     design.progress_message("Rebuilding with lock file metadata...")
 
     # Build final image with label (uses cache from first build)
+    # Also tag with version
+    base_name = tag.split(":")[0] if tag and ":" in tag else tag
+    version_tag = f"{base_name}:{new_version}"
+    
     label_cmd = [
         "docker",
         "build",
         "--label",
         f"org.hud.manifest.head={lock_hash}:{lock_size}",
+        "--label",
+        f"org.hud.version={new_version}",
         "-t",
         tag,
+        "-t",
+        version_tag,
         str(env_dir),
     ]
 
@@ -398,21 +462,28 @@ def build_environment(
     # Print summary
     design.section_title("Build Complete")
 
-    # Show the actual image reference from the lock file
-    final_image_ref = lock_content.get("image", tag)
-    console.print(f"[green]✓[/green] Local image  : {final_image_ref}")
-    console.print("[green]✓[/green] Lock file    : hud.lock.yaml")
-    console.print(f"[green]✓[/green] Tools found  : {analysis['toolCount']}")
+    # Show the version tag as primary since that's what will be pushed
+    design.status_item("Built image", version_tag, primary=True)
+    if tag:
+        design.status_item("Also tagged", tag)
+    design.status_item("Version", new_version)
+    design.status_item("Lock file", "hud.lock.yaml")
+    design.status_item("Tools found", str(analysis['toolCount']))
+    
+    # Show the digest info separately if we have it
+    if image_id:
+        design.dim_info("\nImage digest", image_id)
 
     design.section_title("Next Steps")
-    console.print("Test locally:")
-    console.print("  [cyan]hud dev[/cyan]           # Hot-reload development")
-    console.print(f"  [cyan]hud run {tag}[/cyan]  # Run the built image")
-    console.print("")
-    console.print("Publish to registry:")
-    console.print(f"  [cyan]hud push --image <registry>/{tag}[/cyan]")
-    console.print("")
-    console.print("The lock file can be used to reproduce this exact environment.")
+    design.info("Test locally:")
+    design.command_example("hud dev", "Hot-reload development")
+    design.command_example(f"hud run {tag}", "Run the built image")
+    design.info("")
+    design.info("Publish to registry:")
+    design.command_example("hud push", f"Push as {version_tag}")
+    design.command_example("hud push --tag latest", "Push with custom tag")
+    design.info("")
+    design.info("The lock file can be used to reproduce this exact environment.")
 
 
 def build_command(

hud/cli/init.py

@@ -5,11 +5,10 @@ from __future__ import annotations
 from pathlib import Path
 
 import typer
-from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
 
-console = Console()
+from hud.utils.design import HUDDesign
 
 # Embedded templates
 DOCKERFILE_TEMPLATE = """FROM python:3.11-slim
@@ -249,26 +248,26 @@ def create_environment(name: str | None, directory: str, force: bool) -> None:
 
     design.section_title("Files created")
     for file in files_created:
-        console.print(f"  ✓ {file}")
+        design.status_item(file, "created")
 
     design.section_title("Next steps")
 
     # Show commands based on where we created the environment
     if target_dir == Path.cwd():
-        console.print("1. Start development server (with MCP inspector):")
-        console.print("   [cyan]hud dev --inspector[/cyan]")
+        design.info("1. Start development server (with MCP inspector):")
+        design.command_example("hud dev --inspector")
     else:
-        console.print("1. Enter the directory:")
-        console.print(f"   [cyan]cd {target_dir}[/cyan]")
-        console.print("\n2. Start development server (with MCP inspector):")
-        console.print("   [cyan]hud dev --inspector[/cyan]")
+        design.info("1. Enter the directory:")
+        design.command_example(f"cd {target_dir}")
+        design.info("\n2. Start development server (with MCP inspector):")
+        design.command_example("hud dev --inspector")
 
-    console.print("\n3. Connect from Cursor or test via the MCP inspector:")
-    console.print("   Follow the instructions shown by [cyan]hud dev --inspector[/cyan]")
+    design.info("\n3. Connect from Cursor or test via the MCP inspector:")
+    design.info("   Follow the instructions shown by hud dev --inspector")
 
-    console.print("\n4. Customize your environment:")
-    console.print("   - Add tools to [cyan]src/hud_controller/server.py[/cyan]")
-    console.print("   - Add state to [cyan]src/hud_controller/context.py[/cyan]")
+    design.info("\n4. Customize your environment:")
+    design.info("   - Add tools to src/hud_controller/server.py")
+    design.info("   - Add state to src/hud_controller/context.py")
 
     # Show a sample of the server code
     design.section_title("Your MCP server")
@@ -278,4 +277,4 @@ async def act() -> str:
     return f"Action #{ctx.act()}"'''
 
     syntax = Syntax(sample_code, "python", theme="monokai", line_numbers=False)
-    console.print(Panel(syntax, border_style="dim"))
+    design.console.print(Panel(syntax, border_style="dim"))

hud/cli/mcp_server.py

@@ -12,8 +12,12 @@ import click
 import toml
 from fastmcp import FastMCP
 
+from hud.utils.design import HUDDesign
 from .docker_utils import get_docker_cmd, image_exists, inject_supervisor
 
+# Global design instance
+design = HUDDesign()
+
 
 def get_image_name(directory: str | Path, image_override: str | None = None) -> tuple[str, str]:
     """
@@ -34,7 +38,7 @@ def get_image_name(directory: str | Path, image_override: str | None = None) ->
             if config.get("tool", {}).get("hud", {}).get("image"):
                 return config["tool"]["hud"]["image"], "cache"
         except Exception:
-            click.echo("Failed to load pyproject.toml", err=True)
+            pass  # Silent failure, will use auto-generated name
 
     # Auto-generate with :dev tag
     dir_path = Path(directory).resolve()  # Get absolute path first
@@ -68,17 +72,14 @@ def update_pyproject_toml(directory: str | Path, image_name: str, silent: bool =
                 toml.dump(config, f)
 
             if not silent:
-                click.echo(f"✅ Updated pyproject.toml with image: {image_name}")
+                design.success(f"Updated pyproject.toml with image: {image_name}")
         except Exception as e:
             if not silent:
-                click.echo(f"⚠️  Could not update pyproject.toml: {e}")
+                design.warning(f"Could not update pyproject.toml: {e}")
 
 
 def build_and_update(directory: str | Path, image_name: str, no_cache: bool = False) -> None:
     """Build Docker image and update pyproject.toml."""
-    from hud.utils.design import HUDDesign
-
-    design = HUDDesign()
 
     build_cmd = ["docker", "build", "-t", image_name]
     if no_cache:
@@ -115,7 +116,7 @@ def create_proxy_server(
     # Get the original CMD from the image
     original_cmd = get_docker_cmd(image_name)
     if not original_cmd:
-        click.echo(f"⚠️  Could not extract CMD from {image_name}, using default")
+        design.warning(f"Could not extract CMD from {image_name}, using default")
         original_cmd = ["python", "-m", "hud_controller.server"]
 
     # Generate container name from image
@@ -167,18 +168,15 @@ def create_proxy_server(
     # Debug output - only if verbose
     if verbose:
         if not no_reload:
-            click.echo("📁 Watching: /app/src for changes", err=True)
+            design.info("Watching: /app/src for changes")
         else:
-            click.echo("🔧 Container will run without hot-reload", err=True)
-        click.echo(f"📊 docker logs -f {container_name}", err=True)
+            design.info("Container will run without hot-reload")
+        design.command_example(f"docker logs -f {container_name}", "View container logs")
 
     # Create the HTTP proxy server using config
     try:
         proxy = FastMCP.as_proxy(config, name=f"HUD Dev Proxy - {image_name}")
     except Exception as e:
-        from hud.utils.design import HUDDesign
-        
-        design = HUDDesign(stderr=True)
         design.error(f"Failed to create proxy server: {e}")
         design.info("")
         design.info("💡 Tip: Run the following command to debug the container:")
@@ -277,7 +275,7 @@ async def start_mcp_proxy(
     # Now check for src directory
     src_path = Path(directory) / "src"
     if not src_path.exists():
-        click.echo(f"❌ Source directory not found: {src_path}", err=(transport == "stdio"))
+        design.error(f"Source directory not found: {src_path}")
         raise click.Abort
 
     # Extract container name from the proxy configuration
@@ -293,20 +291,20 @@ async def start_mcp_proxy(
             check=False,  # Don't raise error if container doesn't exist
         )
     except Exception:
-        click.echo(f"Failed to remove existing container {container_name}", err=True)
+        pass  # Silent failure, container might not exist
 
     if transport == "stdio":
         if verbose:
-            click.echo("🔌 Starting stdio proxy (each connection gets its own container)", err=True)
+            design.info("Starting stdio proxy (each connection gets its own container)")
     else:
         # Find available port for HTTP
         actual_port = find_free_port(port)
         if actual_port is None:
-            click.echo(f"❌ No available ports found starting from {port}")
+            design.error(f"No available ports found starting from {port}")
             raise click.Abort
 
         if actual_port != port and verbose:
-            click.echo(f"⚠️  Port {port} in use, using port {actual_port} instead")
+            design.warning(f"Port {port} in use, using port {actual_port} instead")
 
         # Launch MCP Inspector if requested
         if inspector:
@@ -329,11 +327,8 @@ async def start_mcp_proxy(
                     )
 
                     # Print inspector info cleanly
-                    from hud.utils.design import HUDDesign
-
-                    inspector_design = HUDDesign(stderr=(transport == "stdio"))
-                    inspector_design.section_title("MCP Inspector")
-                    inspector_design.link(inspector_url)
+                    design.section_title("MCP Inspector")
+                    design.link(inspector_url)
 
                     # Set environment to disable auth (for development only)
                     env = os.environ.copy()
@@ -359,7 +354,7 @@ async def start_mcp_proxy(
 
                 except (FileNotFoundError, Exception):
                     # Silently fail - inspector is optional
-                    click.echo("Failed to launch inspector", err=True)
+                    design.error("Failed to launch inspector")
 
             # Launch inspector asynchronously so it doesn't block
             asyncio.create_task(launch_inspector())
@@ -369,8 +364,7 @@ async def start_mcp_proxy(
             if transport != "http":
                 from hud.utils.design import HUDDesign
 
-                interactive_design = HUDDesign(stderr=True)
-                interactive_design.warning("Interactive mode only works with HTTP transport")
+                design.warning("Interactive mode only works with HTTP transport")
             else:
                 server_url = f"http://localhost:{actual_port}/mcp"
 
@@ -383,12 +377,9 @@ async def start_mcp_proxy(
                     time.sleep(3)
 
                     try:
-                        from hud.utils.design import HUDDesign
-
-                        interactive_design = HUDDesign(stderr=(transport == "stdio"))
-                        interactive_design.section_title("Interactive Mode")
-                        interactive_design.info("Starting interactive testing mode...")
-                        interactive_design.info("Press Ctrl+C in the interactive session to exit")
+                        design.section_title("Interactive Mode")
+                        design.info("Starting interactive testing mode...")
+                        design.info("Press Ctrl+C in the interactive session to exit")
 
                         # Import and run interactive mode in a new event loop
                         from .interactive import run_interactive_mode
@@ -404,7 +395,7 @@ async def start_mcp_proxy(
                     except Exception as e:
                         # Log error but don't crash the server
                         if verbose:
-                            click.echo(f"Interactive mode error: {e}", err=True)
+                            design.error(f"Interactive mode error: {e}")
 
                 # Launch interactive mode in a separate thread
                 import threading
@@ -415,10 +406,7 @@ async def start_mcp_proxy(
     # Function to stream Docker logs
     async def stream_docker_logs() -> None:
         """Stream Docker container logs asynchronously."""
-        # Import design system for consistent output
-        from hud.utils.design import HUDDesign
-
-        log_design = HUDDesign(stderr=(transport == "stdio"))
+        log_design = design
 
         # Always show waiting message
         log_design.info("")  # Empty line for spacing
@@ -567,39 +555,33 @@ async def start_mcp_proxy(
                     show_banner=False,
                 )
     except (ConnectionError, OSError) as e:
-        from hud.utils.design import HUDDesign
-
-        error_design = HUDDesign(stderr=True)
-        error_design.error(f"Failed to connect to Docker container: {e}")
-        error_design.info("")
-        error_design.info("💡 Tip: Run the following command to debug the container:")
-        error_design.info(f"   hud debug {image_name}")
-        error_design.info("")
-        error_design.info("Common issues:")
-        error_design.info("  • Container failed to start or crashed immediately")
-        error_design.info("  • Server initialization failed")
-        error_design.info("  • Port binding conflicts")
+        design.error(f"Failed to connect to Docker container: {e}")
+        design.info("")
+        design.info("💡 Tip: Run the following command to debug the container:")
+        design.info(f"   hud debug {image_name}")
+        design.info("")
+        design.info("Common issues:")
+        design.info("  • Container failed to start or crashed immediately")
+        design.info("  • Server initialization failed")
+        design.info("  • Port binding conflicts")
         raise
     except KeyboardInterrupt:
-        from hud.utils.design import HUDDesign
-
-        shutdown_design = HUDDesign(stderr=(transport == "stdio"))
-        shutdown_design.info("\n👋 Shutting down...")
+        design.info("\n👋 Shutting down...")
 
         # Show next steps tutorial
         if not interactive:  # Only show if not in interactive mode
-            shutdown_design.section_title("Next Steps")
-            shutdown_design.info("🏗️  Ready to test with real agents? Run:")
-            shutdown_design.info(f"    [cyan]hud build {directory}[/cyan]")
-            shutdown_design.info("")
-            shutdown_design.info("This will:")
-            shutdown_design.info("  1. Build your environment image")
-            shutdown_design.info("  2. Generate a hud.lock.yaml file")
-            shutdown_design.info("  3. Prepare it for testing with agents")
-            shutdown_design.info("")
-            shutdown_design.info("Then you can:")
-            shutdown_design.info("  • Test locally: [cyan]hud run <image>[/cyan]")
-            shutdown_design.info(
+            design.section_title("Next Steps")
+            design.info("🏗️  Ready to test with real agents? Run:")
+            design.info(f"    [cyan]hud build {directory}[/cyan]")
+            design.info("")
+            design.info("This will:")
+            design.info("  1. Build your environment image")
+            design.info("  2. Generate a hud.lock.yaml file")
+            design.info("  3. Prepare it for testing with agents")
+            design.info("")
+            design.info("Then you can:")
+            design.info("  • Test locally: [cyan]hud run <image>[/cyan]")
+            design.info(
                 "  • Push to registry: [cyan]hud push --image <registry/name>[/cyan]"
             )
     except Exception as e:
@@ -613,10 +595,7 @@ async def start_mcp_proxy(
                 "Application shutdown complete",
             ]
         ):
-            from hud.utils.design import HUDDesign
-
-            shutdown_design = HUDDesign(stderr=(transport == "stdio"))
-            shutdown_design.error(f"Unexpected error: {e}")
+            design.error(f"Unexpected error: {e}")
     finally:
         # Cancel log streaming task if it exists
         if log_task and not log_task.done():
@@ -624,7 +603,7 @@ async def start_mcp_proxy(
             try:
                 await log_task
             except asyncio.CancelledError:
-                click.echo("Log streaming task cancelled", err=True)
+                pass  # Log streaming cancelled, normal shutdown
 
 
 def run_mcp_dev_server(
@@ -654,10 +633,6 @@ def run_mcp_dev_server(
         hud dev . --image custom:tag # Use specific image
         hud dev . --no-cache         # Force clean rebuild
     """
-    from hud.utils.design import HUDDesign
-
-    design = HUDDesign(stderr=(transport == "stdio"))
-
     # Ensure directory exists
     if not Path(directory).exists():
         design.error(f"Directory not found: {directory}")
@@ -780,10 +755,10 @@ def run_mcp_dev_server(
             )
         )
     except Exception as e:
-        design.error(f"Failed to start MCP server: {e}")
-        design.info("")
-        design.info("💡 Tip: Run the following command to debug the container:")
-        design.info(f"   hud debug {resolved_image}")
-        design.info("")
-        design.info("This will help identify connection issues or initialization failures.")
+        d.error(f"Failed to start MCP server: {e}")
+        d.info("")
+        d.info("💡 Tip: Run the following command to debug the container:")
+        d.info(f"   hud debug {resolved_image}")
+        d.info("")
+        d.info("This will help identify connection issues or initialization failures.")
         raise