Refactor power feature

2024-12-23 19:07:44 +00:00
parent eb503c0a02
commit 887d59a08f
21 changed files with 729 additions and 347 deletions
--- a/tests/commons.py
+++ b/tests/commons.py
@@ -746,7 +746,7 @@ async def send_power_change_event(entity: BaseThermostat, new_power, date, sleep
            )
        },
    )
-    await entity._async_power_changed(power_event)
+    await entity.power_manager._async_power_sensor_changed(power_event)
    if sleep:
        await asyncio.sleep(0.1)

@@ -772,7 +772,7 @@ async def send_max_power_change_event(
            )
        },
    )
-    await entity._async_max_power_changed(power_event)
+    await entity.power_manager._async_max_power_sensor_changed(power_event)
    if sleep:
        await asyncio.sleep(0.1)

--- a/tests/test_binary_sensors.py
+++ b/tests/test_binary_sensors.py
@@ -159,8 +159,8 @@ async def test_overpowering_binary_sensors(
    await entity.async_set_preset_mode(PRESET_COMFORT)
    await entity.async_set_hvac_mode(HVACMode.HEAT)
    await send_temperature_change_event(entity, 15, now)
-    assert await entity.check_overpowering() is False
-    assert entity.overpowering_state is None
+    assert await entity.power_manager.check_overpowering() is False
+    assert entity.power_manager.overpowering_state is STATE_UNKNOWN

    await overpowering_binary_sensor.async_my_climate_changed()
    assert overpowering_binary_sensor.state is STATE_OFF
@@ -168,8 +168,8 @@ async def test_overpowering_binary_sensors(

    await send_power_change_event(entity, 100, now)
    await send_max_power_change_event(entity, 150, now)
-    assert await entity.check_overpowering() is True
-    assert entity.overpowering_state is True
+    assert await entity.power_manager.check_overpowering() is True
+    assert entity.power_manager.overpowering_state is STATE_ON

    # Simulate the event reception
    await overpowering_binary_sensor.async_my_climate_changed()
@@ -177,8 +177,8 @@ async def test_overpowering_binary_sensors(

    # set max power to a low value
    await send_max_power_change_event(entity, 201, now)
-    assert await entity.check_overpowering() is False
-    assert entity.overpowering_state is False
+    assert await entity.power_manager.check_overpowering() is False
+    assert entity.power_manager.overpowering_state is STATE_OFF
    # Simulate the event reception
    await overpowering_binary_sensor.async_my_climate_changed()
    assert overpowering_binary_sensor.state == STATE_OFF
--- a/tests/test_bugs.py
+++ b/tests/test_bugs.py
@@ -334,7 +334,7 @@ async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
        await entity.async_set_preset_mode(PRESET_COMFORT)
        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_COMFORT
-        assert entity.overpowering_state is None
+        assert entity.power_manager.overpowering_state is STATE_UNKNOWN
        assert entity.target_temperature == 18
        # waits that the heater starts
        await asyncio.sleep(0.1)
@@ -346,10 +346,10 @@ async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
        # Send power mesurement (theheater is already in the power measurement)
        await send_power_change_event(entity, 100, datetime.now())
        # No overpowering yet
-        assert await entity.check_overpowering() is False
+        assert await entity.power_manager.check_overpowering() is False
        # All configuration is complete and power is < power_max
        assert entity.preset_mode is PRESET_COMFORT
-        assert entity.overpowering_state is False
+        assert entity.power_manager.overpowering_state is STATE_OFF
        assert entity.is_device_active is True

    # 2. An already active heater that switch preset will not switch to overpowering
@@ -365,10 +365,10 @@ async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
        # waits that the heater starts
        await asyncio.sleep(0.1)

-        assert await entity.check_overpowering() is False
+        assert await entity.power_manager.check_overpowering() is False
        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_BOOST
-        assert entity.overpowering_state is False
+        assert entity.power_manager.overpowering_state is STATE_OFF
        assert entity.target_temperature == 19
        assert mock_service_call.call_count >= 1

@@ -385,10 +385,10 @@ async def test_bug_407(hass: HomeAssistant, skip_hass_states_is_state):
        # waits that the heater starts
        await asyncio.sleep(0.1)

-        assert await entity.check_overpowering() is True
+        assert await entity.power_manager.check_overpowering() is True
        assert entity.hvac_mode is HVACMode.HEAT
        assert entity.preset_mode is PRESET_POWER
-        assert entity.overpowering_state is True
+        assert entity.power_manager.overpowering_state is STATE_ON


@pytest.mark.parametrize("expected_lingering_tasks", [True])
--- a/tests/test_central_config.py
+++ b/tests/test_central_config.py
@@ -292,8 +292,11 @@ async def test_full_over_switch_wo_central_config(
        assert entity._motion_preset == "comfort"
        assert entity._no_motion_preset == "eco"

-        assert entity._power_sensor_entity_id == "sensor.mock_power_sensor"
-        assert entity._max_power_sensor_entity_id == "sensor.mock_max_power_sensor"
+        assert entity.power_manager.power_sensor_entity_id == "sensor.mock_power_sensor"
+        assert (
+            entity.power_manager.max_power_sensor_entity_id
+            == "sensor.mock_max_power_sensor"
+        )

        assert (
            entity._presence_manager.presence_sensor_entity_id
@@ -409,8 +412,11 @@ async def test_full_over_switch_with_central_config(
        assert entity._motion_preset == "boost"
        assert entity._no_motion_preset == "frost"

-        assert entity._power_sensor_entity_id == "sensor.mock_power_sensor"
-        assert entity._max_power_sensor_entity_id == "sensor.mock_max_power_sensor"
+        assert entity.power_manager.power_sensor_entity_id == "sensor.mock_power_sensor"
+        assert (
+            entity.power_manager.max_power_sensor_entity_id
+            == "sensor.mock_max_power_sensor"
+        )

        assert (
            entity._presence_manager.presence_sensor_entity_id
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -1388,8 +1388,7 @@ async def test_user_config_flow_over_switch_bug_552_tpi(


 # @pytest.mark.parametrize("expected_lingering_tasks", [True])
-# @pytest.mark.parametrize("expected_lingering_timers", [True])
-# @pytest.mark.skip
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_config_flow_over_climate_valve(
    hass: HomeAssistant, skip_hass_states_get
 ):  # pylint: disable=unused-argument
--- a/tests/test_multiple_switch.py
+++ b/tests/test_multiple_switch.py
@@ -776,17 +776,17 @@ async def test_multiple_switch_power_management(
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNKNOWN
    assert entity.target_temperature == 19

    # 1. Send power mesurement
    await send_power_change_event(entity, 50, datetime.now())
    # Send power max mesurement
    await send_max_power_change_event(entity, 300, datetime.now())
-    assert await entity.check_overpowering() is False
+    assert await entity.power_manager.check_overpowering() is False
    # All configuration is complete and power is < power_max
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is False
+    assert entity.power_manager.overpowering_state is STATE_OFF

    # 2. Send power max mesurement too low and HVACMode is on
    with patch(
@@ -798,10 +798,10 @@ async def test_multiple_switch_power_management(
    ) as mock_heater_off:
        # 100 of the device / 4 -> 25, current power 50 so max is 75
        await send_max_power_change_event(entity, 74, datetime.now())
-        assert await entity.check_overpowering() is True
+        assert await entity.power_manager.check_overpowering() is True
        # All configuration is complete and power is > power_max we switch to POWER preset
        assert entity.preset_mode is PRESET_POWER
-        assert entity.overpowering_state is True
+        assert entity.power_manager.overpowering_state is STATE_ON
        assert entity.target_temperature == 12

        assert mock_send_event.call_count == 2
@@ -831,7 +831,7 @@ async def test_multiple_switch_power_management(
        await entity.async_set_preset_mode(PRESET_ECO)
        assert entity.preset_mode is PRESET_ECO
        # No change
-        assert entity.overpowering_state is True
+        assert entity.power_manager.overpowering_state is STATE_ON

    # 4. Send hugh power max mesurement to release overpowering
    with patch(
@@ -843,10 +843,10 @@ async def test_multiple_switch_power_management(
    ) as mock_heater_off:
        # 100 of the device / 4 -> 25, current power 50 so max is 75. With 150 no overheating
        await send_max_power_change_event(entity, 150, datetime.now())
-        assert await entity.check_overpowering() is False
+        assert await entity.power_manager.check_overpowering() is False
        # All configuration is complete and power is > power_max we switch to POWER preset
        assert entity.preset_mode is PRESET_ECO
-        assert entity.overpowering_state is False
+        assert entity.power_manager.overpowering_state is STATE_OFF
        assert entity.target_temperature == 17

        assert (
--- a/tests/test_power.py
+++ b/tests/test_power.py
@@ -1,17 +1,240 @@
 # pylint: disable=protected-access, unused-argument, line-too-long
 """ Test the Power management """
-from unittest.mock import patch, call
+from unittest.mock import patch, call, AsyncMock, MagicMock, PropertyMock
 from datetime import datetime, timedelta
 import logging

 from custom_components.versatile_thermostat.thermostat_switch import (
    ThermostatOverSwitch,
 )
+from custom_components.versatile_thermostat.feature_power_manager import (
+    FeaturePowerManager,
+)
+from custom_components.versatile_thermostat.prop_algorithm import PropAlgorithm
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import

 logging.getLogger().setLevel(logging.DEBUG)


+@pytest.mark.parametrize(
+    "is_over_climate, is_device_active, power, max_power, current_overpowering_state, overpowering_state, nb_call, changed, check_overpowering_ret",
+    [
+        # don't switch to overpower (power is enough)
+        (False, False, 1000, 3000, STATE_OFF, STATE_OFF, 0, True, False),
+        # switch to overpower (power is not enough)
+        (False, False, 2000, 3000, STATE_OFF, STATE_ON, 1, True, True),
+        # don't switch to overpower (power is not enough but device is already on)
+        (False, True, 2000, 3000, STATE_OFF, STATE_OFF, 0, True, False),
+        # Same with a over_climate
+        # don't switch to overpower (power is enough)
+        (True, False, 1000, 3000, STATE_OFF, STATE_OFF, 0, True, False),
+        # switch to overpower (power is not enough)
+        (True, False, 2000, 3000, STATE_OFF, STATE_ON, 1, True, True),
+        # don't switch to overpower (power is not enough but device is already on)
+        (True, True, 2000, 3000, STATE_OFF, STATE_OFF, 0, True, False),
+        # Leave overpowering state
+        # switch to not overpower (power is enough)
+        (False, False, 1000, 3000, STATE_ON, STATE_OFF, 1, True, False),
+        # don't switch to overpower (power is still not enough)
+        (False, False, 2000, 3000, STATE_ON, STATE_ON, 0, True, True),
+        # keep overpower (power is not enough but device is already on)
+        (False, True, 3000, 3000, STATE_ON, STATE_ON, 0, True, True),
+    ],
+)
+async def test_power_feature_manager(
+    hass: HomeAssistant,
+    is_over_climate,
+    is_device_active,
+    power,
+    max_power,
+    current_overpowering_state,
+    overpowering_state,
+    nb_call,
+    changed,
+    check_overpowering_ret,
+):
+    """Test the FeaturePresenceManager class direclty"""
+
+    fake_vtherm = MagicMock(spec=BaseThermostat)
+    type(fake_vtherm).name = PropertyMock(return_value="the name")
+
+    # 1. creation
+    power_manager = FeaturePowerManager(fake_vtherm, hass)
+
+    assert power_manager is not None
+    assert power_manager.is_configured is False
+    assert power_manager.overpowering_state == STATE_UNAVAILABLE
+    assert power_manager.name == "the name"
+
+    assert len(power_manager._active_listener) == 0
+
+    custom_attributes = {}
+    power_manager.add_custom_attributes(custom_attributes)
+    assert custom_attributes["power_sensor_entity_id"] is None
+    assert custom_attributes["max_power_sensor_entity_id"] is None
+    assert custom_attributes["overpowering_state"] == STATE_UNAVAILABLE
+    assert custom_attributes["is_power_configured"] is False
+    assert custom_attributes["device_power"] is 0
+    assert custom_attributes["power_temp"] is None
+    assert custom_attributes["current_power"] is None
+    assert custom_attributes["current_power_max"] is None
+
+    # 2. post_init
+    power_manager.post_init(
+        {
+            CONF_POWER_SENSOR: "sensor.the_power_sensor",
+            CONF_MAX_POWER_SENSOR: "sensor.the_max_power_sensor",
+            CONF_USE_POWER_FEATURE: True,
+            CONF_PRESET_POWER: 10,
+            CONF_DEVICE_POWER: 1234,
+        }
+    )
+
+    assert power_manager.is_configured is True
+    assert power_manager.overpowering_state == STATE_UNKNOWN
+
+    custom_attributes = {}
+    power_manager.add_custom_attributes(custom_attributes)
+    assert custom_attributes["power_sensor_entity_id"] == "sensor.the_power_sensor"
+    assert (
+        custom_attributes["max_power_sensor_entity_id"] == "sensor.the_max_power_sensor"
+    )
+    assert custom_attributes["overpowering_state"] == STATE_UNKNOWN
+    assert custom_attributes["is_power_configured"] is True
+    assert custom_attributes["device_power"] == 1234
+    assert custom_attributes["power_temp"] == 10
+    assert custom_attributes["current_power"] is None
+    assert custom_attributes["current_power_max"] is None
+
+    # 3. start listening
+    power_manager.start_listening()
+    assert power_manager.is_configured is True
+    assert power_manager.overpowering_state == STATE_UNKNOWN
+
+    assert len(power_manager._active_listener) == 2
+
+    # 4. test refresh and check_overpowering with the parametrized
+    side_effects = SideEffects(
+        {
+            "sensor.the_power_sensor": State("sensor.the_power_sensor", power),
+            "sensor.the_max_power_sensor": State(
+                "sensor.the_max_power_sensor", max_power
+            ),
+        },
+        State("unknown.entity_id", "unknown"),
+    )
+    # fmt:off
+    with patch("homeassistant.core.StateMachine.get", side_effect=side_effects.get_side_effects()) as mock_get_state:
+    # fmt:on
+        # Finish the mock configuration
+        tpi_algo = PropAlgorithm(PROPORTIONAL_FUNCTION_TPI, 0.6, 0.01, 5, 0, "climate.vtherm")
+        tpi_algo._on_percent = 1 # pylint: disable="protected-access"
+        type(fake_vtherm).hvac_mode = PropertyMock(return_value=HVACMode.HEAT)
+        type(fake_vtherm).is_device_active = PropertyMock(return_value=is_device_active)
+        type(fake_vtherm).is_over_climate = PropertyMock(return_value=is_over_climate)
+        type(fake_vtherm).proportional_algorithm = PropertyMock(return_value=tpi_algo)
+        type(fake_vtherm).nb_underlying_entities = PropertyMock(return_value=1)
+        type(fake_vtherm).preset_mode = PropertyMock(return_value=PRESET_COMFORT if current_overpowering_state == STATE_OFF else PRESET_POWER)
+        type(fake_vtherm)._saved_preset_mode = PropertyMock(return_value=PRESET_ECO)
+
+        fake_vtherm.save_hvac_mode = MagicMock()
+        fake_vtherm.restore_hvac_mode = AsyncMock()
+        fake_vtherm.save_preset_mode = MagicMock()
+        fake_vtherm.restore_preset_mode = AsyncMock()
+        fake_vtherm.async_underlying_entity_turn_off = AsyncMock()
+        fake_vtherm.async_set_preset_mode_internal = AsyncMock()
+        fake_vtherm.send_event = MagicMock()
+        fake_vtherm.update_custom_attributes = MagicMock()
+
+
+        ret = await power_manager.refresh_state()
+        assert ret == changed
+        assert power_manager.is_configured is True
+        assert power_manager.overpowering_state == STATE_UNKNOWN
+        assert power_manager.current_power == power
+        assert power_manager.current_max_power == max_power
+
+        # check overpowering
+        power_manager._overpowering_state = current_overpowering_state
+        ret2 = await power_manager.check_overpowering()
+        assert ret2 == check_overpowering_ret
+        assert power_manager.overpowering_state == overpowering_state
+        assert mock_get_state.call_count == 2
+
+        if power_manager.overpowering_state == STATE_OFF:
+            assert fake_vtherm.save_hvac_mode.call_count == 0
+            assert fake_vtherm.save_preset_mode.call_count == 0
+            assert fake_vtherm.async_underlying_entity_turn_off.call_count == 0
+            assert fake_vtherm.async_set_preset_mode_internal.call_count == 0
+            assert fake_vtherm.send_event.call_count == nb_call
+
+            if current_overpowering_state == STATE_ON:
+                assert fake_vtherm.update_custom_attributes.call_count == 1
+                assert fake_vtherm.restore_preset_mode.call_count == 1
+                if is_over_climate:
+                    assert fake_vtherm.restore_hvac_mode.call_count == 1
+                else:
+                    assert fake_vtherm.restore_hvac_mode.call_count == 0
+            else:
+                assert fake_vtherm.update_custom_attributes.call_count == 0
+
+            if nb_call == 1:
+                fake_vtherm.send_event.assert_has_calls(
+                    [
+                        call.fake_vtherm.send_event(
+                            EventType.POWER_EVENT,
+                            {'type': 'end', 'current_power': power, 'device_power': 1234, 'current_power_max': max_power}),
+                    ]
+                )
+
+
+        elif power_manager.overpowering_state == STATE_ON:
+            if is_over_climate:
+                assert fake_vtherm.save_hvac_mode.call_count == 1
+            else:
+                assert fake_vtherm.save_hvac_mode.call_count == 0
+
+            if current_overpowering_state == STATE_OFF:
+                assert fake_vtherm.save_preset_mode.call_count == 1
+                assert fake_vtherm.async_underlying_entity_turn_off.call_count == 1
+                assert fake_vtherm.async_set_preset_mode_internal.call_count == 1
+                assert fake_vtherm.send_event.call_count == 1
+                assert fake_vtherm.update_custom_attributes.call_count == 1
+            else:
+                assert fake_vtherm.save_preset_mode.call_count == 0
+                assert fake_vtherm.async_underlying_entity_turn_off.call_count == 0
+                assert fake_vtherm.async_set_preset_mode_internal.call_count == 0
+                assert fake_vtherm.send_event.call_count == 0
+                assert fake_vtherm.update_custom_attributes.call_count == 0
+            assert fake_vtherm.restore_hvac_mode.call_count == 0
+            assert fake_vtherm.restore_preset_mode.call_count == 0
+
+            if nb_call == 1:
+                fake_vtherm.send_event.assert_has_calls(
+                    [
+                        call.fake_vtherm.send_event(
+                            EventType.POWER_EVENT,
+                            {'type': 'start', 'current_power': power, 'device_power': 1234, 'current_power_max': max_power, 'current_power_consumption': 1234.0}),
+                    ]
+                )
+
+        fake_vtherm.reset_mock()
+
+    # 5. Check custom_attributes
+        custom_attributes = {}
+        power_manager.add_custom_attributes(custom_attributes)
+        assert custom_attributes["power_sensor_entity_id"] == "sensor.the_power_sensor"
+        assert (
+            custom_attributes["max_power_sensor_entity_id"] == "sensor.the_max_power_sensor"
+        )
+        assert custom_attributes["overpowering_state"] == overpowering_state
+        assert custom_attributes["is_power_configured"] is True
+        assert custom_attributes["device_power"] == 1234
+        assert custom_attributes["power_temp"] == 10
+        assert custom_attributes["current_power"] == power
+        assert custom_attributes["current_power_max"] == max_power
+
+
@pytest.mark.parametrize("expected_lingering_tasks", [True])
@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_power_management_hvac_off(
@@ -63,23 +286,23 @@ async def test_power_management_hvac_off(
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.preset_mode is PRESET_BOOST
    assert entity.target_temperature == 19
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNKNOWN
    assert entity.hvac_mode == HVACMode.OFF

    # Send power mesurement
    await send_power_change_event(entity, 50, datetime.now())
-    assert await entity.check_overpowering() is False
+    assert await entity.power_manager.check_overpowering() is False

    # All configuration is not complete
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNKNOWN

    # Send power max mesurement
    await send_max_power_change_event(entity, 300, datetime.now())
-    assert await entity.check_overpowering() is False
+    assert await entity.power_manager.check_overpowering() is False
    # All configuration is complete and power is < power_max
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is False
+    assert entity.power_manager.overpowering_state is STATE_OFF

    # Send power max mesurement too low but HVACMode is off
    with patch(
@@ -90,10 +313,10 @@ async def test_power_management_hvac_off(
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off:
        await send_max_power_change_event(entity, 149, datetime.now())
-        assert await entity.check_overpowering() is True
+        assert await entity.power_manager.check_overpowering() is True
        # All configuration is complete and power is > power_max but we stay in Boost cause thermostat if Off
        assert entity.preset_mode is PRESET_BOOST
-        assert entity.overpowering_state is True
+        assert entity.power_manager.overpowering_state is STATE_ON

        assert mock_send_event.call_count == 0
        assert mock_heater_on.call_count == 0
@@ -150,17 +373,17 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNKNOWN
    assert entity.target_temperature == 19

    # Send power mesurement
    await send_power_change_event(entity, 50, datetime.now())
    # Send power max mesurement
    await send_max_power_change_event(entity, 300, datetime.now())
-    assert await entity.check_overpowering() is False
+    assert await entity.power_manager.check_overpowering() is False
    # All configuration is complete and power is < power_max
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is False
+    assert entity.power_manager.overpowering_state is STATE_OFF

    # Send power max mesurement too low and HVACMode is on
    with patch(
@@ -171,10 +394,10 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off:
        await send_max_power_change_event(entity, 149, datetime.now())
-        assert await entity.check_overpowering() is True
+        assert await entity.power_manager.check_overpowering() is True
        # All configuration is complete and power is > power_max we switch to POWER preset
        assert entity.preset_mode is PRESET_POWER
-        assert entity.overpowering_state is True
+        assert entity.power_manager.overpowering_state is STATE_ON
        assert entity.target_temperature == 12

        assert mock_send_event.call_count == 2
@@ -206,10 +429,10 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is
        "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_off"
    ) as mock_heater_off:
        await send_power_change_event(entity, 48, datetime.now())
-        assert await entity.check_overpowering() is False
+        assert await entity.power_manager.check_overpowering() is False
        # All configuration is complete and power is < power_max, we restore previous preset
        assert entity.preset_mode is PRESET_BOOST
-        assert entity.overpowering_state is False
+        assert entity.power_manager.overpowering_state is STATE_OFF
        assert entity.target_temperature == 19

        assert mock_send_event.call_count == 2
@@ -303,7 +526,7 @@ async def test_power_management_energy_over_switch(
        assert entity.current_temperature == 15
        assert tpi_algo.on_percent == 1

-        assert entity.device_power == 100.0
+        assert entity.power_manager.device_power == 100.0

        assert mock_send_event.call_count == 2
        assert mock_heater_on.call_count == 1
@@ -324,7 +547,7 @@ async def test_power_management_energy_over_switch(
    ) as mock_heater_off:
        await send_temperature_change_event(entity, 18, datetime.now())
        assert tpi_algo.on_percent == 0.3
-        assert entity.mean_cycle_power == 30.0
+        assert entity.power_manager.mean_cycle_power == 30.0

        assert mock_send_event.call_count == 0
        assert mock_heater_on.call_count == 0
@@ -346,7 +569,7 @@ async def test_power_management_energy_over_switch(
    ) as mock_heater_off:
        await send_temperature_change_event(entity, 20, datetime.now())
        assert tpi_algo.on_percent == 0.0
-        assert entity.mean_cycle_power == 0.0
+        assert entity.power_manager.mean_cycle_power == 0.0

        assert mock_send_event.call_count == 0
        assert mock_heater_on.call_count == 0
@@ -421,7 +644,7 @@ async def test_power_management_energy_over_climate(
    assert entity.current_temperature == 15

    # Not initialised yet
-    assert entity.mean_cycle_power is None
+    assert entity.power_manager.mean_cycle_power is None
    assert entity._underlying_climate_start_hvac_action_date is None

    # Send a climate_change event with HVACAction=HEATING
--- a/tests/test_presence.py
+++ b/tests/test_presence.py
@@ -7,7 +7,7 @@ from unittest.mock import patch, call, AsyncMock, MagicMock, PropertyMock
 # from datetime import timedelta, datetime

 from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
-from custom_components.versatile_thermostat.presence_manager import (
+from custom_components.versatile_thermostat.feature_presence_manager import (
    FeaturePresenceManager,
 )

@@ -52,7 +52,7 @@ async def test_presence_feature_manager(
    presence_manager.add_custom_attributes(custom_attributes)
    assert custom_attributes["presence_sensor_entity_id"] is None
    assert custom_attributes["presence_state"] == STATE_UNAVAILABLE
-    assert custom_attributes["presence_configured"] is False
+    assert custom_attributes["is_presence_configured"] is False

    # 2. post_init
    presence_manager.post_init(
@@ -72,7 +72,7 @@ async def test_presence_feature_manager(
        custom_attributes["presence_sensor_entity_id"] == "sensor.the_presence_sensor"
    )
    assert custom_attributes["presence_state"] == STATE_UNKNOWN
-    assert custom_attributes["presence_configured"] is True
+    assert custom_attributes["is_presence_configured"] is True

    # 3. start listening
    presence_manager.start_listening()
@@ -124,7 +124,7 @@ async def test_presence_feature_manager(
        presence_manager.add_custom_attributes(custom_attributes)
        assert custom_attributes["presence_sensor_entity_id"] == "sensor.the_presence_sensor"
        assert custom_attributes["presence_state"] == presence_state
-        assert custom_attributes["presence_configured"] is True
+        assert custom_attributes["is_presence_configured"] is True

    # 6. test _presence_sensor_changed with the parametrized
    fake_vtherm.find_preset_temp.return_value = temp
@@ -172,4 +172,4 @@ async def test_presence_feature_manager(
    presence_manager.add_custom_attributes(custom_attributes)
    assert custom_attributes["presence_sensor_entity_id"] == "sensor.the_presence_sensor"
    assert custom_attributes["presence_state"] == presence_state
-    assert custom_attributes["presence_configured"] is True
+    assert custom_attributes["is_presence_configured"] is True
--- a/tests/test_tpi.py
+++ b/tests/test_tpi.py
@@ -58,7 +58,7 @@ async def test_tpi_calculation(
    assert tpi_algo.calculated_on_percent == 1
    assert tpi_algo.on_time_sec == 300
    assert tpi_algo.off_time_sec == 0
-    assert entity.mean_cycle_power is None  # no device power configured
+    assert entity.power_manager.mean_cycle_power is None  # no device power configured

    tpi_algo.calculate(15, 14, 5, HVACMode.HEAT)
    assert tpi_algo.on_percent == 0.4
@@ -100,7 +100,7 @@ async def test_tpi_calculation(
    assert tpi_algo.calculated_on_percent == 1
    assert tpi_algo.on_time_sec == 300
    assert tpi_algo.off_time_sec == 0
-    assert entity.mean_cycle_power is None  # no device power configured
+    assert entity.power_manager.mean_cycle_power is None  # no device power configured

    tpi_algo.set_security(0.09)
    tpi_algo.calculate(25, 30, 35, HVACMode.COOL)
@@ -108,7 +108,7 @@ async def test_tpi_calculation(
    assert tpi_algo.calculated_on_percent == 1
    assert tpi_algo.on_time_sec == 0
    assert tpi_algo.off_time_sec == 300
-    assert entity.mean_cycle_power is None  # no device power configured
+    assert entity.power_manager.mean_cycle_power is None  # no device power configured

    tpi_algo.unset_security()
    # The calculated values for HVACMode.OFF are the same as for HVACMode.HEAT.
--- a/tests/test_window.py
+++ b/tests/test_window.py
@@ -65,7 +65,7 @@ async def test_window_management_time_not_enough(
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 19

    assert entity.window_state is STATE_OFF
@@ -154,7 +154,7 @@ async def test_window_management_time_enough(
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 19

    assert entity.window_state is STATE_OFF
@@ -304,7 +304,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 21

    assert entity.window_state is STATE_OFF
@@ -617,7 +617,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 21

    assert entity.window_state is STATE_OFF
@@ -775,7 +775,7 @@ async def test_window_auto_no_on_percent(
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 20

    assert entity.window_state is STATE_OFF
@@ -891,7 +891,7 @@ async def test_window_bypass(hass: HomeAssistant, skip_hass_states_is_state):
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 19

    assert entity.window_state is STATE_OFF
@@ -1034,7 +1034,7 @@ async def test_window_auto_bypass(hass: HomeAssistant, skip_hass_states_is_state
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 21

    assert entity.window_state is STATE_OFF
@@ -1152,7 +1152,7 @@ async def test_window_bypass_reactivate(hass: HomeAssistant, skip_hass_states_is
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 19

    assert entity.window_state is STATE_OFF
@@ -1591,7 +1591,7 @@ async def test_window_action_eco_temp(hass: HomeAssistant, skip_hass_states_is_s
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 21

    assert entity.window_state is STATE_OFF
@@ -1788,7 +1788,7 @@ async def test_window_action_frost_temp(hass: HomeAssistant, skip_hass_states_is
    await entity.async_set_preset_mode(PRESET_BOOST)
    assert entity.hvac_mode is HVACMode.HEAT
    assert entity.preset_mode is PRESET_BOOST
-    assert entity.overpowering_state is None
+    assert entity.power_manager.overpowering_state is STATE_UNAVAILABLE
    assert entity.target_temperature == 21

    assert entity.window_state is STATE_OFF