ha-mcp-dev 7.2.0.dev332__py3-none-any.whl → 7.2.0.dev334__py3-none-any.whl

ha_mcp/tools/helpers.py

@@ -7,6 +7,7 @@ Centralized utilities that can be shared across multiple tool implementations.
 import functools
 import json
 import logging
+import sys
 import time
 from typing import Any, Literal, NoReturn, overload
 
@@ -230,6 +231,30 @@ def exception_to_structured_error(
     if suggestions and "error" in error_response and isinstance(error_response["error"], dict):
         error_response["error"]["suggestions"] = suggestions
 
+    # Append macOS-specific hints for connection failures (after all other processing
+    # so hints survive regardless of whether caller provided explicit suggestions)
+    if (
+        sys.platform == "darwin"
+        and "error" in error_response
+        and isinstance(error_response["error"], dict)
+        and error_response["error"].get("code")
+        in (ErrorCode.CONNECTION_FAILED, ErrorCode.CONNECTION_TIMEOUT)
+    ):
+        macos_hints = [
+            "macOS may block local network access for Claude Desktop subprocesses "
+            "(System Settings > Privacy & Security > Local Network)",
+            "Try an SSH tunnel: ssh -N -L 8123:localhost:8123 user@ha-server, "
+            "then use http://localhost:8123",
+            "Ensure you are using http:// (not https://) unless SSL/TLS is configured",
+        ]
+        # Handle both "suggestions" (plural, 2+ items) and "suggestion" (singular, 1 item)
+        existing = error_response["error"].get("suggestions") or []
+        if not existing:
+            single = error_response["error"].get("suggestion")
+            if single:
+                existing = [single]
+        error_response["error"]["suggestions"] = existing + macos_hints
+
     if raise_error:
         raise_tool_error(error_response)
 

ha_mcp/tools/smart_search.py

@@ -4,6 +4,7 @@ Smart search tools for Home Assistant MCP server.
 
 import asyncio
 import logging
+import os
 import random
 import time
 from typing import Any
@@ -23,11 +24,23 @@ 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)
-AUTOMATION_CONFIG_TIME_BUDGET = (
-    15.0  # Max time for fetching automation configs individually
-)
-SCRIPT_CONFIG_TIME_BUDGET = 10.0  # Max time for fetching script configs individually
+# 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)
+
+# Batch size for parallel individual config fetches (Attempt C fallback)
+INDIVIDUAL_FETCH_BATCH_SIZE = 10
 
 
 def _simplify_states_summary(
@@ -903,39 +916,61 @@ class SmartSearchTools:
                                 f"Automation WebSocket bulk fetch ({ws_type}) failed: {e}"
                             )
 
-                # Attempt C: Individual REST calls with time budget (LAST RESORT)
-                # Prioritize name-matched automations so we at least get their configs
+                # Attempt C: Parallel individual REST calls with time budget (LAST RESORT)
+                # Fetch configs in parallel batches (subject to time budget) — don't prioritize by name score.
+                # Name score is only used for result ranking, not fetch order, because
+                # deep_search's purpose is to find matches INSIDE configs (conditions/actions),
+                # not just by name. Prioritizing by name would skip the configs most likely
+                # to contain non-obvious matches. See #879.
                 if not bulk_fetched:
                     budget_start = time.perf_counter()
-                    sorted_by_score = sorted(
-                        name_scored, key=lambda x: x[2], reverse=True
-                    )
+                    uids_to_fetch = [
+                        uid
+                        for _, _, _, uid in name_scored
+                        if uid and uid not in all_automation_configs
+                    ]
+                    total_to_fetch = len(uids_to_fetch)
+                    fetched_count = 0
+                    failed_count = 0
 
-                    for (
-                        _entity_id,
-                        _friendly_name,
-                        _name_score,
-                        unique_id,
-                    ) in sorted_by_score:
-                        if (
-                            time.perf_counter() - budget_start
-                            > AUTOMATION_CONFIG_TIME_BUDGET
-                        ):
-                            break
-                        if not unique_id or unique_id in all_automation_configs:
-                            continue
+                    async def _fetch_automation_config(uid: str) -> tuple[str, dict[str, Any] | None]:
                         try:
                             config = await asyncio.wait_for(
                                 self.client._request(
-                                    "GET", f"/config/automation/config/{unique_id}"
+                                    "GET", f"/config/automation/config/{uid}"
                                 ),
                                 timeout=INDIVIDUAL_CONFIG_TIMEOUT,
                             )
-                            all_automation_configs[unique_id] = config
+                            return (uid, config)
                         except Exception as e:
                             logger.debug(
-                                f"Automation individual config fetch ({unique_id}) failed: {e}"
+                                f"Automation individual config fetch ({uid}) failed: {e}"
                             )
+                            return (uid, None)
+
+                    for i in range(0, len(uids_to_fetch), INDIVIDUAL_FETCH_BATCH_SIZE):
+                        if (
+                            time.perf_counter() - budget_start
+                            > AUTOMATION_CONFIG_TIME_BUDGET
+                        ):
+                            skipped = total_to_fetch - fetched_count - failed_count
+                            logger.warning(
+                                f"Automation config fetch budget exhausted "
+                                f"({AUTOMATION_CONFIG_TIME_BUDGET}s). "
+                                f"Fetched {fetched_count}/{total_to_fetch} "
+                                f"({failed_count} failed), skipped {skipped} automations."
+                            )
+                            break
+                        batch = uids_to_fetch[i : i + INDIVIDUAL_FETCH_BATCH_SIZE]
+                        batch_results = await asyncio.gather(
+                            *[_fetch_automation_config(uid) for uid in batch],
+                        )
+                        for uid_result, config_result in batch_results:
+                            if config_result is not None:
+                                all_automation_configs[uid_result] = config_result
+                                fetched_count += 1
+                            else:
+                                failed_count += 1
 
                 # Phase 3: Score with whatever configs we have
                 for entity_id, friendly_name, name_score, unique_id in name_scored:
@@ -1040,37 +1075,54 @@ class SmartSearchTools:
                                 f"Script WebSocket bulk fetch ({ws_type}) failed: {e}"
                             )
 
-                # Attempt C: Individual fetch with budget
+                # Attempt C: Parallel individual fetch with budget (see #879)
                 if not script_bulk_fetched:
                     budget_start = time.perf_counter()
-                    sorted_scripts = sorted(
-                        script_name_scored, key=lambda x: x[3], reverse=True
-                    )
-                    for (
-                        _entity_id,
-                        _friendly_name,
-                        script_id,
-                        _name_score,
-                    ) in sorted_scripts:
-                        if (
-                            time.perf_counter() - budget_start
-                            > SCRIPT_CONFIG_TIME_BUDGET
-                        ):
-                            break
-                        if script_id in all_script_configs:
-                            continue
+                    sids_to_fetch = [
+                        sid
+                        for _, _, sid, _ in script_name_scored
+                        if sid and sid not in all_script_configs
+                    ]
+                    total_to_fetch = len(sids_to_fetch)
+                    fetched_count = 0
+                    failed_count = 0
+
+                    async def _fetch_script_config(sid: str) -> tuple[str, dict[str, Any] | None]:
                         try:
                             config_resp = await asyncio.wait_for(
-                                self.client.get_script_config(script_id),
+                                self.client.get_script_config(sid),
                                 timeout=INDIVIDUAL_CONFIG_TIMEOUT,
                             )
-                            all_script_configs[script_id] = config_resp.get(
-                                "config", {}
-                            )
+                            return (sid, config_resp.get("config", {}))
                         except Exception as e:
                             logger.debug(
-                                f"Script individual config fetch ({script_id}) failed: {e}"
+                                f"Script individual config fetch ({sid}) failed: {e}"
                             )
+                            return (sid, None)
+
+                    for i in range(0, len(sids_to_fetch), INDIVIDUAL_FETCH_BATCH_SIZE):
+                        if (
+                            time.perf_counter() - budget_start
+                            > SCRIPT_CONFIG_TIME_BUDGET
+                        ):
+                            skipped = total_to_fetch - fetched_count - failed_count
+                            logger.warning(
+                                f"Script config fetch budget exhausted "
+                                f"({SCRIPT_CONFIG_TIME_BUDGET}s). "
+                                f"Fetched {fetched_count}/{total_to_fetch} "
+                                f"({failed_count} failed), skipped {skipped} scripts."
+                            )
+                            break
+                        batch = sids_to_fetch[i : i + INDIVIDUAL_FETCH_BATCH_SIZE]
+                        batch_results = await asyncio.gather(
+                            *[_fetch_script_config(sid) for sid in batch],
+                        )
+                        for sid_result, config_result in batch_results:
+                            if config_result is not None:
+                                all_script_configs[sid_result] = config_result
+                                fetched_count += 1
+                            else:
+                                failed_count += 1
 
                 # Phase 3: Score scripts
                 for (

{ha_mcp_dev-7.2.0.dev332.dist-info → ha_mcp_dev-7.2.0.dev334.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.2.0.dev332
+Version: 7.2.0.dev334
 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.2.0.dev332.dist-info → ha_mcp_dev-7.2.0.dev334.dist-info}/RECORD

@@ -38,9 +38,9 @@ ha_mcp/tools/backup.py,sha256=QN0ZhLke1ItivS0ykJV74WAtsiirPduZfhIMXW4pfJc,18372
 ha_mcp/tools/best_practice_checker.py,sha256=wyeeB5L3wPFG11VX6acg7F0fz6ISbgK-5wrUhxntIPE,14576
 ha_mcp/tools/device_control.py,sha256=8vI7LqcbNeJi-j4pA0GCUMOKPy8mD90IDYbEAy38_ok,28586
 ha_mcp/tools/enhanced.py,sha256=plvrTJmuAJ-55M0yznEq1Vv5TFDl_2FgegTYK7RaLC8,6668
-ha_mcp/tools/helpers.py,sha256=GveFEr0UPmnGwv18gHTkzPenrOOYtr8PT8EF8b4mmus,9504
+ha_mcp/tools/helpers.py,sha256=GkSSdgfxRuQx3YoGfzl4U83hsDuUqN2g9maegZrsDmU,10725
 ha_mcp/tools/registry.py,sha256=LDU17zgJCgrlsv-yoBHm6TxAvkfnGoIdYsWfzLTmhGs,7718
-ha_mcp/tools/smart_search.py,sha256=cJzoa5bNcodLy8kBoyOA7syH-Xh9G7Oj-5dZgXqvwX0,62056
+ha_mcp/tools/smart_search.py,sha256=P6kxcW2n-85M711EIt-1bB10HQ1Qwmu5iLBk_BOsd4I,65158
 ha_mcp/tools/tools_addons.py,sha256=gGHn_dYB9cDEReGfZB_cV5S1dSEzmsfCCzTHNQ2uS1A,39378
 ha_mcp/tools/tools_areas.py,sha256=KNCqVom1KD8TjH3cYCgWcDajEXUVPSaB7mUbJ5kL1Kc,18505
 ha_mcp/tools/tools_blueprints.py,sha256=y3m6uC_-EyUj5Onm5DIP3-CkqMhdxOe94KLmpXnx0Q0,13645
@@ -83,12 +83,12 @@ ha_mcp/utils/fuzzy_search.py,sha256=bvT1wnGVVb2q2a4GtAnXK4uSLRU8wfGZBeGVf6CQhR0,
 ha_mcp/utils/operation_manager.py,sha256=1ETI_L2TFNhnJUUJwtuH4R0s6ZP3_rscIOfdehYSmkU,14266
 ha_mcp/utils/python_sandbox.py,sha256=mVBrBR1caQksXso3voUw2YlqY2OQJDXkt3EAZpasE0M,7488
 ha_mcp/utils/usage_logger.py,sha256=ZXbr3vHV2WT7IozrEnuNCulKt3wLXDUJI1dxaBVq0kQ,9294
-ha_mcp_dev-7.2.0.dev332.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
+ha_mcp_dev-7.2.0.dev334.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
 tests/__init__.py,sha256=YRpec-ZFYCJ48oD_7ZcNY7dB8avoTWOrZICjaM-BYJ0,39
 tests/test_constants.py,sha256=F14Pf5QMzG77RhsecaNWWaEL-B_8ykHJLIvVMcJxT8M,609
 tests/test_env_manager.py,sha256=wEYSfwmkga9IPanzVkSo03fsY77KVw71zJG5S7Kkdr8,12045
-ha_mcp_dev-7.2.0.dev332.dist-info/METADATA,sha256=IapaC2pCw7BgQNDcf5JIyR65aCI3yHH1rcAVAvFMOSM,18573
-ha_mcp_dev-7.2.0.dev332.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-ha_mcp_dev-7.2.0.dev332.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
-ha_mcp_dev-7.2.0.dev332.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
-ha_mcp_dev-7.2.0.dev332.dist-info/RECORD,,
+ha_mcp_dev-7.2.0.dev334.dist-info/METADATA,sha256=z21Te4mNY-Hd3XU56YR1H8E5IR30m8kMBF3qdcG6kWI,18573
+ha_mcp_dev-7.2.0.dev334.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+ha_mcp_dev-7.2.0.dev334.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
+ha_mcp_dev-7.2.0.dev334.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
+ha_mcp_dev-7.2.0.dev334.dist-info/RECORD,,