ha-mcp-dev 7.7.0.dev683__tar.gz → 7.7.0.dev684__tar.gz

{ha_mcp_dev-7.7.0.dev683/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.7.0.dev684}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.7.0.dev683
+Version: 7.7.0.dev684
 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.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.7.0.dev683"
+version = "7.7.0.dev684"
 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.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_config_automations.py

@@ -46,6 +46,7 @@ from .helpers import (
 )
 from .reference_validator import validate_config_references
 from .util_helpers import (
+    JSON_STRING_COERCION,
     apply_entity_category,
     attach_skill_content,
     augment_error_dict_with_skill_content,
@@ -435,6 +436,7 @@ class AutomationConfigTools:
         self,
         config: Annotated[
             dict[str, Any] | None,
+            JSON_STRING_COERCION,
             Field(
                 description="Complete automation configuration with required fields: 'alias', 'triggers', 'actions'. "
                 "Optional: 'description', 'conditions', 'mode', 'max', 'initial_state', 'variables'. "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_config_dashboards.py

@@ -32,6 +32,7 @@ from .helpers import (
     validate_identifier_not_empty,
 )
 from .util_helpers import (
+    JSON_STRING_COERCION,
     attach_skill_content,
     augment_error_dict_with_skill_content,
     augment_tool_error_with_skill_content,
@@ -1021,6 +1022,7 @@ def register_config_dashboard_tools(mcp: Any, client: Any, **kwargs: Any) -> Non
         ],
         config: Annotated[
             dict[str, Any] | None,
+            JSON_STRING_COERCION,
             Field(
                 description="Dashboard configuration with views and cards. "
                 "Omit or set to None to create dashboard without initial config. "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_config_helpers.py

@@ -35,6 +35,7 @@ from .helpers import (
     validate_identifier_not_empty,
 )
 from .util_helpers import (
+    JSON_STRING_COERCION,
     apply_entity_category,
     attach_skill_content,
     augment_error_dict_with_skill_content,
@@ -3686,6 +3687,7 @@ class HelperConfigTools:
         ] = None,
         config: Annotated[
             dict[str, Any] | None,
+            JSON_STRING_COERCION,
             Field(
                 description=(
                     "Config dict for flow-based helper types and "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_config_scenes.py

@@ -38,6 +38,7 @@ from .helpers import (
 )
 from .reference_validator import validate_config_references
 from .util_helpers import (
+    JSON_STRING_COERCION,
     apply_entity_category,
     attach_skill_content,
     augment_error_dict_with_skill_content,
@@ -438,6 +439,7 @@ class ConfigSceneTools:
         ],
         config: Annotated[
             dict[str, Any] | None,
+            JSON_STRING_COERCION,
             Field(
                 description=(
                     "Scene configuration dictionary. Must include 'entities' "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_config_scripts.py

@@ -41,6 +41,7 @@ from .helpers import (
 )
 from .reference_validator import validate_config_references
 from .util_helpers import (
+    JSON_STRING_COERCION,
     apply_entity_category,
     attach_skill_content,
     augment_error_dict_with_skill_content,
@@ -399,6 +400,7 @@ class ConfigScriptTools:
         ],
         config: Annotated[
             dict[str, Any] | None,
+            JSON_STRING_COERCION,
             Field(
                 description="Script configuration dictionary. Must include EITHER 'sequence' (for regular scripts) OR 'use_blueprint' (for blueprint-based scripts). "
                 "Optional fields: 'alias', 'description', 'icon', 'mode', 'max', 'fields'. "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_entities.py

@@ -22,7 +22,11 @@ from .helpers import (
     validate_identifier_not_empty,
 )
 from .tools_voice_assistant import KNOWN_ASSISTANTS
-from .util_helpers import parse_json_param, parse_string_list_param
+from .util_helpers import (
+    JSON_STRING_COERCION,
+    parse_json_param,
+    parse_string_list_param,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -596,6 +600,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         ] = None,
         options: Annotated[
             dict[str, dict[str, Any]] | None,
+            JSON_STRING_COERCION,
             Field(
                 description=(
                     "Per-domain entity registry options (e.g. sensor 'display_precision', "
@@ -641,6 +646,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         ] = None,
         categories: Annotated[
             dict[str, str | None] | None,
+            JSON_STRING_COERCION,
             Field(
                 description=(
                     "Category assignment as a dict mapping scope to category_id. "
@@ -667,6 +673,7 @@ def register_entity_tools(mcp: Any, client: Any, **kwargs: Any) -> None:
         ] = "set",
         expose_to: Annotated[
             dict[str, bool] | None,
+            JSON_STRING_COERCION,
             Field(
                 description=(
                     "Control voice assistant exposure. Pass a dict mapping assistant IDs to booleans. "

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/tools_service.py

@@ -24,6 +24,7 @@ from .helpers import (
     register_tool_methods,
 )
 from .util_helpers import (
+    JSON_STRING_COERCION,
     compact_service_result,
     parse_json_param,
     parse_string_list_param,
@@ -297,7 +298,7 @@ class ServiceTools:
         domain: str,
         service: str,
         entity_id: str | None = None,
-        data: dict[str, Any] | None = None,
+        data: Annotated[dict[str, Any] | None, JSON_STRING_COERCION] = None,
         return_response: bool = False,
         wait: bool = True,
         verbose: Annotated[
@@ -584,7 +585,7 @@ class ServiceTools:
     @log_tool_usage
     async def ha_bulk_control(
         self,
-        operations: list[dict[str, Any]],
+        operations: Annotated[list[dict[str, Any]], JSON_STRING_COERCION],
         parallel: bool = True,
         ctx: Context | None = None,
     ) -> dict[str, Any]:
@@ -632,7 +633,7 @@ class ServiceTools:
     async def ha_call_event(
         self,
         event_type: str,
-        data: dict[str, Any] | None = None,
+        data: Annotated[dict[str, Any] | None, JSON_STRING_COERCION] = None,
     ) -> dict[str, Any]:
         """Execute a custom event on the Home Assistant event bus.
 

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684}/src/ha_mcp/tools/util_helpers.py

@@ -13,7 +13,7 @@ from collections.abc import Awaitable, Callable
 from typing import Any
 
 from fastmcp.exceptions import ToolError
-from pydantic import ValidationError
+from pydantic import BeforeValidator, ValidationError
 
 from ..client.rest_client import (
     HomeAssistantAPIError,
@@ -119,6 +119,35 @@ def parse_json_param(
     )
 
 
+def _loads_if_json_container_str(value: Any) -> Any:
+    """Parse a JSON-encoded object/array string into its container value.
+
+    Anything that isn't a string encoding a JSON object or array passes
+    through unchanged, so Pydantic still raises dict_type/list_type for
+    genuinely-malformed input (which ValidationErrorMiddleware rewrites
+    into an actionable message).
+    """
+    if isinstance(value, str):
+        try:
+            parsed = json.loads(value)
+        except (ValueError, RecursionError):
+            # RecursionError (deeply-nested input) must not escape: Pydantic
+            # only converts ValueError/AssertionError into ValidationError.
+            return value
+        if isinstance(parsed, (dict, list)):
+            return parsed
+    return value
+
+
+# Annotated metadata for MCP-exposed dict/list params (issue #1581): coerces a
+# JSON-encoded string to its parsed container before validation, without
+# re-advertising string in the tool schema (the #1485/#1487/#1492 fix). Some
+# MCP client stacks (Claude Desktop stdio among them) pass model-emitted
+# stringified objects through unrepaired, so the strict schema boundary alone
+# rejects previously-valid traffic.
+JSON_STRING_COERCION = BeforeValidator(_loads_if_json_container_str)
+
+
 def _parse_json_to_str_list(s: str, param_name: str) -> list[str]:
     """Parse a JSON string as a list of strings, raising ValueError on failure."""
     try:

{ha_mcp_dev-7.7.0.dev683 → ha_mcp_dev-7.7.0.dev684/src/ha_mcp_dev.egg-info}/PKG-INFO

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