ha-mcp-dev 7.2.0.dev331__tar.gz → 7.2.0.dev332__tar.gz

{ha_mcp_dev-7.2.0.dev331/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.2.0.dev332}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.2.0.dev331
+Version: 7.2.0.dev332
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -37,7 +37,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-93-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-91-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -160,7 +160,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (93 tools)</b></summary>
+<summary><b>Complete Tool List (91 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|

{ha_mcp_dev-7.2.0.dev331 → ha_mcp_dev-7.2.0.dev332}/README.md

@@ -8,7 +8,7 @@
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-93-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-91-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -131,7 +131,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (93 tools)</b></summary>
+<summary><b>Complete Tool List (91 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|

{ha_mcp_dev-7.2.0.dev331 → ha_mcp_dev-7.2.0.dev332}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.2.0.dev331"
+version = "7.2.0.dev332"
 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.2.0.dev331 → ha_mcp_dev-7.2.0.dev332}/src/ha_mcp/tools/backup.py

@@ -51,7 +51,7 @@ def _get_backup_hint_text() -> str:
 
 async def _get_backup_password(
     ws_client: HomeAssistantWebSocketClient,
-) -> tuple[str | None, dict[str, Any] | None]:
+) -> str:
     """
     Retrieve default backup password from Home Assistant configuration.
 
@@ -59,27 +59,30 @@ async def _get_backup_password(
         ws_client: Connected WebSocket client
 
     Returns:
-        Tuple of (password, error_dict). If retrieval fails, password is None.
+        The backup password string.
+
+    Raises:
+        ToolError: If backup config cannot be retrieved or no password is configured.
     """
     backup_config = await ws_client.send_command("backup/config/info")
     if not backup_config.get("success"):
-        return None, {
-            "success": False,
-            "error": "Failed to retrieve backup configuration",
-            "details": backup_config,
-        }
+        raise_tool_error(create_error_response(
+            ErrorCode.SERVICE_CALL_FAILED,
+            "Failed to retrieve backup configuration",
+            context={"details": backup_config},
+        ))
 
     config_data = backup_config.get("result", {}).get("config", {})
     default_password = config_data.get("create_backup", {}).get("password")
 
     if not default_password:
-        return None, {
-            "success": False,
-            "error": "No default backup password configured in Home Assistant",
-            "suggestion": "Configure automatic backups in Home Assistant settings to set a default password",
-        }
+        raise_tool_error(create_error_response(
+            ErrorCode.SERVICE_CALL_FAILED,
+            "No default backup password configured in Home Assistant",
+            suggestions=["Configure automatic backups in Home Assistant settings to set a default password"],
+        ))
 
-    return default_password, None
+    return cast(str, default_password)
 
 
 async def create_backup(
@@ -107,13 +110,8 @@ async def create_backup(
             ))
         ws_client = cast(HomeAssistantWebSocketClient, ws_client)
 
-        # Get backup password
-        password, error = await _get_backup_password(ws_client)
-        if error:
-            raise_tool_error(create_error_response(
-                ErrorCode.SERVICE_CALL_FAILED,
-                error.get("error", "Failed to retrieve backup password"),
-            ))
+        # Get backup password (raises ToolError on failure)
+        password = await _get_backup_password(ws_client)
 
         # Generate backup name if not provided
         if not name:
@@ -283,12 +281,15 @@ async def restore_backup(
         safety_backup_name = f"PreRestore_Safety_{now.strftime('%Y-%m-%d_%H:%M:%S')}"
 
         # Get backup password
-        password, error = await _get_backup_password(ws_client)
-        if error:
+        try:
+            password = await _get_backup_password(ws_client)
+        except ToolError:
             # Password error - log warning but continue (restore might still work)
             logger.warning("No default password - proceeding without safety backup")
+            password = None
             safety_backup_id = None
-        else:
+
+        if password is not None:
             safety_backup = await ws_client.send_command(
                 "backup/generate",
                 name=safety_backup_name,

{ha_mcp_dev-7.2.0.dev331 → ha_mcp_dev-7.2.0.dev332}/src/ha_mcp/tools/device_control.py

@@ -421,38 +421,40 @@ class DeviceControlTools:
             }
 
         elif operation.status.value == "failed":
-            return {
-                "operation_id": operation_id,
-                "status": "failed",
-                "success": False,
-                "entity_id": operation.entity_id,
-                "action": operation.action,
-                "error": operation.error_message,
-                "duration_ms": operation.duration_ms,
-                "suggestions": [
+            raise_tool_error(create_error_response(
+                ErrorCode.SERVICE_CALL_FAILED,
+                operation.error_message or "Device operation failed",
+                context={
+                    "operation_id": operation_id,
+                    "entity_id": operation.entity_id,
+                    "action": operation.action,
+                    "duration_ms": operation.duration_ms,
+                },
+                suggestions=[
                     "Check if device is available and responding",
                     "Verify device supports the requested action",
                     "Check Home Assistant logs for error details",
                     "Try a simpler action like toggle",
                 ],
-            }
+            ))
 
         elif operation.status.value == "timeout":
-            return {
-                "operation_id": operation_id,
-                "status": "timeout",
-                "success": False,
-                "entity_id": operation.entity_id,
-                "action": operation.action,
-                "error": f"Operation timed out after {operation.timeout_ms}ms",
-                "elapsed_ms": operation.elapsed_ms,
-                "suggestions": [
+            raise_tool_error(create_error_response(
+                ErrorCode.TIMEOUT_OPERATION,
+                f"Operation timed out after {operation.timeout_ms}ms",
+                context={
+                    "operation_id": operation_id,
+                    "entity_id": operation.entity_id,
+                    "action": operation.action,
+                    "elapsed_ms": operation.elapsed_ms,
+                },
+                suggestions=[
                     "Device may be slow to respond or offline",
                     "Check device connectivity",
                     "Try increasing timeout for slow devices",
                     "Verify device is powered on",
                 ],
-            }
+            ))
 
         else:  # pending
             return {

{ha_mcp_dev-7.2.0.dev331 → ha_mcp_dev-7.2.0.dev332}/src/ha_mcp/tools/tools_entities.py

@@ -240,21 +240,20 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         else str(error)
                     )
                     failed = dict.fromkeys(assistants, should_expose)
-                    response: dict[str, Any] = {
-                        "success": False,
-                        "error": {
-                            "code": ErrorCode.SERVICE_CALL_FAILED.value,
-                            "message": f"Exposure failed: {error_msg}",
-                            "suggestion": "Check Home Assistant connection and entity availability",
-                        },
+                    context: dict[str, Any] = {
                         "entity_id": entity_id,
                         "exposure_succeeded": succeeded,
                         "exposure_failed": failed,
                     }
                     if has_registry_updates:
-                        response["partial"] = True
-                        response["entity_entry"] = _format_entity_entry(entity_entry)
-                    return response
+                        context["partial"] = True
+                        context["entity_entry"] = _format_entity_entry(entity_entry)
+                    raise_tool_error(create_error_response(
+                        ErrorCode.SERVICE_CALL_FAILED,
+                        f"Exposure failed: {error_msg}",
+                        context=context,
+                        suggestions=["Check Home Assistant connection and entity availability"],
+                    ))
 
                 # Track successful exposures
                 for a in assistants:
@@ -272,21 +271,15 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             if get_result.get("success"):
                 entity_entry = get_result.get("result", {})
             else:
-                # Return plain dict so caller can inspect exposure_succeeded
-                return {
-                    "success": False,
-                    "error": {
-                        "code": ErrorCode.ENTITY_NOT_FOUND.value,
-                        "message": f"Entity '{entity_id}' not found in registry after applying exposure changes",
-                        "suggestion": "Use ha_search_entities() to verify the entity exists",
-                    },
-                    "entity_id": entity_id,
-                    "suggestions": [
+                raise_tool_error(create_error_response(
+                    ErrorCode.ENTITY_NOT_FOUND,
+                    f"Entity '{entity_id}' not found in registry after applying exposure changes",
+                    context={"entity_id": entity_id, "exposure_succeeded": exposure_result},
+                    suggestions=[
                         "Verify the entity_id exists using ha_search_entities()",
                         "The entity's exposure settings were likely changed, but its current state could not be confirmed.",
                     ],
-                    "exposure_succeeded": exposure_result,
-                }
+                ))
 
         response_data: dict[str, Any] = {
             "success": True,
@@ -831,15 +824,10 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         if isinstance(error, dict)
                         else str(error)
                     )
-                    return {
-                        "success": False,
-                        "entity_id": eid,
-                        "error": error_msg,
-                    }
+                    raise ValueError(error_msg)
 
                 entry = result.get("result", {})
                 return {
-                    "success": True,
                     "entity_id": entry.get("entity_id"),
                     "name": entry.get("name"),
                     "original_name": entry.get("original_name"),
@@ -861,21 +849,13 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             if not is_bulk:
                 eid = entity_ids[0]
                 logger.info(f"Getting entity registry entry for {eid}")
-                result = await _fetch_entity(eid)
-
-                if result.get("success"):
-                    return {
-                        "success": True,
-                        "entity_id": eid,
-                        "entity_entry": {
-                            k: v for k, v in result.items() if k not in ("success",)
-                        },
-                    }
-                else:
+                try:
+                    result = await _fetch_entity(eid)
+                except ValueError as e:
                     raise_tool_error(
                         create_error_response(
                             ErrorCode.SERVICE_CALL_FAILED,
-                            f"Entity not found: {result.get('error', 'Unknown error')}",
+                            f"Entity not found: {e}",
                             context={"entity_id": eid},
                             suggestions=[
                                 "Use ha_search_entities() to find valid entity IDs",
@@ -883,6 +863,11 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                             ],
                         )
                     )
+                return {
+                    "success": True,
+                    "entity_id": eid,
+                    "entity_entry": result,
+                }
 
             # Bulk case - fetch all entities
             logger.info(
@@ -904,18 +889,8 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                             "error": str(fetch_result),
                         }
                     )
-                    continue
-                if fetch_result.get("success"):
-                    entity_entries.append(
-                        {k: v for k, v in fetch_result.items() if k not in ("success",)}
-                    )
                 else:
-                    errors.append(
-                        {
-                            "entity_id": eid,
-                            "error": fetch_result.get("error", "Unknown error"),
-                        }
-                    )
+                    entity_entries.append(fetch_result)
 
             response: dict[str, Any] = {
                 "success": True,

{ha_mcp_dev-7.2.0.dev331 → ha_mcp_dev-7.2.0.dev332/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.2.0.dev331
+Version: 7.2.0.dev332
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Author-email: Julien <github@qc-h.net>
 License: MIT
@@ -37,7 +37,7 @@ Dynamic: license-file
   <!-- mcp-name: io.github.homeassistant-ai/ha-mcp -->
 
   <p align="center">
-    <img src="https://img.shields.io/badge/tools-93-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-91-blue" alt="95+ Tools">
     <a href="https://github.com/homeassistant-ai/ha-mcp/releases"><img src="https://img.shields.io/github/v/release/homeassistant-ai/ha-mcp" alt="Release"></a>
     <a href="https://github.com/homeassistant-ai/ha-mcp/actions/workflows/e2e-tests.yml"><img src="https://img.shields.io/github/actions/workflow/status/homeassistant-ai/ha-mcp/e2e-tests.yml?branch=master&label=E2E%20Tests" alt="E2E Tests"></a>
     <a href="LICENSE.md"><img src="https://img.shields.io/github/license/homeassistant-ai/ha-mcp.svg" alt="License"></a>
@@ -160,7 +160,7 @@ Spend less time configuring, more time enjoying your smart home.
 <details>
 <!-- TOOLS_TABLE_START -->
 
-<summary><b>Complete Tool List (93 tools)</b></summary>
+<summary><b>Complete Tool List (91 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|