ha-mcp-dev 7.6.0.dev623__tar.gz → 7.6.0.dev625__tar.gz

{ha_mcp_dev-7.6.0.dev623/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.6.0.dev625}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev623
+Version: 7.6.0.dev625
 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.6.0.dev623 → ha_mcp_dev-7.6.0.dev625}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.6.0.dev623"
+version = "7.6.0.dev625"
 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.6.0.dev623 → ha_mcp_dev-7.6.0.dev625}/src/ha_mcp/server.py

@@ -190,6 +190,12 @@ class HomeAssistantSmartMCPServer(EnhancedToolsMixin):
         # the skill guide tool are registered so it can wrap everything)
         self._apply_tool_search()
 
+        # Convert Pydantic type-validation errors to structured ToolErrors so
+        # models get actionable guidance instead of raw Pydantic messages.
+        from .tools.validation_middleware import ValidationErrorMiddleware
+
+        self.mcp.add_middleware(ValidationErrorMiddleware())
+
         # Wire tool security policies middleware (#966) — opt-in via
         # ENABLE_TOOL_SECURITY_POLICIES. Must come last so the middleware
         # wraps the final tool surface (including the search proxies).

{ha_mcp_dev-7.6.0.dev623 → ha_mcp_dev-7.6.0.dev625}/src/ha_mcp/tools/tools_service.py

@@ -572,14 +572,15 @@ class ServiceTools:
     @log_tool_usage
     async def ha_bulk_control(
         self,
-        operations: str | list[dict[str, Any]],
+        operations: list[dict[str, Any]],
         parallel: bool = True,
         ctx: Context | None = None,
     ) -> dict[str, Any]:
         """Control multiple devices with bulk operation support and WebSocket tracking."""
         parallel_bool = parallel
 
-        # Parse JSON operations if provided as string
+        # FastMCP validates operations as list[dict] before this runs.
+        # parse_json_param is kept as a defensive passthrough for the list case.
         try:
             parsed_operations = parse_json_param(operations, "operations")
         except ValueError as e:
@@ -591,8 +592,7 @@ class ServiceTools:
                 )
             )
 
-        # Ensure operations is a list of dicts
-        if parsed_operations is None or not isinstance(parsed_operations, list):
+        if not isinstance(parsed_operations, list):
             raise_tool_error(
                 create_validation_error(
                     "Operations parameter must be a list",

ha_mcp_dev-7.6.0.dev625/src/ha_mcp/tools/validation_middleware.py

@@ -0,0 +1,57 @@
+"""FastMCP middleware that converts Pydantic validation errors to structured ToolErrors.
+
+When a model passes the wrong type for a tool parameter (e.g. a JSON string where
+a dict is required), FastMCP raises a PydanticValidationError with a raw message
+like "Input should be a valid dictionary". This middleware intercepts those errors
+and converts them to ha-mcp's structured format with actionable guidance.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from fastmcp.server.middleware.middleware import CallNext, Middleware, MiddlewareContext
+from pydantic import ValidationError as PydanticValidationError
+
+from ..errors import create_validation_error
+from .helpers import raise_tool_error
+
+logger = logging.getLogger(__name__)
+
+# Maps Pydantic error types to model-readable fix hints.
+# FastMCP uses non-strict Pydantic: scalar mismatches (bool, int) are coerced
+# rather than rejected, so only dict_type and list_type fire in practice.
+_TYPE_HINTS: dict[str, str] = {
+    "dict_type": (
+        "expected a JSON object. "
+        'Pass {"key": "value"} directly, not a JSON-encoded string.'
+    ),
+    "list_type": (
+        "expected a JSON array. Pass [...] directly, not a JSON-encoded string."
+    ),
+}
+
+
+class ValidationErrorMiddleware(Middleware):
+    """Convert PydanticValidationError from argument validation into ToolErrors."""
+
+    async def on_call_tool(
+        self, context: MiddlewareContext, call_next: CallNext
+    ) -> Any:
+        try:
+            return await call_next(context)
+        except PydanticValidationError as exc:
+            errors = exc.errors(include_url=False)
+            parts: list[str] = []
+            for err in errors:
+                loc = err.get("loc", ())
+                param = ".".join(str(p) for p in loc if p != "__root__")
+                hint = _TYPE_HINTS.get(err["type"], err["msg"])
+                parts.append(f"`{param}`: {hint}" if param else hint)
+            raise_tool_error(
+                create_validation_error(
+                    "; ".join(parts) if parts else "Invalid argument types.",
+                    details=", ".join(err["type"] for err in errors),
+                )
+            )

{ha_mcp_dev-7.6.0.dev623 → ha_mcp_dev-7.6.0.dev625/src/ha_mcp_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.6.0.dev623
+Version: 7.6.0.dev625
 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.6.0.dev623 → ha_mcp_dev-7.6.0.dev625}/src/ha_mcp_dev.egg-info/SOURCES.txt

@@ -99,6 +99,7 @@ src/ha_mcp/tools/tools_voice_assistant.py
 src/ha_mcp/tools/tools_yaml_config.py
 src/ha_mcp/tools/tools_zones.py
 src/ha_mcp/tools/util_helpers.py
+src/ha_mcp/tools/validation_middleware.py
 src/ha_mcp/transforms/__init__.py
 src/ha_mcp/transforms/categorized_search.py
 src/ha_mcp/transforms/lite_docstrings.py