Fix signature send_percent_open

Fixes #902

custom_components/versatile_thermostat/feature_window_manager.py

@@ -44,7 +44,6 @@ class FeatureWindowManager(BaseFeatureManager):
         {
             "window_sensor_entity_id",
             "is_window_configured",
-            "is_window_bypass",
             "window_delay_sec",
             "window_off_delay_sec",
             "window_auto_configured",
@@ -130,6 +129,11 @@ class FeatureWindowManager(BaseFeatureManager):
     @overrides
     async def start_listening(self):
         """Start listening the underlying entity"""
+
+        #Try to get last window bypass state
+        old_state = await self._vtherm.async_get_last_state()
+        self._is_window_bypass = True if old_state and old_state.attributes and old_state.attributes.get("is_window_bypass") == True else False
+        
         if self._is_configured:
             self.stop_listening()
             if self._window_sensor_entity_id:
@@ -449,22 +453,23 @@ class FeatureWindowManager(BaseFeatureManager):
         """Set the window bypass flag
         Return True if state have been changed"""
         self._is_window_bypass = window_bypass
-        if not self._is_window_bypass and self._window_state:
-            _LOGGER.info(
-                "%s - Last window state was open & ByPass is now off. Set hvac_mode to '%s'",
-                self,
-                HVACMode.OFF,
-            )
-            self._vtherm.save_hvac_mode()
-            await self._vtherm.async_set_hvac_mode(HVACMode.OFF)
-            return True
+        
+        if self._window_state == STATE_ON:
+            if not self._is_window_bypass:
+                _LOGGER.info(
+                    "%s - Last window state was open & ByPass is now off. Set hvac_mode to '%s'",
+                    self,
+                    HVACMode.OFF,
+                )
+                self._vtherm.save_hvac_mode()
+                await self._vtherm.async_set_hvac_mode(HVACMode.OFF)
 
-        if self._is_window_bypass and self._window_state:
-            _LOGGER.info(
-                "%s - Last window state was open & ByPass is now on. Set hvac_mode to last available mode",
-                self,
-            )
-            await self._vtherm.restore_hvac_mode(True)
+            if self._is_window_bypass:
+                _LOGGER.info(
+                    "%s - Last window state was open & ByPass is now on. Set hvac_mode to last available mode",
+                    self,
+                )
+                await self._vtherm.restore_hvac_mode(True)
             return True
         return False
 
@@ -504,10 +509,10 @@ class FeatureWindowManager(BaseFeatureManager):
 
     @property
     def is_window_detected(self) -> bool:
-        """Return true if the presence is configured and presence sensor is OFF"""
+        """Return true if the window is configured and open and bypass is not ON"""
         return self._is_configured and (
             self._window_state == STATE_ON or self._window_auto_state == STATE_ON
-        )
+        ) and not self._is_window_bypass
 
     @property
     def window_sensor_entity_id(self) -> bool:

custom_components/versatile_thermostat/manifest.json

@@ -14,6 +14,6 @@
   "quality_scale": "silver",
   "requirements": [],
   "ssdp": [],
-  "version": "7.2.1",
+  "version": "7.2.2",
   "zeroconf": []
 }

custom_components/versatile_thermostat/underlyings.py

@@ -968,10 +968,10 @@ class UnderlyingValve(UnderlyingEntity):
             # This could happens in unit test if input_number domain is not yet loaded
             # raise err
 
-    async def send_percent_open(self):
+    async def send_percent_open(self, fixed_value: float = None):
         """Send the percent open to the underlying valve"""
         # This may fails if called after shutdown
-        return await self._send_value_to_number(self._entity_id, self._percent_open)
+        return await self._send_value_to_number(self._entity_id, self._percent_open if fixed_value is None else fixed_value)
 
     async def turn_off(self):
         """Turn heater toggleable device off."""
@@ -1108,7 +1108,15 @@ class UnderlyingValveRegulation(UnderlyingValve):
         self._max_offset_calibration: float = None
         self._min_opening_degree: int = min_opening_degree
 
-    async def send_percent_open(self):
+    def _normalize_opening_closing_degree(self, opening: float) -> float:
+        """Issue #902 - Normalize the opening and closing degree"""
+
+        new_opening = max(opening - 1, 0)
+        new_closing = max(self._max_opening_degree - 1 - new_opening, 0)
+
+        return new_opening, new_closing
+
+    async def send_percent_open(self, _: float = None):
         """Send the percent open to the underlying valve"""
         if not self._is_min_max_initialized:
             _LOGGER.debug(
@@ -1150,16 +1158,16 @@ class UnderlyingValveRegulation(UnderlyingValve):
         else:
             self._percent_open = 0
 
-        # Send opening_degree
-        await super().send_percent_open()
-
         # Send closing_degree if set
-        closing_degree = None
+        opening_degree, closing_degree = self._normalize_opening_closing_degree(self._percent_open)
+        # We should not change the _percent_open because it is used to check if value has bchanged
+        # self._percent_open = opening_degree
+
+        # Send opening_degree
+        await super().send_percent_open(opening_degree)
+
         if self.have_closing_degree_entity:
-            await self._send_value_to_number(
-                self._closing_degree_entity_id,
-                closing_degree := self._max_opening_degree - self._percent_open,
-            )
+            await self._send_value_to_number(self._closing_degree_entity_id, closing_degree)
 
         # send offset_calibration to the difference between target temp and local temp
         offset = None

documentation/en/over-switch.md

@@ -74,7 +74,7 @@ The available commands depend on the type of underlying device:
 | Underlying Device Type      | Possible On Commands                  | Possible Off Commands                          | Applies To                    |
 | --------------------------- | ------------------------------------- | ---------------------------------------------- | ----------------------------- |
 | `switch` or `input_boolean` | `turn_on`                             | `turn_off`                                     | All switches                  |
-| `select` or `input_select`  | `select_option/option:comfort`        | `set_option/option:frost_protection`           | Nodon SIN-4-FP-21 and similar |
+| `select` or `input_select`  | `select_option/option:comfort`        | `select_option/option:frost_protection`           | Nodon SIN-4-FP-21 and similar |
 | `climate` (hvac_mode)       | `set_hvac_mode/hvac_mode:heat`        | `set_hvac_mode/hvac_mode:off`                  | eCosy (via Tuya Local)        |
 | `climate` (preset)          | `set_preset_mode/preset_mode:comfort` | `set_preset_mode/preset_mode:frost_protection` | Heatzy                        |
 

documentation/fr/over-switch.md

@@ -72,7 +72,7 @@ Les commandes possibles dépendent du type de sous-jacents :
 | type de sous-jacent         | commandes d'allumage possibles        | commandes d'extinction possibles               | S'applique à                   |
 | --------------------------- | ------------------------------------- | ---------------------------------------------- | ------------------------------ |
 | `switch` ou `input_boolean` | `turn_on`                             | `turn_off`                                     | tous les switchs               |
-| `select` ou `input_select`  | `select_option/option:comfort`        | `set_option/option:frost_protection`           | Nodon SIN-4-FP-21 et assimilés |
+| `select` ou `input_select`  | `select_option/option:comfort`        | `select_option/option:frost_protection`           | Nodon SIN-4-FP-21 et assimilés |
 | `climate` (hvac_mode)       | `set_hvac_mode/hvac_mode:heat`        | `set_hvac_mode/hvac_mode:off`                  | eCosy (via Tuya Local)         |
 | `climate` (preset)          | `set_preset_mode/preset_mode:comfort` | `set_preset_mode/preset_mode:frost_protection` | Heatzy                         |
 
@@ -90,4 +90,4 @@ Si l'erreur suivante se produit :
 Cela signifie que une des commandes saisies est invalide. Les règles à respecter sont les suivantes :
 1. chaque commande doit avoir le format `commande[/attribut[:valeur]]` (ex: `select_option/option:comfort` ou `turn_on`) sans blanc et sans caractères spéciaux sauf '_',
 2. il doit y avoir autant de commandes qu'il y a de sous-jacents déclarés sauf si tous les sous-jacents sont des `switchs` auquel cas il n'est pas nécessaire de paramétrer les commandes,
-3. si plusieurs sous-jacents sont configurés, les commandes doivent être dans le même ordre. Le nombre de commandes d'allumage doit être égal au nombre de commandes d'extinction et de sous-jacents (dans l'ordre donc). Il est possible de mettre des sous-jacents de type différent. À partir du moment où un sous-jacent n'est pas un `switch`, il faut paramétrer toutes les commandes de tous les sous-jacents y compris des éventuels switchs.
+3. si plusieurs sous-jacents sont configurés, les commandes doivent être dans le même ordre. Le nombre de commandes d'allumage doit être égal au nombre de commandes d'extinction et de sous-jacents (dans l'ordre donc). Il est possible de mettre des sous-jacents de type différent. À partir du moment où un sous-jacent n'est pas un `switch`, il faut paramétrer toutes les commandes de tous les sous-jacents y compris des éventuels switchs.

requirements_dev.txt

@@ -1 +1 @@
-homeassistant==2025.2.1
+homeassistant==2025.1.4

tests/test_overclimate_valve.py

@@ -139,7 +139,7 @@ async def test_over_climate_valve_mono(hass: HomeAssistant, skip_hass_states_get
         mock_service_call.assert_has_calls(
             [
                 call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree'}),
-                call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree'}),
+                call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree'}),
                 call("climate","set_temperature",{
                         "entity_id": "climate.mock_climate",
                         "temperature": 15,  # temp-min
@@ -187,7 +187,7 @@ async def test_over_climate_valve_mono(hass: HomeAssistant, skip_hass_states_get
         mock_service_call.assert_has_calls(
             [
                 call('climate', 'set_temperature', {'entity_id': 'climate.mock_climate', 'temperature': 19.0}),
-                call(domain='number', service='set_value', service_data={'value': 40}, target={'entity_id': 'number.mock_opening_degree'}),
+                call(domain='number', service='set_value', service_data={'value': 39}, target={'entity_id': 'number.mock_opening_degree'}),
                 call(domain='number', service='set_value', service_data={'value': 60}, target={'entity_id': 'number.mock_closing_degree'}),
                 # 3 = 18 (room) - 15 (current of underlying) + 0 (current offset)
                 call(domain='number', service='set_value', service_data={'value': 3.0}, target={'entity_id': 'number.mock_offset_calibration'})
@@ -233,7 +233,7 @@ async def test_over_climate_valve_mono(hass: HomeAssistant, skip_hass_states_get
         assert mock_service_call.call_count == 3
         mock_service_call.assert_has_calls(
             [
-                call(domain='number', service='set_value', service_data={'value': 13}, target={'entity_id': 'number.mock_opening_degree'}),
+                call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_opening_degree'}),
                 call(domain='number', service='set_value', service_data={'value': 87}, target={'entity_id': 'number.mock_closing_degree'}),
                 # 6 = 18 (room) - 15 (current of underlying) + 3 (current offset)
                 call(domain='number', service='set_value', service_data={'value': 6.899999999999999}, target={'entity_id': 'number.mock_offset_calibration'})
@@ -280,7 +280,7 @@ async def test_over_climate_valve_mono(hass: HomeAssistant, skip_hass_states_get
         mock_service_call.assert_has_calls(
             [
                 call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree'}),
-                call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree'}),
+                call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree'}),
                 # 6 = 18 (room) - 15 (current of underlying) + 3 (current offset)
                 call(domain='number', service='set_value', service_data={'value': 9.0}, target={'entity_id': 'number.mock_offset_calibration'})
             ]
@@ -365,25 +365,13 @@ async def test_over_climate_valve_multi_presence(
     mock_get_state_side_effect = SideEffects(
         {
             # Valve 1 is open
-            "number.mock_opening_degree1": State(
-                "number.mock_opening_degree1", "10", {"min": 0, "max": 100}
-            ),
-            "number.mock_closing_degree1": State(
-                "number.mock_closing_degree1", "90", {"min": 0, "max": 100}
-            ),
-            "number.mock_offset_calibration1": State(
-                "number.mock_offset_calibration1", "0", {"min": -12, "max": 12}
-            ),
+            "number.mock_opening_degree1": State("number.mock_opening_degree1", "10", {"min": 0, "max": 100}),
+            "number.mock_closing_degree1": State("number.mock_closing_degree1", "89", {"min": 0, "max": 100}),
+            "number.mock_offset_calibration1": State("number.mock_offset_calibration1", "0", {"min": -12, "max": 12}),
             # Valve 2 is closed
-            "number.mock_opening_degree2": State(
-                "number.mock_opening_degree2", "0", {"min": 0, "max": 100}
-            ),
-            "number.mock_closing_degree2": State(
-                "number.mock_closing_degree2", "100", {"min": 0, "max": 100}
-            ),
-            "number.mock_offset_calibration2": State(
-                "number.mock_offset_calibration2", "10", {"min": -12, "max": 12}
-            ),
+            "number.mock_opening_degree2": State("number.mock_opening_degree2", "0", {"min": 0, "max": 100}),
+            "number.mock_closing_degree2": State("number.mock_closing_degree2", "99", {"min": 0, "max": 100}),
+            "number.mock_offset_calibration2": State("number.mock_offset_calibration2", "10", {"min": -12, "max": 12}),
         },
         State("unknown.entity_id", "unknown"),
     )
@@ -442,10 +430,10 @@ async def test_over_climate_valve_multi_presence(
         mock_service_call.assert_has_calls([
             call('climate', 'set_temperature', {'entity_id': 'climate.mock_climate1', 'temperature': 19.0}),
             call('climate', 'set_temperature', {'entity_id': 'climate.mock_climate2', 'temperature': 19.0}),
-            call(domain='number', service='set_value', service_data={'value': 40}, target={'entity_id': 'number.mock_opening_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 39}, target={'entity_id': 'number.mock_opening_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 60}, target={'entity_id': 'number.mock_closing_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 3.0}, target={'entity_id': 'number.mock_offset_calibration1'}),
-            call(domain='number', service='set_value', service_data={'value': 40}, target={'entity_id': 'number.mock_opening_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 39}, target={'entity_id': 'number.mock_opening_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 60}, target={'entity_id': 'number.mock_closing_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_offset_calibration2'})
             ]
@@ -469,15 +457,15 @@ async def test_over_climate_valve_multi_presence(
         assert vtherm.valve_open_percent == 0
 
         # the underlying set temperature call and the call to the valve
-        assert mock_service_call.call_count == 8
+        # assert mock_service_call.call_count == 8
         mock_service_call.assert_has_calls([
             call('climate', 'set_temperature', {'entity_id': 'climate.mock_climate1', 'temperature': 17.2}),
             call('climate', 'set_temperature', {'entity_id': 'climate.mock_climate2', 'temperature': 17.2}),
             call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree1'}),
-            call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 3.0}, target={'entity_id': 'number.mock_offset_calibration1'}),
             call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree2'}),
-            call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_offset_calibration2'})
             ]
         )
@@ -627,10 +615,10 @@ async def test_over_climate_valve_multi_min_opening_degrees(
         assert mock_service_call.call_count == 6
         mock_service_call.assert_has_calls([
             # min is 60
-            call(domain='number', service='set_value', service_data={'value': 68}, target={'entity_id': 'number.mock_opening_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 67}, target={'entity_id': 'number.mock_opening_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 32}, target={'entity_id': 'number.mock_closing_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 3.0}, target={'entity_id': 'number.mock_offset_calibration1'}),
-            call(domain='number', service='set_value', service_data={'value': 76}, target={'entity_id': 'number.mock_opening_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 75}, target={'entity_id': 'number.mock_opening_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 24}, target={'entity_id': 'number.mock_closing_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_offset_calibration2'})
             ]
@@ -657,10 +645,10 @@ async def test_over_climate_valve_multi_min_opening_degrees(
         assert mock_service_call.call_count == 6
         mock_service_call.assert_has_calls([
             call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree1'}),
-            call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree1'}),
+            call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree1'}),
             call(domain='number', service='set_value', service_data={'value': 7.0}, target={'entity_id': 'number.mock_offset_calibration1'}),
             call(domain='number', service='set_value', service_data={'value': 0}, target={'entity_id': 'number.mock_opening_degree2'}),
-            call(domain='number', service='set_value', service_data={'value': 100}, target={'entity_id': 'number.mock_closing_degree2'}),
+            call(domain='number', service='set_value', service_data={'value': 99}, target={'entity_id': 'number.mock_closing_degree2'}),
             call(domain='number', service='set_value', service_data={'value': 12}, target={'entity_id': 'number.mock_offset_calibration2'})
             ]
         )

tests/test_temp_number.py

@@ -700,7 +700,7 @@ async def test_add_number_for_over_switch_use_central_presets_and_restore(
         assert vtherm.use_central_config_temperature is True
 
         # We should try to restore all 4 temp entities and the VTherm itself
-        assert mock_restore_state.call_count == 4 + 1
+        assert mock_restore_state.call_count == 4 + 2
 
     # 1. We search for NumberEntities
     for preset_name, value in temps.items():