ha-mcp-dev 7.3.0.dev379__tar.gz → 7.3.0.dev380__tar.gz

{ha_mcp_dev-7.3.0.dev379/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.3.0.dev380}/PKG-INFO

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

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

@@ -97,50 +97,44 @@ class HomeAssistantClient:
         await self.httpx_client.aclose()
         logger.debug("Closed Home Assistant client")
 
-    async def _request(self, method: str, endpoint: str, **kwargs: Any) -> dict[str, Any]:
-        """
-        Make authenticated request to Home Assistant API.
+    async def _raw_request(
+        self, method: str, endpoint: str, **kwargs: Any
+    ) -> httpx.Response:
+        """Authenticated request that returns the raw httpx.Response.
 
-        Args:
-            method: HTTP method (GET, POST, etc.)
-            endpoint: API endpoint (without /api prefix)
-            **kwargs: Additional arguments for httpx request
-
-        Returns:
-            Response data as dictionary
+        Handles auth, HTTP 4xx/5xx, and transport errors in one place.
+        Callers parse the body themselves (JSON via `_request`, text via
+        `get_addon_logs`, etc.).
 
         Raises:
-            HomeAssistantConnectionError: Connection failed
-            HomeAssistantAuthError: Authentication failed
-            HomeAssistantAPIError: API error
+            HomeAssistantAuthError: 401 response.
+            HomeAssistantAPIError: Non-2xx response (with status_code and
+                response_data set from JSON body when possible).
+            HomeAssistantConnectionError: Network, timeout, or transport error.
         """
         try:
             response = await self.httpx_client.request(method, endpoint, **kwargs)
 
-            # Handle authentication errors
             if response.status_code == 401:
                 raise HomeAssistantAuthError("Invalid authentication token")
 
-            # Handle other HTTP errors
             if response.status_code >= 400:
                 try:
                     error_data = response.json()
                 except Exception:
                     error_data = {"message": response.text}
 
+                message = error_data.get("message")
+                if not message or not message.strip():
+                    message = response.reason_phrase or "<empty body>"
+
                 raise HomeAssistantAPIError(
-                    f"API error: {response.status_code} - {error_data.get('message', 'Unknown error')}",
+                    f"API error: {response.status_code} - {message}",
                     status_code=response.status_code,
                     response_data=error_data,
                 )
 
-            # Parse JSON response
-            try:
-                result: dict[str, Any] = response.json()
-                return result
-            except json.JSONDecodeError:
-                # Some endpoints return empty responses
-                return {}
+            return response
 
         except httpx.ConnectError as e:
             raise HomeAssistantConnectionError(
@@ -151,6 +145,31 @@ class HomeAssistantClient:
         except httpx.HTTPError as e:
             raise HomeAssistantConnectionError(f"HTTP error: {e}") from e
 
+    async def _request(self, method: str, endpoint: str, **kwargs: Any) -> dict[str, Any]:
+        """
+        Make authenticated request to Home Assistant API and parse JSON body.
+
+        Args:
+            method: HTTP method (GET, POST, etc.)
+            endpoint: API endpoint (without /api prefix)
+            **kwargs: Additional arguments for httpx request
+
+        Returns:
+            Response data as dictionary
+
+        Raises:
+            HomeAssistantConnectionError: Connection failed
+            HomeAssistantAuthError: Authentication failed
+            HomeAssistantAPIError: API error
+        """
+        response = await self._raw_request(method, endpoint, **kwargs)
+        try:
+            result: dict[str, Any] = response.json()
+            return result
+        except json.JSONDecodeError:
+            # Some endpoints return empty responses
+            return {}
+
     async def get_config(self) -> dict[str, Any]:
         """Get Home Assistant configuration."""
         logger.debug("Fetching Home Assistant configuration")
@@ -367,6 +386,29 @@ class HomeAssistantClient:
         response = await self._request("GET", "/error_log")
         return response if isinstance(response, str) else str(response)
 
+    async def get_addon_logs(self, slug: str) -> str:
+        """Fetch an add-on's container logs via HA Core's Supervisor REST proxy.
+
+        Uses `/api/hassio/addons/{slug}/logs`, which HA Core proxies to
+        Supervisor and returns as `text/plain`. This avoids the
+        `supervisor/api` websocket path that tries to JSON-decode the text
+        body and always fails (see #950).
+
+        Raises:
+            HomeAssistantAuthError: 401 from HA Core.
+            HomeAssistantAPIError: Non-2xx response (e.g. 404 unknown slug,
+                400 addon not installed). `status_code` is set so callers
+                can map to specific suggestions.
+            HomeAssistantConnectionError: Network, timeout, or transport error.
+        """
+        logger.debug(f"Fetching addon logs for slug={slug}")
+        response = await self._raw_request(
+            "GET",
+            f"/hassio/addons/{slug}/logs",
+            headers={"Accept": "text/plain"},
+        )
+        return response.text
+
     async def test_connection(self) -> tuple[bool, str | None]:
         """
         Test connection to Home Assistant.

{ha_mcp_dev-7.3.0.dev379 → ha_mcp_dev-7.3.0.dev380}/src/ha_mcp/tools/tools_utility.py

@@ -182,7 +182,7 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "The 'slug' parameter is required for source='supervisor'",
                     suggestions=[
                         "Provide the add-on slug, e.g. slug='core_mosquitto'",
-                        "Use ha_list_addons() to find available add-on slugs",
+                        "Use ha_get_addon() to list installed add-on slugs",
                     ],
                 )
             )
@@ -515,53 +515,17 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         limit: int | str | None = None,
         search: str | None = None,
     ) -> dict[str, Any]:
-        """Fetch add-on container logs via the Supervisor API."""
+        """Fetch add-on container logs via HA Core's Supervisor REST proxy.
+
+        Routes through `/api/hassio/addons/{slug}/logs` (returned as
+        text/plain) instead of the `supervisor/api` websocket path, which
+        always fails because HA Core's proxy tries to JSON-decode the
+        text body. See #950.
+        """
         effective_limit = _coerce_limit(limit, default=DEFAULT_LOG_LIMIT, suggestion_example="100")
 
         try:
-            result = await client.send_websocket_message(
-                {
-                    "type": "supervisor/api",
-                    "endpoint": f"/addons/{slug}/logs",
-                    "method": "get",
-                }
-            )
-
-            if not result.get("success"):
-                error_msg = str(result.get("error", ""))
-                suggestions = [
-                    f"Verify add-on slug '{slug}' is correct",
-                    "Use ha_list_addons() to find available add-on slugs",
-                ]
-                if "not_found" in error_msg.lower() or "unknown" in error_msg.lower():
-                    suggestions.insert(
-                        0,
-                        "Supervisor API not available - requires HA OS or Supervised install",
-                    )
-                raise_tool_error(
-                    create_error_response(
-                        ErrorCode.SERVICE_CALL_FAILED,
-                        result.get(
-                            "error", f"Failed to retrieve logs for add-on '{slug}'"
-                        ),
-                        context={"slug": slug},
-                        suggestions=suggestions,
-                    )
-                )
-
-            # Result may be a string (log text) or dict with result key
-            log_text = result.get("result", "")
-            if isinstance(log_text, dict):
-                if "data" in log_text:
-                    log_text = log_text["data"]
-                else:
-                    logger.warning(
-                        "Supervisor log for '%s' returned unexpected dict structure",
-                        slug,
-                    )
-                    log_text = ""
-            if not isinstance(log_text, str):
-                log_text = str(log_text)
+            log_text = await client.get_addon_logs(slug)
 
             lines = log_text.splitlines() if log_text else []
 
@@ -594,9 +558,43 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
         except ToolError:
             raise
+        except HomeAssistantAPIError as e:
+            status = getattr(e, "status_code", None)
+            if status == 400:
+                # Supervisor-side rejection — not caller validation. The default
+                # `exception_to_structured_error` path would map 400 →
+                # VALIDATION_INVALID_PARAMETER, which reads as "caller passed
+                # bad input"; a downstream proxy rejection is better modelled
+                # as SERVICE_CALL_FAILED.
+                raise_tool_error(
+                    create_error_response(
+                        ErrorCode.SERVICE_CALL_FAILED,
+                        str(e),
+                        context={"source": "supervisor", "slug": slug},
+                        suggestions=[
+                            f"Supervisor rejected the request for '{slug}' — "
+                            "verify slug format or that the add-on is installed "
+                            "and running",
+                            "Use ha_get_addon() to list installed add-on slugs",
+                            "Ensure Supervisor is available (HA OS or Supervised install)",
+                        ],
+                    )
+                )
+            if status == 404:
+                first_suggestion = f"Add-on '{slug}' not found or not installed"
+            else:
+                first_suggestion = f"Verify add-on slug '{slug}' is correct"
+            exception_to_structured_error(
+                e,
+                context={"source": "supervisor", "slug": slug},
+                suggestions=[
+                    first_suggestion,
+                    "Use ha_get_addon() to list installed add-on slugs",
+                    "Ensure Supervisor is available (HA OS or Supervised install)",
+                ],
+            )
         except (
             HomeAssistantConnectionError,
-            HomeAssistantAPIError,
             TimeoutError,
             OSError,
         ) as e:
@@ -604,8 +602,9 @@ def register_utility_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 e,
                 context={"source": "supervisor", "slug": slug},
                 suggestions=[
+                    "Check Home Assistant connection",
                     f"Verify add-on slug '{slug}' is correct",
-                    "Use ha_list_addons() to find available add-on slugs",
+                    "Use ha_get_addon() to list installed add-on slugs",
                     "Ensure Supervisor is available (HA OS or Supervised install)",
                 ],
             )

{ha_mcp_dev-7.3.0.dev379 → ha_mcp_dev-7.3.0.dev380/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.3.0.dev379
+Version: 7.3.0.dev380
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT