ha-mcp-dev 8.6.0.dev2871__tar.gz → 8.6.0.dev2873__tar.gz

{ha_mcp_dev-8.6.0.dev2871 → ha_mcp_dev-8.6.0.dev2873}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 8.6.0.dev2871
+Version: 8.6.0.dev2873
 Summary: Home Assistant MCP Server - Complete control of Home Assistant through MCP
 Keywords: mcp,home-assistant,ai,automation,smart-home
 Author: Julien

{ha_mcp_dev-8.6.0.dev2871 → ha_mcp_dev-8.6.0.dev2873}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2871"
+version = "8.6.0.dev2873"
 description = "Home Assistant MCP Server - Complete control of Home Assistant through MCP"
 readme = "README.md"
 requires-python = ">=3.13,<3.15"

{ha_mcp_dev-8.6.0.dev2871 → ha_mcp_dev-8.6.0.dev2873}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "ha-mcp-dev"
-version = "8.6.0.dev2871"
+version = "8.6.0.dev2873"
 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-8.6.0.dev2873/src/ha_mcp/tools/area_messages.py

@@ -0,0 +1,171 @@
+"""WebSocket message builders and parameter checks for the area/floor setter.
+
+Kept apart from ``tools_areas`` so the tool module stays under the size ratchet;
+these are pure functions over the parameters ``ha_set_area_or_floor`` accepts.
+"""
+
+from typing import Any
+
+from ..errors import ErrorCode, create_error_response
+from .helpers import raise_tool_error
+
+_AREA_PARAMS = (
+    "name, id, floor_id, icon, aliases, picture, labels, "
+    "temperature_entity_id, humidity_entity_id"
+)
+
+
+def validate_cross_kind_params(
+    kind: str,
+    level: int | None,
+    floor_id: str | None,
+    picture: str | None,
+    labels: list[str] | None = None,
+    temperature_entity_id: str | None = None,
+    humidity_entity_id: str | None = None,
+) -> None:
+    """Reject params that don't belong to *kind* before building a set message."""
+    # Reject cross-kind params loudly so silent intent loss can't happen
+    # (e.g., kind='floor' with picture='...' previously dropped the picture
+    # without a diagnostic). Floors have no labels in HA core.
+    cross_kind_params: list[str] = []
+    if kind == "area" and level is not None:
+        cross_kind_params.append("level")
+    elif kind == "floor":
+        if floor_id is not None:
+            cross_kind_params.append("floor_id")
+        if picture is not None:
+            cross_kind_params.append("picture")
+        if labels is not None:
+            cross_kind_params.append("labels")
+        if temperature_entity_id is not None:
+            cross_kind_params.append("temperature_entity_id")
+        if humidity_entity_id is not None:
+            cross_kind_params.append("humidity_entity_id")
+    if cross_kind_params:
+        raise_tool_error(
+            create_error_response(
+                ErrorCode.VALIDATION_INVALID_PARAMETER,
+                f"Parameter(s) {cross_kind_params} are not valid for kind={kind!r}",
+                context={"kind": kind, "invalid_parameters": cross_kind_params},
+                suggestions=[
+                    f"For kind='area' use: {_AREA_PARAMS}",
+                    "For kind='floor' use: name, id, level, icon, aliases",
+                ],
+            )
+        )
+
+
+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,
+    parsed_labels: list[str] | None,
+    temperature_entity_id: str | None = None,
+    humidity_entity_id: str | None = 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
+    if parsed_labels is not None:
+        message["labels"] = parsed_labels
+    if temperature_entity_id is not None:
+        message["temperature_entity_id"] = temperature_entity_id or None
+    if humidity_entity_id is not None:
+        message["humidity_entity_id"] = humidity_entity_id or None
+    return message
+
+
+def build_area_create_message(
+    name: str,
+    floor_id: str | None,
+    icon: str | None,
+    parsed_aliases: list[str] | None,
+    picture: str | None,
+    parsed_labels: list[str] | None,
+    temperature_entity_id: str | None = None,
+    humidity_entity_id: str | None = 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
+    if parsed_labels:
+        message["labels"] = parsed_labels
+    if temperature_entity_id:
+        message["temperature_entity_id"] = temperature_entity_id
+    if humidity_entity_id:
+        message["humidity_entity_id"] = humidity_entity_id
+    return message
+
+
+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
+
+
+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 & FLOOR LISTING
+# ============================================================

{ha_mcp_dev-8.6.0.dev2871 → ha_mcp_dev-8.6.0.dev2873}/src/ha_mcp/tools/tools_areas.py

@@ -17,6 +17,13 @@ from ha_mcp._vendor.fastmcp.tools import tool
 
 from ..errors import ErrorCode, create_error_response, create_validation_error
 from ..utils.registry_update_lock import registry_update_lock
+from .area_messages import (
+    build_area_create_message,
+    build_area_update_message,
+    build_floor_create_message,
+    build_floor_update_message,
+    validate_cross_kind_params,
+)
 from .auto_backup import with_auto_backup
 from .coercion import JSON_STRING_COERCION, parse_string_list_param
 from .component_registries import fetch_registries_via_component
@@ -118,149 +125,12 @@ def _floor_sort_key(floor: dict[str, Any]) -> int:
         return 0
 
 
-def _validate_cross_kind_params(
-    kind: str,
-    level: int | None,
-    floor_id: str | None,
-    picture: str | None,
-    labels: list[str] | None = None,
-) -> None:
-    """Reject params that don't belong to *kind* before building a set message."""
-    # Reject cross-kind params loudly so silent intent loss can't happen
-    # (e.g., kind='floor' with picture='...' previously dropped the picture
-    # without a diagnostic). Floors have no labels in HA core.
-    cross_kind_params: list[str] = []
-    if kind == "area" and level is not None:
-        cross_kind_params.append("level")
-    elif kind == "floor":
-        if floor_id is not None:
-            cross_kind_params.append("floor_id")
-        if picture is not None:
-            cross_kind_params.append("picture")
-        if labels is not None:
-            cross_kind_params.append("labels")
-    if cross_kind_params:
-        raise_tool_error(
-            create_error_response(
-                ErrorCode.VALIDATION_INVALID_PARAMETER,
-                f"Parameter(s) {cross_kind_params} are not valid for kind={kind!r}",
-                context={"kind": kind, "invalid_parameters": cross_kind_params},
-                suggestions=[
-                    "For kind='area' use: name, id, floor_id, icon, aliases, picture, labels",
-                    "For kind='floor' use: name, id, level, icon, aliases",
-                ],
-            )
-        )
-
-
 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,
-        parsed_labels: list[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
-        if parsed_labels is not None:
-            message["labels"] = parsed_labels
-        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,
-        parsed_labels: list[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
-        if parsed_labels:
-            message["labels"] = parsed_labels
-        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 & FLOOR LISTING
-    # ============================================================
-
     @tool(
         name="ha_list_floors_areas",
         tags={"Areas & Floors"},
@@ -488,6 +358,8 @@ class AreaTools:
         parsed_aliases: list[str] | None,
         picture: str | None,
         parsed_labels: list[str] | None,
+        temperature_entity_id: str | None = None,
+        humidity_entity_id: str | None = None,
     ) -> tuple[dict[str, Any], str, str, str, str | None]:
         """Build the WS message plus (result_key, id_key, operation, name) for a set.
 
@@ -496,7 +368,7 @@ class AreaTools:
         """
         if kind == "area":
             if identifier:
-                message = self._build_area_update_message(
+                message = build_area_update_message(
                     identifier,
                     name,
                     floor_id,
@@ -504,6 +376,8 @@ class AreaTools:
                     parsed_aliases,
                     picture,
                     parsed_labels,
+                    temperature_entity_id,
+                    humidity_entity_id,
                 )
                 operation = "update"
             else:
@@ -516,20 +390,22 @@ class AreaTools:
                     context={"operation": "create_area"},
                     suggestions=["Provide a non-empty name for the new area"],
                 )
-                message = self._build_area_create_message(
+                message = build_area_create_message(
                     name,
                     floor_id,
                     icon,
                     parsed_aliases,
                     picture,
                     parsed_labels,
+                    temperature_entity_id,
+                    humidity_entity_id,
                 )
                 operation = "create"
             result_key = "area"
             id_key = "area_id"
         else:  # kind == "floor"
             if identifier:
-                message = self._build_floor_update_message(
+                message = build_floor_update_message(
                     identifier,
                     name,
                     level,
@@ -545,7 +421,7 @@ class AreaTools:
                     context={"operation": "create_floor"},
                     suggestions=["Provide a non-empty name for the new floor"],
                 )
-                message = self._build_floor_create_message(
+                message = build_floor_create_message(
                     name,
                     level,
                     icon,
@@ -800,10 +676,33 @@ class AreaTools:
                 default=None,
             ),
         ] = None,
+        temperature_entity_id: Annotated[
+            str | None,
+            Field(
+                description=(
+                    "Sensor the area reports temperature from, when kind='area' "
+                    "(a sensor.* entity with device_class temperature; empty "
+                    "string to clear). Omit to leave unchanged."
+                ),
+                default=None,
+            ),
+        ] = None,
+        humidity_entity_id: Annotated[
+            str | None,
+            Field(
+                description=(
+                    "Sensor the area reports humidity from, when kind='area' "
+                    "(a sensor.* entity with device_class humidity; empty "
+                    "string to clear). Omit to leave unchanged."
+                ),
+                default=None,
+            ),
+        ] = None,
     ) -> dict[str, Any]:
         """Create or update a Home Assistant area or floor.
 
-        Pass kind='area' (with optional floor_id, picture, labels) or kind='floor' (with optional level).
+        Pass kind='area' (with optional floor_id, picture, labels, temperature_entity_id,
+        humidity_entity_id) or kind='floor' (with optional level).
         Provide name only to create a new entry; provide id to update an existing one.
         Cross-kind parameters (e.g., picture or labels under kind='floor') are rejected with VALIDATION_INVALID_PARAMETER.
 
@@ -811,6 +710,7 @@ class AreaTools:
         ha_set_area_or_floor(kind="area", name="Kitchen")
         ha_set_area_or_floor(kind="area", id="kitchen", floor_id="ground_floor")
         ha_set_area_or_floor(kind="area", id="kitchen", labels=["site_home"])
+        ha_set_area_or_floor(kind="area", id="kitchen", temperature_entity_id="sensor.kitchen_temp", humidity_entity_id="")
         ha_set_area_or_floor(kind="floor", name="Basement", level=-1)
         ha_set_area_or_floor(kind="floor", id="ground_floor", level=0)
         """
@@ -836,7 +736,15 @@ class AreaTools:
                     )
                 )
 
-            _validate_cross_kind_params(kind, level, floor_id, picture, parsed_labels)
+            validate_cross_kind_params(
+                kind,
+                level,
+                floor_id,
+                picture,
+                parsed_labels,
+                temperature_entity_id,
+                humidity_entity_id,
+            )
 
             # ``None`` stays the documented "create-new" sentinel; explicit
             # empty/whitespace would silently route to the ``if id:`` create
@@ -863,6 +771,8 @@ class AreaTools:
                     parsed_aliases,
                     picture,
                     parsed_labels,
+                    temperature_entity_id,
+                    humidity_entity_id,
                 )
             )
 
@@ -873,7 +783,7 @@ class AreaTools:
                 # verbatim, and an unknown label_id is dropped on the way in
                 # (HA filters the set through the label registry) — both end as a
                 # success envelope that does not match what was asked for, so
-                # validate before writing. ``_validate_cross_kind_params`` already
+                # validate before writing. ``validate_cross_kind_params`` already
                 # rejected floor_id/labels for kind='floor', so this only ever
                 # runs for areas; None and "" / [] (clear) skip the lookup.
                 await validate_registry_ids(