ha-mcp-dev 7.6.0.dev673__tar.gz → 7.6.0.dev675__tar.gz

{ha_mcp_dev-7.6.0.dev673/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.6.0.dev675}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev673
+Version: 7.6.0.dev675
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.6.0.dev673"
+version = "7.6.0.dev675"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/src/ha_mcp/config.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from typing import Any, Literal, NamedTuple
 
 from dotenv import load_dotenv
-from pydantic import Field, field_validator
+from pydantic import Field, ValidationInfo, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from ha_mcp._version import get_version
@@ -65,6 +65,24 @@ class Settings(BaseSettings):
     fuzzy_threshold: int = Field(60, alias="FUZZY_THRESHOLD")
     entity_search_limit: int = Field(20, alias="ENTITY_SEARCH_LIMIT")
 
+    # Smart-search config-fetch time budgets (seconds). Bound how long
+    # ha_search / ha_deep_search spends fetching automation/script/scene
+    # definitions during the per-id fallback before reporting a partial
+    # result. Surfaced in the Advanced settings panel (issue #1538) so
+    # add-on users — who cannot set raw env vars — can tune them. Consumed
+    # as import-time module constants in tools/smart_search/_config.py, so
+    # a change requires an MCP-host restart to take effect (advanced
+    # settings already carry a restart-required notice in the UI).
+    automation_config_time_budget: float = Field(
+        30.0, alias="HAMCP_AUTOMATION_CONFIG_TIME_BUDGET"
+    )
+    script_config_time_budget: float = Field(
+        20.0, alias="HAMCP_SCRIPT_CONFIG_TIME_BUDGET"
+    )
+    scene_config_time_budget: float = Field(
+        20.0, alias="HAMCP_SCENE_CONFIG_TIME_BUDGET"
+    )
+
     # Backup tool configuration
     backup_hint: str = Field("normal", alias="BACKUP_HINT")
 
@@ -293,6 +311,51 @@ class Settings(BaseSettings):
             return False
         return v
 
+    @field_validator(
+        "automation_config_time_budget",
+        "script_config_time_budget",
+        "scene_config_time_budget",
+        mode="before",
+    )
+    @classmethod
+    def _lenient_time_budget(cls, v: object, info: ValidationInfo) -> object:
+        """Coerce the three smart-search time budgets, falling back to the
+        field default (with a warning) instead of crashing startup.
+
+        Preserves the parse-tolerance of the removed ``_env_float`` helper
+        (empty / unparseable -> default) and additionally enforces the same
+        ``_ADVANCED_SETTINGS_BOUNDS`` range as the override-file / UI-POST
+        path, so the env-var path can't smuggle in an out-of-range or
+        non-finite budget. A ``<= 0`` budget would silently disable the
+        per-id config-fetch scan, and ``inf`` / ``nan`` would uncap it; the
+        ``lo <= val <= hi`` test rejects all three (NaN comparisons are
+        False), keeping the env and override-file paths consistent."""
+        field_name = info.field_name
+        if field_name is None:  # always set for field_validator; defensive
+            return v
+        default = cls.model_fields[field_name].default
+        if v is None or (isinstance(v, str) and not v.strip()):
+            return default
+        try:
+            val = float(v)  # type: ignore[arg-type]
+        except (ValueError, TypeError):
+            logger.warning(
+                "Invalid value for %s=%r; using default %s", field_name, v, default
+            )
+            return default
+        lo, hi = _ADVANCED_SETTINGS_BOUNDS[field_name]
+        if not (lo <= val <= hi):
+            logger.warning(
+                "%s=%r is outside %s-%s; using default %s",
+                field_name,
+                v,
+                lo,
+                hi,
+                default,
+            )
+            return default
+        return val
+
     @property
     def env_file_name(self) -> str:
         """Get the current environment file name."""
@@ -598,9 +661,44 @@ ADVANCED_SETTINGS_FIELDS: tuple[AdvancedField, ...] = (
     # Search & matching.
     AdvancedField("fuzzy_threshold", "FUZZY_THRESHOLD", int, "search", True),
     AdvancedField("entity_search_limit", "ENTITY_SEARCH_LIMIT", int, "search", True),
+    # Smart-search config-fetch time budgets (#1538). Restart-required
+    # (consumed as import-time constants in smart_search/_config.py).
+    AdvancedField(
+        "automation_config_time_budget",
+        "HAMCP_AUTOMATION_CONFIG_TIME_BUDGET",
+        float,
+        "search",
+        True,
+    ),
+    AdvancedField(
+        "script_config_time_budget",
+        "HAMCP_SCRIPT_CONFIG_TIME_BUDGET",
+        float,
+        "search",
+        True,
+    ),
+    AdvancedField(
+        "scene_config_time_budget",
+        "HAMCP_SCENE_CONFIG_TIME_BUDGET",
+        float,
+        "search",
+        True,
+    ),
     # Operations.
     AdvancedField("backup_hint", "BACKUP_HINT", str, "operations", True),
     AdvancedField("enable_websocket", "ENABLE_WEBSOCKET", bool, "operations", True),
+    # Dashboard-screenshot engine URL (#1538): docker/.env users could set
+    # HAMCP_DASHBOARD_SCREENSHOT_ENGINE_URL, but add-on users had no path to
+    # it. It is resolved live per capture (resolve_engine_url), so unlike the
+    # time budgets it takes effect without a restart. Blank = auto-discover
+    # the Puppet add-on via the Supervisor.
+    AdvancedField(
+        "dashboard_screenshot_engine_url",
+        "HAMCP_DASHBOARD_SCREENSHOT_ENGINE_URL",
+        str,
+        "operations",
+        True,
+    ),
     AdvancedField(
         "enabled_tool_modules", "ENABLED_TOOL_MODULES", str, "tools_surface", True
     ),
@@ -660,6 +758,9 @@ _ADVANCED_SETTINGS_BOUNDS: dict[str, tuple[float, float]] = {
     "max_retries": (0, 20),
     "fuzzy_threshold": (0, 100),
     "entity_search_limit": (1, 1000),
+    "automation_config_time_budget": (1.0, 600.0),
+    "script_config_time_budget": (1.0, 600.0),
+    "scene_config_time_budget": (1.0, 600.0),
     "code_mode_max_duration": (1.0, 300.0),
     "code_mode_max_memory": (1_048_576, 268_435_456),
     "code_mode_max_recursion": (1, 10_000),

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/src/ha_mcp/settings.js

@@ -2400,7 +2400,11 @@ const ADVANCED_FIELD_META = {
   verify_ssl:          { label: "Verify SSL certificates",     help: "Skip TLS verification only on trusted networks (self-signed certs, hostname mismatch). Restart required." },
   fuzzy_threshold:     { label: "Fuzzy-search threshold",      help: "Lower = looser entity match. Range 0–100." },
   entity_search_limit: { label: "Entity search result limit",  help: "Max entities returned by ha_search_entities. Range 1–1000." },
+  automation_config_time_budget: { label: "Automation config time budget (s)", help: "Max seconds ha_search/ha_deep_search spends fetching automation configs before returning a partial result. Raise on instances with many automations. Range 1–600. Restart required." },
+  script_config_time_budget:     { label: "Script config time budget (s)",     help: "Max seconds ha_search/ha_deep_search spends fetching script configs before returning a partial result. Range 1–600. Restart required." },
+  scene_config_time_budget:      { label: "Scene config time budget (s)",      help: "Max seconds ha_search/ha_deep_search spends fetching scene configs before returning a partial result. Range 1–600. Restart required." },
   backup_hint:         { label: "Backup-hint level",           help: "Tunes how strongly the LLM is prompted to take a full-HA snapshot before risky writes." },
+  dashboard_screenshot_engine_url: { label: "Dashboard screenshot engine URL", help: "Base URL of the screenshot engine (e.g. http://puppet:10000). Leave blank to auto-discover the Puppet add-on via the Supervisor (HA OS / Supervised). Only used when the Dashboard Screenshot beta feature is enabled. Takes effect without a restart." },
   enable_websocket:    { label: "Enable WebSocket",            help: "WebSocket-based state monitoring. Disabling falls back to polling — many tools degrade. Restart required." },
   enabled_tool_modules: { label: "Enabled tool modules",       help: "Comma-separated module names, or 'all'. Restricts which tool registry modules load at startup. Restart required." },
   enable_dashboard_partial_tools: { label: "Dashboard partial-update tools", help: "Token-efficient partial dashboard tools. Disable for clients with programmatic tool use." },
@@ -2430,6 +2434,12 @@ const ADVANCED_RESTART_REQUIRED = new Set([
   // lazy-init singleton (tools/smart_search.py) — changes
   // need restart to rebuild the searcher.
   "fuzzy_threshold",
+  // The three smart-search time budgets are read once at import by
+  // SmartSearchTools' _config module (singleton), so a change needs a
+  // restart. dashboard_screenshot_engine_url is intentionally absent —
+  // it is resolved live per capture, so it takes effect immediately.
+  "automation_config_time_budget", "script_config_time_budget",
+  "scene_config_time_budget",
   "code_mode_max_duration", "code_mode_max_memory",
   "code_mode_max_recursion", "code_mode_max_invocations",
   "code_mode_saved_tools_path",

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/src/ha_mcp/tools/smart_search/_config.py

@@ -5,11 +5,7 @@ smart-search mixins and the public ``smart_search`` shell can both depend
 on it without creating an import cycle.
 """
 
-import logging
-import os
-
-logger = logging.getLogger(__name__)
-
+from ha_mcp.config import get_global_settings
 
 # Default concurrency limit for parallel operations
 DEFAULT_CONCURRENCY_LIMIT = 20
@@ -20,22 +16,17 @@ BULK_WEBSOCKET_TIMEOUT = 3.0  # Timeout for bulk WebSocket calls
 INDIVIDUAL_CONFIG_TIMEOUT = 5.0  # Timeout for individual config fetches
 
 
-# Time budgets for fallback individual fetching (in seconds).
-# Configurable via env vars for instances with many automations/scripts.
-def _env_float(key: str, default: float) -> float:
-    raw = os.environ.get(key)
-    if raw is None:
-        return default
-    try:
-        return float(raw)
-    except (ValueError, TypeError):
-        logger.warning(f"Invalid value for {key}={raw!r}, using default {default}")
-        return default
-
-
-AUTOMATION_CONFIG_TIME_BUDGET = _env_float("HAMCP_AUTOMATION_CONFIG_TIME_BUDGET", 30.0)
-SCRIPT_CONFIG_TIME_BUDGET = _env_float("HAMCP_SCRIPT_CONFIG_TIME_BUDGET", 20.0)
-SCENE_CONFIG_TIME_BUDGET = _env_float("HAMCP_SCENE_CONFIG_TIME_BUDGET", 20.0)
+# Time budgets for fallback individual fetching (in seconds). Sourced from
+# the resolved Settings (issue #1538) so the env var, the web Settings UI
+# override file, and the field defaults all flow through one precedence path
+# — and so add-on users (who cannot set raw env vars) can tune them from the
+# Advanced panel. Read once at import as module-level constants; a change
+# takes effect on the next MCP-host restart (advanced settings already
+# carry a restart-required notice in the UI).
+_settings = get_global_settings()
+AUTOMATION_CONFIG_TIME_BUDGET = _settings.automation_config_time_budget
+SCRIPT_CONFIG_TIME_BUDGET = _settings.script_config_time_budget
+SCENE_CONFIG_TIME_BUDGET = _settings.scene_config_time_budget
 
 # Batch size for parallel individual config fetches (Attempt C fallback)
 INDIVIDUAL_FETCH_BATCH_SIZE = 10

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/src/ha_mcp/tools/smart_search/_deep.py

@@ -903,8 +903,9 @@ class DeepSearchMixin(SceneSearchMixin):
                 f"{automation_skipped} automation(s) not scanned (time budget "
                 "exhausted) — their match status is unknown; this result is "
                 "not exhaustive. Pass `config_time_budget=` on `ha_search` to "
-                "raise the per-call limit (or set "
-                "HAMCP_AUTOMATION_CONFIG_TIME_BUDGET for the default)."
+                "raise the per-call limit (or, for the default, set "
+                "HAMCP_AUTOMATION_CONFIG_TIME_BUDGET or the matching field in "
+                "the web Settings UI's Advanced section)."
             )
         if automation_failed:
             reasons.append(
@@ -925,8 +926,9 @@ class DeepSearchMixin(SceneSearchMixin):
                 f"{script_skipped} script(s) not scanned (time budget "
                 "exhausted) — their match status is unknown; this result is "
                 "not exhaustive. Pass `config_time_budget=` on `ha_search` to "
-                "raise the per-call limit (or set "
-                "HAMCP_SCRIPT_CONFIG_TIME_BUDGET for the default)."
+                "raise the per-call limit (or, for the default, set "
+                "HAMCP_SCRIPT_CONFIG_TIME_BUDGET or the matching field in "
+                "the web Settings UI's Advanced section)."
             )
         if script_failed:
             reasons.append(

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675}/src/ha_mcp/tools/smart_search/_scenes.py

@@ -347,8 +347,9 @@ class SceneSearchMixin(ConfigFetchMixin):
                 f"{skipped} scene(s) not scanned (time budget exhausted) — "
                 "their match status is unknown; this result is not exhaustive. "
                 "Pass `config_time_budget=` on `ha_search` to raise the "
-                "per-call limit (or set HAMCP_SCENE_CONFIG_TIME_BUDGET for "
-                "the default)."
+                "per-call limit (or, for the default, set "
+                "HAMCP_SCENE_CONFIG_TIME_BUDGET or the matching field in the "
+                "web Settings UI's Advanced section)."
             )
         if scene_stats["integration_skipped"]:
             # Informational, not an unknown-match-status condition: these

{ha_mcp_dev-7.6.0.dev673 → ha_mcp_dev-7.6.0.dev675/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev673
+Version: 7.6.0.dev675
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT