ha-mcp-dev 7.2.0.dev348__tar.gz → 7.2.0.dev349__tar.gz

{ha_mcp_dev-7.2.0.dev348/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.2.0.dev349}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.2.0.dev348
+Version: 7.2.0.dev349
 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-87-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-86-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 (87 tools)</b></summary>
+<summary><b>Complete Tool List (86 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -177,7 +177,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Groups** | `ha_config_list_groups`, `ha_config_remove_group`, `ha_config_set_group` |
 | **HACS** | `ha_hacs_add_repository`, `ha_hacs_download`, `ha_hacs_repository_info`, `ha_hacs_search` |
 | **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema`, `ha_set_config_entry_helper` |
-| **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs`, `ha_get_statistics` |
+| **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_delete_config_entry`, `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |

{ha_mcp_dev-7.2.0.dev348 → ha_mcp_dev-7.2.0.dev349}/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-87-blue" alt="95+ Tools">
+    <img src="https://img.shields.io/badge/tools-86-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 (87 tools)</b></summary>
+<summary><b>Complete Tool List (86 tools)</b></summary>
 
 | Category | Tools |
 |----------|-------|
@@ -148,7 +148,7 @@ Spend less time configuring, more time enjoying your smart home.
 | **Groups** | `ha_config_list_groups`, `ha_config_remove_group`, `ha_config_set_group` |
 | **HACS** | `ha_hacs_add_repository`, `ha_hacs_download`, `ha_hacs_repository_info`, `ha_hacs_search` |
 | **Helper Entities** | `ha_config_list_helpers`, `ha_config_remove_helper`, `ha_config_set_helper`, `ha_get_helper_schema`, `ha_set_config_entry_helper` |
-| **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs`, `ha_get_statistics` |
+| **History & Statistics** | `ha_get_automation_traces`, `ha_get_history`, `ha_get_logs` |
 | **Integrations** | `ha_delete_config_entry`, `ha_get_integration`, `ha_set_integration_enabled` |
 | **Labels & Categories** | `ha_config_get_category`, `ha_config_get_label`, `ha_config_remove_category`, `ha_config_remove_label`, `ha_config_set_category`, `ha_config_set_label` |
 | **Scripts** | `ha_config_get_script`, `ha_config_remove_script`, `ha_config_set_script` |

{ha_mcp_dev-7.2.0.dev348 → ha_mcp_dev-7.2.0.dev349}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.2.0.dev348"
+version = "7.2.0.dev349"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.14"
@@ -133,8 +133,8 @@ ignore = [
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "tests/**/*" = ["E501", "B011"]
-# C901 ignores for unmigrated tools files (see #925).
-# Remove lines as files are migrated to class-based pattern.
+# C901 ignores for tools files with complex methods (see #925).
+# Remove lines as individual methods are simplified below threshold.
 "src/ha_mcp/tools/backup.py" = ["C901"]
 "src/ha_mcp/tools/best_practice_checker.py" = ["C901"]
 "src/ha_mcp/tools/device_control.py" = ["C901"]
@@ -142,28 +142,16 @@ ignore = [
 "src/ha_mcp/tools/registry.py" = ["C901"]
 "src/ha_mcp/tools/smart_search.py" = ["C901"]
 "src/ha_mcp/tools/tools_addons.py" = ["C901"]
-"src/ha_mcp/tools/tools_areas.py" = ["C901"]
-"src/ha_mcp/tools/tools_blueprints.py" = ["C901"]
-"src/ha_mcp/tools/tools_calendar.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_automations.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_dashboards.py" = ["C901"]
-"src/ha_mcp/tools/tools_config_entry_flow.py" = ["C901"]
 "src/ha_mcp/tools/tools_config_helpers.py" = ["C901"]
-"src/ha_mcp/tools/tools_config_scripts.py" = ["C901"]
 "src/ha_mcp/tools/tools_entities.py" = ["C901"]
 "src/ha_mcp/tools/tools_filesystem.py" = ["C901"]
-"src/ha_mcp/tools/tools_groups.py" = ["C901"]
 "src/ha_mcp/tools/tools_hacs.py" = ["C901"]
 "src/ha_mcp/tools/tools_history.py" = ["C901"]
-"src/ha_mcp/tools/tools_integrations.py" = ["C901"]
-"src/ha_mcp/tools/tools_mcp_component.py" = ["C901"]
 "src/ha_mcp/tools/tools_registry.py" = ["C901"]
 "src/ha_mcp/tools/tools_resources.py" = ["C901"]
 "src/ha_mcp/tools/tools_search.py" = ["C901"]
-"src/ha_mcp/tools/tools_service.py" = ["C901"]
-"src/ha_mcp/tools/tools_services.py" = ["C901"]
-"src/ha_mcp/tools/tools_system.py" = ["C901"]
-"src/ha_mcp/tools/tools_todo.py" = ["C901"]
 "src/ha_mcp/tools/tools_traces.py" = ["C901"]
 "src/ha_mcp/tools/tools_updates.py" = ["C901"]
 "src/ha_mcp/tools/tools_utility.py" = ["C901"]

{ha_mcp_dev-7.2.0.dev348 → ha_mcp_dev-7.2.0.dev349}/src/ha_mcp/tools/tools_areas.py

@@ -9,25 +9,130 @@ import logging
 from typing import Annotated, Any
 
 from fastmcp.exceptions import ToolError
+from fastmcp.tools import tool
 from pydantic import Field
 
 from ..errors import ErrorCode, create_error_response
-from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
+from .helpers import (
+    exception_to_structured_error,
+    log_tool_usage,
+    raise_tool_error,
+    register_tool_methods,
+)
 from .util_helpers import parse_string_list_param
 
 logger = logging.getLogger(__name__)
 
 
-def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
-    """Register Home Assistant area and floor management tools."""
+class AreaTools:
+    """Area and floor management tools for Home Assistant."""
+
+    def __init__(self, client: Any) -> None:
+        self._client = client
+
+    @staticmethod
+    def _build_area_update_message(
+        area_id: str,
+        name: str | None,
+        floor_id: str | None,
+        icon: str | None,
+        parsed_aliases: list[str] | None,
+        picture: str | None,
+    ) -> dict[str, Any]:
+        """Build a WebSocket message for updating an existing area."""
+        message: dict[str, Any] = {
+            "type": "config/area_registry/update",
+            "area_id": area_id,
+        }
+        if name is not None:
+            message["name"] = name
+        if floor_id is not None:
+            message["floor_id"] = floor_id if floor_id else None
+        if icon is not None:
+            message["icon"] = icon if icon else None
+        if parsed_aliases is not None:
+            message["aliases"] = parsed_aliases
+        if picture is not None:
+            message["picture"] = picture if picture else None
+        return message
+
+    @staticmethod
+    def _build_area_create_message(
+        name: str,
+        floor_id: str | None,
+        icon: str | None,
+        parsed_aliases: list[str] | None,
+        picture: str | None,
+    ) -> dict[str, Any]:
+        """Build a WebSocket message for creating a new area."""
+        message: dict[str, Any] = {
+            "type": "config/area_registry/create",
+            "name": name,
+        }
+        if floor_id:
+            message["floor_id"] = floor_id
+        if icon:
+            message["icon"] = icon
+        if parsed_aliases:
+            message["aliases"] = parsed_aliases
+        if picture:
+            message["picture"] = picture
+        return message
+
+    @staticmethod
+    def _build_floor_update_message(
+        floor_id: str,
+        name: str | None,
+        level: int | None,
+        icon: str | None,
+        parsed_aliases: list[str] | None,
+    ) -> dict[str, Any]:
+        """Build a WebSocket message for updating an existing floor."""
+        message: dict[str, Any] = {
+            "type": "config/floor_registry/update",
+            "floor_id": floor_id,
+        }
+        if name is not None:
+            message["name"] = name
+        if level is not None:
+            message["level"] = level
+        if icon is not None:
+            message["icon"] = icon if icon else None
+        if parsed_aliases is not None:
+            message["aliases"] = parsed_aliases
+        return message
+
+    @staticmethod
+    def _build_floor_create_message(
+        name: str,
+        level: int | None,
+        icon: str | None,
+        parsed_aliases: list[str] | None,
+    ) -> dict[str, Any]:
+        """Build a WebSocket message for creating a new floor."""
+        message: dict[str, Any] = {
+            "type": "config/floor_registry/create",
+            "name": name,
+        }
+        if level is not None:
+            message["level"] = level
+        if icon:
+            message["icon"] = icon
+        if parsed_aliases:
+            message["aliases"] = parsed_aliases
+        return message
 
     # ============================================================
     # AREA TOOLS
     # ============================================================
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"idempotentHint": True, "readOnlyHint": True, "title": "List Areas"})
+    @tool(
+        name="ha_config_list_areas",
+        tags={"Areas & Floors"},
+        annotations={"idempotentHint": True, "readOnlyHint": True, "title": "List Areas"},
+    )
     @log_tool_usage
-    async def ha_config_list_areas() -> dict[str, Any]:
+    async def ha_config_list_areas(self) -> dict[str, Any]:
         """
         List all Home Assistant areas (rooms).
 
@@ -38,7 +143,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "type": "config/area_registry/list",
             }
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 areas = result.get("result", [])
@@ -63,9 +168,14 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "Verify WebSocket connection is active",
             ])
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"destructiveHint": True, "title": "Create or Update Area"})
+    @tool(
+        name="ha_config_set_area",
+        tags={"Areas & Floors"},
+        annotations={"destructiveHint": True, "title": "Create or Update Area"},
+    )
     @log_tool_usage
     async def ha_config_set_area(
+        self,
         name: Annotated[
             str | None,
             Field(
@@ -127,27 +237,11 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             # Determine if this is a create or update operation
             if area_id:
-                # UPDATE operation
-                message: dict[str, Any] = {
-                    "type": "config/area_registry/update",
-                    "area_id": area_id,
-                }
-
-                # Only add fields that were explicitly provided
-                if name is not None:
-                    message["name"] = name
-                if floor_id is not None:
-                    message["floor_id"] = floor_id if floor_id else None
-                if icon is not None:
-                    message["icon"] = icon if icon else None
-                if parsed_aliases is not None:
-                    message["aliases"] = parsed_aliases
-                if picture is not None:
-                    message["picture"] = picture if picture else None
-
+                message = self._build_area_update_message(
+                    area_id, name, floor_id, icon, parsed_aliases, picture,
+                )
                 operation = "update"
             else:
-                # CREATE operation - name is required
                 if not name:
                     raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_MISSING_PARAMETER,
@@ -155,24 +249,12 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         context={"operation": "create_area"},
                         suggestions=["Provide a name for the new area"],
                     ))
-
-                message = {
-                    "type": "config/area_registry/create",
-                    "name": name,
-                }
-
-                if floor_id:
-                    message["floor_id"] = floor_id
-                if icon:
-                    message["icon"] = icon
-                if parsed_aliases:
-                    message["aliases"] = parsed_aliases
-                if picture:
-                    message["picture"] = picture
-
+                message = self._build_area_create_message(
+                    name, floor_id, icon, parsed_aliases, picture,
+                )
                 operation = "create"
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 area_data = result.get("result", {})
@@ -183,19 +265,19 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "area_id": area_data.get("area_id", area_id),
                     "message": f"Successfully {operation}d area: {area_name}",
                 }
-            else:
-                error = result.get("error", {})
-                error_msg = error.get("message", str(error)) if isinstance(error, dict) else str(error)
-                ctx: dict[str, Any] = {"operation": operation}
-                if name:
-                    ctx["name"] = name
-                if area_id:
-                    ctx["area_id"] = area_id
-                raise_tool_error(create_error_response(
-                    ErrorCode.SERVICE_CALL_FAILED,
-                    f"Failed to {operation} area: {error_msg}",
-                    context=ctx,
-                ))
+
+            error = result.get("error", {})
+            error_msg = error.get("message", str(error)) if isinstance(error, dict) else str(error)
+            ctx: dict[str, Any] = {"operation": operation}
+            if name:
+                ctx["name"] = name
+            if area_id:
+                ctx["area_id"] = area_id
+            raise_tool_error(create_error_response(
+                ErrorCode.SERVICE_CALL_FAILED,
+                f"Failed to {operation} area: {error_msg}",
+                context=ctx,
+            ))
 
         except ToolError:
             raise
@@ -208,9 +290,14 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "If assigning to a floor, verify floor_id exists",
             ])
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"destructiveHint": True, "idempotentHint": True, "title": "Remove Area"})
+    @tool(
+        name="ha_config_remove_area",
+        tags={"Areas & Floors"},
+        annotations={"destructiveHint": True, "idempotentHint": True, "title": "Remove Area"},
+    )
     @log_tool_usage
     async def ha_config_remove_area(
+        self,
         area_id: Annotated[
             str,
             Field(description="Area ID to delete (use ha_config_list_areas to find IDs)"),
@@ -228,7 +315,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "area_id": area_id,
             }
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 return {
@@ -258,9 +345,13 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
     # FLOOR TOOLS
     # ============================================================
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"idempotentHint": True, "readOnlyHint": True, "title": "List Floors"})
+    @tool(
+        name="ha_config_list_floors",
+        tags={"Areas & Floors"},
+        annotations={"idempotentHint": True, "readOnlyHint": True, "title": "List Floors"},
+    )
     @log_tool_usage
-    async def ha_config_list_floors() -> dict[str, Any]:
+    async def ha_config_list_floors(self) -> dict[str, Any]:
         """
         List all Home Assistant floors.
 
@@ -271,7 +362,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "type": "config/floor_registry/list",
             }
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 floors = result.get("result", [])
@@ -296,9 +387,14 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "Verify WebSocket connection is active",
             ])
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"destructiveHint": True, "title": "Create or Update Floor"})
+    @tool(
+        name="ha_config_set_floor",
+        tags={"Areas & Floors"},
+        annotations={"destructiveHint": True, "title": "Create or Update Floor"},
+    )
     @log_tool_usage
     async def ha_config_set_floor(
+        self,
         name: Annotated[
             str | None,
             Field(
@@ -353,25 +449,11 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             # Determine if this is a create or update operation
             if floor_id:
-                # UPDATE operation
-                message: dict[str, Any] = {
-                    "type": "config/floor_registry/update",
-                    "floor_id": floor_id,
-                }
-
-                # Only add fields that were explicitly provided
-                if name is not None:
-                    message["name"] = name
-                if level is not None:
-                    message["level"] = level
-                if icon is not None:
-                    message["icon"] = icon if icon else None
-                if parsed_aliases is not None:
-                    message["aliases"] = parsed_aliases
-
+                message = self._build_floor_update_message(
+                    floor_id, name, level, icon, parsed_aliases,
+                )
                 operation = "update"
             else:
-                # CREATE operation - name is required
                 if not name:
                     raise_tool_error(create_error_response(
                         ErrorCode.VALIDATION_MISSING_PARAMETER,
@@ -379,22 +461,12 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                         context={"operation": "create_floor"},
                         suggestions=["Provide a name for the new floor"],
                     ))
-
-                message = {
-                    "type": "config/floor_registry/create",
-                    "name": name,
-                }
-
-                if level is not None:
-                    message["level"] = level
-                if icon:
-                    message["icon"] = icon
-                if parsed_aliases:
-                    message["aliases"] = parsed_aliases
-
+                message = self._build_floor_create_message(
+                    name, level, icon, parsed_aliases,
+                )
                 operation = "create"
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 floor_data = result.get("result", {})
@@ -405,19 +477,19 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "floor_id": floor_data.get("floor_id", floor_id),
                     "message": f"Successfully {operation}d floor: {floor_name}",
                 }
-            else:
-                error = result.get("error", {})
-                error_msg = error.get("message", str(error)) if isinstance(error, dict) else str(error)
-                ctx: dict[str, Any] = {"operation": operation}
-                if name:
-                    ctx["name"] = name
-                if floor_id:
-                    ctx["floor_id"] = floor_id
-                raise_tool_error(create_error_response(
-                    ErrorCode.SERVICE_CALL_FAILED,
-                    f"Failed to {operation} floor: {error_msg}",
-                    context=ctx,
-                ))
+
+            error = result.get("error", {})
+            error_msg = error.get("message", str(error)) if isinstance(error, dict) else str(error)
+            ctx: dict[str, Any] = {"operation": operation}
+            if name:
+                ctx["name"] = name
+            if floor_id:
+                ctx["floor_id"] = floor_id
+            raise_tool_error(create_error_response(
+                ErrorCode.SERVICE_CALL_FAILED,
+                f"Failed to {operation} floor: {error_msg}",
+                context=ctx,
+            ))
 
         except ToolError:
             raise
@@ -429,9 +501,14 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "For update: Verify the floor_id exists using ha_config_list_floors()",
             ])
 
-    @mcp.tool(tags={"Areas & Floors"}, annotations={"destructiveHint": True, "idempotentHint": True, "title": "Remove Floor"})
+    @tool(
+        name="ha_config_remove_floor",
+        tags={"Areas & Floors"},
+        annotations={"destructiveHint": True, "idempotentHint": True, "title": "Remove Floor"},
+    )
     @log_tool_usage
     async def ha_config_remove_floor(
+        self,
         floor_id: Annotated[
             str,
             Field(description="Floor ID to delete (use ha_config_list_floors to find IDs)"),
@@ -449,7 +526,7 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "floor_id": floor_id,
             }
 
-            result = await client.send_websocket_message(message)
+            result = await self._client.send_websocket_message(message)
 
             if result.get("success"):
                 return {
@@ -474,3 +551,8 @@ def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 "Check Home Assistant connection",
                 "Verify the floor_id exists using ha_config_list_floors()",
             ])
+
+
+def register_area_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
+    """Register Home Assistant area and floor management tools."""
+    register_tool_methods(mcp, AreaTools(client))

{ha_mcp_dev-7.2.0.dev348 → ha_mcp_dev-7.2.0.dev349}/src/ha_mcp/tools/tools_blueprints.py

@@ -9,17 +9,27 @@ import logging
 from typing import Annotated, Any
 
 from fastmcp.exceptions import ToolError
+from fastmcp.tools import tool
 from pydantic import Field
 
 from ..errors import ErrorCode, create_error_response
-from .helpers import exception_to_structured_error, log_tool_usage, raise_tool_error
+from .helpers import (
+    exception_to_structured_error,
+    log_tool_usage,
+    raise_tool_error,
+    register_tool_methods,
+)
 
 logger = logging.getLogger(__name__)
 
 
-def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
-    """Register Home Assistant blueprint management tools."""
+class BlueprintTools:
+    """Blueprint management tools for Home Assistant."""
 
+    def __init__(self, client: Any) -> None:
+        self._client = client
+
+    @staticmethod
     def _format_blueprint_list(blueprints_data: dict[str, Any], domain: str) -> dict[str, Any]:
         """Format blueprint data into list response structure.
 
@@ -56,9 +66,14 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
             "blueprints": blueprints,
         }
 
-    @mcp.tool(tags={"Blueprints"}, annotations={"idempotentHint": True, "readOnlyHint": True, "title": "Get Blueprint"})
+    @tool(
+        name="ha_get_blueprint",
+        tags={"Blueprints"},
+        annotations={"idempotentHint": True, "readOnlyHint": True, "title": "Get Blueprint"},
+    )
     @log_tool_usage
     async def ha_get_blueprint(
+        self,
         path: Annotated[
             str | None,
             Field(
@@ -107,7 +122,7 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 ))
 
             # Get list of blueprints
-            list_response = await client.send_websocket_message(
+            list_response = await self._client.send_websocket_message(
                 {"type": "blueprint/list", "domain": domain}
             )
 
@@ -122,7 +137,7 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
 
             # If no path provided, return list of all blueprints
             if path is None:
-                return _format_blueprint_list(blueprints_data, domain)
+                return self._format_blueprint_list(blueprints_data, domain)
 
             # Path provided - get specific blueprint details
             if path not in blueprints_data:
@@ -183,9 +198,14 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 ],
             )
 
-    @mcp.tool(tags={"Blueprints"}, annotations={"destructiveHint": True, "title": "Import Blueprint"})
+    @tool(
+        name="ha_import_blueprint",
+        tags={"Blueprints"},
+        annotations={"destructiveHint": True, "title": "Import Blueprint"},
+    )
     @log_tool_usage
     async def ha_import_blueprint(
+        self,
         url: Annotated[
             str,
             Field(
@@ -224,7 +244,7 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 ))
 
             # Send WebSocket command to import blueprint
-            response = await client.send_websocket_message(
+            response = await self._client.send_websocket_message(
                 {"type": "blueprint/import", "url": url}
             )
 
@@ -272,7 +292,7 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                 suggested_filename = suggested_filename + ".yaml"
 
             # Save the blueprint to disk (blueprint/import only validates)
-            save_response = await client.send_websocket_message(
+            save_response = await self._client.send_websocket_message(
                 {
                     "type": "blueprint/save",
                     "domain": domain,
@@ -333,3 +353,8 @@ def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
                     "Try importing from a different source (GitHub, Community, direct URL)",
                 ],
             )
+
+
+def register_blueprint_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
+    """Register Home Assistant blueprint management tools."""
+    register_tool_methods(mcp, BlueprintTools(client))