Let's keep gateway_id as api-callable

Author: bouwew

plugwise/__init__.py

@@ -11,6 +11,7 @@
     DOMAIN_OBJECTS,
     LOGGER,
     MODULES,
+    NONE,
     SMILES,
     STATUS,
     SYSTEM,
@@ -69,6 +70,7 @@ def __init__(
         self._websession = websession
 
         self._cooling_present = False
+        self._data: PlugwiseData = {}
         self._elga = False
         self._is_thermostat = False
         self._on_off_device = False
@@ -77,6 +79,7 @@ def __init__(
         self._stretch_v2 = False
         self._stretch_v3 = False
         self._target_smile: str
+        self.gateway_id: str = NONE
         self.loc_data: dict[str, ThermoLoc] = {}
         self.smile_fw_version: str | None
         self.smile_hostname: str
@@ -135,6 +138,7 @@ async def connect(self) -> bool:
             self._opentherm_device,
             self._schedule_old_states,
             self._target_smile,
+            self.gateway_id,
             self.loc_data,
             self.smile_fw_version,
             self.smile_hostname,
@@ -310,7 +314,9 @@ def get_all_devices(self) -> None:
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
-        return await self._smile_api.async_update()
+        self._data = await self._smile_api.async_update()
+        self.gateway_id = self._data.gateway["gateway_id"]
+        return self._data
 
 ########################################################################################################
 ###  API Set and HA Service-related Functions                                                        ###

plugwise/smile.py

@@ -55,6 +55,7 @@ def __init__(
         _opentherm_device: bool,
         _schedule_old_states: dict[str, dict[str, str]],
         _target_smile: str | None,
+        gateway_id: str,
         loc_data: dict[str, ThermoLoc],
         smile_fw_version: str | None,
         smile_hostname: str | None,
@@ -89,6 +90,7 @@ def __init__(
         self._opentherm_device = _opentherm_device
         self._schedule_old_states = _schedule_old_states
         self._target_smile = _target_smile
+        self.gateway_id = gateway_id
         self.loc_data = loc_data
         self.smile_fw_version = smile_fw_version
         self.smile_hostname = smile_hostname
@@ -100,7 +102,6 @@ def __init__(
         self.smile_type = smile_type
         self.smile_version = smile_version
 
-        self._gateway_id: str
         self._heater_id: str
         self._cooling_enabled = False
 
@@ -140,8 +141,6 @@ async def async_update(self) -> PlugwiseData:
         await self.full_update_device()
         self.get_all_devices()
 
-
-        self._gateway_id = self.gw_data["gateway_id"]
         if "heater_id" in self.gw_data:
             self._heater_id = self.gw_data["heater_id"]
             if "cooling_enabled" in self.gw_devices[self._heater_id]["binary_sensors"]:
@@ -394,7 +393,7 @@ async def set_gateway_mode(self, mode: str) -> None:
             vacation_time = time_2 + "T23:00:00.000Z"
             valid = f"<valid_from>{vacation_time}</valid_from><valid_to>{end_time}</valid_to>"
 
-        uri = f"{APPLIANCES};id={self._gateway_id}/gateway_mode_control"
+        uri = f"{APPLIANCES};id={self.gateway_id}/gateway_mode_control"
         data = f"<gateway_mode_control_functionality><mode>{mode}</mode>{valid}</gateway_mode_control_functionality>"
 
         await self._request(uri, method="put", data=data)

tests/test_adam.py

@@ -32,7 +32,7 @@ async def test_connect_adam_zone_per_device(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "fe799307f1624099878210aa0b9f1475"
+        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
@@ -189,7 +189,7 @@ async def test_connect_adam_plus_anna(self):
         )
 
         await self.device_test(smile, "2020-03-22 00:00:01", testdata)
-        assert self.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
+        assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
         # assert smile._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
         assert self.device_items == 70
         assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
@@ -238,7 +238,7 @@ async def test_connect_adam_plus_anna_new(self):
         )
 
         await self.device_test(smile, "2023-12-17 00:00:01", testdata)
-        assert self.gateway_id == "da224107914542988a88561b4452b0f6"
+        assert smile.gateway_id == "da224107914542988a88561b4452b0f6"
         # assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
         # assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
         assert self.device_items == 147
@@ -342,7 +342,7 @@ async def test_adam_plus_jip(self):
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, "2021-06-20 00:00:01", testdata)
-        assert self.gateway_id == "b5c2386c6f6342669e50fe49dd05b188"
+        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

tests/test_anna.py

@@ -28,7 +28,7 @@ async def test_connect_anna_v4(self):
         )
 
         await self.device_test(smile, "2020-04-05 00:00:01", testdata)
-        assert self.gateway_id == "0466eae8520144c78afb29628384edeb"
+        assert smile.gateway_id == "0466eae8520144c78afb29628384edeb"
         # assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
         assert self.device_items == 56
         assert not self.notifications
@@ -188,7 +188,7 @@ async def test_connect_anna_heatpump_heating(self):
         )
 
         await self.device_test(smile, "2020-04-12 00:00:01", testdata)
-        assert self.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
+        assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
         # assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
         assert self.device_items == 66
         assert not self.notifications
@@ -315,7 +315,7 @@ async def test_connect_anna_elga_no_cooling(self):
         )
 
         await self.device_test(smile, "2020-04-12 00:00:01", testdata)
-        assert self.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
+        assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
         # assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
         assert self.device_items == 62
         assert not self.notifications
@@ -345,7 +345,7 @@ async def test_connect_anna_elga_2(self):
         #     == THERMOSTAT_SCHEDULE
         # )
         assert self.device_items == 62
-        assert self.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
+        assert smile.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
         assert self.cooling_present
         assert not self._cooling_enabled
         assert not self.notifications

tests/test_init.py

@@ -568,7 +568,6 @@ async def device_test(
         if "cooling_present" in data.gateway:
             self.cooling_present = data.gateway["cooling_present"]
         self.notifications = data.gateway["notifications"]
-        self.gateway_id = data.gateway["gateway_id"]
         self.device_items = data.gateway["item_count"]
 
         self._cooling_active = False

tests/test_legacy_anna.py

@@ -29,7 +29,7 @@ async def test_connect_legacy_anna(self):
         )
 
         await self.device_test(smile, "2020-03-22 00:00:01", testdata)
-        assert self.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
+        assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
         assert self.device_items == 44
         assert not self.notifications
 
@@ -66,7 +66,7 @@ async def test_connect_legacy_anna_2(self):
 
         await self.device_test(smile, "2020-05-03 00:00:01", testdata)
 
-        assert self.gateway_id == "be81e3f8275b4129852c4d8d550ae2eb"
+        assert smile.gateway_id == "be81e3f8275b4129852c4d8d550ae2eb"
         assert self.device_items == 44
         assert not self.notifications
 

tests/test_legacy_p1.py

@@ -28,7 +28,7 @@ async def test_connect_smile_p1_v2(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "aaaa0000aaaa0000aaaa0000aaaa00aa"
+        assert smile.gateway_id == "aaaa0000aaaa0000aaaa0000aaaa00aa"
         assert self.device_items == 26
         assert not self.notifications
 

tests/test_legacy_stretch.py

@@ -30,7 +30,7 @@ async def test_connect_stretch_v31(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
+        assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
         assert self.device_items == 83
 
         switch_change = await self.tinker_switch(

tests/test_p1.py

@@ -27,7 +27,7 @@ async def test_connect_p1v4(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "a455b61e52394b2db5081ce025a430f3"
+        assert smile.gateway_id == "a455b61e52394b2db5081ce025a430f3"
         assert self.device_items == 29
         assert "97a04c0c263049b29350a660b4cdd01e" in self.notifications
 
@@ -51,7 +51,7 @@ async def test_connect_p1v4_442_single(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "a455b61e52394b2db5081ce025a430f3"
+        assert smile.gateway_id == "a455b61e52394b2db5081ce025a430f3"
         assert self.device_items == 31
         assert not self.notifications
 
@@ -85,7 +85,7 @@ async def test_connect_p1v4_442_triple(self):
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.gateway_id == "03e65b16e4b247a29ae0d75a78cb492e"
+        assert smile.gateway_id == "03e65b16e4b247a29ae0d75a78cb492e"
         assert self.device_items == 40
         assert self.notifications