ha-mcp-dev 7.6.0.dev639__tar.gz → 7.6.0.dev640__tar.gz

{ha_mcp_dev-7.6.0.dev639/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.6.0.dev640}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev639
+Version: 7.6.0.dev640
 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.dev639 → ha_mcp_dev-7.6.0.dev640}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.6.0.dev639"
+version = "7.6.0.dev640"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -150,7 +150,6 @@ ignore = [
 "src/ha_mcp/tools/tools_entities.py" = ["C901"]
 "src/ha_mcp/tools/tools_registry.py" = ["C901"]
 "src/ha_mcp/tools/tools_search.py" = ["C901"]
-"src/ha_mcp/tools/smart_search.py" = ["C901"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

ha_mcp_dev-7.6.0.dev640/src/ha_mcp/tools/smart_search/__init__.py

@@ -0,0 +1,62 @@
+"""Smart search tools for Home Assistant MCP server.
+
+The implementation is split across sibling modules to keep each unit
+focused (see issue #925):
+
+- ``_search_config``: shared constants and pure helpers
+- ``_search_base``: attributes shared across mixins + registry-list helper
+- ``_search_deep``: ``deep_search`` (config-definition search)
+- ``_search_overview``: ``get_system_overview``
+- ``_search_entities``: ``smart_entity_search`` + ``get_entities_by_area``
+"""
+
+import logging
+
+from ...client.rest_client import HomeAssistantClient
+from ...config import get_global_settings
+from ...utils.fuzzy_search import create_fuzzy_searcher
+
+# Re-export shared constants so existing ``smart_search.<CONST>`` references
+# keep resolving.
+from ._config import (
+    AUTOMATION_CONFIG_TIME_BUDGET,
+    BULK_REST_TIMEOUT,
+    BULK_WEBSOCKET_TIMEOUT,
+    DEFAULT_CONCURRENCY_LIMIT,
+    INDIVIDUAL_CONFIG_TIMEOUT,
+    INDIVIDUAL_FETCH_BATCH_SIZE,
+    SCENE_CONFIG_TIME_BUDGET,
+    SCRIPT_CONFIG_TIME_BUDGET,
+)
+from ._deep import DeepSearchMixin
+from ._entities import EntitySearchMixin
+from ._overview import SystemOverviewMixin
+
+logger = logging.getLogger(__name__)
+
+
+class SmartSearchTools(DeepSearchMixin, SystemOverviewMixin, EntitySearchMixin):
+    """Smart search tools with fuzzy matching and AI optimization."""
+
+    def __init__(
+        self, client: HomeAssistantClient | None = None, fuzzy_threshold: int = 60
+    ):
+        """Initialize with Home Assistant client."""
+        # Always load settings for configuration access
+        self.settings = get_global_settings()
+
+        # Use provided client or create new one
+        if client is None:
+            self.client = HomeAssistantClient()
+            fuzzy_threshold = self.settings.fuzzy_threshold
+        else:
+            self.client = client
+
+        self.fuzzy_searcher = create_fuzzy_searcher(threshold=fuzzy_threshold)
+
+
+def create_smart_search_tools(
+    client: HomeAssistantClient | None = None,
+) -> SmartSearchTools:
+    """Create smart search tools instance."""
+    return SmartSearchTools(client)

ha_mcp_dev-7.6.0.dev640/src/ha_mcp/tools/smart_search/_base.py

@@ -0,0 +1,38 @@
+"""Shared base for the smart-search feature mixins.
+
+``_SearchBase`` declares the instance attributes that
+``SmartSearchTools.__init__`` sets, so each feature mixin type-checks in
+isolation, and hosts the registry-list helper shared by the overview and
+entity/area search mixins.
+"""
+
+import logging
+from typing import Any
+
+from ...client.rest_client import HomeAssistantClient
+
+logger = logging.getLogger(__name__)
+
+
+class _SearchBase:
+    """Attributes set by ``SmartSearchTools.__init__`` plus shared helpers."""
+
+    client: HomeAssistantClient
+    fuzzy_searcher: Any
+    settings: Any
+
+    @staticmethod
+    def _extract_registry_list(result: Any, label: str) -> list[dict[str, Any]]:
+        """Unwrap a WS registry-list result, returning ``[]`` on error/failure.
+
+        Exceptions are logged at debug because every caller treats missing
+        registry data as non-fatal rather than raising: the overview degrades
+        its area enrichment, and the area search degrades to "no match found".
+        """
+        if isinstance(result, Exception):
+            logger.debug(f"Could not fetch {label}: {result}")
+            return []
+        if isinstance(result, dict) and result.get("success"):
+            registry: list[dict[str, Any]] = result.get("result", [])
+            return registry
+        return []

ha_mcp_dev-7.6.0.dev640/src/ha_mcp/tools/smart_search/_config.py

@@ -0,0 +1,73 @@
+"""Shared constants and pure helpers for the smart-search modules.
+
+This module imports nothing from the ``ha_mcp.tools`` package so the
+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__)
+
+
+# Default concurrency limit for parallel operations
+DEFAULT_CONCURRENCY_LIMIT = 20
+
+# Bulk fetch timeouts (in seconds)
+BULK_REST_TIMEOUT = 5.0  # Timeout for bulk REST endpoint calls
+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)
+
+# Batch size for parallel individual config fetches (Attempt C fallback)
+INDIVIDUAL_FETCH_BATCH_SIZE = 10
+
+
+def _simplify_states_summary(
+    states_summary: dict[str, int],
+    detail_level: str,
+    max_states: int | None = None,
+) -> dict[str, int]:
+    """Keep only the most common states, aggregate the rest into _other.
+
+    Args:
+        states_summary: Original {state: count} mapping.
+        detail_level: "minimal", "standard", or "full".
+        max_states: Override cap (None = 5 for minimal, 10 for standard).
+
+    Returns:
+        Capped states_summary with ``_other`` count when truncated.
+    """
+    if detail_level == "full":
+        return states_summary
+
+    if max_states is None:
+        max_states = 5 if detail_level == "minimal" else 10
+
+    if len(states_summary) <= max_states:
+        return states_summary
+
+    sorted_states = sorted(states_summary.items(), key=lambda x: x[1], reverse=True)
+    top = dict(sorted_states[:max_states])
+    other_count = sum(count for _, count in sorted_states[max_states:])
+    if other_count > 0:
+        top["_other"] = other_count
+    return top