ha-mcp-dev 8.1.1.dev2294__tar.gz → 8.2.0.dev2305__tar.gz

{ha_mcp_dev-8.1.1.dev2294/src/ha_mcp_dev.egg-info → ha_mcp_dev-8.2.0.dev2305}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.1.1.dev2294
+Version: 8.2.0.dev2305
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.15,>=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastmcp==3.4.5
+Requires-Dist: fastmcp==3.4.6
 Requires-Dist: httpx[socks]==0.28.1
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: python-dotenv==1.2.2

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.1.1.dev2294"
+version = "8.2.0.dev2305"
 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
@@ -28,7 +28,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "fastmcp==3.4.5",
+    "fastmcp==3.4.6",
     "httpx[socks]==0.28.1",
     "pydantic==2.13.4",
     "python-dotenv==1.2.2",

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305}/src/ha_mcp/__init__.py

@@ -5,6 +5,10 @@ A Model Context Protocol server that provides complete control over Home Assista
 through REST API and WebSocket integration.
 """
 
+# Must be imported before anything that reaches fastmcp (``.auth`` below does),
+# because fastmcp configures rich logging at import time and dies on a rich
+# older than 13.9.4. Importing this module applies the shim. See #2186.
+from . import _rich_compat as _rich_compat
 from ._version import get_version
 
 __version__ = get_version()

ha_mcp_dev-8.2.0.dev2305/src/ha_mcp/_rich_compat.py

@@ -0,0 +1,109 @@
+"""Tolerate a ``rich`` older than fastmcp's logging setup expects (#2186).
+
+``fastmcp/__init__.py`` calls ``configure_logging()`` at import time, which
+builds a ``rich.logging.RichHandler`` with ``tracebacks_max_frames`` and
+``tracebacks_suppress`` unconditionally — no version guard, no ``try``. Both
+keywords require ``rich>=13.9.4`` (``fastmcp-slim``'s declared floor), so an
+environment holding an older ``rich`` cannot ``import fastmcp`` at all::
+
+    TypeError: RichHandler.__init__() got an unexpected keyword argument
+    'tracebacks_max_frames'
+
+Since ``ha_mcp/__init__.py`` imports ``.auth`` -> ``fastmcp``, that takes the
+whole package down before any of our code runs. It is not hypothetical: the
+official Home Assistant container ships ``rich 10.16.2`` (held below 11 by
+``surepy``'s ``rich>=10.1.0,<11.0.0``) and ``rich`` is absent from HA's
+``package_constraints.txt``, so whether installing ``ha-mcp`` pulls ``rich``
+forward is left entirely to the resolver — it usually does, and when it does
+not the integration cannot start.
+
+The declared dependency floor is correct upstream and this module does not
+second-guess it: it only intervenes when the *installed* ``RichHandler``
+genuinely cannot accept a keyword, dropping the unsupported ones so logging
+setup degrades instead of aborting the import. On ``rich>=13.9.4`` it is a
+no-op. Handlers still attach and still render; such installs lose only
+traceback frame-limiting and framework-frame suppression, which beats not
+importing.
+
+Remove this once the upstream fix is released and ha-mcp's floor excludes the
+affected fastmcp versions.
+"""
+
+from __future__ import annotations
+
+import functools
+import inspect
+import logging
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+# Marker set on our wrapper so repeated calls do not stack wrappers.
+_PATCH_MARKER = "_ha_mcp_filters_unsupported_kwargs"
+
+# Present only on rich>=13.9.4; its absence is what makes fastmcp's call fatal.
+_PROBE_KWARG = "tracebacks_max_frames"
+
+
+def ensure_rich_handler_compat() -> bool:
+    """Make ``RichHandler`` ignore keywords the installed ``rich`` lacks.
+
+    Returns ``True`` when a shim is in place (freshly applied or already
+    applied), ``False`` when none is needed or none could be applied — an
+    unimportable ``rich``, an uninspectable ``__init__``, or a signature that
+    already absorbs ``**kwargs``.
+    """
+    try:
+        from rich.logging import RichHandler
+    except Exception:  # pragma: no cover - rich absent or broken
+        # fastmcp depends on rich, so this means the import would fail anyway
+        # for reasons this shim cannot address.
+        logger.debug("rich.logging unavailable; skipping RichHandler shim")
+        return False
+
+    original_init = RichHandler.__init__
+    if getattr(original_init, _PATCH_MARKER, False):
+        return True
+
+    try:
+        parameters = inspect.signature(original_init).parameters
+    except (TypeError, ValueError):  # pragma: no cover - exotic rich build
+        logger.debug("RichHandler.__init__ is not introspectable; skipping shim")
+        return False
+
+    if any(p.kind is inspect.Parameter.VAR_KEYWORD for p in parameters.values()):
+        # Already tolerant of anything fastmcp passes.
+        return False
+
+    if _PROBE_KWARG in parameters:
+        return False
+
+    supported = frozenset(parameters)
+
+    @functools.wraps(original_init)
+    def _init(self: Any, *args: Any, **kwargs: Any) -> Any:
+        dropped = kwargs.keys() - supported
+        if dropped:
+            logger.debug(
+                "Dropping RichHandler kwargs this rich does not accept: %s",
+                ", ".join(sorted(dropped)),
+            )
+        return original_init(
+            self, *args, **{k: v for k, v in kwargs.items() if k in supported}
+        )
+
+    setattr(_init, _PATCH_MARKER, True)
+    RichHandler.__init__ = _init  # type: ignore[method-assign]
+
+    logger.debug(
+        "Installed RichHandler compatibility shim: rich is older than "
+        "fastmcp expects, so tracebacks lose frame-limiting and "
+        "framework-frame suppression. Upgrade to rich>=13.9.4 to restore them."
+    )
+    return True
+
+
+# Applied as an import side effect: ``ha_mcp/__init__.py`` imports this module
+# ahead of anything that reaches fastmcp, and that is the only window in which
+# the shim can do any good.
+ensure_rich_handler_compat()

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305}/src/ha_mcp/tools/tools_dev.py

@@ -16,6 +16,7 @@ import logging
 import sys
 from typing import Annotated, Any, Literal
 
+import httpx
 from fastmcp.exceptions import ToolError
 from fastmcp.tools import tool
 from pydantic import Field
@@ -479,17 +480,36 @@ def schedule_deferred_entry_reload(client: Any, entry_id: str) -> None:
     very worker answering the current request, so it must not run until the
     response has flushed. Failures can only be logged — there is no caller
     left to answer.
+
+    Uses the ``homeassistant.reload_config_entry`` service, NOT
+    ``POST /config/config_entries/entry/{id}/reload``: only the services
+    handler shields the call. HA runs aiohttp with
+    ``handler_cancellation=True``, and the reload kills the client sending
+    this request, so on the unshielded route it cancelled itself mid-unload
+    and stranded the entry in ``UNLOAD_IN_PROGRESS`` until HA restarted.
     """
 
     async def _reload() -> None:
         await asyncio.sleep(_SELF_ACTION_FLUSH_DELAY_S)
         try:
-            await client._request(
-                "POST", f"/config/config_entries/entry/{entry_id}/reload"
+            await client.call_service(
+                "homeassistant", "reload_config_entry", {"entry_id": entry_id}
             )
             logger.info("Deferred reload of entry %s requested", entry_id)
-        except Exception:
-            logger.exception("Deferred config-entry reload failed")
+        except Exception as exc:
+            # A lost reply means the request reached HA and the shielded reload
+            # then killed this client — the expected end of a self-restart, not
+            # a failure. A connect error or timeout may never have dispatched,
+            # so those stay loud. WARNING, not INFO: HA surfaces this package
+            # at WARNING and above, so INFO here would log nothing at all.
+            if isinstance(exc.__cause__, httpx.ReadError | httpx.RemoteProtocolError):
+                logger.warning(
+                    "Deferred reload of entry %s dispatched; it tore down this "
+                    "connection before the reply arrived (expected)",
+                    entry_id,
+                )
+            else:
+                logger.exception("Deferred config-entry reload failed")
 
     _spawn_background(_reload())
 

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.1.1.dev2294
+Version: 8.2.0.dev2305
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.15,>=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastmcp==3.4.5
+Requires-Dist: fastmcp==3.4.6
 Requires-Dist: httpx[socks]==0.28.1
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: python-dotenv==1.2.2

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ pyproject.toml
 src/ha_mcp/__init__.py
 src/ha_mcp/__main__.py
 src/ha_mcp/_pypi_marker
+src/ha_mcp/_rich_compat.py
 src/ha_mcp/_version.py
 src/ha_mcp/backup_manager.py
 src/ha_mcp/browser_landing.py

{ha_mcp_dev-8.1.1.dev2294 → ha_mcp_dev-8.2.0.dev2305}/src/ha_mcp_dev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastmcp==3.4.5
+fastmcp==3.4.6
 httpx[socks]==0.28.1
 pydantic==2.13.4
 python-dotenv==1.2.2