Issue #280 - enable to use central config for window configuration

README-fr.md

@@ -114,7 +114,7 @@ En conséquence toute la phase de paramètrage d'un VTherm a été profondemment
 **Note :** les copies d'écran de la configuration d'un VTherm n'ont pas été mises à jour.
 
 # Merci pour la bière [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Un grand merci à @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG pour les bières. Ca fait très plaisir et ça m'encourage à continuer !
+Un grand merci à @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG @Mexx62, @Someone pour les bières. Ca fait très plaisir et ça m'encourage à continuer !
 
 
 # Quand l'utiliser et ne pas l'utiliser

README.md

@@ -114,7 +114,7 @@ Consequently, the entire configuration phase of a VTherm has been profoundly mod
 **Note:** the VTherm configuration screenshots have not been updated.
 
 # Thanks for the beer [buymecoffee](https://www.buymeacoffee.com/jmcollin78)
-Many thanks to @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG for the beers. It's very nice and encourages me to continue!
+Many thanks to @salabur, @pvince83, @bergoglio, @EPicLURcher, @ecolorado66, @Kriss1670, @maia, @f.maymil, @moutte69, @Jerome, @Gunnar M, @Greg.o, @John Burgess, @abyssmal, @capinfo26, @Helge, @MattG, @MattG, @Mexx62, @Someone for the beers. It's very nice and encourages me to continue!
 
 # When to use / not use
 This thermostat can control 3 types of equipment:

custom_components/versatile_thermostat/config_flow.py

@@ -86,7 +86,10 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
 
         # VTherm API should have been initialized before arriving here
         vtherm_api = VersatileThermostatAPI.get_vtherm_api()
-        self._central_config = vtherm_api.find_central_configuration()
+        if vtherm_api is not None:
+            self._central_config = vtherm_api.find_central_configuration()
+        else:
+            self._central_config = None
 
         self._init_feature_flags(infos)
         self._init_central_config_flags(infos)
@@ -168,7 +171,7 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             _LOGGER.error(
                 "Only one window detection method should be used. Use window_sensor or auto window open detection but not both"
             )
-            raise WindowOpenDetectionMethod(CONF_WINDOW_SENSOR)
+            raise WindowOpenDetectionMethod(CONF_WINDOW_AUTO_OPEN_THRESHOLD)
 
         # Check that is USE_CENTRAL config is used, that a central config exists
         if self._central_config is None:
@@ -405,7 +408,11 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
             next_step = self.async_step_motion
         # If comes from async_step_spec_window
         elif self._infos.get(COMES_FROM) == "async_step_spec_window":
-            schema = STEP_CENTRAL_WINDOW_DATA_SCHEMA
+            # If we have a window sensor don't display the auto window parameters
+            if self._infos.get(CONF_WINDOW_SENSOR) is not None:
+                schema = STEP_CENTRAL_WINDOW_WO_AUTO_DATA_SCHEMA
+            else:
+                schema = STEP_CENTRAL_WINDOW_DATA_SCHEMA
         elif user_input and user_input.get(CONF_USE_WINDOW_CENTRAL_CONFIG) is False:
             next_step = self.async_step_spec_window
 
@@ -420,6 +427,8 @@ class VersatileThermostatBaseConfigFlow(FlowHandler):
         )
 
         schema = STEP_CENTRAL_WINDOW_DATA_SCHEMA
+        if self._infos.get(CONF_WINDOW_SENSOR) is not None:
+            schema = STEP_CENTRAL_WINDOW_WO_AUTO_DATA_SCHEMA
 
         self._infos[COMES_FROM] = "async_step_spec_window"
 

custom_components/versatile_thermostat/config_schema.py

@@ -195,6 +195,12 @@ STEP_CENTRAL_WINDOW_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
     }
 )
 
+STEP_CENTRAL_WINDOW_WO_AUTO_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
+    {
+        vol.Optional(CONF_WINDOW_DELAY, default=30): cv.positive_int,
+    }
+)
+
 STEP_MOTION_DATA_SCHEMA = vol.Schema(  # pylint: disable=invalid-name
     {
         vol.Optional(CONF_MOTION_SENSOR): selector.EntitySelector(

custom_components/versatile_thermostat/vtherm_api.py

@@ -19,26 +19,27 @@ _LOGGER = logging.getLogger(__name__)
 class VersatileThermostatAPI(dict):
     """The VersatileThermostatAPI"""
 
-    _hass: HomeAssistant
+    _hass: HomeAssistant = None
     # _entries: Dict(str, ConfigEntry)
 
     @classmethod
     def get_vtherm_api(cls, hass=None):
-        """Get the eventual VTherm API class instance"""
+        """Get the eventual VTherm API class instance or
+        instantiate it if it doesn't exists"""
         if hass is not None:
             VersatileThermostatAPI._hass = hass
-        else:
-            if VersatileThermostatAPI._hass is None:
-                return None
+
+        if VersatileThermostatAPI._hass is None:
+            return None
 
         domain = VersatileThermostatAPI._hass.data.get(DOMAIN)
         if not domain:
-            hass.data.setdefault(DOMAIN, {})
+            VersatileThermostatAPI._hass.data.setdefault(DOMAIN, {})
 
         ret = VersatileThermostatAPI._hass.data.get(DOMAIN).get(VTHERM_API_NAME)
         if ret is None:
             ret = VersatileThermostatAPI()
-            hass.data[DOMAIN][VTHERM_API_NAME] = ret
+            VersatileThermostatAPI._hass.data[DOMAIN][VTHERM_API_NAME] = ret
         return ret
 
     def __init__(self) -> None:
@@ -46,7 +47,6 @@ class VersatileThermostatAPI(dict):
         super().__init__()
         self._expert_params = None
         self._short_ema_params = None
-        self._central_config = None
 
     def find_central_configuration(self):
         """Search for a central configuration"""
@@ -57,8 +57,8 @@ class VersatileThermostatAPI(dict):
                 config_entry.data.get(CONF_THERMOSTAT_TYPE)
                 == CONF_THERMOSTAT_CENTRAL_CONFIG
             ):
-                self._central_config = config_entry
-                return self._central_config
+                central_config = config_entry
+                return central_config
         return None
 
     def add_entry(self, entry: ConfigEntry):

tests/const.py

@@ -139,6 +139,11 @@ MOCK_PRESETS_AC_CONFIG = {
 
 MOCK_WINDOW_CONFIG = {
     CONF_WINDOW_SENSOR: "binary_sensor.window_sensor",
+    # Not used normally only for tests to avoid rewrite all tests
+    CONF_WINDOW_DELAY: 10,
+}
+
+MOCK_WINDOW_DELAY_CONFIG = {
     CONF_WINDOW_DELAY: 10,
 }
 

tests/test_central_config.py

@@ -31,6 +31,8 @@ from .commons import *  # pylint: disable=wildcard-import, unused-wildcard-impor
 from .const import *  # pylint: disable=wildcard-import, unused-wildcard-import
 
 
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_state):
     """Tests the clean_central_config_doubon of base_thermostat"""
     central_config_entry = MockConfigEntry(
@@ -95,6 +97,8 @@ async def test_add_a_central_config(hass: HomeAssistant, skip_hass_states_is_sta
     assert central_configuration is not None
 
 
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_minimal_over_switch_wo_central_config(
     hass: HomeAssistant, skip_hass_states_is_state, init_vtherm_api
 ):
@@ -169,6 +173,8 @@ async def test_minimal_over_switch_wo_central_config(
         assert entity.is_inversed
 
 
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_full_over_switch_wo_central_config(
     hass: HomeAssistant, skip_hass_states_is_state, init_vtherm_api
 ):
@@ -281,6 +287,8 @@ async def test_full_over_switch_wo_central_config(
         assert entity._presence_sensor_entity_id == "binary_sensor.mock_presence_sensor"
 
 
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_full_over_switch_with_central_config(
     hass: HomeAssistant, skip_hass_states_is_state, init_central_config
 ):
@@ -388,6 +396,8 @@ async def test_full_over_switch_with_central_config(
         assert entity._presence_sensor_entity_id == "binary_sensor.mock_presence_sensor"
 
 
+@pytest.mark.parametrize("expected_lingering_tasks", [True])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_over_switch_with_central_config_but_no_central_config(
     hass: HomeAssistant, skip_hass_states_get, init_vtherm_api
 ):

tests/test_config_flow.py

@@ -472,15 +472,17 @@ async def test_user_config_flow_window_auto_ko(
 
     result = await hass.config_entries.flow.async_configure(
         result["flow_id"],
-        user_input=MOCK_WINDOW_AUTO_CONFIG,
+        user_input=MOCK_WINDOW_DELAY_CONFIG,
     )
 
+    # Since issue #280 we cannot have the error because we only display the
+    # MOCK_WINDOW_DELAY_CONFIG form if we have a sensor configured
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
     # We should stay on window with an error
-    assert result["errors"] == {
-        "window_sensor_entity_id": "window_open_detection_method"
-    }
-    assert result["step_id"] == "window"
+    assert result["errors"] == {}
+    #    "window_sensor_entity_id": "window_open_detection_method"
+    # }
+    assert result["step_id"] == "advanced"
 
 
 @pytest.mark.parametrize("expected_lingering_tasks", [True])