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

hud/cli/{mcp_server.py → dev.py}

@@ -9,12 +9,17 @@ import subprocess
 from pathlib import Path
 
 import click
-import toml
 from fastmcp import FastMCP
 
 from hud.utils.design import HUDDesign
-from .docker_utils import get_docker_cmd, inject_supervisor
-from .env_utils import get_image_name, update_pyproject_toml, build_environment, image_exists
+
+from .utils.docker import get_docker_cmd, inject_supervisor
+from .utils.environment import (
+    build_environment,
+    get_image_name,
+    image_exists,
+    update_pyproject_toml,
+)
 
 # Global design instance
 design = HUDDesign()
@@ -30,6 +35,7 @@ def create_proxy_server(
     directory: str | Path,
     image_name: str,
     no_reload: bool = False,
+    full_reload: bool = False,
     verbose: bool = False,
     docker_args: list[str] | None = None,
     interactive: bool = False,
@@ -43,8 +49,12 @@ def create_proxy_server(
         design.warning(f"Could not extract CMD from {image_name}, using default")
         original_cmd = ["python", "-m", "hud_controller.server"]
 
-    # Generate container name from image
-    container_name = f"{image_name.replace(':', '-').replace('/', '-')}"
+    # Generate unique container name from image to avoid conflicts between multiple instances
+    import os
+
+    pid = str(os.getpid())[-6:]  # Last 6 digits of process ID for uniqueness
+    base_name = image_name.replace(":", "-").replace("/", "-")
+    container_name = f"{base_name}-{pid}"
 
     # Build the docker run command
     docker_cmd = [
@@ -68,14 +78,20 @@ def create_proxy_server(
     if interactive:
         no_reload = True
 
-    if not no_reload:
-        # Inject our supervisor into the CMD
+    # Validate reload options
+    if no_reload and full_reload:
+        design.warning("Cannot use --full-reload with --no-reload, ignoring --full-reload")
+        full_reload = False
+
+    if not no_reload and not full_reload:
+        # Standard hot-reload: inject supervisor for server restart within container
         modified_cmd = inject_supervisor(original_cmd)
         docker_cmd.extend(["--entrypoint", modified_cmd[0]])
         docker_cmd.append(image_name)
         docker_cmd.extend(modified_cmd[1:])
     else:
-        # No reload - use original CMD
+        # No reload or full reload: use original CMD without supervisor
+        # Note: Full reload logic (container restart) would be implemented here in the future
         docker_cmd.append(image_name)
 
     # Create configuration following MCPConfig schema
@@ -91,12 +107,23 @@ def create_proxy_server(
 
     # Debug output - only if verbose
     if verbose:
-        if not no_reload:
+        if not no_reload and not full_reload:
+            design.info("Mode: Hot-reload (server restart within container)")
             design.info("Watching: /app/src for changes")
+        elif full_reload:
+            design.info("Mode: Full reload (container restart on file changes)")
+            design.info("Note: Full container restart not yet implemented, using no-reload mode")
         else:
+            design.info("Mode: No reload")
             design.info("Container will run without hot-reload")
         design.command_example(f"docker logs -f {container_name}", "View container logs")
 
+        # Show the full Docker command if there are environment variables
+        if docker_args and any(arg == "-e" or arg.startswith("--env") for arg in docker_args):
+            design.info("")
+            design.info("Docker command with environment variables:")
+            design.info(" ".join(docker_cmd))
+
     # Create the HTTP proxy server using config
     try:
         proxy = FastMCP.as_proxy(config, name=f"HUD Dev Proxy - {image_name}")
@@ -116,6 +143,7 @@ async def start_mcp_proxy(
     transport: str,
     port: int,
     no_reload: bool = False,
+    full_reload: bool = False,
     verbose: bool = False,
     inspector: bool = False,
     no_logs: bool = False,
@@ -127,10 +155,9 @@ async def start_mcp_proxy(
     import asyncio
     import logging
     import os
-    import subprocess
     import sys
 
-    from .utils import find_free_port
+    from .utils.logging import find_free_port
 
     # Always disable the banner - we have our own output
     os.environ["FASTMCP_DISABLE_BANNER"] = "1"
@@ -202,20 +229,24 @@ async def start_mcp_proxy(
         design.error(f"Source directory not found: {src_path}")
         raise click.Abort
 
-    # Extract container name from the proxy configuration
-    container_name = f"{image_name.replace(':', '-').replace('/', '-')}"
+    # Extract container name from the proxy configuration (must match create_proxy_server naming)
+    import os
+
+    pid = str(os.getpid())[-6:]  # Last 6 digits of process ID for uniqueness
+    base_name = image_name.replace(":", "-").replace("/", "-")
+    container_name = f"{base_name}-{pid}"
 
     # Remove any existing container with the same name (silently)
     # Note: The proxy creates containers on-demand when clients connect
-    try:
+    try:  # noqa: SIM105
         subprocess.run(  # noqa: S603, ASYNC221
             ["docker", "rm", "-f", container_name],  # noqa: S607
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             check=False,  # Don't raise error if container doesn't exist
         )
-    except Exception:
-        pass  # Silent failure, container might not exist
+    except Exception:  # noqa: S110
+        pass
 
     if transport == "stdio":
         if verbose:
@@ -281,13 +312,11 @@ async def start_mcp_proxy(
                     design.error("Failed to launch inspector")
 
             # Launch inspector asynchronously so it doesn't block
-            asyncio.create_task(launch_inspector())
+            asyncio.create_task(launch_inspector())  # noqa: RUF006
 
         # Launch interactive mode if requested
         if interactive:
             if transport != "http":
-                from hud.utils.design import HUDDesign
-
                 design.warning("Interactive mode only works with HTTP transport")
             else:
                 server_url = f"http://localhost:{actual_port}/mcp"
@@ -306,7 +335,7 @@ async def start_mcp_proxy(
                         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
+                        from .utils.interactive import run_interactive_mode
 
                         # Create a new event loop for the thread
                         loop = asyncio.new_event_loop()
@@ -329,12 +358,17 @@ async def start_mcp_proxy(
 
     # Function to stream Docker logs
     async def stream_docker_logs() -> None:
-        """Stream Docker container logs asynchronously."""
+        """Stream Docker container logs asynchronously.
+
+        Note: The Docker container is created on-demand when the first client connects.
+        Any environment variables passed via -e flags are included when the container starts.
+        """
         log_design = design
 
         # Always show waiting message
         log_design.info("")  # Empty line for spacing
         log_design.progress_message("⏳ Waiting for first client connection to start container...")
+        log_design.info(f"📋 Looking for container: {container_name}")  # noqa: G004
 
         # Keep trying to stream logs - container is created on demand
         has_shown_started = False
@@ -385,7 +419,8 @@ async def start_mcp_proxy(
 
                         # Show all logs with gold formatting like hud debug
                         # Format all logs in gold/dim style like hud debug's stderr
-                        log_design.console.print(
+                        # Use stdout console to avoid stderr redirection when not verbose
+                        log_design._stdout_console.print(
                             f"[rgb(192,150,12)]■[/rgb(192,150,12)] {decoded_line}", highlight=False
                         )
 
@@ -396,16 +431,19 @@ async def start_mcp_proxy(
                 await asyncio.sleep(1)
                 continue  # Loop back to check if container exists
 
-            except Exception:
-                # Some unexpected error
+            except Exception as e:
+                # Some unexpected error - show it so we can debug
+                log_design.warning(f"Failed to stream Docker logs: {e}")  # noqa: G004
                 if verbose:
-                    log_design.warning("Failed to stream logs")
+                    import traceback
+
+                    log_design.warning(f"Traceback: {traceback.format_exc()}")  # noqa: G004
                 await asyncio.sleep(1)
 
     # CRITICAL: Create proxy AFTER all logging setup to prevent it from resetting logging config
     # This is important because FastMCP might initialize loggers during creation
     proxy = create_proxy_server(
-        directory, image_name, no_reload, verbose, docker_args or [], interactive
+        directory, image_name, no_reload, full_reload, verbose, docker_args or [], interactive
     )
 
     # One more attempt to suppress the FastMCP server log
@@ -505,9 +543,7 @@ async def start_mcp_proxy(
             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]"
-            )
+            design.info("  • Push to registry: [cyan]hud push --image <registry/name>[/cyan]")
     except Exception as e:
         # Suppress the graceful shutdown error and other FastMCP/uvicorn internal errors
         error_msg = str(e)
@@ -527,7 +563,7 @@ async def start_mcp_proxy(
             try:
                 await log_task
             except asyncio.CancelledError:
-                pass  # Log streaming cancelled, normal shutdown
+                contextlib.suppress(asyncio.CancelledError)
 
 
 def run_mcp_dev_server(
@@ -538,6 +574,7 @@ def run_mcp_dev_server(
     transport: str = "http",
     port: int = 8765,
     no_reload: bool = False,
+    full_reload: bool = False,
     verbose: bool = False,
     inspector: bool = False,
     no_logs: bool = False,
@@ -588,7 +625,7 @@ def run_mcp_dev_server(
     # For HTTP transport, find available port first
     actual_port = port
     if transport == "http":
-        from .utils import find_free_port
+        from .utils.logging import find_free_port
 
         actual_port = find_free_port(port)
         if actual_port is None:
@@ -600,8 +637,13 @@ def run_mcp_dev_server(
     # Create config
     if transport == "stdio":
         server_config = {"command": "hud", "args": ["dev", directory, "--transport", "stdio"]}
+        # For stdio, include docker args in the command
+        if docker_args:
+            server_config["args"].extend(docker_args)
     else:
         server_config = {"url": f"http://localhost:{actual_port}/mcp"}
+        # Note: Environment variables are passed to the Docker container via the proxy,
+        # not included in the client configuration
 
     # For the deeplink, we only need the server config
     server_config_json = json.dumps(server_config, indent=2)
@@ -627,7 +669,27 @@ def run_mcp_dev_server(
     else:
         design.info(f"🐳 {resolved_image}")
 
-    design.progress_message(f"❗ If any issues arise, run `hud debug {resolved_image}` to debug the container")
+    design.progress_message(
+        f"❗ If any issues arise, run `hud debug {resolved_image}` to debug the container"
+    )
+
+    # Show environment variables if provided
+    if docker_args and any(arg == "-e" or arg.startswith("--env") for arg in docker_args):
+        design.section_title("Environment Variables")
+        design.info("The following environment variables will be passed to the Docker container:")
+        i = 0
+        while i < len(docker_args):
+            if docker_args[i] == "-e" and i + 1 < len(docker_args):
+                design.info(f"  • {docker_args[i + 1]}")
+                i += 2
+            elif docker_args[i].startswith("--env="):
+                design.info(f"  • {docker_args[i][6:]}")
+                i += 1
+            elif docker_args[i] == "--env" and i + 1 < len(docker_args):
+                design.info(f"  • {docker_args[i + 1]}")
+                i += 2
+            else:
+                i += 1
 
     # Show hints about inspector and interactive mode
     if transport == "http":
@@ -671,6 +733,7 @@ def run_mcp_dev_server(
                 transport,
                 port,
                 no_reload,
+                full_reload,
                 verbose,
                 inspector,
                 no_logs,
@@ -679,10 +742,10 @@ def run_mcp_dev_server(
             )
         )
     except Exception as e:
-        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.")
+        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.")
         raise