ha-mcp-dev 7.2.0.dev331__py3-none-any.whl → 7.2.0.dev332__py3-none-any.whl

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/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/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.dist-info → ha_mcp_dev-7.2.0.dev332.dist-info}/METADATA

@@ -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.dist-info → ha_mcp_dev-7.2.0.dev332.dist-info}/RECORD

@@ -34,9 +34,9 @@ ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/h
 ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/safe-refactoring.md,sha256=RVkY-J-ZrBDDD3INHwbbkkPocukDgNg8eOuApswRlqk,8014
 ha_mcp/resources/skills-vendor/skills/home-assistant-best-practices/references/template-guidelines.md,sha256=rrcM8KrJ0hZw1jd4PPsVnE4rTFnsA1uA7SgltVjewkw,17856
 ha_mcp/tools/__init__.py,sha256=79ML0aicKZ5WJQn47eTPaeQntJZe1Mzt30E31_v6tXU,334
-ha_mcp/tools/backup.py,sha256=uFtzT9qM3FXt07egRbxs31uTB7-ZtfAVWPacoy-9FyQ,18395
+ha_mcp/tools/backup.py,sha256=QN0ZhLke1ItivS0ykJV74WAtsiirPduZfhIMXW4pfJc,18372
 ha_mcp/tools/best_practice_checker.py,sha256=wyeeB5L3wPFG11VX6acg7F0fz6ISbgK-5wrUhxntIPE,14576
-ha_mcp/tools/device_control.py,sha256=4PoeMyV7L1C1DirDpVxgpgjyCcaI-I2bsJJCGFzgGWA,28444
+ha_mcp/tools/device_control.py,sha256=8vI7LqcbNeJi-j4pA0GCUMOKPy8mD90IDYbEAy38_ok,28586
 ha_mcp/tools/enhanced.py,sha256=plvrTJmuAJ-55M0yznEq1Vv5TFDl_2FgegTYK7RaLC8,6668
 ha_mcp/tools/helpers.py,sha256=GveFEr0UPmnGwv18gHTkzPenrOOYtr8PT8EF8b4mmus,9504
 ha_mcp/tools/registry.py,sha256=LDU17zgJCgrlsv-yoBHm6TxAvkfnGoIdYsWfzLTmhGs,7718
@@ -53,7 +53,7 @@ ha_mcp/tools/tools_config_dashboards.py,sha256=3eQKQI-x7ESEBpVdIztp6YCZhWGl26Plj
 ha_mcp/tools/tools_config_entry_flow.py,sha256=AlDGCQxCWZPRTEyee3ak-KeDzlQM83AFNYAi-D7tS4I,21065
 ha_mcp/tools/tools_config_helpers.py,sha256=7CHDyCBsKkArZRDBf9hsNlszTGcW3bqIBOyyucBXahg,55094
 ha_mcp/tools/tools_config_scripts.py,sha256=92CJmlx5u2IQCrIPXnqIjpvDLvAbmAmWQ4EY3oGLA_A,16218
-ha_mcp/tools/tools_entities.py,sha256=aPDqXCO5EidqyIU6OTtF-X7aqNyVimwvhWm1oOpHL28,43542
+ha_mcp/tools/tools_entities.py,sha256=EgnR95p8SZatCKW4oFyhbDiIVvMte81qycZuJi_sVl4,42469
 ha_mcp/tools/tools_filesystem.py,sha256=-ZEOPD7Q4_4ULoxg2Cye8vJkdCUESHUhn1-bUHi_1_g,17846
 ha_mcp/tools/tools_groups.py,sha256=OQe3BHD8L86IAov-B6tDBkEJZIFq5p8_VmpkbfYKJ0k,14283
 ha_mcp/tools/tools_hacs.py,sha256=YHDwb2YzBbJLajNrfsQC-UpRjGNbQ9jOmd2lzB0aGjk,27168
@@ -83,12 +83,12 @@ ha_mcp/utils/fuzzy_search.py,sha256=bvT1wnGVVb2q2a4GtAnXK4uSLRU8wfGZBeGVf6CQhR0,
 ha_mcp/utils/operation_manager.py,sha256=1ETI_L2TFNhnJUUJwtuH4R0s6ZP3_rscIOfdehYSmkU,14266
 ha_mcp/utils/python_sandbox.py,sha256=mVBrBR1caQksXso3voUw2YlqY2OQJDXkt3EAZpasE0M,7488
 ha_mcp/utils/usage_logger.py,sha256=ZXbr3vHV2WT7IozrEnuNCulKt3wLXDUJI1dxaBVq0kQ,9294
-ha_mcp_dev-7.2.0.dev331.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
+ha_mcp_dev-7.2.0.dev332.dist-info/licenses/LICENSE,sha256=7rJXXKBJWgJF8595wk-YTxwVTEi1kQaIqyy9dh5o_oY,1062
 tests/__init__.py,sha256=YRpec-ZFYCJ48oD_7ZcNY7dB8avoTWOrZICjaM-BYJ0,39
 tests/test_constants.py,sha256=F14Pf5QMzG77RhsecaNWWaEL-B_8ykHJLIvVMcJxT8M,609
 tests/test_env_manager.py,sha256=wEYSfwmkga9IPanzVkSo03fsY77KVw71zJG5S7Kkdr8,12045
-ha_mcp_dev-7.2.0.dev331.dist-info/METADATA,sha256=dd9VPXxete5DamDBJGKgfc99YaDXgTw13h-PfPT-V3k,18573
-ha_mcp_dev-7.2.0.dev331.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-ha_mcp_dev-7.2.0.dev331.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
-ha_mcp_dev-7.2.0.dev331.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
-ha_mcp_dev-7.2.0.dev331.dist-info/RECORD,,
+ha_mcp_dev-7.2.0.dev332.dist-info/METADATA,sha256=IapaC2pCw7BgQNDcf5JIyR65aCI3yHH1rcAVAvFMOSM,18573
+ha_mcp_dev-7.2.0.dev332.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+ha_mcp_dev-7.2.0.dev332.dist-info/entry_points.txt,sha256=ckO8PIrfV4-YQEyjqgO8wIzcQiMFTTJNWKZLyRtFpms,292
+ha_mcp_dev-7.2.0.dev332.dist-info/top_level.txt,sha256=cqJLEmgh4gQBKg_vBqj0ahS4DCg4J0qBXYgZCDQ2IWs,13
+ha_mcp_dev-7.2.0.dev332.dist-info/RECORD,,