Add self._last_active to api, and test

Author: bouwew

plugwise/__init__.py

@@ -72,6 +72,7 @@ def __init__(
         self._cooling_present = False
         self._elga = False
         self._is_thermostat = False
+        self._last_active: dict[str, str | None] = {}
         self._on_off_device = False
         self._opentherm_device = False
         self._schedule_old_states: dict[str, dict[str, str]] = {}
@@ -133,6 +134,7 @@ async def connect(self) -> bool:
             self._cooling_present,
             self._elga,
             self._is_thermostat,
+            self._last_active,
             self._on_off_device,
             self._opentherm_device,
             self._schedule_old_states,

plugwise/helper.py

@@ -207,7 +207,7 @@ def __init__(self) -> None:
         self._heater_id: str
         self._home_location: str
         self._is_thermostat = False
-        self._last_active: dict[str, str | None] = {}
+        self._last_active: dict[str, str | None]
         self._last_modified: dict[str, str] = {}
         self._notifications: dict[str, dict[str, str]] = {}
         self._on_off_device = False

plugwise/smile.py

@@ -51,6 +51,7 @@ def __init__(
         _cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
+        _last_active: dict[str, str | None],
         _on_off_device: bool,
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
@@ -86,6 +87,7 @@ def __init__(
         self._cooling_present = _cooling_present
         self._elga = _elga
         self._is_thermostat = _is_thermostat
+        self._last_active = _last_active
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states

tests/test_adam.py

@@ -33,11 +33,11 @@ async def test_connect_adam_zone_per_device(self):
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
         assert smile.gateway_id == "fe799307f1624099878210aa0b9f1475"
-        # assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
-        # assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
-        # assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
-        # assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
-        # assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
+        assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
+        assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
+        assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
+        assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
+        assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
         assert self.device_items == 315
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
@@ -102,11 +102,11 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        # assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
-        # assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
-        # assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
-        # assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
-        # assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
+        assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
+        assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
+        assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
+        assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
+        assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
         assert self.device_items == 315
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
@@ -135,16 +135,16 @@ async def test_adam_heatpump_cooling(self):
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, "2022-01-02 00:00:01", testdata)
-        # assert smile._last_active["b52908550469425b812c87f766fe5303"] == WERKDAG_SCHEMA
-        # assert smile._last_active["20e735858f8146cead98b873177a4f99"] == WERKDAG_SCHEMA
-        # assert smile._last_active["e39529c79ab54fda9bed26cfc0447546"] == WERKDAG_SCHEMA
-        # assert smile._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == WERKDAG_SCHEMA
-        # assert smile._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == WERKDAG_SCHEMA
-        # assert smile._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == WERKDAG_SCHEMA
-        # assert smile._last_active["04b15f6e884448288f811d29fb7b1b30"] == WERKDAG_SCHEMA
-        # assert smile._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
-        # assert smile._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
-        # assert smile._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
+        assert smile._last_active["b52908550469425b812c87f766fe5303"] == WERKDAG_SCHEMA
+        assert smile._last_active["20e735858f8146cead98b873177a4f99"] == WERKDAG_SCHEMA
+        assert smile._last_active["e39529c79ab54fda9bed26cfc0447546"] == WERKDAG_SCHEMA
+        assert smile._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == WERKDAG_SCHEMA
+        assert smile._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == WERKDAG_SCHEMA
+        assert smile._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == WERKDAG_SCHEMA
+        assert smile._last_active["04b15f6e884448288f811d29fb7b1b30"] == WERKDAG_SCHEMA
+        assert smile._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
+        assert smile._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
+        assert smile._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
         assert self.device_items == 415
 
         await smile.close_connection()
@@ -190,7 +190,7 @@ async def test_connect_adam_plus_anna(self):
 
         await self.device_test(smile, "2020-03-22 00:00:01", testdata)
         assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
-        # assert smile._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
+        assert smile._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
         assert self.device_items == 70
         assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
 
@@ -239,8 +239,8 @@ async def test_connect_adam_plus_anna_new(self):
 
         await self.device_test(smile, "2023-12-17 00:00:01", testdata)
         assert smile.gateway_id == "da224107914542988a88561b4452b0f6"
-        # assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
-        # assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
+        assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
+        assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
         assert self.device_items == 147
         assert self.device_list == [
             "da224107914542988a88561b4452b0f6",
@@ -343,10 +343,10 @@ async def test_adam_plus_jip(self):
 
         await self.device_test(smile, "2021-06-20 00:00:01", testdata)
         assert smile.gateway_id == "b5c2386c6f6342669e50fe49dd05b188"
-        # assert smile._last_active["d58fec52899f4f1c92e4f8fad6d8c48c"] is None
-        # assert smile._last_active["06aecb3d00354375924f50c47af36bd2"] is None
-        # assert smile._last_active["d27aede973b54be484f6842d1b2802ad"] is None
-        # assert smile._last_active["13228dab8ce04617af318a2888b3c548"] is None
+        assert smile._last_active["d58fec52899f4f1c92e4f8fad6d8c48c"] is None
+        assert smile._last_active["06aecb3d00354375924f50c47af36bd2"] is None
+        assert smile._last_active["d27aede973b54be484f6842d1b2802ad"] is None
+        assert smile._last_active["13228dab8ce04617af318a2888b3c548"] is None
         assert self.device_items == 221
 
         # Negative test

tests/test_anna.py

@@ -29,7 +29,7 @@ async def test_connect_anna_v4(self):
 
         await self.device_test(smile, "2020-04-05 00:00:01", testdata)
         assert smile.gateway_id == "0466eae8520144c78afb29628384edeb"
-        # assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
+        assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
         assert self.device_items == 56
         assert not self.notifications
 
@@ -98,7 +98,7 @@ async def test_connect_anna_v4_dhw(self):
         )
 
         await self.device_test(smile, "2020-04-05 00:00:01", testdata)
-        # assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
+        assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
         assert self.device_items == 56
         assert not self.notifications
 
@@ -160,7 +160,7 @@ async def test_connect_anna_without_boiler_fw441(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        # assert smile._last_active["c34c6864216446528e95d88985e714cc"] == "Normaal"
+        assert smile._last_active["c34c6864216446528e95d88985e714cc"] == "Normaal"
         assert self.device_items == 38
         assert not self.notifications
 
@@ -189,7 +189,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         await self.device_test(smile, "2020-04-12 00:00:01", testdata)
         assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
-        # assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
+        assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
         assert self.device_items == 66
         assert not self.notifications
         assert self.cooling_present
@@ -244,7 +244,7 @@ async def test_connect_anna_heatpump_cooling(self):
         )
 
         await self.device_test(smile, "2020-04-19 00:00:01", testdata)
-        # assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
+        assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
         assert self.device_items == 63
         assert self.cooling_present
         assert not self.notifications
@@ -316,7 +316,7 @@ async def test_connect_anna_elga_no_cooling(self):
 
         await self.device_test(smile, "2020-04-12 00:00:01", testdata)
         assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
-        # assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
+        assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
         assert self.device_items == 62
         assert not self.notifications
         assert not self.cooling_present
@@ -340,10 +340,10 @@ async def test_connect_anna_elga_2(self):
         )
 
         await self.device_test(smile, "2022-03-13 00:00:01", testdata)
-        # assert (
-        #     smile._last_active["d3ce834534114348be628b61b26d9220"]
-        #     == THERMOSTAT_SCHEDULE
-        # )
+        assert (
+            smile._last_active["d3ce834534114348be628b61b26d9220"]
+            == THERMOSTAT_SCHEDULE
+        )
         assert self.device_items == 62
         assert smile.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
         assert self.cooling_present
@@ -363,10 +363,10 @@ async def test_connect_anna_elga_2_schedule_off(self):
         assert smile.smile_hostname == "smile000000"
 
         await self.device_test(smile, "2022-03-13 00:00:01", testdata)
-        # assert (
-        #     smile._last_active["d3ce834534114348be628b61b26d9220"]
-        #     == THERMOSTAT_SCHEDULE
-        # )
+        assert (
+            smile._last_active["d3ce834534114348be628b61b26d9220"]
+            == THERMOSTAT_SCHEDULE
+        )
         assert self.cooling_present
         assert not self._cooling_enabled
         assert self.device_items == 62
@@ -394,10 +394,10 @@ async def test_connect_anna_elga_2_cooling(self):
         )
 
         await self.device_test(smile, "2022-03-10 00:00:01", testdata)
-        # assert (
-        #     smile._last_active["d3ce834534114348be628b61b26d9220"]
-        #     == THERMOSTAT_SCHEDULE
-        # )
+        assert (
+            smile._last_active["d3ce834534114348be628b61b26d9220"]
+            == THERMOSTAT_SCHEDULE
+        )
         assert self.device_items == 62
         assert not self.notifications
 
@@ -424,7 +424,7 @@ async def test_connect_anna_loria_heating_idle(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        # assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
+        assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
         assert self.device_items == 64
         assert self.cooling_present
         assert not self._cooling_enabled
@@ -479,7 +479,7 @@ async def test_connect_anna_loria_cooling_active(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        # assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
+        assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
         assert self.device_items == 64
         assert self.cooling_present
         assert self._cooling_enabled