ha-mcp-dev 7.9.0.dev768__tar.gz → 7.9.0.dev769__tar.gz

{ha_mcp_dev-7.9.0.dev768/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.9.0.dev769}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.9.0.dev768
+Version: 7.9.0.dev769
 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.9.0.dev768 → ha_mcp_dev-7.9.0.dev769}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.9.0.dev768"
+version = "7.9.0.dev769"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 # Upper bound widened to <3.15 so the package installs on Home Assistant's

{ha_mcp_dev-7.9.0.dev768 → ha_mcp_dev-7.9.0.dev769}/src/ha_mcp/tools/validation_middleware.py

@@ -1,9 +1,11 @@
 """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.
+a dict is required), FastMCP surfaces a validation error with a raw message like
+"Input should be a valid dictionary" -- a bare ``pydantic.ValidationError`` on
+older FastMCP, or a ``fastmcp.exceptions.ValidationError`` wrapping it (chained
+via ``from e``) on FastMCP >= 3.4.3. This middleware intercepts either shape and
+converts it to ha-mcp's structured format with actionable guidance.
 """
 
 from __future__ import annotations
@@ -11,6 +13,7 @@ from __future__ import annotations
 import logging
 from typing import Any
 
+from fastmcp.exceptions import ValidationError as FastMCPValidationError
 from fastmcp.server.middleware.middleware import CallNext, Middleware, MiddlewareContext
 from pydantic import ValidationError as PydanticValidationError
 
@@ -40,9 +43,20 @@ class ValidationErrorMiddleware(Middleware):
         self, context: MiddlewareContext, call_next: CallNext
     ) -> Any:
         try:
-            return await call_next(context)
-        except PydanticValidationError as exc:
-            errors = exc.errors(include_url=False)
+            result = await call_next(context)
+        except (PydanticValidationError, FastMCPValidationError) as exc:
+            # fastmcp >= 3.4.3 re-raises an argument-validation failure as
+            # ``fastmcp.exceptions.ValidationError`` wrapping the pydantic error
+            # (chained via ``from e``); older fastmcp raises the pydantic error
+            # directly. Recover the pydantic errors from whichever shape arrived,
+            # and let any other fastmcp ValidationError (e.g. a return-value
+            # failure with no pydantic cause) propagate unchanged.
+            pydantic_exc = (
+                exc if isinstance(exc, PydanticValidationError) else exc.__cause__
+            )
+            if not isinstance(pydantic_exc, PydanticValidationError):
+                raise
+            errors = pydantic_exc.errors(include_url=False)
             # Group by the real argument path. A union param like
             # `str | list[str]` emits one error per arm with loc (param, "str"),
             # (param, "list[str]"); without grouping the user saw `param.str` /
@@ -73,3 +87,4 @@ class ValidationErrorMiddleware(Middleware):
                     details=", ".join(dict.fromkeys(err["type"] for err in errors)),
                 )
             )
+        return result

{ha_mcp_dev-7.9.0.dev768 → ha_mcp_dev-7.9.0.dev769/src/ha_mcp_dev.egg-info}/PKG-INFO

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