updated apps

custom_components/powercalc/flow_helper/profile_preview.py

@@ -13,9 +13,9 @@ from homeassistant.helpers.typing import ConfigType
 import voluptuous as vol
 
 from custom_components.powercalc.common import SourceEntity
-from custom_components.powercalc.const import CONF_FIXED_VALUE, CalculationStrategy
+from custom_components.powercalc.const import CalculationStrategy
 from custom_components.powercalc.errors import StrategyConfigurationError, UnsupportedStrategyError
-from custom_components.powercalc.flow_helper.common import unwrap_choose_selector
+from custom_components.powercalc.flow_helper.strategy_form import unwrap_strategy_user_input
 from custom_components.powercalc.power_profile.power_profile import PowerProfile
 from custom_components.powercalc.strategy.factory import PowerCalculatorStrategyFactory
 from custom_components.powercalc.strategy.selector import detect_calculation_strategy
@@ -125,18 +125,10 @@ def _build_preview_sensor_config(flow: PreviewFlowProtocol, step_id: str, user_i
     except ValueError:
         return sensor_config
 
-    sensor_config[strategy] = _unwrap_preview_strategy_input(strategy, user_input)
+    sensor_config[strategy] = unwrap_strategy_user_input(strategy, dict(user_input))
     return sensor_config
 
 
-def _unwrap_preview_strategy_input(strategy: CalculationStrategy, user_input: dict[str, Any]) -> dict[str, Any]:
-    """Unwrap form-only selector wrappers before building a preview strategy config."""
-    unwrapped = dict(user_input)
-    if strategy == CalculationStrategy.FIXED:
-        unwrap_choose_selector(unwrapped, CONF_FIXED_VALUE)
-    return unwrapped
-
-
 async def build_profile_preview(
     hass: HomeAssistant,
     sensor_config: ConfigType,
@@ -177,7 +169,7 @@ async def _calculate_current_power(
             power_profile,
             source_entity,
         )
-    except (StrategyConfigurationError, UnsupportedStrategyError):
+    except StrategyConfigurationError, UnsupportedStrategyError:
         return None
 
     try: