ha-mcp-dev 7.13.0.dev2037__tar.gz → 7.13.0.dev2042__tar.gz

{ha_mcp_dev-7.13.0.dev2037/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.13.0.dev2042}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.13.0.dev2037"
+version = "7.13.0.dev2042"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's
@@ -164,15 +164,6 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "tests/**/*" = ["E501", "B011"]
-# C901 (mccabe complexity) grandfathered debt: newly enabled rule, these files
-# already exceeded the threshold. Remove a line once its functions are
-# refactored below threshold -- do not add new files here.
-"src/ha_mcp/tools/tools_config_automations.py" = ["C901"]
-"src/ha_mcp/tools/tools_config_scenes.py" = ["C901"]
-"src/ha_mcp/tools/tools_config_scripts.py" = ["C901"]
-"src/ha_mcp/tools/tools_dev.py" = ["C901"]
-"src/ha_mcp/tools/tools_system.py" = ["C901"]
-"tests/src/unit/test_advanced_settings_coverage.py" = ["C901"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]

{ha_mcp_dev-7.13.0.dev2037 → ha_mcp_dev-7.13.0.dev2042}/src/ha_mcp/tools/smart_search/_deep.py

@@ -393,12 +393,12 @@ class DeepSearchMixin(SceneSearchMixin):
         failed_count = 0
         yaml_skipped_count = 0
         timeout_count = 0
-        # One representative summary — only the FIRST ``failed``-class
-        # exception is kept (the fetch closure guards the append); it rides
-        # partial_reason as an ``e.g.`` (#1784 follow-up). The remaining
-        # failures are counted (``failed_count``) but not summarized, so the
-        # motivating "every per-id fetch 500s" case does N-1 fewer
-        # ``summarize_fetch_error`` calls.
+        # One representative summary — ``record_first_failure`` (which holds
+        # the guard) keeps the first ``failed``-class exception, upgrading
+        # once to the first HTTP 500 so a fast-failing outlier can't suppress
+        # the 500 diagnosis hint; it rides partial_reason as an ``e.g.``
+        # (#1784 follow-up). The remaining failures are counted
+        # (``failed_count``) but not summarized.
         failed_errors: list[str] = []
         if not bulk_fetched:
             uids_to_fetch = [
@@ -547,12 +547,12 @@ class DeepSearchMixin(SceneSearchMixin):
         failed_count = 0
         yaml_skipped_count = 0
         timeout_count = 0
-        # One representative summary — only the FIRST ``failed``-class
-        # exception is kept (the fetch closure guards the append); it rides
-        # partial_reason as an ``e.g.`` (#1784 follow-up). The remaining
-        # failures are counted (``failed_count``) but not summarized, so the
-        # motivating "every per-id fetch 500s" case does N-1 fewer
-        # ``summarize_fetch_error`` calls.
+        # One representative summary — ``record_first_failure`` (which holds
+        # the guard) keeps the first ``failed``-class exception, upgrading
+        # once to the first HTTP 500 so a fast-failing outlier can't suppress
+        # the 500 diagnosis hint; it rides partial_reason as an ``e.g.``
+        # (#1784 follow-up). The remaining failures are counted
+        # (``failed_count``) but not summarized.
         failed_errors: list[str] = []
         if not bulk_fetched:
             sids_to_fetch = [

{ha_mcp_dev-7.13.0.dev2037 → ha_mcp_dev-7.13.0.dev2042}/src/ha_mcp/tools/smart_search/_fetch.py

@@ -40,7 +40,8 @@ def summarize_fetch_error(exc: BaseException) -> str:
 
     HTTP errors render as ``HTTP <code>: <first line of the message>`` (the
     client's own ``API error: <code> - `` prefix is stripped rather than
-    duplicated); everything else as ``<ExceptionType>: <first line>``.
+    duplicated); everything else as ``<ExceptionType>: <first line>``. An
+    empty message renders the bare prefix (``HTTP <code>`` / ``<Type>``).
     """
     lines = str(exc).strip().splitlines()
     text = lines[0].strip() if lines else ""
@@ -55,15 +56,24 @@ def summarize_fetch_error(exc: BaseException) -> str:
     return summary
 
 
-# Marks a rendered ``summarize_fetch_error`` summary whose cause the sample
-# cannot name: an HTTP 500's body is aiohttp's generic "500 Internal Server
-# Error" placeholder, so the real error (a YAMLException the per-id config
-# view raised, most often a ``!secret`` reference it rejects) lives only in
-# the HA log, never in the response.
-_HTTP_500_PREFIX = "HTTP 500:"
+# Matches a rendered ``summarize_fetch_error`` HTTP-500 summary — ``HTTP
+# 500: <text>``, or bare ``HTTP 500`` when the error body was empty. An HTTP
+# 500 is the one sample whose cause the summary cannot name (the body is
+# aiohttp's generic "500 Internal Server Error" placeholder; the real error —
+# most often a ``!secret`` reference the per-id config view rejects — lives
+# only in the HA log). Shared by the sample upgrade in
+# ``record_first_failure`` and by ``http_500_diagnosis_hint`` so the two can
+# never disagree on what counts as a 500.
+_HTTP_500_SAMPLE = re.compile(r"HTTP 500(?::|$)")
+
+
+def _is_http_500_sample(sample: str) -> bool:
+    """True when ``sample`` is a rendered HTTP-500 summary (``_HTTP_500_SAMPLE``)."""
+    return _HTTP_500_SAMPLE.match(sample) is not None
+
 
 # Static diagnosis appended to an HTTP-500 failed fragment. The sample names
-# the status but not the cause (see ``_HTTP_500_PREFIX``); this points the
+# the status but not the cause (see ``_HTTP_500_SAMPLE``); this points the
 # reader at the HA log and the single most common cause, delivering the
 # five-minute diagnosis the #1784 follow-up asked for without claiming a
 # cause the response can't actually confirm. Kept endpoint-agnostic — this
@@ -84,23 +94,35 @@ def http_500_diagnosis_hint(failed_sample: str | None) -> str:
     Returns ``""`` for any other sample (or ``None``), so non-500 fragments
     are byte-identical to before. See ``_HTTP_500_DIAGNOSIS``.
     """
-    if failed_sample and failed_sample.startswith(_HTTP_500_PREFIX):
+    if failed_sample and _is_http_500_sample(failed_sample):
         return _HTTP_500_DIAGNOSIS
     return ""
 
 
 def record_first_failure(failed_errors: list[str], exc: BaseException) -> None:
-    """Capture ``exc``'s summary as the representative ``failed`` sample, once.
+    """Capture ``exc``'s summary as the representative ``failed`` sample.
 
-    Only the FIRST generic-``failed`` exception per fetch pass is summarized
+    The first generic-``failed`` exception per fetch pass is summarized
     (subsequent ones are counted but not summarized) — in the motivating
     "every per-id fetch 500s" case that is N-1 fewer ``summarize_fetch_error``
-    calls. The append is a no-op once ``failed_errors`` is non-empty. Called
-    from the per-id fetch closures, which run under ``asyncio.gather`` but
-    never suspend between the check and the append, so no lock is needed.
+    calls. One exception: the first HTTP 500 upgrades a non-500 sample, once —
+    failure order tracks latency under ``asyncio.gather``, so a fast-failing
+    outlier (e.g. a connection blip losing the race against slower 500
+    round-trips) must not claim the slot and suppress the
+    ``http_500_diagnosis_hint`` diagnosis this sample exists to deliver. At
+    most two summaries are rendered per pass. Called from the per-id fetch
+    closures, which run under ``asyncio.gather`` but never suspend between
+    the check and the write, so no lock is needed.
     """
     if not failed_errors:
         failed_errors.append(summarize_fetch_error(exc))
+        return
+    if (
+        isinstance(exc, HomeAssistantAPIError)
+        and exc.status_code == 500
+        and not _is_http_500_sample(failed_errors[0])
+    ):
+        failed_errors[0] = summarize_fetch_error(exc)
 
 
 def is_timeout_error(exc: BaseException) -> bool:

{ha_mcp_dev-7.13.0.dev2037 → ha_mcp_dev-7.13.0.dev2042}/src/ha_mcp/tools/smart_search/_scenes.py

@@ -273,10 +273,12 @@ class SceneSearchMixin(ConfigFetchMixin):
         skipped_count = 0
         integration_skipped = 0
         timeout_count = 0
-        # One representative summary — only the FIRST ``failed``-class
-        # exception is kept (the fetch closure guards the append); it rides
-        # partial_reason as an ``e.g.`` (#1784 follow-up). The remaining
-        # failures are counted (``failed_count``) but not summarized.
+        # One representative summary — ``record_first_failure`` (which holds
+        # the guard) keeps the first ``failed``-class exception, upgrading
+        # once to the first HTTP 500 so a fast-failing outlier can't suppress
+        # the 500 diagnosis hint; it rides partial_reason as an ``e.g.``
+        # (#1784 follow-up). The remaining failures are counted
+        # (``failed_count``) but not summarized.
         failed_errors: list[str] = []
 
         # Attempt C: parallel per-id fetch with a wall-clock budget so a few

{ha_mcp_dev-7.13.0.dev2037 → ha_mcp_dev-7.13.0.dev2042}/src/ha_mcp/tools/tools_config_automations.py

@@ -839,39 +839,7 @@ class AutomationConfigTools:
                 and e.status_code == 404
             ):
                 await self._raise_automation_not_found(identifier)
-            error_text = str(e)
-            suggestions = [
-                "Check automation configuration format",
-                "Ensure required fields: alias, triggers, actions",
-                "Use entity_id format: automation.morning_routine or unique_id",
-                "Use ha_search(domain_filter='automation') to find automations",
-                "Use ha_get_skill_guide for automation examples",
-            ]
-            if isinstance(e, HomeAssistantAPIError):
-                if "'service'" in error_text and "not allowed" in error_text:
-                    suggestions.insert(
-                        0,
-                        "Use 'action:' not 'service:' for service calls in action steps "
-                        "(renamed in HA 2024.8).",
-                    )
-                elif "unexpected keyword argument" in error_text.lower():
-                    suggestions.insert(
-                        0,
-                        "An action step contains a field that belongs at the automation root "
-                        "(e.g. alias, trigger, condition). Each action step should only contain "
-                        "action/target/data/delay/choose/if/repeat/parallel keys.",
-                    )
-                elif "'variables'" in error_text and "dictionary" in error_text:
-                    suggestions.insert(
-                        0,
-                        "variables must be a dict mapping names to values, "
-                        'e.g. {"variables": {"my_var": 42}}',
-                    )
-            if bp_warnings:
-                suggestions.append(
-                    "Config had best-practice issues that may be related: "
-                    + "; ".join(bp_warnings)
-                )
+            suggestions = self._build_set_automation_suggestions(e, bp_warnings)
             error = exception_to_structured_error(
                 e,
                 context={"identifier": identifier},
@@ -881,6 +849,51 @@ class AutomationConfigTools:
             augment_error_dict_with_skill_content(error, bp_warnings)
             raise_tool_error(error)
 
+    @staticmethod
+    def _build_set_automation_suggestions(
+        e: Exception, bp_warnings: BestPracticeCheckResult
+    ) -> list[str]:
+        """Build the ordered suggestion list for a failed config-replacement set.
+
+        Extracted verbatim from ``ha_config_set_automation``'s exception
+        handler: HA-API messages get a targeted lead suggestion inserted, and
+        any best-practice warnings are appended.
+        """
+        error_text = str(e)
+        suggestions = [
+            "Check automation configuration format",
+            "Ensure required fields: alias, triggers, actions",
+            "Use entity_id format: automation.morning_routine or unique_id",
+            "Use ha_search(domain_filter='automation') to find automations",
+            "Use ha_get_skill_guide for automation examples",
+        ]
+        if isinstance(e, HomeAssistantAPIError):
+            if "'service'" in error_text and "not allowed" in error_text:
+                suggestions.insert(
+                    0,
+                    "Use 'action:' not 'service:' for service calls in action steps "
+                    "(renamed in HA 2024.8).",
+                )
+            elif "unexpected keyword argument" in error_text.lower():
+                suggestions.insert(
+                    0,
+                    "An action step contains a field that belongs at the automation root "
+                    "(e.g. alias, trigger, condition). Each action step should only contain "
+                    "action/target/data/delay/choose/if/repeat/parallel keys.",
+                )
+            elif "'variables'" in error_text and "dictionary" in error_text:
+                suggestions.insert(
+                    0,
+                    "variables must be a dict mapping names to values, "
+                    'e.g. {"variables": {"my_var": 42}}',
+                )
+        if bp_warnings:
+            suggestions.append(
+                "Config had best-practice issues that may be related: "
+                + "; ".join(bp_warnings)
+            )
+        return suggestions
+
     async def _upsert_automation(
         self,
         config: dict[str, Any],