ha-mcp-dev 7.4.1.dev471__tar.gz → 7.4.1.dev473__tar.gz

{ha_mcp_dev-7.4.1.dev471/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.4.1.dev473}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.4.1.dev471"
+version = "7.4.1.dev473"
 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.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp/client/rest_client.py

@@ -13,6 +13,7 @@ import httpx
 
 from .._version import get_supervisor_base_url, is_running_in_addon
 from ..config import get_global_settings
+from .supervisor_client import make_supervisor_httpx_client
 
 
 def _is_ssl_error(exc: BaseException) -> bool:
@@ -555,23 +556,21 @@ class HomeAssistantClient:
                 "(addon-mode gate fired but SUPERVISOR_TOKEN env var not set)"
             )
 
-        url = f"{get_supervisor_base_url()}/{path}/logs"
-        logger.debug("Fetching %s via Supervisor direct", url)
+        relative_path = f"/{path}/logs"
+        logger.debug(
+            "Fetching %s%s via Supervisor direct",
+            get_supervisor_base_url(),
+            relative_path,
+        )
 
         try:
-            async with httpx.AsyncClient(
+            async with make_supervisor_httpx_client(
                 timeout=httpx.Timeout(self.timeout),
-                # `verify` is a no-op for plain http://supervisor, but kept
-                # for symmetry with the other two direct-Supervisor httpx
-                # clients (#1128 establishes the 3-site convention).
                 verify=self.verify_ssl,
             ) as client:
                 response = await client.get(
-                    url,
-                    headers={
-                        "Authorization": f"Bearer {token}",
-                        "Accept": "text/plain",
-                    },
+                    relative_path,
+                    headers={"Accept": "text/plain"},
                 )
         except httpx.TimeoutException as e:
             raise HomeAssistantConnectionError(

ha_mcp_dev-7.4.1.dev473/src/ha_mcp/client/supervisor_client.py

@@ -0,0 +1,88 @@
+"""Shared factory for direct-Supervisor httpx clients.
+
+Three call sites in the codebase talk directly to the Home Assistant
+Supervisor REST API at ``http://supervisor`` rather than through
+``HomeAssistantClient.httpx_client`` (which is bound to HA Core, not the
+Supervisor — different base URL, different token, different role gate):
+
+- :meth:`ha_mcp.client.rest_client.HomeAssistantClient._supervisor_logs_get`
+  — fetches addon and system-service logs
+- :func:`ha_mcp.tools.tools_bug_report._fetch_addon_logs` — bundles ha-mcp's
+  own addon logs into a bug-report payload
+- :func:`ha_mcp.settings_ui._restart_addon` — POSTs ``/addons/self/restart``
+  from the settings UI
+
+All three share the same boilerplate (base URL, ``Authorization: Bearer
+${SUPERVISOR_TOKEN}`` header), so this module supplies a single factory and
+keeps the three sites consistent.
+"""
+
+from __future__ import annotations
+
+import os
+import ssl
+
+import httpx
+
+from .._version import get_supervisor_base_url
+
+__all__ = ["make_supervisor_httpx_client"]
+
+
+def make_supervisor_httpx_client(
+    *,
+    timeout: float | httpx.Timeout,
+    verify: bool | str | ssl.SSLContext,
+) -> httpx.AsyncClient:
+    """Construct an ``httpx.AsyncClient`` pre-configured for the Supervisor REST API.
+
+    Args:
+        timeout: Per-request timeout. Accepts either a plain ``float``
+            (seconds, applied to all phases) or a full :class:`httpx.Timeout`
+            for finer-grained control.
+        verify: TLS verify policy. A no-op for the default
+            ``http://supervisor`` base URL (plain HTTP — no TLS to verify),
+            but kept as a parameter because :func:`get_supervisor_base_url`
+            honours ``SUPERVISOR_BASE_URL`` env-var overrides that may be
+            HTTPS in non-add-on test rigs. The full httpx ``verify`` surface
+            (``bool``, CA-bundle path, or :class:`ssl.SSLContext`) is
+            accepted and forwarded verbatim.
+
+    Returns:
+        A new :class:`httpx.AsyncClient` bound to the Supervisor base URL
+        with ``Authorization: Bearer ${SUPERVISOR_TOKEN}`` preset. Callers
+        pass relative paths (``/addons/self/logs``) to ``client.get/post``;
+        ``base_url`` joins them onto the Supervisor host.
+
+    Raises:
+        RuntimeError: ``SUPERVISOR_TOKEN`` is unset or empty in the
+            environment. Each call site has its own absent-token policy
+            (a rich :class:`HomeAssistantAuthError`, a silent ``""``
+            return, or a 400 ``JSONResponse``) that does not share a
+            common shape, so the factory cannot translate. Detecting the
+            absence at construction time prevents a malformed
+            ``Authorization: Bearer `` header from being read as a token
+            rejection by Supervisor, which would mask the missing-env-var
+            root cause.
+
+    Note:
+        ``SUPERVISOR_TOKEN`` is read from env at construction time and
+        baked into the constructed client's ``Authorization`` header.
+        Reusing a single client across token rotations would not pick up
+        the new value — short-lived ``async with`` callers are unaffected,
+        but a future long-lived caller would need to discard and re-create.
+    """
+    token = os.environ.get("SUPERVISOR_TOKEN", "")
+    if not token:
+        raise RuntimeError(
+            "SUPERVISOR_TOKEN is not set; "
+            "make_supervisor_httpx_client cannot construct an "
+            "authenticated client. Callers must verify the token is "
+            "present before invoking the factory."
+        )
+    return httpx.AsyncClient(
+        base_url=get_supervisor_base_url(),
+        timeout=timeout,
+        verify=verify,
+        headers={"Authorization": f"Bearer {token}"},
+    )

{ha_mcp_dev-7.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp/settings_ui.py

@@ -19,7 +19,8 @@ import httpx
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse
 
-from ._version import get_supervisor_base_url, is_running_in_addon
+from ._version import is_running_in_addon
+from .client.supervisor_client import make_supervisor_httpx_client
 from .errors import ErrorCode, create_error_response
 from .transforms import DEFAULT_PINNED_TOOLS
 from .utils.data_paths import get_data_dir
@@ -893,8 +894,7 @@ def register_settings_routes(
         )
 
     async def _restart_addon(_: Request) -> JSONResponse:
-        token = os.environ.get("SUPERVISOR_TOKEN")
-        if not token:
+        if not os.environ.get("SUPERVISOR_TOKEN"):
             return JSONResponse(
                 create_error_response(
                     ErrorCode.CONFIG_VALIDATION_FAILED,
@@ -906,13 +906,10 @@ def register_settings_routes(
         # Short timeout — the supervisor kills our process during restart so
         # the connection will drop. A connection drop is actually success.
         try:
-            async with httpx.AsyncClient(
+            async with make_supervisor_httpx_client(
                 timeout=5.0, verify=server.settings.verify_ssl
             ) as client:
-                resp = await client.post(
-                    f"{get_supervisor_base_url()}/addons/self/restart",
-                    headers={"Authorization": f"Bearer {token}"},
-                )
+                resp = await client.post("/addons/self/restart")
         except (httpx.ReadError, httpx.RemoteProtocolError):
             # Connection dropped mid-request — restart is happening.
             # `ConnectError` is deliberately NOT in this tuple: it fires

{ha_mcp_dev-7.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp/tools/tools_bug_report.py

@@ -20,7 +20,7 @@ from pydantic import Field
 
 from ha_mcp import __version__
 
-from .._version import get_supervisor_base_url
+from ..client.supervisor_client import make_supervisor_httpx_client
 from ..config import Settings, get_global_settings
 from ..utils.usage_logger import (
     AVG_LOG_ENTRIES_PER_TOOL,
@@ -349,18 +349,14 @@ async def _fetch_addon_logs() -> str:
     """
     # Redundant with the caller's `install_method == "addon"` gate, but kept
     # as a defensive guard for any direct callers added later.
-    token = os.environ.get("SUPERVISOR_TOKEN", "")
-    if not token:
+    if not os.environ.get("SUPERVISOR_TOKEN"):
         return ""
 
     try:
-        async with httpx.AsyncClient(
+        async with make_supervisor_httpx_client(
             timeout=10.0, verify=get_global_settings().verify_ssl
         ) as http_client:
-            resp = await http_client.get(
-                f"{get_supervisor_base_url()}/addons/self/logs",
-                headers={"Authorization": f"Bearer {token}"},
-            )
+            resp = await http_client.get("/addons/self/logs")
             if resp.status_code != 200:
                 logger.info("Addon log fetch returned HTTP %s", resp.status_code)
                 return ""

{ha_mcp_dev-7.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp/tools/tools_config_scenes.py

@@ -23,6 +23,7 @@ from ..errors import ErrorCode, create_error_response
 from ..utils.config_hash import compute_config_hash
 from ..utils.python_sandbox import (
     PythonSandboxError,
+    format_sandbox_error,
     get_security_documentation,
     safe_execute,
 )
@@ -572,16 +573,12 @@ class ConfigSceneTools:
                 try:
                     transformed_config = safe_execute(python_transform, actual_config)
                 except PythonSandboxError as e:
+                    message, suggestions = format_sandbox_error(e, python_transform)
                     raise_tool_error(
                         create_error_response(
                             ErrorCode.VALIDATION_FAILED,
-                            str(e),
-                            suggestions=[
-                                "Check expression syntax",
-                                "Ensure only allowed operations are used",
-                                "See tool description for allowed operations",
-                                f"Expression: {python_transform[:100]}{'...' if len(python_transform) > 100 else ''}",
-                            ],
+                            message,
+                            suggestions=suggestions,
                             context={
                                 "action": "python_transform",
                                 "scene_id": resolved_id,
@@ -656,9 +653,9 @@ class ConfigSceneTools:
                 # is the in-place equivalent of ``del`` — normalise both
                 # by checking against ``(None, resolved_id)``, so only an
                 # explicit non-None mismatch triggers the reject.
-                if (
-                    "id" in transformed_config
-                    and transformed_config["id"] not in (None, resolved_id)
+                if "id" in transformed_config and transformed_config["id"] not in (
+                    None,
+                    resolved_id,
                 ):
                     raise_tool_error(
                         create_error_response(

{ha_mcp_dev-7.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp/utils/python_sandbox.py

@@ -472,6 +472,17 @@ def format_sandbox_error(
             "See tool description for allowed operations",
             f"Expression: {preview}",
         ]
+        # Agents commonly emit ``\"`` (intending a JSON-style quote escape)
+        # inside transforms. Outside Python string literals this is a
+        # line-continuation token followed by an unexpected character.
+        # Pinpoint the actual mistake so the agent fixes it on the first
+        # retry instead of guessing at "syntax".
+        if "line continuation character" in str(error):
+            suggestions.insert(
+                0,
+                'Remove the leading backslash before quotes — write "foo" '
+                'not \\"foo\\" in the Python source.',
+            )
     if variable_name != "config":
         suggestions = [
             f"Operate on the `{variable_name}` variable (in-place or reassign)",

{ha_mcp_dev-7.4.1.dev471 → ha_mcp_dev-7.4.1.dev473/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.4.1.dev471
+Version: 7.4.1.dev473
 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.4.1.dev471 → ha_mcp_dev-7.4.1.dev473}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/ha_mcp/auth/consent_form.py
 src/ha_mcp/auth/provider.py
 src/ha_mcp/client/__init__.py
 src/ha_mcp/client/rest_client.py
+src/ha_mcp/client/supervisor_client.py
 src/ha_mcp/client/websocket_client.py
 src/ha_mcp/client/websocket_listener.py
 src/ha_mcp/resources/skills-vendor/AGENTS.md