Integration tests ok

.devcontainer/configuration.yaml

@@ -44,6 +44,12 @@ input_number:
         step: 10
         icon: mdi:flash
         unit_of_measurement: kW
+    fake_valve1:
+        name: The valve 1
+        min: 0
+        max: 100
+        icon: mdi:pipe-valve
+        unit_of_measurement: percentage
 
 input_boolean:
     # input_boolean to simulate the windows entity. Only for development environment.

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter"
+        "editor.defaultFormatter": "ms-python.python"
     },
     "python.linting.pylintEnabled": true,
     "python.linting.enabled": true,

custom_components/versatile_thermostat/__init__.py

@@ -8,7 +8,7 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .climate import VersatileThermostat
+from .base_thermostat import BaseThermostat
 
 from .const import DOMAIN, PLATFORMS
 

custom_components/versatile_thermostat/commons.py

@@ -8,7 +8,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.device_registry import DeviceInfo, DeviceEntryType
 from homeassistant.helpers.event import async_track_state_change_event, async_call_later
 
-from .climate import VersatileThermostat
+from .base_thermostat import BaseThermostat
 from .const import DOMAIN, DEVICE_MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
@@ -17,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 class VersatileThermostatBaseEntity(Entity):
     """A base class for all entities"""
 
-    _my_climate: VersatileThermostat
+    _my_climate: BaseThermostat
     hass: HomeAssistant
     _config_id: str
     _device_name: str
@@ -37,7 +37,7 @@ class VersatileThermostatBaseEntity(Entity):
         return False
 
     @property
-    def my_climate(self) -> VersatileThermostat | None:
+    def my_climate(self) -> BaseThermostat | None:
         """Returns my climate if found"""
         if not self._my_climate:
             self._my_climate = self.find_my_versatile_thermostat()
@@ -54,7 +54,7 @@ class VersatileThermostatBaseEntity(Entity):
             model=DOMAIN,
         )
 
-    def find_my_versatile_thermostat(self) -> VersatileThermostat:
+    def find_my_versatile_thermostat(self) -> BaseThermostat:
         """Find the underlying climate entity"""
         try:
             component: EntityComponent[ClimateEntity] = self.hass.data[CLIMATE_DOMAIN]

custom_components/versatile_thermostat/config_flow.py

@@ -1,3 +1,7 @@
+# pylint: disable=line-too-long
+# pylint: disable=too-many-lines
+# pylint: disable=invalid-name
+
 """Config flow for Versatile Thermostat integration."""
 from __future__ import annotations
 
@@ -24,6 +28,7 @@ from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers import selector
 from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
+from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN
 from homeassistant.components.input_boolean import (
     DOMAIN as INPUT_BOOLEAN_DOMAIN,
 )
@@ -91,6 +96,11 @@ from .const import (
     CONF_USE_POWER_FEATURE,
     CONF_AC_MODE,
     CONF_THERMOSTAT_TYPES,
+    CONF_THERMOSTAT_VALVE,
+    CONF_VALVE,
+    CONF_VALVE_2,
+    CONF_VALVE_3,
+    CONF_VALVE_4,
     UnknownEntity,
     WindowOpenDetectionMethod,
 )
@@ -249,6 +259,39 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             }
         )
 
+        self.STEP_THERMOSTAT_VALVE = vol.Schema(  # pylint: disable=invalid-name
+            {
+                vol.Required(CONF_VALVE): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_2): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_3): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Optional(CONF_VALVE_4): selector.EntitySelector(
+                    selector.EntitySelectorConfig(
+                        domain=[NUMBER_DOMAIN, INPUT_NUMBER_DOMAIN]
+                    ),
+                ),
+                vol.Required(
+                    CONF_PROP_FUNCTION, default=PROPORTIONAL_FUNCTION_TPI
+                ): vol.In(
+                    [
+                        PROPORTIONAL_FUNCTION_TPI,
+                    ]
+                ),
+                vol.Optional(CONF_AC_MODE, default=False): cv.boolean,
+            }
+        )
+
         self.STEP_TPI_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
             {
                 vol.Required(CONF_TPI_COEF_INT, default=0.6): vol.Coerce(float),
@@ -479,6 +522,10 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             return await self.generic_step(
                 "type", self.STEP_THERMOSTAT_SWITCH, user_input, self.async_step_tpi
             )
+        elif self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_VALVE:
+            return await self.generic_step(
+                "type", self.STEP_THERMOSTAT_VALVE, user_input, self.async_step_tpi
+            )
         else:
             return await self.generic_step(
                 "type",
@@ -509,7 +556,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         elif self._infos[CONF_USE_PRESENCE_FEATURE]:
             next_step = self.async_step_presence
 
-        if self._infos.get(CONF_AC_MODE) == True:
+        if self._infos.get(CONF_AC_MODE) is True:
             schema = self.STEP_PRESETS_WITH_AC_DATA_SCHEMA
         else:
             schema = self.STEP_PRESETS_DATA_SCHEMA
@@ -565,7 +612,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         """Handle the presence management flow steps"""
         _LOGGER.debug("Into ConfigFlow.async_step_presence user_input=%s", user_input)
 
-        if self._infos.get(CONF_AC_MODE) == True:
+        if self._infos.get(CONF_AC_MODE) is True:
             schema = self.STEP_PRESENCE_WITH_AC_DATA_SCHEMA
         else:
             schema = self.STEP_PRESENCE_DATA_SCHEMA
@@ -670,6 +717,10 @@ class VersatileThermostatOptionsFlowHandler(
             return await self.generic_step(
                 "type", self.STEP_THERMOSTAT_SWITCH, user_input, self.async_step_tpi
             )
+        elif self._infos[CONF_THERMOSTAT_TYPE] == CONF_THERMOSTAT_VALVE:
+            return await self.generic_step(
+                "type", self.STEP_THERMOSTAT_VALVE, user_input, self.async_step_tpi
+            )
         else:
             return await self.generic_step(
                 "type",
@@ -704,7 +755,7 @@ class VersatileThermostatOptionsFlowHandler(
         elif self._infos[CONF_USE_PRESENCE_FEATURE]:
             next_step = self.async_step_presence
 
-        if self._infos.get(CONF_AC_MODE) == True:
+        if self._infos.get(CONF_AC_MODE) is True:
             schema = self.STEP_PRESETS_WITH_AC_DATA_SCHEMA
         else:
             schema = self.STEP_PRESETS_DATA_SCHEMA
@@ -767,7 +818,7 @@ class VersatileThermostatOptionsFlowHandler(
             "Into OptionsFlowHandler.async_step_presence user_input=%s", user_input
         )
 
-        if self._infos.get(CONF_AC_MODE) == True:
+        if self._infos.get(CONF_AC_MODE) is True:
             schema = self.STEP_PRESENCE_WITH_AC_DATA_SCHEMA
         else:
             schema = self.STEP_PRESENCE_DATA_SCHEMA

custom_components/versatile_thermostat/const.py

@@ -11,16 +11,16 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
 )
 
-PRESET_AC_SUFFIX = "_ac"
-PRESET_ECO_AC = PRESET_ECO + PRESET_AC_SUFFIX
-PRESET_COMFORT_AC = PRESET_COMFORT + PRESET_AC_SUFFIX
-PRESET_BOOST_AC = PRESET_BOOST + PRESET_AC_SUFFIX
-
 from homeassistant.exceptions import HomeAssistantError
 
 from .prop_algorithm import (
     PROPORTIONAL_FUNCTION_TPI,
 )
+PRESET_AC_SUFFIX = "_ac"
+PRESET_ECO_AC = PRESET_ECO + PRESET_AC_SUFFIX
+PRESET_COMFORT_AC = PRESET_COMFORT + PRESET_AC_SUFFIX
+PRESET_BOOST_AC = PRESET_BOOST + PRESET_AC_SUFFIX
+
 
 DEVICE_MANUFACTURER = "JMCOLLIN"
 DEVICE_MODEL = "Versatile Thermostat"
@@ -65,6 +65,7 @@ CONF_SECURITY_DEFAULT_ON_PERCENT = "security_default_on_percent"
 CONF_THERMOSTAT_TYPE = "thermostat_type"
 CONF_THERMOSTAT_SWITCH = "thermostat_over_switch"
 CONF_THERMOSTAT_CLIMATE = "thermostat_over_climate"
+CONF_THERMOSTAT_VALVE = "thermostat_over_valve"
 CONF_CLIMATE = "climate_entity_id"
 CONF_CLIMATE_2 = "climate_entity2_id"
 CONF_CLIMATE_3 = "climate_entity3_id"
@@ -77,6 +78,10 @@ CONF_AC_MODE = "ac_mode"
 CONF_WINDOW_AUTO_OPEN_THRESHOLD = "window_auto_open_threshold"
 CONF_WINDOW_AUTO_CLOSE_THRESHOLD = "window_auto_close_threshold"
 CONF_WINDOW_AUTO_MAX_DURATION = "window_auto_max_duration"
+CONF_VALVE = "valve_entity_id"
+CONF_VALVE_2 = "valve_entity2_id"
+CONF_VALVE_3 = "valve_entity3_id"
+CONF_VALVE_4 = "valve_entity4_id"
 
 CONF_PRESETS = {
     p: f"{p}_temp"
@@ -174,6 +179,11 @@ ALL_CONF = (
         CONF_USE_PRESENCE_FEATURE,
         CONF_USE_POWER_FEATURE,
         CONF_AC_MODE,
+        CONF_VALVE,
+        CONF_VALVE_2,
+        CONF_VALVE_3,
+        CONF_VALVE_4,
+
     ]
     + CONF_PRESETS_VALUES
     + CONF_PRESETS_AWAY_VALUES
@@ -185,7 +195,7 @@ CONF_FUNCTIONS = [
     PROPORTIONAL_FUNCTION_TPI,
 ]
 
-CONF_THERMOSTAT_TYPES = [CONF_THERMOSTAT_SWITCH, CONF_THERMOSTAT_CLIMATE]
+CONF_THERMOSTAT_TYPES = [CONF_THERMOSTAT_SWITCH, CONF_THERMOSTAT_CLIMATE, CONF_THERMOSTAT_VALVE]
 
 SUPPORT_FLAGS = ClimateEntityFeature.TARGET_TEMPERATURE
 
@@ -217,3 +227,14 @@ class UnknownEntity(HomeAssistantError):
 
 class WindowOpenDetectionMethod(HomeAssistantError):
     """Error to indicate there is an error in the window open detection method given."""
+
+class overrides: # pylint: disable=invalid-name
+    """ An annotation to inform overrides """
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, instance, owner):
+        return self.func.__get__(instance, owner)
+
+    def __call__(self, *args, **kwargs):
+        raise RuntimeError(f"Method {self.func.__name__} should have been overridden")

custom_components/versatile_thermostat/sensor.py

@@ -1,3 +1,4 @@
+# pylint: disable=unused-argument
 """ Implements the VersatileThermostat sensors component """
 import logging
 import math
@@ -22,6 +23,7 @@ from .const import (
     CONF_PROP_FUNCTION,
     PROPORTIONAL_FUNCTION_TPI,
     CONF_THERMOSTAT_SWITCH,
+    CONF_THERMOSTAT_VALVE,
     CONF_THERMOSTAT_TYPE,
 )
 
@@ -50,7 +52,7 @@ async def async_setup_entry(
     ]
     if entry.data.get(CONF_DEVICE_POWER):
         entities.append(EnergySensor(hass, unique_id, name, entry.data))
-        if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_SWITCH:
+        if entry.data.get(CONF_THERMOSTAT_TYPE) in [CONF_THERMOSTAT_SWITCH, CONF_THERMOSTAT_VALVE]:
             entities.append(MeanPowerSensor(hass, unique_id, name, entry.data))
 
     if entry.data.get(CONF_PROP_FUNCTION) == PROPORTIONAL_FUNCTION_TPI:
@@ -58,6 +60,9 @@ async def async_setup_entry(
         entities.append(OnTimeSensor(hass, unique_id, name, entry.data))
         entities.append(OffTimeSensor(hass, unique_id, name, entry.data))
 
+    if entry.data.get(CONF_THERMOSTAT_TYPE) == CONF_THERMOSTAT_VALVE:
+        entities.append(ValveOpenPercentSensor(hass, unique_id, name, entry.data))
+
     async_add_entities(entities, True)
 
 
@@ -224,6 +229,47 @@ class OnPercentSensor(VersatileThermostatBaseEntity, SensorEntity):
         """Return the suggested number of decimal digits for display."""
         return 1
 
+class ValveOpenPercentSensor(VersatileThermostatBaseEntity, SensorEntity):
+    """Representation of a on percent sensor which exposes the on_percent in a cycle"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the energy sensor"""
+        super().__init__(hass, unique_id, entry_infos.get(CONF_NAME))
+        self._attr_name = "Vave open percent"
+        self._attr_unique_id = f"{self._device_name}_valve_open_percent"
+
+    @callback
+    async def async_my_climate_changed(self, event: Event = None):
+        """Called when my climate have change"""
+        _LOGGER.debug("%s - climate state change", self._attr_unique_id)
+
+        old_state = self._attr_native_value
+        self._attr_native_value = self.my_climate.valve_open_percent
+        if old_state != self._attr_native_value:
+            self.async_write_ha_state()
+        return
+
+    @property
+    def icon(self) -> str | None:
+        return "mdi:pipe-valve"
+
+    @property
+    def device_class(self) -> SensorDeviceClass | None:
+        return SensorDeviceClass.POWER_FACTOR
+
+    @property
+    def state_class(self) -> SensorStateClass | None:
+        return SensorStateClass.MEASUREMENT
+
+    @property
+    def native_unit_of_measurement(self) -> str | None:
+        return PERCENTAGE
+
+    @property
+    def suggested_display_precision(self) -> int | None:
+        """Return the suggested number of decimal digits for display."""
+        return 0
+
 
 class OnTimeSensor(VersatileThermostatBaseEntity, SensorEntity):
     """Representation of a on time sensor which exposes the on_time_sec in a cycle"""

custom_components/versatile_thermostat/strings.json

@@ -34,7 +34,11 @@
           "climate_entity2_id": "2nd underlying climate",
           "climate_entity3_id": "3rd underlying climate",
           "climate_entity4_id": "4th underlying climate",
-          "ac_mode": "AC mode"
+          "ac_mode": "AC mode",
+          "valve_entity_id": "1rst valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number"
         },
         "data_description": {
           "heater_entity_id": "Mandatory heater entity id",
@@ -46,7 +50,11 @@
           "climate_entity2_id": "2nd underlying climate entity id",
           "climate_entity3_id": "3rd underlying climate entity id",
           "climate_entity4_id": "4th underlying climate entity id",
-          "ac_mode": "Use the Air Conditioning (AC) mode"
+          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1rst valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id"
         }
       },
       "tpi": {
@@ -178,16 +186,20 @@
         "title": "Linked entities",
         "description": "Linked entities attributes",
         "data": {
-          "heater_entity_id": "Heater switch",
-          "heater_entity2_id": "2nd Heater switch",
-          "heater_entity3_id": "3rd Heater switch",
-          "heater_entity4_id": "4th Heater switch",
+          "heater_entity_id": "1rst heater switch",
+          "heater_entity2_id": "2nd heater switch",
+          "heater_entity3_id": "3rd heater switch",
+          "heater_entity4_id": "4th heater switch",
           "proportional_function": "Algorithm",
-          "climate_entity_id": "Underlying thermostat",
+          "climate_entity_id": "1rst underlying climate",
           "climate_entity2_id": "2nd underlying climate",
           "climate_entity3_id": "3rd underlying climate",
           "climate_entity4_id": "4th underlying climate",
-          "ac_mode": "AC mode"
+          "ac_mode": "AC mode",
+          "valve_entity_id": "1rst valve number",
+          "valve_entity2_id": "2nd valve number",
+          "valve_entity3_id": "3rd valve number",
+          "valve_entity4_id": "4th valve number"
         },
         "data_description": {
           "heater_entity_id": "Mandatory heater entity id",
@@ -199,7 +211,11 @@
           "climate_entity2_id": "2nd underlying climate entity id",
           "climate_entity3_id": "3rd underlying climate entity id",
           "climate_entity4_id": "4th underlying climate entity id",
-          "ac_mode": "Use the Air Conditioning (AC) mode"
+          "ac_mode": "Use the Air Conditioning (AC) mode",
+          "valve_entity_id": "1rst valve number entity id",
+          "valve_entity2_id": "2nd valve number entity id",
+          "valve_entity3_id": "3rd valve number entity id",
+          "valve_entity4_id": "4th valve number entity id"
         }
       },
       "tpi": {
@@ -310,7 +326,8 @@
     "thermostat_type": {
       "options": {
         "thermostat_over_switch": "Thermostat over a switch",
-        "thermostat_over_climate": "Thermostat over another thermostat"
+        "thermostat_over_climate": "Thermostat over a climate",
+        "thermostat_over_valve": "Thermostat over a valve"
       }
     }
   },

custom_components/versatile_thermostat/thermostat_climate.py

@@ -0,0 +1,133 @@
+""" A climate over switch classe """
+import logging
+from datetime import timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event, async_track_time_interval
+
+from homeassistant.components.climate import HVACAction
+
+from .base_thermostat import BaseThermostat
+
+from .const import CONF_CLIMATE, CONF_CLIMATE_2, CONF_CLIMATE_3, CONF_CLIMATE_4
+
+from .underlyings import UnderlyingClimate
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverClimate(BaseThermostat):
+    """Representation of a base class for a Versatile Thermostat over a climate"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_climate(self) -> bool:
+        """ True if the Thermostat is over_climate"""
+        return True
+
+    @property
+    def hvac_action(self) -> HVACAction | None:
+        """ Returns the current hvac_action by checking all hvac_action of the underlyings """
+
+        # if one not IDLE or OFF -> return it
+        # else if one IDLE -> IDLE
+        # else OFF
+        one_idle = False
+        for under in self._underlyings:
+            if (action := under.hvac_action) not in [
+                HVACAction.IDLE,
+                HVACAction.OFF,
+            ]:
+                return action
+            if under.hvac_action == HVACAction.IDLE:
+                one_idle = True
+        if one_idle:
+            return HVACAction.IDLE
+        return HVACAction.OFF
+
+    @property
+    def hvac_modes(self):
+        """List of available operation modes."""
+        if self.underlying_entity(0):
+            return self.underlying_entity(0).hvac_modes
+        else:
+            return super.hvac_modes
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        for climate in [
+            CONF_CLIMATE,
+            CONF_CLIMATE_2,
+            CONF_CLIMATE_3,
+            CONF_CLIMATE_4,
+        ]:
+            if entry_infos.get(climate):
+                self._underlyings.append(
+                    UnderlyingClimate(
+                        hass=self._hass,
+                        thermostat=self,
+                        climate_entity_id=entry_infos.get(climate),
+                    )
+                )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for climate in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [climate.entity_id], self._async_climate_changed
+                )
+            )
+
+        # Start the control_heating
+        # starts a cycle
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self.async_control_heating,
+                interval=timedelta(minutes=self._cycle_min),
+            )
+        )
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+
+        self._attr_extra_state_attributes["is_over_climate"] = self.is_over_climate
+        self._attr_extra_state_attributes["start_hvac_action_date"] = (
+            self._underlying_climate_start_hvac_action_date)
+        self._attr_extra_state_attributes["underlying_climate_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_climate_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_climate_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_climate_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self.update_custom_attributes()
+        self.async_write_ha_state()

custom_components/versatile_thermostat/thermostat_switch.py

@@ -0,0 +1,121 @@
+""" A climate over switch classe """
+import logging
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.components.climate import HVACMode
+
+from .const import (
+    CONF_HEATER,
+    CONF_HEATER_2,
+    CONF_HEATER_3,
+    CONF_HEATER_4
+)
+
+from .base_thermostat import BaseThermostat
+
+from .underlyings import UnderlyingSwitch
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverSwitch(BaseThermostat):
+    """Representation of a base class for a Versatile Thermostat over a switch."""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_switch(self) -> bool:
+        """ True if the Thermostat is over_switch"""
+        return True
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        lst_switches = [entry_infos.get(CONF_HEATER)]
+        if entry_infos.get(CONF_HEATER_2):
+            lst_switches.append(entry_infos.get(CONF_HEATER_2))
+        if entry_infos.get(CONF_HEATER_3):
+            lst_switches.append(entry_infos.get(CONF_HEATER_3))
+        if entry_infos.get(CONF_HEATER_4):
+            lst_switches.append(entry_infos.get(CONF_HEATER_4))
+
+        delta_cycle = self._cycle_min * 60 / len(lst_switches)
+        for idx, switch in enumerate(lst_switches):
+            self._underlyings.append(
+                UnderlyingSwitch(
+                    hass=self._hass,
+                    thermostat=self,
+                    switch_entity_id=switch,
+                    initial_delay_sec=idx * delta_cycle,
+                )
+            )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for switch in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [switch.entity_id], self._async_switch_changed
+                )
+        )
+
+        self.hass.create_task(self.async_control_heating())
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+
+        self._attr_extra_state_attributes["is_over_switch"] = self.is_over_switch
+        self._attr_extra_state_attributes["underlying_switch_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_switch_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_switch_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_switch_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self._attr_extra_state_attributes[
+                "on_percent"
+            ] = self._prop_algorithm.on_percent
+        self._attr_extra_state_attributes[
+            "on_time_sec"
+        ] = self._prop_algorithm.on_time_sec
+        self._attr_extra_state_attributes[
+            "off_time_sec"
+        ] = self._prop_algorithm.off_time_sec
+        self._attr_extra_state_attributes["cycle_min"] = self._cycle_min
+        self._attr_extra_state_attributes["function"] = self._proportional_function
+        self._attr_extra_state_attributes["tpi_coef_int"] = self._tpi_coef_int
+        self._attr_extra_state_attributes["tpi_coef_ext"] = self._tpi_coef_ext
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self._prop_algorithm.calculate(
+            self._target_temp,
+            self._cur_temp,
+            self._cur_ext_temp,
+            self._hvac_mode == HVACMode.COOL,
+        )
+        self.update_custom_attributes()
+        self.async_write_ha_state()

custom_components/versatile_thermostat/thermostat_valve.py

@@ -0,0 +1,311 @@
+# pylint: disable=line-too-long
+""" A climate over switch classe """
+import logging
+from datetime import timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.event import async_track_state_change_event, async_track_time_interval
+from homeassistant.core import callback
+from homeassistant.components.climate import HVACMode, HVACAction
+
+from .base_thermostat import BaseThermostat
+
+from .const import CONF_VALVE, CONF_VALVE_2, CONF_VALVE_3, CONF_VALVE_4
+
+from .underlyings import UnderlyingValve
+
+_LOGGER = logging.getLogger(__name__)
+
+class ThermostatOverValve(BaseThermostat):
+    """Representation of a class for a Versatile Thermostat over a Valve"""
+
+    def __init__(self, hass: HomeAssistant, unique_id, name, entry_infos) -> None:
+        """Initialize the thermostat over switch."""
+        super().__init__(hass, unique_id, name, entry_infos)
+
+    @property
+    def is_over_valve(self) -> bool:
+        """ True if the Thermostat is over_valve"""
+        return True
+
+    @property
+    def valve_open_percent(self) -> int:
+        """ Gives the percentage of valve needed"""
+        if self._hvac_mode == HVACMode.OFF:
+            return 0
+        else:
+            return round(max(0, min(self.proportional_algorithm.on_percent, 1)) * 100)
+
+    def post_init(self, entry_infos):
+        """ Initialize the Thermostat"""
+
+        super().post_init(entry_infos)
+        lst_valves = [entry_infos.get(CONF_VALVE)]
+        if entry_infos.get(CONF_VALVE_2):
+            lst_valves.append(entry_infos.get(CONF_VALVE_2))
+        if entry_infos.get(CONF_VALVE_3):
+            lst_valves.append(entry_infos.get(CONF_VALVE_3))
+        if entry_infos.get(CONF_VALVE_4):
+            lst_valves.append(entry_infos.get(CONF_VALVE_4))
+
+        for _, valve in enumerate(lst_valves):
+            self._underlyings.append(
+                UnderlyingValve(
+                    hass=self._hass,
+                    thermostat=self,
+                    valve_entity_id=valve
+                )
+            )
+
+    async def async_added_to_hass(self):
+        """Run when entity about to be added."""
+        _LOGGER.debug("Calling async_added_to_hass")
+
+        await super().async_added_to_hass()
+
+        # Add listener to all underlying entities
+        for valve in self._underlyings:
+            self.async_on_remove(
+                async_track_state_change_event(
+                    self.hass, [valve.entity_id], self._async_valve_changed
+                )
+        )
+
+        # Start the control_heating
+        # starts a cycle
+        self.async_on_remove(
+            async_track_time_interval(
+                self.hass,
+                self.async_control_heating,
+                interval=timedelta(minutes=self._cycle_min),
+            )
+        )
+
+    @callback
+    async def _async_valve_changed(self, event):
+        """Handle unerdlying valve state changes.
+        This method takes the underlying values and update the VTherm with them.
+        To avoid loops (issues #121 #101 #95 #99), we discard the event if it is received
+        less than 10 sec after the last command. What we want here is to take the values
+        from underlyings ONLY if someone have change directly on the underlying and not
+        as a return of the command. The only thing we take all the time is the HVACAction
+        which is important for feedaback and which cannot generates loops.
+        """
+
+        async def end_climate_changed(changes):
+            """To end the event management"""
+            if changes:
+                self.async_write_ha_state()
+                self.update_custom_attributes()
+                await self.async_control_heating()
+
+        new_state = event.data.get("new_state")
+        _LOGGER.debug("%s - _async_climate_changed new_state is %s", self, new_state)
+        if not new_state:
+            return
+
+        changes = False
+        new_hvac_mode = new_state.state
+
+        old_state = event.data.get("old_state")
+        old_hvac_action = (
+            old_state.attributes.get("hvac_action")
+            if old_state and old_state.attributes
+            else None
+        )
+        new_hvac_action = (
+            new_state.attributes.get("hvac_action")
+            if new_state and new_state.attributes
+            else None
+        )
+
+        old_state_date_changed = (
+            old_state.last_changed if old_state and old_state.last_changed else None
+        )
+        old_state_date_updated = (
+            old_state.last_updated if old_state and old_state.last_updated else None
+        )
+        new_state_date_changed = (
+            new_state.last_changed if new_state and new_state.last_changed else None
+        )
+        new_state_date_updated = (
+            new_state.last_updated if new_state and new_state.last_updated else None
+        )
+
+        # Issue 99 - some AC turn hvac_mode=cool and hvac_action=idle when sending a HVACMode_OFF command
+        # Issue 114 - Remove this because hvac_mode is now managed by local _hvac_mode and use idle action as is
+        # if self._hvac_mode == HVACMode.OFF and new_hvac_action == HVACAction.IDLE:
+        #    _LOGGER.debug("The underlying switch to idle instead of OFF. We will consider it as OFF")
+        #    new_hvac_mode = HVACMode.OFF
+
+        _LOGGER.info(
+            "%s - Underlying climate changed. Event.new_hvac_mode is %s, current_hvac_mode=%s, new_hvac_action=%s, old_hvac_action=%s",
+            self,
+            new_hvac_mode,
+            self._hvac_mode,
+            new_hvac_action,
+            old_hvac_action,
+        )
+
+        _LOGGER.debug(
+            "%s - last_change_time=%s old_state_date_changed=%s old_state_date_updated=%s new_state_date_changed=%s new_state_date_updated=%s",
+            self,
+            self._last_change_time,
+            old_state_date_changed,
+            old_state_date_updated,
+            new_state_date_changed,
+            new_state_date_updated,
+        )
+
+        # Interpretation of hvac action
+        HVAC_ACTION_ON = [  # pylint: disable=invalid-name
+            HVACAction.COOLING,
+            HVACAction.DRYING,
+            HVACAction.FAN,
+            HVACAction.HEATING,
+        ]
+        if old_hvac_action not in HVAC_ACTION_ON and new_hvac_action in HVAC_ACTION_ON:
+            self._underlying_climate_start_hvac_action_date = (
+                self.get_last_updated_date_or_now(new_state)
+            )
+            _LOGGER.info(
+                "%s - underlying just switch ON. Set power and energy start date %s",
+                self,
+                self._underlying_climate_start_hvac_action_date.isoformat(),
+            )
+            changes = True
+
+        if old_hvac_action in HVAC_ACTION_ON and new_hvac_action not in HVAC_ACTION_ON:
+            stop_power_date = self.get_last_updated_date_or_now(new_state)
+            if self._underlying_climate_start_hvac_action_date:
+                delta = (
+                    stop_power_date - self._underlying_climate_start_hvac_action_date
+                )
+                self._underlying_climate_delta_t = delta.total_seconds() / 3600.0
+
+                # increment energy at the end of the cycle
+                self.incremente_energy()
+
+                self._underlying_climate_start_hvac_action_date = None
+
+            _LOGGER.info(
+                "%s - underlying just switch OFF at %s. delta_h=%.3f h",
+                self,
+                stop_power_date.isoformat(),
+                self._underlying_climate_delta_t,
+            )
+            changes = True
+
+        # Issue #120 - Some TRV are chaning target temperature a very long time (6 sec) after the change.
+        # In that case a loop is possible if a user change multiple times during this 6 sec.
+        if new_state_date_updated and self._last_change_time:
+            delta = (new_state_date_updated - self._last_change_time).total_seconds()
+            if delta < 10:
+                _LOGGER.info(
+                    "%s - underlying event is received less than 10 sec after command. Forget it to avoid loop",
+                    self,
+                )
+                await end_climate_changed(changes)
+                return
+
+        if (
+            new_hvac_mode
+            in [
+                HVACMode.OFF,
+                HVACMode.HEAT,
+                HVACMode.COOL,
+                HVACMode.HEAT_COOL,
+                HVACMode.DRY,
+                HVACMode.AUTO,
+                HVACMode.FAN_ONLY,
+                None,
+            ]
+            and self._hvac_mode != new_hvac_mode
+        ):
+            changes = True
+            self._hvac_mode = new_hvac_mode
+            # Update all underlyings state
+            if self.is_over_climate:
+                for under in self._underlyings:
+                    await under.set_hvac_mode(new_hvac_mode)
+
+        if not changes:
+            # try to manage new target temperature set if state
+            _LOGGER.debug(
+                "Do temperature check. temperature is %s, new_state.attributes is %s",
+                self.target_temperature,
+                new_state.attributes,
+            )
+            if (
+                self.is_over_climate
+                and new_state.attributes
+                and (new_target_temp := new_state.attributes.get("temperature"))
+                and new_target_temp != self.target_temperature
+            ):
+                _LOGGER.info(
+                    "%s - Target temp in underlying have change to %s",
+                    self,
+                    new_target_temp,
+                )
+                await self.async_set_temperature(temperature=new_target_temp)
+                changes = True
+
+        await end_climate_changed(changes)
+
+    def update_custom_attributes(self):
+        """ Custom attributes """
+        super().update_custom_attributes()
+        self._attr_extra_state_attributes["valve_open_percent"] = self.valve_open_percent
+        self._attr_extra_state_attributes["is_over_valve"] = self.is_over_valve
+        self._attr_extra_state_attributes["underlying_valve_0"] = (
+                self._underlyings[0].entity_id)
+        self._attr_extra_state_attributes["underlying_valve_1"] = (
+                self._underlyings[1].entity_id if len(self._underlyings) > 1 else None
+            )
+        self._attr_extra_state_attributes["underlying_valve_2"] = (
+                self._underlyings[2].entity_id if len(self._underlyings) > 2 else None
+            )
+        self._attr_extra_state_attributes["underlying_valve_3"] = (
+                self._underlyings[3].entity_id if len(self._underlyings) > 3 else None
+            )
+
+        self._attr_extra_state_attributes[
+                "on_percent"
+            ] = self._prop_algorithm.on_percent
+        self._attr_extra_state_attributes[
+            "on_time_sec"
+        ] = self._prop_algorithm.on_time_sec
+        self._attr_extra_state_attributes[
+            "off_time_sec"
+        ] = self._prop_algorithm.off_time_sec
+        self._attr_extra_state_attributes["cycle_min"] = self._cycle_min
+        self._attr_extra_state_attributes["function"] = self._proportional_function
+        self._attr_extra_state_attributes["tpi_coef_int"] = self._tpi_coef_int
+        self._attr_extra_state_attributes["tpi_coef_ext"] = self._tpi_coef_ext
+
+        self.async_write_ha_state()
+        _LOGGER.debug(
+            "%s - Calling update_custom_attributes: %s",
+            self,
+            self._attr_extra_state_attributes,
+        )
+
+    def recalculate(self):
+        """A utility function to force the calculation of a the algo and
+        update the custom attributes and write the state
+        """
+        _LOGGER.debug("%s - recalculate all", self)
+        self._prop_algorithm.calculate(
+            self._target_temp,
+            self._cur_temp,
+            self._cur_ext_temp,
+            self._hvac_mode == HVACMode.COOL,
+        )
+
+        for under in self._underlyings:
+            under.set_valve_open_percent(
+                self._prop_algorithm.on_percent
+            )
+
+        self.update_custom_attributes()
+        self.async_write_ha_state()

custom_components/versatile_thermostat/translations/en.json

@@ -310,7 +310,8 @@
     "thermostat_type": {
       "options": {
         "thermostat_over_switch": "Thermostat over a switch",
-        "thermostat_over_climate": "Thermostat over another thermostat"
+        "thermostat_over_climate": "Thermostat over another thermostat",
+        "thermostat_over_valve": "Thermostat over a valve"
       }
     }
   },

custom_components/versatile_thermostat/translations/fr.json

@@ -34,7 +34,11 @@
           "climate_entity2_id": "2ème thermostat sous-jacent",
           "climate_entity3_id": "3ème thermostat sous-jacent",
           "climate_entity4_id": "4ème thermostat sous-jacent",
-          "ac_mode": "AC mode ?"
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "1ère valve number",
+          "valve_entity2_id": "2ème valve number",
+          "valve_entity3_id": "3ème valve number",
+          "valve_entity4_id": "4ème valve number"
         },
         "data_description": {
           "heater_entity_id": "Entity id du 1er radiateur obligatoire",
@@ -46,7 +50,11 @@
           "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
           "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
           "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
-          "ac_mode": "Utilisation du mode Air Conditionné (AC)"
+          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
+          "valve_entity_id": "Entity id de la 1ère valve",
+          "valve_entity2_id": "Entity id de la 2ème valve",
+          "valve_entity3_id": "Entity id de la 3ème valve",
+          "valve_entity4_id": "Entity id de la 4ème valve"
         }
       },
       "tpi": {
@@ -188,7 +196,11 @@
           "climate_entity2_id": "2ème thermostat sous-jacent",
           "climate_entity3_id": "3ème thermostat sous-jacent",
           "climate_entity4_id": "4ème thermostat sous-jacent",
-          "ac_mode": "AC mode ?"
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "1ère valve number",
+          "valve_entity2_id": "2ème valve number",
+          "valve_entity3_id": "3ème valve number",
+          "valve_entity4_id": "4ème valve number"
         },
         "data_description": {
           "heater_entity_id": "Entity id du 1er radiateur obligatoire",
@@ -200,7 +212,11 @@
           "climate_entity2_id": "Entity id du 2ème thermostat sous-jacent",
           "climate_entity3_id": "Entity id du 3ème thermostat sous-jacent",
           "climate_entity4_id": "Entity id du 4ème thermostat sous-jacent",
-          "ac_mode": "Utilisation du mode Air Conditionné (AC)"
+          "ac_mode": "Utilisation du mode Air Conditionné (AC)",
+          "valve_entity_id": "Entity id de la 1ère valve",
+          "valve_entity2_id": "Entity id de la 2ème valve",
+          "valve_entity3_id": "Entity id de la 3ème valve",
+          "valve_entity4_id": "Entity id de la 4ème valve"
         }
       },
       "tpi": {
@@ -311,7 +327,8 @@
     "thermostat_type": {
       "options": {
         "thermostat_over_switch": "Thermostat sur un switch",
-        "thermostat_over_climate": "Thermostat sur un autre thermostat"
+        "thermostat_over_climate": "Thermostat sur un autre thermostat",
+        "thermostat_over_valve": "Thermostat sur une valve"
       }
     }
   },

custom_components/versatile_thermostat/translations/it.json

@@ -34,7 +34,11 @@
           "climate_entity2_id": "Secundo termostato sottostante",
           "climate_entity3_id": "Terzo termostato sottostante",
           "climate_entity4_id": "Quarto termostato sottostante",
-          "ac_mode": "AC mode ?"
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "Primo valvola numero",
+          "valve_entity2_id": "Secondo valvola numero",
+          "valve_entity3_id": "Terzo valvola numero",
+          "valve_entity4_id": "Quarto valvola numero"
         },
         "data_description": {
           "heater_entity_id": "Entity id obbligatoria del primo riscaldatore",
@@ -46,7 +50,11 @@
           "climate_entity2_id": "Entity id del secundo termostato sottostante",
           "climate_entity3_id": "Entity id del terzo termostato sottostante",
           "climate_entity4_id": "Entity id del quarto termostato sottostante",
-          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?"
+          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?",
+          "valve_entity_id": "Entity id del primo valvola numero",
+          "valve_entity2_id": "Entity id del secondo valvola numero",
+          "valve_entity3_id": "Entity id del terzo valvola numero",
+          "valve_entity4_id": "Entity id del quarto valvola numero"
         }
       },
       "tpi": {
@@ -169,18 +177,22 @@
       },
       "type": {
         "title": "Entità collegate",
-        "description": "Attributi delle entità collegate",
+        "description": "Parametri entità collegate",
         "data": {
-          "heater_entity_id": "Interruttore riscaldatore",
-          "heater_entity2_id": "Secondo interruttore riscaldatore",
-          "heater_entity3_id": "Terzo interruttore riscaldatore",
-          "heater_entity4_id": "Quarto interruttore riscaldatore",
+          "heater_entity_id": "Primo riscaldatore",
+          "heater_entity2_id": "Secondo riscaldatore",
+          "heater_entity3_id": "Terzo riscaldatore",
+          "heater_entity4_id": "Quarto riscaldatore",
           "proportional_function": "Algoritmo",
           "climate_entity_id": "Termostato sottostante",
           "climate_entity2_id": "Secundo termostato sottostante",
           "climate_entity3_id": "Terzo termostato sottostante",
           "climate_entity4_id": "Quarto termostato sottostante",
-          "ac_mode": "AC mode ?"
+          "ac_mode": "AC mode ?",
+          "valve_entity_id": "Primo valvola numero",
+          "valve_entity2_id": "Secondo valvola numero",
+          "valve_entity3_id": "Terzo valvola numero",
+          "valve_entity4_id": "Quarto valvola numero"
         },
         "data_description": {
           "heater_entity_id": "Entity id obbligatoria del primo riscaldatore",
@@ -192,7 +204,11 @@
           "climate_entity2_id": "Entity id del secundo termostato sottostante",
           "climate_entity3_id": "Entity id del terzo termostato sottostante",
           "climate_entity4_id": "Entity id del quarto termostato sottostante",
-          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?"
+          "ac_mode": "Utilizzare la modalità AC (Air Conditioned) ?",
+          "valve_entity_id": "Entity id del primo valvola numero",
+          "valve_entity2_id": "Entity id del secondo valvola numero",
+          "valve_entity3_id": "Entity id del terzo valvola numero",
+          "valve_entity4_id": "Entity id del quarto valvola numero"
         }
       },
       "tpi": {
@@ -296,7 +312,8 @@
     "thermostat_type": {
       "options": {
         "thermostat_over_switch": "Termostato su un interruttore",
-        "thermostat_over_climate": "Termostato sopra un altro termostato"
+        "thermostat_over_climate": "Termostato sopra un altro termostato",
+        "thermostat_over_valve": "Thermostato su una valvola"
       }
     }
   },

custom_components/versatile_thermostat/underlyings.py

@@ -1,3 +1,5 @@
+# pylint: disable=unused-argument, line-too-long
+
 """ Underlying entities classes """
 import logging
 from typing import Any
@@ -22,10 +24,13 @@ from homeassistant.components.climate import (
     SERVICE_TURN_ON,
     SERVICE_SET_TEMPERATURE,
 )
+
+from homeassistant.components.number import SERVICE_SET_VALUE
+
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_call_later
 
-from .const import UnknownEntity
+from .const import UnknownEntity, overrides
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -42,6 +47,9 @@ class UnderlyingEntityType(StrEnum):
     # a climate
     CLIMATE = "climate"
 
+    # a valve
+    VALVE = "valve"
+
 
 class UnderlyingEntity:
     """Represent a underlying device which could be a switch or a climate"""
@@ -155,6 +163,19 @@ class UnderlyingEntity:
         """Call the method after a delay"""
         return async_call_later(hass, delay_sec, called_method)
 
+    async def start_cycle(
+        self,
+        hvac_mode: HVACMode,
+        on_time_sec: int,
+        off_time_sec: int,
+        on_percent: int,
+        force=False,
+    ):
+        """Starting cycle for switch"""
+
+    def _cancel_cycle(self):
+        """ Stops an eventual cycle """
+
 
 class UnderlyingSwitch(UnderlyingEntity):
     """Represent a underlying switch"""
@@ -210,11 +231,13 @@ class UnderlyingSwitch(UnderlyingEntity):
         """If the toggleable device is currently active."""
         return self._hass.states.is_state(self._entity_id, STATE_ON)
 
+    @overrides
     async def start_cycle(
         self,
         hvac_mode: HVACMode,
         on_time_sec: int,
         off_time_sec: int,
+        on_percent: int,
         force=False,
     ):
         """Starting cycle for switch"""
@@ -265,6 +288,7 @@ class UnderlyingSwitch(UnderlyingEntity):
         else:
             _LOGGER.debug("%s - nothing to do", self)
 
+    @overrides
     def _cancel_cycle(self):
         """Cancel the cycle"""
         if self._async_cancel_cycle:
@@ -298,15 +322,6 @@ class UnderlyingSwitch(UnderlyingEntity):
         time = self._on_time_sec
 
         action_label = "start"
-        # if self._should_relaunch_control_heating:
-        #    _LOGGER.debug("Don't %s cause a cycle have to be relaunch", action_label)
-        #    self._should_relaunch_control_heating = False
-        #    # self.hass.create_task(self._async_control_heating())
-        #    await self.start_cycle(
-        #        self._hvac_mode, self._on_time_sec, self._off_time_sec
-        #    )
-        #    _LOGGER.debug("%s - End of cycle (3)", self)
-        #    return
 
         if time > 0:
             _LOGGER.info(
@@ -343,16 +358,6 @@ class UnderlyingSwitch(UnderlyingEntity):
             return
 
         action_label = "stop"
-        # if self._should_relaunch_control_heating:
-        #    _LOGGER.debug("Don't %s cause a cycle have to be relaunch", action_label)
-        #    self._should_relaunch_control_heating = False
-        #    # self.hass.create_task(self._async_control_heating())
-        #    await self.start_cycle(
-        #        self._hvac_mode, self._on_time_sec, self._off_time_sec
-        #    )
-        #    _LOGGER.debug("%s - End of cycle (3)", self)
-        #    return
-
         time = self._off_time_sec
 
         if time > 0:
@@ -626,3 +631,107 @@ class UnderlyingClimate(UnderlyingEntity):
         if not self.is_initialized:
             return None
         return self._underlying_climate.turn_aux_heat_off()
+
+class UnderlyingValve(UnderlyingEntity):
+    """Represent a underlying switch"""
+
+    _hvac_mode: HVACMode
+    # This is the percentage of opening int integer (from 0 to 100)
+    _percent_open: int
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        thermostat: Any,
+        valve_entity_id: str
+    ) -> None:
+        """Initialize the underlying switch"""
+
+        super().__init__(
+            hass=hass,
+            thermostat=thermostat,
+            entity_type=UnderlyingEntityType.VALVE,
+            entity_id=valve_entity_id,
+        )
+        self._async_cancel_cycle = None
+        self._should_relaunch_control_heating = False
+        self._hvac_mode = None
+        self._percent_open = self._thermostat.valve_open_percent
+
+    async def send_percent_open(self):
+        """ Send the percent open to the underlying valve """
+        # This may fails if called after shutdown
+        try:
+            data = { ATTR_ENTITY_ID: self._entity_id, "value": self._percent_open }
+            domain = self._entity_id.split('.')[0]
+            await self._hass.services.async_call(
+                domain,
+                SERVICE_SET_VALUE,
+                data,
+            )
+        except ServiceNotFound as err:
+            _LOGGER.error(err)
+
+    async def turn_off(self):
+        """Turn heater toggleable device off."""
+        _LOGGER.debug("%s - Stopping underlying valve entity %s", self, self._entity_id)
+        self._percent_open = 0
+        if self.is_device_active:
+            await self.send_percent_open()
+
+    async def turn_on(self):
+        """Nothing to do for Valve because it cannot be turned off"""
+
+    async def set_hvac_mode(self, hvac_mode: HVACMode) -> bool:
+        """Set the HVACmode. Returns true if something have change"""
+
+        if hvac_mode == HVACMode.OFF:
+            await self.turn_off()
+
+        if self._hvac_mode != hvac_mode:
+            self._hvac_mode = hvac_mode
+            return True
+        else:
+            return False
+
+    @property
+    def is_device_active(self):
+        """If the toggleable device is currently active."""
+        try:
+            return self._percent_open > 0
+            # To test if real device is open but this is causing some side effect
+            # because the activation can be deferred -
+            # or float(self._hass.states.get(self._entity_id).state) > 0
+        except Exception: # pylint: disable=broad-exception-caught
+            return False
+
+    @overrides
+    async def start_cycle(
+        self,
+        hvac_mode: HVACMode,
+        _1,
+        _2,
+        _3,
+        force=False,
+    ):
+        """We use this function to change the on_percent"""
+        if force:
+            await self.send_percent_open()
+
+    def set_valve_open_percent(self, percent):
+        """ Update the valve open percent """
+        caped_val = self._thermostat.valve_open_percent
+        if self._percent_open == caped_val:
+            # No changes
+            return
+
+        self._percent_open = caped_val
+        # Send the new command to valve via a service call
+
+        _LOGGER.info("%s - Setting valve ouverture percent to %s", self, self._percent_open)
+        # Send the change to the valve, in background
+        self._hass.create_task(self.send_percent_open())
+
+    def remove_entity(self):
+        """Remove the entity after stopping its cycle"""
+        self._cancel_cycle()

tests/commons.py

@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Some common resources """
 import asyncio
 import logging
@@ -20,7 +22,7 @@ from homeassistant.components.climate import (
 
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
-from custom_components.versatile_thermostat.climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
 from custom_components.versatile_thermostat.const import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from custom_components.versatile_thermostat.underlyings import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
@@ -219,10 +221,10 @@ class MagicMockClimate(MagicMock):
 
 async def create_thermostat(
     hass: HomeAssistant, entry: MockConfigEntry, entity_id: str
-) -> VersatileThermostat:
+) -> BaseThermostat:
     """Creates and return a TPI Thermostat"""
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ):
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
@@ -248,7 +250,7 @@ def search_entity(hass: HomeAssistant, entity_id, domain) -> Entity:
 
 
 async def send_temperature_change_event(
-    entity: VersatileThermostat, new_temp, date, sleep=True
+    entity: BaseThermostat, new_temp, date, sleep=True
 ):
     """Sending a new temperature event simulating a change on temperature sensor"""
     _LOGGER.info(
@@ -274,7 +276,7 @@ async def send_temperature_change_event(
 
 
 async def send_ext_temperature_change_event(
-    entity: VersatileThermostat, new_temp, date, sleep=True
+    entity: BaseThermostat, new_temp, date, sleep=True
 ):
     """Sending a new external temperature event simulating a change on temperature sensor"""
     _LOGGER.info(
@@ -300,7 +302,7 @@ async def send_ext_temperature_change_event(
 
 
 async def send_power_change_event(
-    entity: VersatileThermostat, new_power, date, sleep=True
+    entity: BaseThermostat, new_power, date, sleep=True
 ):
     """Sending a new power event simulating a change on power sensor"""
     _LOGGER.info(
@@ -326,7 +328,7 @@ async def send_power_change_event(
 
 
 async def send_max_power_change_event(
-    entity: VersatileThermostat, new_power_max, date, sleep=True
+    entity: BaseThermostat, new_power_max, date, sleep=True
 ):
     """Sending a new power max event simulating a change on power max sensor"""
     _LOGGER.info(
@@ -352,7 +354,7 @@ async def send_max_power_change_event(
 
 
 async def send_window_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
     """Sending a new window event simulating a change on the window state"""
     _LOGGER.info(
@@ -386,7 +388,7 @@ async def send_window_change_event(
 
 
 async def send_motion_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
     """Sending a new motion event simulating a change on the window state"""
     _LOGGER.info(
@@ -420,7 +422,7 @@ async def send_motion_change_event(
 
 
 async def send_presence_change_event(
-    entity: VersatileThermostat, new_state: bool, old_state: bool, date, sleep=True
+    entity: BaseThermostat, new_state: bool, old_state: bool, date, sleep=True
 ):
     """Sending a new presence event simulating a change on the window state"""
     _LOGGER.info(
@@ -460,7 +462,7 @@ def get_tz(hass: HomeAssistant):
 
 
 async def send_climate_change_event(
-    entity: VersatileThermostat,
+    entity: BaseThermostat,
     new_hvac_mode: HVACMode,
     old_hvac_mode: HVACMode,
     new_hvac_action: HVACAction,
@@ -503,7 +505,7 @@ async def send_climate_change_event(
     return ret
 
 async def send_climate_change_event_with_temperature(
-    entity: VersatileThermostat,
+    entity: BaseThermostat,
     new_hvac_mode: HVACMode,
     old_hvac_mode: HVACMode,
     new_hvac_action: HVACAction,
@@ -548,9 +550,9 @@ async def send_climate_change_event_with_temperature(
     return ret
 
 
-def cancel_switchs_cycles(entity: VersatileThermostat):
+def cancel_switchs_cycles(entity: BaseThermostat):
     """This method will cancel all running cycle on all underlying switch entity"""
-    if entity._is_over_climate:
+    if entity.is_over_climate:
         return
     for under in entity._underlyings:
         under._cancel_cycle()

tests/conftest.py

@@ -26,9 +26,7 @@ from custom_components.versatile_thermostat.config_flow import (
     VersatileThermostatBaseConfigFlow,
 )
 
-from custom_components.versatile_thermostat.climate import (
-    VersatileThermostat,
-)
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
 
 pytest_plugins = "pytest_homeassistant_custom_component"  # pylint: disable=invalid-name
 
@@ -84,7 +82,7 @@ def skip_hass_states_get_fixture():
 def skip_control_heating_fixture():
     """Skip the control_heating of VersatileThermostat"""
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         yield
 
@@ -107,6 +105,6 @@ def skip_hass_states_is_state_fixture():
 
 @pytest.fixture(name="skip_send_event")
 def skip_send_event_fixture():
-    """Skip the send_event in VersatileThermostat"""
-    with patch.object(VersatileThermostat, "send_event"):
+    """Skip the send_event in BaseThermostat"""
+    with patch.object(BaseThermostat, "send_event"):
         yield

tests/test_binary_sensors.py

@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from unittest.mock import patch
 from datetime import timedelta, datetime
@@ -9,7 +11,7 @@ from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
-from custom_components.versatile_thermostat.climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
 from custom_components.versatile_thermostat.binary_sensor import (
     SecurityBinarySensor,
     OverpoweringBinarySensor,
@@ -18,7 +20,7 @@ from custom_components.versatile_thermostat.binary_sensor import (
     PresenceBinarySensor,
 )
 
-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+from .commons import *
 
 
 @pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -60,7 +62,7 @@ async def test_security_binary_sensors(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat (
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -141,7 +143,7 @@ async def test_overpowering_binary_sensors(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -223,7 +225,7 @@ async def test_window_binary_sensors(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -311,7 +313,7 @@ async def test_motion_binary_sensors(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -401,7 +403,7 @@ async def test_presence_binary_sensors(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -483,7 +485,7 @@ async def test_binary_sensors_over_climate_minimal(
             },
         )
 
-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
             hass, entry, "climate.theoverclimatemockname"
         )
         assert entity

tests/test_bugs.py

@@ -1,10 +1,12 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the Window management """
 from unittest.mock import patch, call
-from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 from datetime import datetime, timedelta
 
 import logging
 
+from .commons import *
 logging.getLogger().setLevel(logging.DEBUG)
 
 
@@ -49,7 +51,7 @@ async def test_bug_56(
             },
         )
 
-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
             hass, entry, "climate.theoverclimatemockname"
         )
         assert entity
@@ -60,9 +62,9 @@ async def test_bug_56(
         # Should not failed
         entity.update_custom_attributes()
 
-        # try to call _async_control_heating
+        # try to call async_control_heating
         try:
-            ret = await entity._async_control_heating()
+            ret = await entity.async_control_heating()
             # an exception should be send
             assert ret is False
         except Exception:  # pylint: disable=broad-exception-caught
@@ -73,9 +75,9 @@ async def test_bug_56(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
         return_value=the_mock_underlying,  # dont find the underlying climate
     ):
-        # try to call _async_control_heating
+        # try to call async_control_heating
         try:
-            await entity._async_control_heating()
+            await entity.async_control_heating()
         except UnknownEntity:
             assert False
         except Exception:  # pylint: disable=broad-exception-caught
@@ -126,7 +128,7 @@ async def test_bug_63(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -178,7 +180,7 @@ async def test_bug_64(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -230,7 +232,7 @@ async def test_bug_66(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -245,7 +247,7 @@ async def test_bug_66(
 
     # Open the window and let the thermostat shut down
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -273,7 +275,7 @@ async def test_bug_66(
 
     # Close the window but too shortly
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -296,7 +298,7 @@ async def test_bug_66(
 
     # Reopen immediatly with sufficient time
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -319,7 +321,7 @@ async def test_bug_66(
 
     # Close the window but with sufficient time this time
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -366,7 +368,7 @@ async def test_bug_82(
     fake_underlying_climate = MockUnavailableClimate(hass, "mockUniqueId", "MockClimateName", {})
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
         return_value=fake_underlying_climate,
@@ -387,7 +389,7 @@ async def test_bug_82(
         assert entity
 
         assert entity.name == "TheOverClimateMockName"
-        assert entity._is_over_climate is True
+        assert entity.is_over_climate is True
         # assert entity.hvac_action is HVACAction.OFF
         assert entity.hvac_mode is HVACMode.OFF
         # assert entity.hvac_mode is None
@@ -431,10 +433,10 @@ async def test_bug_82(
 
         # 2. activate security feature when date is expired
         with patch(
-            "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
         ) as mock_send_event, patch(
             "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
-        ) as mock_heater_on:
+        ):
             event_timestamp = now - timedelta(minutes=6)
 
             # set temperature to 15 so that on_percent will be > security_min_on_percent (0.2)
@@ -468,7 +470,7 @@ async def test_bug_101(
     fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT)
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
         return_value=fake_underlying_climate,
@@ -491,7 +493,7 @@ async def test_bug_101(
         assert entity
 
         assert entity.name == "TheOverClimateMockName"
-        assert entity._is_over_climate is True
+        assert entity.is_over_climate is True
         assert entity.hvac_mode is HVACMode.OFF
         # because the underlying is heating. In real life the underlying should be shut-off
         assert entity.hvac_action is HVACAction.HEATING
@@ -540,6 +542,3 @@ async def test_bug_101(
         await send_climate_change_event_with_temperature(entity, HVACMode.HEAT, HVACMode.HEAT, HVACAction.OFF, HVACAction.OFF, event_timestamp, 12.75)
         assert entity.target_temperature == 12.75
         assert entity.preset_mode is PRESET_NONE
-
-
-

tests/test_movement.py

@@ -64,7 +64,7 @@ async def test_movement_management_time_not_enough(
 
     # start heating, in boost mode, when someone is present. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         await entity.async_set_hvac_mode(HVACMode.HEAT)
         await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -85,7 +85,7 @@ async def test_movement_management_time_not_enough(
 
     # starts detecting motion with time not enough
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -118,7 +118,7 @@ async def test_movement_management_time_not_enough(
 
     # starts detecting motion with time enough this time
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -144,7 +144,7 @@ async def test_movement_management_time_not_enough(
 
     # stop detecting motion with off delay too low
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -176,7 +176,7 @@ async def test_movement_management_time_not_enough(
 
     # stop detecting motion with off delay enough long
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -261,7 +261,7 @@ async def test_movement_management_time_enough_and_presence(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         await entity.async_set_hvac_mode(HVACMode.HEAT)
         await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -282,7 +282,7 @@ async def test_movement_management_time_enough_and_presence(
 
     # starts detecting motion
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -311,7 +311,7 @@ async def test_movement_management_time_enough_and_presence(
 
     # stop detecting motion with confirmation of stop
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -393,7 +393,7 @@ async def test_movement_management_time_enoughand_not_presence(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         await entity.async_set_hvac_mode(HVACMode.HEAT)
         await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -414,7 +414,7 @@ async def test_movement_management_time_enoughand_not_presence(
 
     # starts detecting motion
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -443,7 +443,7 @@ async def test_movement_management_time_enoughand_not_presence(
 
     # stop detecting motion with confirmation of stop
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -527,7 +527,7 @@ async def test_movement_management_with_stop_during_condition(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         await entity.async_set_hvac_mode(HVACMode.HEAT)
         await entity.async_set_preset_mode(PRESET_ACTIVITY)
@@ -548,7 +548,7 @@ async def test_movement_management_with_stop_during_condition(
 
     # starts detecting motion
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(

tests/test_multiple_switch.py

@@ -58,7 +58,7 @@ async def test_one_switch_cycle(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ):
         await entity.async_set_hvac_mode(HVACMode.HEAT)
         await entity.async_set_preset_mode(PRESET_BOOST)
@@ -75,14 +75,14 @@ async def test_one_switch_cycle(
     with patch(
         "homeassistant.core.StateMachine.is_state", return_value=False
     ) as mock_is_state:
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
         # Should be call for the Switch
         assert mock_is_state.call_count == 1
 
     # Set temperature to a low level
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -117,7 +117,7 @@ async def test_one_switch_cycle(
     # Set a temperature at middle level
     event_timestamp = now - timedelta(minutes=4)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -139,7 +139,7 @@ async def test_one_switch_cycle(
     # Set another temperature at middle level
     event_timestamp = now - timedelta(minutes=3)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -172,7 +172,7 @@ async def test_one_switch_cycle(
     # Simulate the end of heater on cycle
     event_timestamp = now - timedelta(minutes=3)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -195,7 +195,7 @@ async def test_one_switch_cycle(
     # Simulate the start of heater on cycle
     event_timestamp = now - timedelta(minutes=3)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -269,7 +269,7 @@ async def test_multiple_switchs(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
@@ -285,7 +285,7 @@ async def test_multiple_switchs(
         await send_temperature_change_event(entity, 15, event_timestamp)
 
         # Checks that all climates are off
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
         # Should be call for all Switch
         assert mock_underlying_set_hvac_mode.call_count == 4
@@ -297,7 +297,7 @@ async def test_multiple_switchs(
 
     # Set temperature to a low level
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -335,7 +335,7 @@ async def test_multiple_switchs(
     # Set a temperature at middle level
     event_timestamp = now - timedelta(minutes=4)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -405,7 +405,7 @@ async def test_multiple_climates(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
@@ -427,11 +427,11 @@ async def test_multiple_climates(
                 call.set_hvac_mode(HVACMode.HEAT),
             ]
         )
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
     # Stop heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
@@ -452,7 +452,7 @@ async def test_multiple_climates(
                 call.set_hvac_mode(HVACMode.OFF),
             ]
         )
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
 
 @pytest.mark.parametrize("expected_lingering_tasks", [True])
@@ -505,7 +505,7 @@ async def test_multiple_climates_underlying_changes(
 
     # start heating, in boost mode. We block the control_heating to avoid running a cycle
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
@@ -527,11 +527,11 @@ async def test_multiple_climates_underlying_changes(
                 call.set_hvac_mode(HVACMode.HEAT),
             ]
         )
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
     # Stop heating on one underlying climate
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode:
@@ -554,11 +554,11 @@ async def test_multiple_climates_underlying_changes(
             ]
         )
         assert entity.hvac_mode == HVACMode.OFF
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access
 
     # Start heating on one underlying climate
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat._async_control_heating"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.async_control_heating"
     ), patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.set_hvac_mode"
     ) as mock_underlying_set_hvac_mode, patch(
@@ -587,4 +587,4 @@ async def test_multiple_climates_underlying_changes(
         )
         assert entity.hvac_mode == HVACMode.HEAT
         assert entity.hvac_action == HVACAction.IDLE
-        assert entity._is_device_active is False  # pylint: disable=protected-access
+        assert entity.is_device_active is False  # pylint: disable=protected-access

tests/test_power.py

@@ -81,7 +81,7 @@ async def test_power_management_hvac_off(
 
     # Send power max mesurement too low but HVACMode is off
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -162,7 +162,7 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is
 
     # Send power max mesurement too low and HVACMode is on
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -196,7 +196,7 @@ async def test_power_management_hvac_on(hass: HomeAssistant, skip_hass_states_is
 
     # Send power mesurement low to unseet power preset
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -282,7 +282,7 @@ async def test_power_management_energy_over_switch(
 
     # set temperature to 15 so that on_percent will be set
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -311,7 +311,7 @@ async def test_power_management_energy_over_switch(
 
     # change temperature to a higher value
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -333,7 +333,7 @@ async def test_power_management_energy_over_switch(
 
     # change temperature to a much higher value so that heater will be shut down
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(

tests/test_security.py

@@ -87,7 +87,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):
 
     # 2. activate security feature when date is expired
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on:
@@ -134,7 +134,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):
 
     # 3. Change the preset to Boost (we should stay in SECURITY)
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on:
@@ -149,7 +149,7 @@ async def test_security_feature(hass: HomeAssistant, skip_hass_states_is_state):
 
     # 5. resolve the datetime issue
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on:
@@ -214,7 +214,7 @@ async def test_security_over_climate(
     fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {}, HVACMode.HEAT)
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
         return_value=fake_underlying_climate,
@@ -235,7 +235,7 @@ async def test_security_over_climate(
         assert entity
 
         assert entity.name == "TheOverClimateMockName"
-        assert entity._is_over_climate is True
+        assert entity.is_over_climate is True
 
         # Because the underlying is HEATING. In real life the underlying will be shut-off
         assert entity.hvac_action is HVACAction.HEATING
@@ -292,7 +292,7 @@ async def test_security_over_climate(
 
         # 2. activate security feature when date is expired
         with patch(
-            "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+            "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
         ) as mock_send_event, patch(
             "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
         ) as mock_heater_on:

tests/test_sensors.py

@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from datetime import timedelta, datetime
 
@@ -12,7 +14,7 @@ from homeassistant.const import UnitOfTime, UnitOfPower, UnitOfEnergy, PERCENTAG
 
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
-from custom_components.versatile_thermostat.climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
 from custom_components.versatile_thermostat.sensor import (
     EnergySensor,
     MeanPowerSensor,
@@ -66,7 +68,7 @@ async def test_sensors_over_switch(
         },
     )
 
-    entity: VersatileThermostat = await create_thermostat(
+    entity: BaseThermostat = await create_thermostat(
         hass, entry, "climate.theoverswitchmockname"
     )
     assert entity
@@ -229,7 +231,7 @@ async def test_sensors_over_climate(
             },
         )
 
-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
             hass, entry, "climate.theoverclimatemockname"
         )
         assert entity
@@ -361,7 +363,7 @@ async def test_sensors_over_climate_minimal(
             },
         )
 
-        entity: VersatileThermostat = await create_thermostat(
+        entity: BaseThermostat = await create_thermostat(
             hass, entry, "climate.theoverclimatemockname"
         )
         assert entity

tests/test_start.py

@@ -1,3 +1,5 @@
+# pylint: disable=wildcard-import, unused-wildcard-import, protected-access, unused-argument, line-too-long
+
 """ Test the normal start of a Thermostat """
 from unittest.mock import patch, call
 
@@ -10,7 +12,9 @@ from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DO
 
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
-from custom_components.versatile_thermostat.climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.thermostat_climate import ThermostatOverClimate
+from custom_components.versatile_thermostat.thermostat_switch import ThermostatOverSwitch
 
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
@@ -28,7 +32,7 @@ async def test_over_switch_full_start(hass: HomeAssistant, skip_hass_states_is_s
     )
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event:
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
@@ -41,12 +45,13 @@ async def test_over_switch_full_start(hass: HomeAssistant, skip_hass_states_is_s
                 if entity.entity_id == entity_id:
                     return entity
 
-        entity: VersatileThermostat = find_my_entity("climate.theoverswitchmockname")
+        entity: BaseThermostat = find_my_entity("climate.theoverswitchmockname")
 
         assert entity
+        assert isinstance(entity, ThermostatOverSwitch)
 
         assert entity.name == "TheOverSwitchMockName"
-        assert entity._is_over_climate is False
+        assert entity.is_over_climate is False
         assert entity.hvac_action is HVACAction.OFF
         assert entity.hvac_mode is HVACMode.OFF
         assert entity.target_temperature == entity.min_temp
@@ -93,7 +98,7 @@ async def test_over_climate_full_start(hass: HomeAssistant, skip_hass_states_is_
     fake_underlying_climate = MockClimate(hass, "mockUniqueId", "MockClimateName", {})
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingClimate.find_underlying_climate",
         return_value=fake_underlying_climate,
@@ -112,9 +117,10 @@ async def test_over_climate_full_start(hass: HomeAssistant, skip_hass_states_is_
         entity = find_my_entity("climate.theoverclimatemockname")
 
         assert entity
+        assert isinstance(entity, ThermostatOverClimate)
 
         assert entity.name == "TheOverClimateMockName"
-        assert entity._is_over_climate is True
+        assert entity.is_over_climate is True
         assert entity.hvac_action is HVACAction.OFF
         assert entity.hvac_mode is HVACMode.OFF
         assert entity.target_temperature == entity.min_temp
@@ -160,7 +166,7 @@ async def test_over_4switch_full_start(hass: HomeAssistant, skip_hass_states_is_
     )
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event:
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
@@ -173,12 +179,12 @@ async def test_over_4switch_full_start(hass: HomeAssistant, skip_hass_states_is_
                 if entity.entity_id == entity_id:
                     return entity
 
-        entity: VersatileThermostat = find_my_entity("climate.theover4switchmockname")
+        entity: BaseThermostat = find_my_entity("climate.theover4switchmockname")
 
         assert entity
 
         assert entity.name == "TheOver4SwitchMockName"
-        assert entity._is_over_climate is False
+        assert entity.is_over_climate is False
         assert entity.hvac_action is HVACAction.OFF
         assert entity.hvac_mode is HVACMode.OFF
         assert entity.target_temperature == entity.min_temp

tests/test_switch_ac.py

@@ -11,7 +11,8 @@ from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DO
 
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
-from custom_components.versatile_thermostat.climate import VersatileThermostat
+from custom_components.versatile_thermostat.base_thermostat import BaseThermostat
+from custom_components.versatile_thermostat.thermostat_switch import ThermostatOverSwitch
 
 from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
@@ -31,7 +32,7 @@ async def test_over_switch_ac_full_start(hass: HomeAssistant, skip_hass_states_i
     now: datetime = datetime.now(tz=tz)
 
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event:
         entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
@@ -45,12 +46,13 @@ async def test_over_switch_ac_full_start(hass: HomeAssistant, skip_hass_states_i
                     return entity
 
         # The name is in the CONF and not the title of the entry
-        entity: VersatileThermostat = find_my_entity("climate.theoverswitchmockname")
+        entity: BaseThermostat = find_my_entity("climate.theoverswitchmockname")
 
         assert entity
+        assert isinstance(entity, ThermostatOverSwitch)
 
         assert entity.name == "TheOverSwitchMockName"
-        assert entity._is_over_climate is False     # pylint: disable=protected-access
+        assert entity.is_over_climate is False     # pylint: disable=protected-access
         assert entity.ac_mode is True
         assert entity.hvac_action is HVACAction.OFF
         assert entity.hvac_mode is HVACMode.OFF
@@ -136,5 +138,3 @@ async def test_over_switch_ac_full_start(hass: HomeAssistant, skip_hass_states_i
             assert entity.hvac_mode is HVACMode.COOL
             assert (entity.hvac_action is HVACAction.OFF or entity.hvac_action is HVACAction.IDLE)
             assert entity.target_temperature == 27 # eco_ac_away
-
-

tests/test_valve.py

@@ -0,0 +1,259 @@
+# pylint: disable=line-too-long
+
+""" Test the normal start of a Switch AC Thermostat """
+from unittest.mock import patch, call
+from datetime import datetime, timedelta
+
+from homeassistant.core import HomeAssistant
+from homeassistant.components.climate import HVACAction, HVACMode
+from homeassistant.config_entries import ConfigEntryState
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.components.climate import ClimateEntity, DOMAIN as CLIMATE_DOMAIN
+
+from pytest_homeassistant_custom_component.common import MockConfigEntry
+
+from custom_components.versatile_thermostat.thermostat_valve import ThermostatOverValve
+
+from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-import
+
+@pytest.mark.parametrize("expected_lingering_timers", [True])
+async def test_over_valve_full_start(hass: HomeAssistant, skip_hass_states_is_state):   # pylint: disable=unused-argument
+    """Test the normal full start of a thermostat in thermostat_over_switch type"""
+
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="TheOverValveMockName",
+        unique_id="uniqueId",
+        data={
+            CONF_NAME: "TheOverValveMockName",
+            CONF_THERMOSTAT_TYPE: CONF_THERMOSTAT_VALVE,
+            CONF_TEMP_SENSOR: "sensor.mock_temp_sensor",
+            CONF_EXTERNAL_TEMP_SENSOR: "sensor.mock_ext_temp_sensor",
+            CONF_VALVE: "number.mock_valve",
+            CONF_CYCLE_MIN: 5,
+            CONF_TEMP_MIN: 15,
+            CONF_TEMP_MAX: 30,
+            PRESET_ECO + "_temp": 17,
+            PRESET_COMFORT + "_temp": 19,
+            PRESET_BOOST + "_temp": 21,
+            CONF_USE_WINDOW_FEATURE: True,
+            CONF_USE_MOTION_FEATURE: True,
+            CONF_USE_POWER_FEATURE: True,
+            CONF_USE_PRESENCE_FEATURE: True,
+            CONF_PROP_FUNCTION: PROPORTIONAL_FUNCTION_TPI,
+            CONF_TPI_COEF_INT: 0.3,
+            CONF_TPI_COEF_EXT: 0.01,
+            CONF_MOTION_SENSOR: "input_boolean.motion_sensor",
+            CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
+            CONF_WINDOW_DELAY: 10,
+            CONF_MOTION_DELAY: 10,
+            CONF_MOTION_OFF_DELAY: 30,
+            CONF_MOTION_PRESET: PRESET_COMFORT,
+            CONF_NO_MOTION_PRESET: PRESET_ECO,
+            CONF_POWER_SENSOR: "sensor.power_sensor",
+            CONF_MAX_POWER_SENSOR: "sensor.power_max_sensor",
+            CONF_PRESENCE_SENSOR: "person.presence_sensor",
+            PRESET_ECO + PRESET_AWAY_SUFFIX + "_temp": 17.1,
+            PRESET_COMFORT + PRESET_AWAY_SUFFIX + "_temp": 17.2,
+            PRESET_BOOST + PRESET_AWAY_SUFFIX + "_temp": 17.3,
+            CONF_PRESET_POWER: 10,
+            CONF_MINIMAL_ACTIVATION_DELAY: 30,
+            CONF_SECURITY_DELAY_MIN: 5,
+            CONF_SECURITY_MIN_ON_PERCENT: 0.3,
+            CONF_DEVICE_POWER: 100,
+            CONF_AC_MODE: False
+        },
+    )
+
+    tz = get_tz(hass)  # pylint: disable=invalid-name
+    now: datetime = datetime.now(tz=tz)
+
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event:
+        entry.add_to_hass(hass)
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.LOADED
+
+        def find_my_entity(entity_id) -> ClimateEntity:
+            """Find my new entity"""
+            component: EntityComponent[ClimateEntity] = hass.data[CLIMATE_DOMAIN]
+            for entity in component.entities:
+                if entity.entity_id == entity_id:
+                    return entity
+
+        # The name is in the CONF and not the title of the entry
+        entity: ThermostatOverValve = find_my_entity("climate.theovervalvemockname")
+
+        assert entity
+        assert isinstance(entity, ThermostatOverValve)
+
+        assert entity.name == "TheOverValveMockName"
+        assert entity.is_over_climate is False
+        assert entity.is_over_switch is False
+        assert entity.is_over_valve is True
+        assert entity.ac_mode is False
+        assert entity.hvac_mode is HVACMode.OFF
+        assert entity.hvac_action is HVACAction.OFF
+        assert entity.hvac_modes == [HVACMode.HEAT, HVACMode.OFF]
+        assert entity.target_temperature == entity.min_temp
+        assert entity.preset_modes == [
+            PRESET_NONE,
+            PRESET_ECO,
+            PRESET_COMFORT,
+            PRESET_BOOST,
+            PRESET_ACTIVITY,
+        ]
+        assert entity.preset_mode is PRESET_NONE
+        assert entity._security_state is False             # pylint: disable=protected-access
+        assert entity._window_state is None       # pylint: disable=protected-access
+        assert entity._motion_state is None       # pylint: disable=protected-access
+        assert entity._presence_state is None       # pylint: disable=protected-access
+        assert entity._prop_algorithm is not None       # pylint: disable=protected-access
+
+        # should have been called with EventType.PRESET_EVENT and EventType.HVAC_MODE_EVENT
+        assert mock_send_event.call_count == 2
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(EventType.PRESET_EVENT, {"preset": PRESET_NONE}),
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.OFF},
+                ),
+            ]
+        )
+
+    # Set the HVACMode to HEAT, with manual preset and target_temp to 18 before receiving temperature
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event:
+        # Select a hvacmode, presence and preset
+        await entity.async_set_hvac_mode(HVACMode.HEAT)
+        #
+        assert entity.hvac_mode is HVACMode.HEAT
+        # No heating now
+        assert entity.valve_open_percent == 0
+        assert entity.hvac_action == HVACAction.IDLE
+        assert mock_send_event.call_count == 1
+        mock_send_event.assert_has_calls(
+            [
+                call.send_event(
+                    EventType.HVAC_MODE_EVENT,
+                    {"hvac_mode": HVACMode.HEAT},
+                ),
+            ]
+        )
+
+        # set manual target temp
+        await entity.async_set_temperature(temperature=18)
+        assert entity.preset_mode == PRESET_NONE # Manual mode
+        assert entity.target_temperature == 18
+        # Nothing have changed cause we don't have room and external temperature
+        assert mock_send_event.call_count == 1
+
+
+    # Set temperature and external temperature
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "homeassistant.core.ServiceRegistry.async_call"
+    ) as mock_service_call, patch(
+        "homeassistant.core.StateMachine.get", return_value=State(entity_id="number.mock_valve", state="90")
+    ):
+        # Change temperature
+        event_timestamp = now - timedelta(minutes=10)
+        await send_temperature_change_event(entity, 15, datetime.now())
+        assert entity.valve_open_percent == 90
+        await send_ext_temperature_change_event(entity, 10, datetime.now())
+        # Should heating strongly now
+        assert entity.valve_open_percent == 98
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        assert mock_service_call.call_count == 2
+        mock_service_call.assert_has_calls([
+            call.async_call('number', 'set_value', {'entity_id': 'number.mock_valve', 'value': 90}),
+            call.async_call('number', 'set_value', {'entity_id': 'number.mock_valve', 'value': 98})
+        ])
+
+        assert mock_send_event.call_count == 0
+
+        # Change to preset Comfort
+        await entity.async_set_preset_mode(preset_mode=PRESET_COMFORT)
+        assert entity.preset_mode == PRESET_COMFORT
+        assert entity.target_temperature == 17.2
+        assert entity.valve_open_percent == 73
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        # Change presence to on
+        event_timestamp = now - timedelta(minutes=4)
+        await send_presence_change_event(entity, True, False, event_timestamp)
+        assert entity.presence_state == STATE_ON   # pylint: disable=protected-access
+        assert entity.preset_mode is PRESET_COMFORT
+        assert entity.target_temperature == 19
+        assert entity.valve_open_percent == 100 # Full heating
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+    # Change internal temperature
+    with patch(
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
+    ) as mock_send_event, patch(
+        "homeassistant.core.ServiceRegistry.async_call"
+    ) as mock_service_call, patch(
+        "homeassistant.core.StateMachine.get", return_value=0
+    ):
+        event_timestamp = now - timedelta(minutes=3)
+        await send_temperature_change_event(entity, 20, datetime.now())
+        assert entity.valve_open_percent == 0
+        assert entity.is_device_active is False
+        assert entity.hvac_action == HVACAction.IDLE
+
+
+        await send_temperature_change_event(entity, 17, datetime.now())
+        # switch to Eco
+        await entity.async_set_preset_mode(PRESET_ECO)
+        assert entity.preset_mode is PRESET_ECO
+        assert entity.target_temperature == 17
+        assert entity.valve_open_percent == 7
+
+        # Unset the presence
+        event_timestamp = now - timedelta(minutes=2)
+        await send_presence_change_event(entity, False, True, event_timestamp)
+        assert entity.presence_state == STATE_OFF   # pylint: disable=protected-access
+        assert entity.valve_open_percent == 10
+        assert entity.target_temperature == 17.1 # eco_away
+        assert entity.is_device_active is True
+        assert entity.hvac_action == HVACAction.HEATING
+
+        # Open a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=1)
+            try_condition = await send_window_change_event(entity, True, False, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.OFF
+            assert entity.hvac_action is HVACAction.OFF
+            assert entity.target_temperature == 17.1 # eco
+            assert entity.valve_open_percent == 0
+
+        # Close a window
+        with patch(
+            "homeassistant.helpers.condition.state", return_value=True
+        ):
+            event_timestamp = now - timedelta(minutes=0)
+            try_condition = await send_window_change_event(entity, False, True, event_timestamp)
+
+            # Confirme the window event
+            await try_condition(None)
+
+            assert entity.hvac_mode is HVACMode.HEAT
+            assert (entity.hvac_action is HVACAction.OFF or entity.hvac_action is HVACAction.IDLE)
+            assert entity.target_temperature == 17.1 # eco
+            assert entity.valve_open_percent == 10

tests/test_window.py

@@ -66,7 +66,7 @@ async def test_window_management_time_not_enough(
 
     # Open the window, but condition of time is not satisfied and check the thermostat don't turns off
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -154,7 +154,7 @@ async def test_window_management_time_enough(
 
     # change temperature to force turning on the heater
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -172,7 +172,7 @@ async def test_window_management_time_enough(
 
     # Open the window, condition of time is satisfied, check the thermostat and heater turns off
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -200,7 +200,7 @@ async def test_window_management_time_enough(
 
     # Close the window
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -296,7 +296,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
 
     # Make the temperature down
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -318,7 +318,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
 
     # send one degre down in one minute
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -353,7 +353,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
 
     # send another 0.1 degre in one minute -> no change
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -378,7 +378,7 @@ async def test_window_auto_fast(hass: HomeAssistant, skip_hass_states_is_state):
 
     # send another plus 1.1 degre in one minute -> restore state
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -480,7 +480,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
 
     # Make the temperature down
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -501,7 +501,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
 
     # send one degre down in one minute
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -539,7 +539,7 @@ async def test_window_auto_auto_stop(hass: HomeAssistant, skip_hass_states_is_st
 
         # Waits for automatic disable
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -625,7 +625,7 @@ async def test_window_auto_no_on_percent(
 
     # Make the temperature down
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(
@@ -647,7 +647,7 @@ async def test_window_auto_no_on_percent(
 
     # send one degre down in one minute
     with patch(
-        "custom_components.versatile_thermostat.climate.VersatileThermostat.send_event"
+        "custom_components.versatile_thermostat.base_thermostat.BaseThermostat.send_event"
     ) as mock_send_event, patch(
         "custom_components.versatile_thermostat.underlyings.UnderlyingSwitch.turn_on"
     ) as mock_heater_on, patch(