updated apps

custom_components/powercalc/flow_helper/flows/virtual_power.py

@@ -47,8 +47,6 @@ from custom_components.powercalc.flow_helper.common import (
     PowercalcFormStep,
     Step,
     fill_schema_defaults,
-    unwrap_choose_selector,
-    wrap_choose_selector,
 )
 from custom_components.powercalc.flow_helper.flows.global_configuration import get_global_powercalc_config
 from custom_components.powercalc.flow_helper.flows.library import (
@@ -61,6 +59,13 @@ from custom_components.powercalc.flow_helper.schema import (
     SCHEMA_SENSOR_ENERGY_OPTIONS,
     SCHEMA_UTILITY_METER_TOGGLE,
 )
+from custom_components.powercalc.flow_helper.strategy_form import (
+    FIXED_CHOICES,
+    find_present_choice,
+    order_choices_for_default,
+    unwrap_strategy_user_input,
+    wrap_strategy_form_data,
+)
 from custom_components.powercalc.power_profile.power_profile import DeviceType
 from custom_components.powercalc.strategy.wled import CONFIG_SCHEMA as SCHEMA_POWER_WLED
 
@@ -110,28 +115,6 @@ FIXED_CHOICE_SELECTORS: dict[str, selector.ChooseSelectorChoiceConfig] = {
 }
 
 
-def order_choices_for_default(
-    choices: dict[str, selector.ChooseSelectorChoiceConfig],
-    default_choice: str | None,
-) -> dict[str, selector.ChooseSelectorChoiceConfig]:
-    """Put the default choice first because HA initializes choose selectors from the first choice."""
-    if default_choice not in choices:
-        return choices
-    return {
-        default_choice: choices[default_choice],
-        **{choice: config for choice, config in choices.items() if choice != default_choice},
-    }
-
-
-def find_present_choice(form_data: dict[str, Any], choices: dict[str, list[str] | str]) -> str | None:
-    """Find the first choice that has matching config data."""
-    for choice_id, mapping in choices.items():
-        keys = [mapping] if isinstance(mapping, str) else mapping
-        if any(key in form_data for key in keys):
-            return choice_id
-    return None
-
-
 SCHEMA_POWER_FIXED = vol.Schema(
     {
         vol.Required(CONF_FIXED_VALUE): selector.ChooseSelector(
@@ -168,48 +151,6 @@ SCHEMA_POWER_LINEAR = vol.Schema(
     },
 )
 
-FIXED_CHOICES: dict[str, list[str] | str] = {
-    CONF_STATES_POWER: CONF_STATES_POWER,
-    CONF_POWER_TEMPLATE: CONF_POWER_TEMPLATE,
-    CONF_POWER: CONF_POWER,
-}
-
-
-def fixed_choice_key_from_validated_value(value: object) -> str:
-    """Infer the fixed strategy config key from a validated ChooseSelector value."""
-    if isinstance(value, list):
-        return CONF_STATES_POWER
-    if isinstance(value, str):
-        return CONF_POWER_TEMPLATE
-    return CONF_POWER
-
-
-def unwrap_strategy_user_input(strategy: CalculationStrategy, user_input: dict[str, Any]) -> dict[str, Any]:
-    """Unwrap ChooseSelector wrappers and normalize list/dict shapes for strategy user input."""
-    if strategy == CalculationStrategy.FIXED:
-        unwrap_choose_selector(user_input, CONF_FIXED_VALUE, fixed_choice_key_from_validated_value)
-    if CONF_STATE_TRIGGER in user_input and isinstance(user_input[CONF_STATE_TRIGGER], list):
-        user_input[CONF_STATE_TRIGGER] = {
-            item[CONF_STATE]: item[CONF_PLAYBOOK_ID] for item in user_input[CONF_STATE_TRIGGER]
-        }
-    return user_input
-
-
-def wrap_strategy_form_data(strategy: CalculationStrategy, form_data: dict[str, Any]) -> dict[str, Any]:
-    """Wrap flat strategy config back into ChooseSelector form structure for display."""
-    if strategy == CalculationStrategy.FIXED:
-        form_data = wrap_choose_selector(form_data, CONF_FIXED_VALUE, FIXED_CHOICES, raw_value=True)
-    if CONF_STATE_TRIGGER in form_data and isinstance(form_data[CONF_STATE_TRIGGER], dict):
-        form_data = {
-            **form_data,
-            CONF_STATE_TRIGGER: [
-                {CONF_STATE: state, CONF_PLAYBOOK_ID: playbook_id}
-                for state, playbook_id in form_data[CONF_STATE_TRIGGER].items()
-            ],
-        }
-    return form_data
-
-
 SCHEMA_POWER_MULTI_SWITCH_MANUAL = vol.Schema(
     {
         vol.Required(CONF_POWER): vol.Coerce(float),