fix #1983 - fallback to home assistant state in get_state if entity state not yet cached (#1996)

* fix #1983 - fallback to home assistant state in get_state if entity state not yet cached

* fix pylance test

Author: jmcollin78

custom_components/versatile_thermostat/state_manager.py

@@ -146,7 +146,8 @@ async def calculate_current_hvac_mode(self, vtherm: "BaseThermostat") -> bool:
                 self._current_state.set_hvac_mode(VThermHvacMode_OFF)
 
         elif vtherm.last_central_mode == CENTRAL_MODE_FROST_PROTECTION and self._requested_state.hvac_mode != VThermHvacMode_OFF:
-            if VThermPreset.FROST not in vtherm.vtherm_preset_modes or VThermHvacMode_HEAT not in vtherm.vtherm_hvac_modes:
+            preset_modes = vtherm.vtherm_preset_modes
+            if preset_modes is None or VThermPreset.FROST not in preset_modes or VThermHvacMode_HEAT not in vtherm.vtherm_hvac_modes:
                 self._current_state.set_hvac_mode(VThermHvacMode_OFF)
                 vtherm.set_hvac_off_reason(HVAC_OFF_REASON_CENTRAL_MODE)
             elif vtherm.vtherm_hvac_mode != VThermHvacMode_HEAT and VThermHvacMode_HEAT in vtherm.vtherm_hvac_modes:
@@ -196,7 +197,8 @@ async def calculate_current_preset(self, vtherm: "BaseThermostat") -> bool:
             self._current_state.set_preset(VThermPreset.SAFETY)
 
         elif vtherm.last_central_mode == CENTRAL_MODE_FROST_PROTECTION:
-            if VThermPreset.FROST in vtherm.vtherm_preset_modes and vtherm.vtherm_hvac_mode == VThermHvacMode_HEAT:
+            preset_modes = vtherm.vtherm_preset_modes
+            if preset_modes is not None and VThermPreset.FROST in preset_modes and vtherm.vtherm_hvac_mode == VThermHvacMode_HEAT:
                 self._current_state.set_preset(VThermPreset.FROST)
                 vtherm.set_temperature_reason(MSG_TARGET_TEMP_CENTRAL_MODE)
 

custom_components/versatile_thermostat/underlying_state_manager.py

@@ -78,6 +78,13 @@ def get_state(self, entity_id: str) -> Optional[State]:
         """Return the last known `State` for `entity_id`, or `None` if unknown."""
         idx = self._index_of(entity_id)
         if idx is None:
+            state = self._hass.states.get(entity_id)
+            if state is not None:
+                _LOGGER.debug(
+                    "UnderlyingStateManager - Requested state for unknown entity_id: %s, found in HA",
+                    entity_id,
+                )
+                return state
             _LOGGER.error("UnderlyingStateManager - Requested state for unknown entity_id: %s", entity_id)
             return None
         return self._states[idx]

tests/test_under_state_manager.py

@@ -94,3 +94,24 @@ async def on_change(entity_id: str, state, old_state):
     hass.states.async_set("switch.cb", "off")
     await hass.async_block_till_done()
     assert len(calls) == before
+
+
+async def test_get_state_unknown_but_found_in_ha(hass: HomeAssistant):
+    """Test get_state with an unknown entity_id, which gets retrieved from HA but not added to manager."""
+    mgr = UnderlyingStateManager(hass)
+    assert mgr._entity_ids == []
+
+    # Prepare state in HA but do not add to manager initially
+    hass.states.async_set("switch.test_ha_only", "on")
+    await hass.async_block_till_done()
+
+    # Request state of unknown entity_id, should retrieve it from HA without adding it
+    state = mgr.get_state("switch.test_ha_only")
+    assert state is not None
+    assert state.state == "on"
+    assert "switch.test_ha_only" not in mgr._entity_ids
+
+    # Request state of another still unknown entity, which is not in HA either, should return None
+    state_unknown = mgr.get_state("sensor.not_existing")
+    assert state_unknown is None
+    assert "sensor.not_existing" not in mgr._entity_ids