unifi-network-mcp 0.4.1__tar.gz → 0.4.2__tar.gz

{unifi_network_mcp-0.4.1 → unifi_network_mcp-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-mcp
-Version: 0.4.1
+Version: 0.4.2
 Summary: Unifi Network MCP Server
 License-File: LICENSE
 Requires-Python: >=3.13

{unifi_network_mcp-0.4.1 → unifi_network_mcp-0.4.2}/src/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.1'
-__version_tuple__ = version_tuple = (0, 4, 1)
+__version__ = version = '0.4.2'
+__version_tuple__ = version_tuple = (0, 4, 2)
 
 __commit_id__ = commit_id = None

{unifi_network_mcp-0.4.1 → unifi_network_mcp-0.4.2}/src/config/config.yaml

@@ -51,6 +51,7 @@ server:
 
   http:
     enabled: ${oc.env:UNIFI_MCP_HTTP_ENABLED,false}
+    force: ${oc.env:UNIFI_MCP_HTTP_FORCE,false}
   diagnostics:
     enabled: ${oc.env:UNIFI_MCP_DIAGNOSTICS,false}
     log_tool_args: ${oc.env:UNIFI_MCP_DIAG_LOG_TOOL_ARGS,true}

{unifi_network_mcp-0.4.1 → unifi_network_mcp-0.4.2}/src/main.py

@@ -10,9 +10,11 @@ Responsibilities:
 import asyncio
 import logging
 import os
-import sys  # Removed uvicorn import
+import sys
 import traceback
 
+import uvicorn.config
+
 from src.bootstrap import (
     UNIFI_TOOL_REGISTRATION_MODE,
     logger,
@@ -26,6 +28,7 @@ from src.runtime import (
     server,
 )
 from src.tool_index import register_tool, tool_index_handler
+from src.utils.config_helpers import parse_config_bool
 from src.utils.diagnostics import diagnostics_enabled, wrap_tool
 from src.utils.lazy_tool_loader import setup_lazy_loading
 from src.utils.meta_tools import register_load_tools, register_meta_tools
@@ -310,17 +313,16 @@ async def main_async():
     host = config.server.get("host", "0.0.0.0")
     port = int(config.server.get("port", 3000))
     http_cfg = config.server.get("http", {})
-    http_enabled_raw = http_cfg.get("enabled", False)
-    if isinstance(http_enabled_raw, str):
-        http_enabled = http_enabled_raw.strip().lower() in {"1", "true", "yes", "on"}
-    else:
-        http_enabled = bool(http_enabled_raw)
+    http_enabled = parse_config_bool(http_cfg.get("enabled", False))
 
-    # Only the main container process (PID 1) should bind the HTTP SSE port.
+    # Only the main container process (PID 1) should bind the HTTP SSE port,
+    # unless http.force=true is set in config (for local development/testing).
+    force_http = parse_config_bool(http_cfg.get("force", False))
     is_main_container_process = os.getpid() == 1
-    if http_enabled and not is_main_container_process:
+    if http_enabled and not is_main_container_process and not force_http:
         logger.info(
-            "HTTP SSE enabled in config but skipped in exec session (PID %s != 1)",
+            "HTTP SSE enabled in config but skipped in exec session (PID %s != 1). "
+            "Set UNIFI_MCP_HTTP_FORCE=true to override.",
             os.getpid(),
         )
         http_enabled = False
@@ -338,9 +340,9 @@ async def main_async():
                 server.settings.host = host
                 server.settings.port = port
 
-                # Disable uvicorn access logging to prevent stdout conflicts
-                # when running alongside stdio transport
-                logging.getLogger("uvicorn.access").disabled = True
+                # Redirect uvicorn access logs to stderr to prevent stdout conflicts
+                # when running alongside stdio transport (stdout is used for JSON-RPC)
+                uvicorn.config.LOGGING_CONFIG["handlers"]["access"]["stream"] = "ext://sys.stderr"
 
                 await server.run_sse_async()
                 logger.info("HTTP SSE started via run_sse_async() using server.settings host/port.")

unifi_network_mcp-0.4.2/src/utils/config_helpers.py

@@ -0,0 +1,38 @@
+"""Configuration parsing utilities.
+
+This module provides helpers for parsing configuration values that may come
+from OmegaConf-resolved environment variables (which can be strings like
+"true"/"false") or direct boolean values.
+"""
+
+from typing import Any
+
+
+def parse_config_bool(value: Any, default: bool = False) -> bool:
+    """Parse a config value as boolean, handling string values from env vars.
+
+    OmegaConf resolves ${oc.env:VAR,default} to strings when the env var is set,
+    so "true"/"false" strings need to be parsed explicitly.
+
+    Args:
+        value: The config value to parse (string, bool, or None)
+        default: Default value if value is None
+
+    Returns:
+        Boolean interpretation of the value
+
+    Examples:
+        >>> parse_config_bool("true")
+        True
+        >>> parse_config_bool("false")
+        False
+        >>> parse_config_bool(True)
+        True
+        >>> parse_config_bool(None, default=True)
+        True
+    """
+    if value is None:
+        return default
+    if isinstance(value, str):
+        return value.strip().lower() in {"1", "true", "yes", "on"}
+    return bool(value)