ha-mcp-dev 7.14.2.dev2091__tar.gz → 7.14.2.dev2093__tar.gz

{ha_mcp_dev-7.14.2.dev2091/src/ha_mcp_dev.egg-info → ha_mcp_dev-7.14.2.dev2093}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ha-mcp-dev
-Version: 7.14.2.dev2091
+Version: 7.14.2.dev2093
 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.14.2.dev2091 → ha_mcp_dev-7.14.2.dev2093}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ha-mcp-dev"
-version = "7.14.2.dev2091"
+version = "7.14.2.dev2093"
 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.14.2.dev2091 → ha_mcp_dev-7.14.2.dev2093}/src/ha_mcp/tools/config_entry_flow.py

@@ -11,6 +11,7 @@ for the 15 helper types listed in FLOW_HELPER_TYPES.
 """
 
 import asyncio
+import copy
 import logging
 from collections.abc import Iterator
 from enum import StrEnum
@@ -78,6 +79,7 @@ _RECONFIGURE_SUCCESS_REASONS = frozenset(
         "reconfigure_successful",
     }
 )
+_MISSING_DEFAULT = object()
 
 
 class _FlowType(StrEnum):
@@ -172,6 +174,47 @@ def _record_ignored_section_keys(
     )
 
 
+def _field_default_value(field: dict[str, Any]) -> Any:
+    """Return a serialized schema field's default/suggested value, if present."""
+    description = field.get("description")
+    if isinstance(description, dict) and description.get("suggested_value") is not None:
+        return copy.deepcopy(description["suggested_value"])
+    if field.get("suggested_value") is not None:
+        return copy.deepcopy(field["suggested_value"])
+    if "default" in field:
+        return copy.deepcopy(field["default"])
+    return _MISSING_DEFAULT
+
+
+def _schema_default_values(data_schema: list[Any]) -> dict[str, Any]:
+    """Build default form data from serialized schema suggestions/defaults."""
+    defaults: dict[str, Any] = {}
+    for field in data_schema:
+        if not isinstance(field, dict):
+            continue
+        name = field.get("name")
+        nested_schema = field.get("schema")
+        if not isinstance(name, str):
+            continue
+        if isinstance(nested_schema, list):
+            nested_defaults = _schema_default_values(nested_schema)
+            if nested_defaults:
+                defaults[name] = nested_defaults
+            continue
+        default = _field_default_value(field)
+        if default is not _MISSING_DEFAULT:
+            defaults[name] = default
+    return defaults
+
+
+def _required_section_defaults(field: dict[str, Any]) -> dict[str, Any]:
+    """Return default data for a required section, otherwise an empty dict."""
+    nested_schema = field.get("schema")
+    if not field.get("required") or not isinstance(nested_schema, list):
+        return {}
+    return _schema_default_values(nested_schema)
+
+
 def _ignored_keys_warnings(
     ignored_config_keys: set[str], remaining_config: dict[str, Any]
 ) -> list[str]:
@@ -194,10 +237,89 @@ def _ignored_keys_warnings(
     return warnings
 
 
+def _consume_section_schema(
+    field: dict[str, Any],
+    explicit_section: dict[str, Any] | None,
+    remaining_config: dict[str, Any],
+    ignored_config_keys: set[str] | None,
+    consumed_config_keys: set[str] | None,
+    path_prefix: str,
+) -> dict[str, Any]:
+    """Consume config values for a nested flow section."""
+    nested_schema = field.get("schema")
+    if not isinstance(nested_schema, list):
+        return {}
+
+    name = field.get("name")
+    section_path = _section_path(path_prefix, name)
+    nested_data = _required_section_defaults(field)
+
+    if explicit_section is not None:
+        explicit_remaining = dict(explicit_section)
+        nested_data.update(
+            _consume_form_schema(
+                nested_schema,
+                explicit_remaining,
+                ignored_config_keys,
+                consumed_config_keys,
+                section_path,
+            )
+        )
+        _record_ignored_section_keys(
+            ignored_config_keys,
+            explicit_remaining,
+            section_path,
+        )
+
+    nested_data.update(
+        _consume_form_schema(
+            nested_schema,
+            remaining_config,
+            ignored_config_keys,
+            consumed_config_keys,
+            section_path,
+        )
+    )
+    return nested_data
+
+
+def _mark_consumed(
+    consumed_config_keys: set[str] | None,
+    path_prefix: str,
+    name: str,
+) -> None:
+    """Record that a caller-supplied form key, not an injected default, was used."""
+    if consumed_config_keys is not None:
+        consumed_config_keys.add(_section_path(path_prefix, name))
+
+
+def _auto_confirm_form_payload(current_step: dict[str, Any]) -> dict[str, Any] | None:
+    """Return payload for HA preview/confirmation-only forms we can safely advance."""
+    if "preview" not in current_step:
+        return None
+    data_schema = current_step.get("data_schema")
+    if not isinstance(data_schema, list) or len(data_schema) != 1:
+        return None
+    field = data_schema[0]
+    if not isinstance(field, dict) or not field.get("required"):
+        return None
+    name = field.get("name")
+    if not isinstance(name, str) or name in _MENU_SELECTION_KEYS:
+        return None
+    default = _field_default_value(field)
+    if default is not False:
+        return None
+    selector = field.get("selector")
+    if isinstance(selector, dict) and selector and "boolean" not in selector:
+        return None
+    return {name: True}
+
+
 def _consume_form_schema(
     data_schema: list[Any],
     remaining_config: dict[str, Any],
     ignored_config_keys: set[str] | None = None,
+    consumed_config_keys: set[str] | None = None,
     path_prefix: str = "",
 ) -> dict[str, Any]:
     """Consume matching config values and shape nested flow sections.
@@ -208,7 +330,6 @@ def _consume_form_schema(
     ``ignored_config_keys`` with their dotted section path.
     """
     form_data: dict[str, Any] = {}
-    missing = object()
 
     for field in data_schema:
         if not isinstance(field, dict):
@@ -217,47 +338,27 @@ def _consume_form_schema(
         name = field.get("name")
         nested_schema = field.get("schema")
         if isinstance(nested_schema, list):
-            section_path = _section_path(path_prefix, name)
-            explicit_section = (
-                remaining_config.pop(name, missing)
-                if isinstance(name, str)
-                else missing
-            )
-            if explicit_section is not missing and not isinstance(
-                explicit_section, dict
-            ):
-                if isinstance(name, str):
-                    form_data[name] = explicit_section
-                continue
-
-            nested_data: dict[str, Any] = {}
-            if isinstance(explicit_section, dict):
-                explicit_remaining = dict(explicit_section)
-                nested_data.update(
-                    _consume_form_schema(
-                        nested_schema,
-                        explicit_remaining,
-                        ignored_config_keys,
-                        section_path,
-                    )
-                )
-                _record_ignored_section_keys(
-                    ignored_config_keys,
-                    explicit_remaining,
-                    section_path,
-                )
-            nested_data.update(
-                _consume_form_schema(
-                    nested_schema,
-                    remaining_config,
-                    ignored_config_keys,
-                    section_path,
-                )
+            section_name = name if isinstance(name, str) else None
+            explicit_section = None
+            if section_name is not None and section_name in remaining_config:
+                explicit_value = remaining_config.pop(section_name)
+                if not isinstance(explicit_value, dict):
+                    form_data[section_name] = explicit_value
+                    _mark_consumed(consumed_config_keys, path_prefix, section_name)
+                    continue
+                explicit_section = explicit_value
+
+            nested_data = _consume_section_schema(
+                field,
+                explicit_section,
+                remaining_config,
+                ignored_config_keys,
+                consumed_config_keys,
+                path_prefix,
             )
-
             if nested_data:
-                if isinstance(name, str):
-                    form_data[name] = nested_data
+                if section_name is not None:
+                    form_data[section_name] = nested_data
                 else:
                     form_data.update(nested_data)
             continue
@@ -268,6 +369,7 @@ def _consume_form_schema(
             and name in remaining_config
         ):
             form_data[name] = remaining_config.pop(name)
+            _mark_consumed(consumed_config_keys, path_prefix, name)
 
     return form_data
 
@@ -296,6 +398,7 @@ def _handle_form_step(
     current_step: dict[str, Any],
     remaining_config: dict[str, Any],
     ignored_config_keys: set[str] | None = None,
+    consumed_config_keys: set[str] | None = None,
 ) -> dict[str, Any]:
     """Validate a form step and return form data to submit.
 
@@ -337,9 +440,10 @@ def _handle_form_step(
             if key in _MENU_SELECTION_KEYS:
                 continue
             form_data[key] = remaining_config.pop(key)
+            _mark_consumed(consumed_config_keys, "", key)
     else:
         form_data = _consume_form_schema(
-            data_schema, remaining_config, ignored_config_keys
+            data_schema, remaining_config, ignored_config_keys, consumed_config_keys
         )
 
     return form_data
@@ -783,13 +887,17 @@ async def _handle_flow_steps(
             # for subsequent steps (HA can present multi-step forms, e.g.
             # statistics: user step then pick-characteristic step).
             saw_form_step = True
-            form_data = _handle_form_step(
-                flow_id,
-                current_step,
-                remaining_config,
-                ignored_config_keys,
-            )
-            if form_data:
+            consumed_form_keys: set[str] = set()
+            form_data = _auto_confirm_form_payload(current_step)
+            if form_data is None:
+                form_data = _handle_form_step(
+                    flow_id,
+                    current_step,
+                    remaining_config,
+                    ignored_config_keys,
+                    consumed_form_keys,
+                )
+            if consumed_form_keys:
                 any_form_key_consumed = True
             logger.debug(
                 f"Flow step {step_num}: form submit "

{ha_mcp_dev-7.14.2.dev2091 → ha_mcp_dev-7.14.2.dev2093/src/ha_mcp_dev.egg-info}/PKG-INFO

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