ha-mcp-dev 7.1.0.dev306__tar.gz → 7.1.0.dev308__tar.gz

{ha_mcp_dev-7.1.0.dev306/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.1.0.dev308}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.1.0.dev306
+Version: 7.1.0.dev308
 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.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.1.0.dev306"
+version = "7.1.0.dev308"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -177,6 +177,7 @@ dev = [
     "lefthook>=1.10.0",
     "ruff>=0.12.12",
     "testcontainers>=4.13.0",
+    "ast-grep-cli>=0.42.0",
 ]
 
 # Semantic versioning configuration

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/src/ha_mcp/tools/tools_addons.py

@@ -87,19 +87,19 @@ async def _supervisor_api_call(
         if not result.get("success"):
             error_msg = str(result.get("error", ""))
             if "not_found" in error_msg.lower() or "unknown" in error_msg.lower():
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.RESOURCE_NOT_FOUND,
                     "Supervisor API not available",
                     details=str(result),
                     suggestions=[
                         "This feature requires Home Assistant OS or Supervised installation",
                     ],
-                )
-            return create_error_response(
+                ))
+            raise_tool_error(create_error_response(
                 ErrorCode.SERVICE_CALL_FAILED,
                 f"Supervisor API call failed: {endpoint}",
                 details=str(result),
-            )
+            ))
 
         return {"success": True, "result": result.get("result", {})}
 
@@ -107,10 +107,9 @@ async def _supervisor_api_call(
         raise
     except Exception as e:
         logger.error(f"Error calling Supervisor API {endpoint}: {e}")
-        return exception_to_structured_error(
+        exception_to_structured_error(
             e,
             context={"endpoint": endpoint},
-            raise_error=False,
             suggestions=["Check Home Assistant connection and Supervisor availability"],
         )
     finally:
@@ -311,23 +310,23 @@ async def _call_addon_ws(
     # 1. Sanitize path
     normalized = unquote(path).lstrip("/")
     if ".." in normalized.split("/"):
-        return create_validation_error(
+        raise_tool_error(create_validation_error(
             "Path contains '..' traversal component",
             parameter="path",
             details=f"Rejected path: {path}",
-        )
+        ))
 
     # 2. Get add-on info
     addon_response = await get_addon_info(client, slug)
     if not addon_response.get("success"):
-        return addon_response
+        raise_tool_error(addon_response)
 
     addon = addon_response["addon"]
     addon_name = addon.get("name", slug)
 
     # 3. Verify add-on supports Ingress (unless using direct port override)
     if not port and not addon.get("ingress"):
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.VALIDATION_FAILED,
             f"Add-on '{addon_name}' does not support Ingress",
             suggestions=[
@@ -335,37 +334,37 @@ async def _call_addon_ws(
                 f"Use ha_get_addon(slug='{slug}') to see available ports",
             ],
             context={"slug": slug},
-        )
+        ))
 
     # 4. Verify add-on is running
     if addon.get("state") != "started":
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.SERVICE_CALL_FAILED,
             f"Add-on '{addon_name}' is not running (state: {addon.get('state')})",
             suggestions=[
                 f"Start the add-on first with: ha_call_service('hassio', 'addon_start', {{'addon': '{slug}'}})",
             ],
             context={"slug": slug, "state": addon.get("state")},
-        )
+        ))
 
     # 5. Build WebSocket URL
     addon_ip = addon.get("ip_address", "")
     if port:
         if not addon_ip:
-            return create_error_response(
+            raise_tool_error(create_error_response(
                 ErrorCode.INTERNAL_ERROR,
                 f"Add-on '{addon_name}' is missing ip_address",
                 context={"slug": slug},
-            )
+            ))
         target_port = port
     else:
         ingress_port = addon.get("ingress_port")
         if not addon_ip or not ingress_port:
-            return create_error_response(
+            raise_tool_error(create_error_response(
                 ErrorCode.INTERNAL_ERROR,
                 f"Add-on '{addon_name}' is missing network info",
                 context={"slug": slug},
-            )
+            ))
         target_port = ingress_port
 
     ws_url = f"ws://{addon_ip}:{target_port}/{normalized}"
@@ -439,7 +438,7 @@ async def _call_addon_ws(
                 total_size += len(clean)
 
     except websockets.exceptions.InvalidHandshake as e:
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.SERVICE_CALL_FAILED,
             f"WebSocket handshake failed with '{addon_name}': {e!s}",
             suggestions=[
@@ -447,9 +446,9 @@ async def _call_addon_ws(
                 f"Use ha_get_addon(slug='{slug}') to inspect available endpoints",
             ],
             context={"slug": slug, "path": path},
-        )
+        ))
     except websockets.exceptions.ConnectionClosed as e:
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.SERVICE_CALL_FAILED,
             f"WebSocket connection to '{addon_name}' closed unexpectedly: {e!s}",
             suggestions=[
@@ -457,20 +456,20 @@ async def _call_addon_ws(
                 "Try again or check add-on logs for errors",
             ],
             context={"slug": slug, "path": path},
-        )
+        ))
     except TimeoutError:
-        return create_timeout_error(
+        raise_tool_error(create_timeout_error(
             f"WebSocket connection to '{addon_name}'",
             timeout,
             details=f"path={path}",
             context={"slug": slug, "path": path},
-        )
+        ))
     except OSError as e:
-        return create_connection_error(
+        raise_tool_error(create_connection_error(
             f"Failed to connect to add-on '{addon_name}' WebSocket: {e!s}",
             details="Check that the add-on is running and the port is correct",
             context={"slug": slug},
-        )
+        ))
 
     elapsed = round(time.monotonic() - start_time, 2)
 
@@ -554,23 +553,23 @@ async def _call_addon_api(
     # 1. Sanitize path to prevent traversal attacks (including URL-encoded)
     normalized = unquote(path).lstrip("/")
     if ".." in normalized.split("/"):
-        return create_validation_error(
+        raise_tool_error(create_validation_error(
             "Path contains '..' traversal component",
             parameter="path",
             details=f"Rejected path: {path}",
-        )
+        ))
 
     # 2. Get add-on info to verify ingress support and get entry path
     addon_response = await get_addon_info(client, slug)
     if not addon_response.get("success"):
-        return addon_response
+        raise_tool_error(addon_response)
 
     addon = addon_response["addon"]
     addon_name = addon.get("name", slug)
 
     # 3. Verify add-on supports Ingress (unless using direct port override)
     if not port and not addon.get("ingress"):
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.VALIDATION_FAILED,
             f"Add-on '{addon_name}' does not support Ingress",
             suggestions=[
@@ -579,18 +578,18 @@ async def _call_addon_api(
                 "Use the 'port' parameter to connect to a direct access port",
             ],
             context={"slug": slug},
-        )
+        ))
 
     # 4. Verify add-on is running
     if addon.get("state") != "started":
-        return create_error_response(
+        raise_tool_error(create_error_response(
             ErrorCode.SERVICE_CALL_FAILED,
             f"Add-on '{addon_name}' is not running (state: {addon.get('state')})",
             suggestions=[
                 f"Start the add-on first with: ha_call_service('hassio', 'addon_start', {{'addon': '{slug}'}})",
             ],
             context={"slug": slug, "state": addon.get("state")},
-        )
+        ))
 
     # 5. Build URL to the add-on container
     addon_ip = addon.get("ip_address", "")
@@ -600,21 +599,21 @@ async def _call_addon_api(
         # (e.g., 1880 for Node-RED, 6052 for ESPHome) instead of the ingress port.
         # Requires 'leave_front_door_open' or equivalent setting on the add-on.
         if not addon_ip:
-            return create_error_response(
+            raise_tool_error(create_error_response(
                 ErrorCode.INTERNAL_ERROR,
                 f"Add-on '{addon_name}' is missing ip_address",
                 context={"slug": slug, "ip_address": addon_ip},
-            )
+            ))
         target_port = port
     else:
         # Default: use the ingress port for direct container communication
         ingress_port = addon.get("ingress_port")
         if not addon_ip or not ingress_port:
-            return create_error_response(
+            raise_tool_error(create_error_response(
                 ErrorCode.INTERNAL_ERROR,
                 f"Add-on '{addon_name}' is missing network info (ip_address or ingress_port)",
                 context={"slug": slug, "ip_address": addon_ip, "ingress_port": ingress_port},
-            )
+            ))
         target_port = ingress_port
 
     url = f"http://{addon_ip}:{target_port}/{normalized}"
@@ -648,18 +647,18 @@ async def _call_addon_api(
                 content=request_content,
             )
     except httpx.TimeoutException:
-        return create_timeout_error(
+        raise_tool_error(create_timeout_error(
             f"add-on API call to '{addon_name}'",
             timeout,
             details=f"path={path}, method={method}",
             context={"slug": slug, "path": path},
-        )
+        ))
     except httpx.ConnectError as e:
-        return create_connection_error(
+        raise_tool_error(create_connection_error(
             f"Failed to connect to add-on '{addon_name}': {e!s}",
             details="Check that the add-on is running and Home Assistant Ingress is working",
             context={"slug": slug},
-        )
+        ))
 
     # 7. Parse response
     content_type = response.headers.get("content-type", "")

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -1057,14 +1057,14 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
                     break
 
             if resolved_id is None:
-                return create_resource_not_found_error(
+                raise_tool_error(create_resource_not_found_error(
                     "Dashboard",
                     dashboard_id,
                     details=(
                         f"No dashboard found with ID or URL path '{dashboard_id}'. "
                         "Use ha_config_get_dashboard(list_only=True) to see available dashboards."
                     ),
-                )
+                ))
 
             response = await client.send_websocket_message(
                 {"type": "lovelace/dashboards/delete", "dashboard_id": resolved_id}
@@ -1121,10 +1121,9 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
             raise
         except Exception as e:
             logger.error(f"Error deleting dashboard: {e}")
-            return exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"action": "delete", "dashboard_id": dashboard_id},
-                raise_error=False,
                 suggestions=[
                     "Verify dashboard exists and is storage-mode",
                     "Check that you have admin permissions",

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/src/ha_mcp/tools/tools_entities.py

@@ -117,10 +117,10 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             try:
                 enabled_bool = coerce_bool_param(enabled, "enabled")
             except ValueError as e:
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.VALIDATION_INVALID_PARAMETER,
                     str(e),
-                )
+                ))
             message["disabled_by"] = None if enabled_bool else "user"
             updates_made.append("enabled" if enabled_bool else "disabled")
 
@@ -128,10 +128,10 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             try:
                 hidden_bool = coerce_bool_param(hidden, "hidden")
             except ValueError as e:
-                return create_error_response(
+                raise_tool_error(create_error_response(
                     ErrorCode.VALIDATION_INVALID_PARAMETER,
                     str(e),
-                )
+                ))
             message["hidden_by"] = "user" if hidden_bool else None
             updates_made.append("hidden" if hidden_bool else "visible")
 

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/src/ha_mcp/tools/tools_resources.py

@@ -544,14 +544,14 @@ def register_resources_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     error_str = str(error_msg)
 
                 if "not found" in error_str.lower() or "unable to find" in error_str.lower():
-                    return create_resource_not_found_error(
+                    raise_tool_error(create_resource_not_found_error(
                         "Dashboard resource",
                         resource_id,
                         details=(
                             f"Resource '{resource_id}' not found. "
                             "Use ha_config_list_dashboard_resources() to see available resources."
                         ),
-                    )
+                    ))
 
                 raise_tool_error(create_error_response(
                     code=ErrorCode.SERVICE_CALL_FAILED,
@@ -575,10 +575,9 @@ def register_resources_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             raise
         except Exception as e:
             logger.error(f"Error deleting dashboard resource: {e}")
-            return exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"action": "delete", "resource_id": resource_id},
-                raise_error=False,
                 suggestions=[
                     "Verify resource ID using ha_config_list_dashboard_resources()",
                     "Check that you have admin permissions",

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308}/src/ha_mcp/tools/tools_search.py

@@ -8,12 +8,13 @@ import asyncio
 import logging
 from typing import Annotated, Any, Literal, cast
 
+from fastmcp.exceptions import ToolError
 from pydantic import Field
 
 from ..config import get_global_settings
 from ..errors import create_validation_error
 from ..transforms.categorized_search import DEFAULT_PINNED_TOOLS
-from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
+from .helpers import exception_to_structured_error, log_tool_usage
 from .util_helpers import (
     add_timezone_metadata,
     coerce_bool_param,
@@ -475,23 +476,22 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             return await add_timezone_metadata(client, result)
 
+        except ToolError:
+            raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={
                     "query": query,
                     "domain_filter": domain_filter,
                     "area_filter": area_filter,
                 },
-                raise_error=False,
                 suggestions=[
                     "Check Home Assistant connection",
                     "Try simpler search terms",
                     "Check area/domain filter spelling",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         tags={"Search & Discovery"},
@@ -737,6 +737,8 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 exact_match=exact_match_bool,
             )
             return cast(dict[str, Any], result)
+        except ToolError:
+            raise
         except Exception as e:
             logger.error(
                 f"Error in deep search: query={query}, "
@@ -744,14 +746,13 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 f"error={e}",
                 exc_info=True,
             )
-            return exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={
                     "query": query,
                     "search_types": parsed_search_types,
                     "limit": limit,
                 },
-                raise_error=False,
                 suggestions=[
                     "Check Home Assistant connection",
                     "Try simpler search terms",
@@ -772,19 +773,18 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         try:
             result = await client.get_entity_state(entity_id)
             return await add_timezone_metadata(client, result)
+        except ToolError:
+            raise
         except Exception as e:
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"entity_id": entity_id},
-                raise_error=False,
                 suggestions=[
                     f"Verify entity '{entity_id}' exists in Home Assistant",
                     "Check Home Assistant connection",
                     "Use ha_search_entities() to find correct entity IDs",
                 ],
             )
-            error_with_tz = await add_timezone_metadata(client, error_response)
-            raise_tool_error(error_with_tz)
 
     @mcp.tool(
         tags={"Search & Discovery"},
@@ -867,6 +867,7 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     return {"success": True, "entity_id": entity_id, "state": state}
                 except Exception as e:
                     logger.warning(f"Failed to fetch state for '{entity_id}': {e}")
+                    # ast-grep-ignore — batch item failure, aggregated via asyncio.gather
                     return exception_to_structured_error(
                         e,
                         context={"entity_id": entity_id},
@@ -913,11 +914,11 @@ def register_search_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             return await add_timezone_metadata(client, response)
 
+        except ToolError:
+            raise
         except Exception as e:
             logger.error(f"Error getting bulk states: {e}", exc_info=True)
-            error_response = exception_to_structured_error(
+            exception_to_structured_error(
                 e,
                 context={"entity_ids": entity_ids},
-                raise_error=False,
             )
-            return await add_timezone_metadata(client, error_response)

{ha_mcp_dev-7.1.0.dev306 → ha_mcp_dev-7.1.0.dev308/src/ha_mcp_dev.egg-info}/PKG-INFO

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