ha-mcp-dev 7.5.0.dev550__tar.gz → 7.5.0.dev551__tar.gz

{ha_mcp_dev-7.5.0.dev550/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.5.0.dev551}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.5.0.dev550
+Version: 7.5.0.dev551
 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.5.0.dev550 → ha_mcp_dev-7.5.0.dev551}/pyproject.toml

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

@@ -231,6 +231,30 @@ def _normalize_config_for_roundtrip(config: dict[str, Any]) -> dict[str, Any]:
     return cast(dict[str, Any], normalized)
 
 
+def _strip_redundant_identifier_echo(
+    result: dict[str, Any],
+    *,
+    extra_excludes: tuple[str, ...] = (),
+) -> dict[str, Any]:
+    """Strip the redundant ``identifier`` echo from an upsert/delete response.
+
+    The canonical ``automation_id`` key (resolved entity_id, falling back to
+    input identifier or ``unique_id``) makes re-echoing the raw ``identifier``
+    redundant noise.
+
+    ``unique_id`` is intentionally retained — it's HA's internal identifier,
+    distinct from ``entity_id``/``automation_id``, and callers track it for
+    cleanup. Do not extend ``extra_excludes`` to ``"unique_id"``: that
+    regression broke E2E ``test_duplicate_automation_prevention`` at 5fe5338.
+
+    ``extra_excludes`` lets a call site drop additional internal keys the
+    spread shouldn't surface (e.g. ``"success"`` on the python_transform
+    branch, where the caller manages that key directly).
+    """
+    excluded = {"identifier", *extra_excludes}
+    return {k: v for k, v in result.items() if k not in excluded}
+
+
 class AutomationConfigTools:
     """Configuration management tools for Home Assistant automations."""
 
@@ -284,7 +308,9 @@ class AutomationConfigTools:
 
         The returned `config_hash` is stable across consecutive reads of an unchanged config — `compute_config_hash` documents the underlying contract.
 
-        The returned `automation_id` is the resolved entity_id (canonical form, e.g. `automation.morning_routine`) when the registry lookup succeeds, falling back to the input `identifier` otherwise.
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when the registry lookup
+        succeeds, falling back to the input `identifier` otherwise.
 
         EXAMPLES:
         - Get automation: ha_config_get_automation("automation.morning_routine")
@@ -406,6 +432,12 @@ class AutomationConfigTools:
         """
         Create or update a Home Assistant automation.
 
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when entity registration
+        succeeds, falling back to the input `identifier` (update path) or
+        the generated `unique_id` from the upsert response (fresh create
+        when no identifier was passed).
+
         Before reaching for ``ha_config_set_automation``, consider whether a
         dedicated tool fits the use case better:
 
@@ -666,12 +698,15 @@ class AutomationConfigTools:
                 response: dict[str, Any] = {
                     "success": True,
                     "action": "python_transform",
-                    "identifier": identifier,
+                    "automation_id": (
+                        entity_id or identifier or result.get("unique_id")
+                    ),
                     "config_hash": new_config_hash,
                     "python_expression": python_transform,
                     "message": f"Automation {identifier} updated via Python transform",
-                    # Merge upsert result, excluding "success" (we set it ourselves)
-                    **{k: v for k, v in result.items() if k != "success"},
+                    **_strip_redundant_identifier_echo(
+                        result, extra_excludes=("success",)
+                    ),
                 }
                 if bp_warnings:
                     response["best_practice_warnings"] = bp_warnings
@@ -761,9 +796,15 @@ class AutomationConfigTools:
 
             merge_validation_meta(result, validation_meta)
 
+            automation_id = entity_id or identifier or result.get("unique_id")
             return {
                 "success": True,
-                **result,
+                # automation_id omitted when all three fallbacks are falsy —
+                # the create path is unguarded by validate_identifier_not_empty,
+                # and surfacing automation_id=None would lie about resolvability.
+                # HA's upsert contract makes this branch unreachable in practice.
+                **({"automation_id": automation_id} if automation_id else {}),
+                **_strip_redundant_identifier_echo(result),
             }
 
         except ToolError:
@@ -1001,6 +1042,11 @@ class AutomationConfigTools:
         """
         Delete a Home Assistant automation.
 
+        The returned `automation_id` is the resolved entity_id (canonical
+        form, e.g. `automation.morning_routine`) when the registry lookup
+        succeeded before the delete, falling back to the input
+        `identifier` otherwise.
+
         EXAMPLES:
         - Delete automation: ha_config_remove_automation("automation.old_automation")
         - Delete by unique_id: ha_config_remove_automation("my_unique_id")
@@ -1040,7 +1086,14 @@ class AutomationConfigTools:
                         f"Deletion confirmed but removal verification failed: {e}"
                     )
 
-            return {"success": True, "action": "delete", **result}
+            return {
+                "success": True,
+                "action": "delete",
+                "automation_id": (
+                    entity_id_for_wait or identifier or result.get("unique_id")
+                ),
+                **_strip_redundant_identifier_echo(result),
+            }
         except ToolError:
             raise
         except Exception as e:

{ha_mcp_dev-7.5.0.dev550 → ha_mcp_dev-7.5.0.dev551/src/ha_mcp_dev.egg-info}/PKG-INFO

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