Try 8

Author: bouwew

plugwise/smile.py

@@ -98,7 +98,7 @@ def __init__(
         request: Callable[..., Awaitable[Any]],
         _cooling_present: bool,
         _elga: bool,
-        _gateway_id: str,
+        _gateway_id: dict[str, str],
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
         _loc_data: dict[str, ThermoLoc],
@@ -151,7 +151,7 @@ def _all_entity_data(self) -> None:
 
         self.gw_data.update(
             {
-                "gateway_id": self._gateway_id,
+                "gateway_id": self._gateway_id["gateway_id"],
                 "item_count": self._count,
                 "notifications": self._notifications,
                 "reboot": True,
@@ -180,7 +180,7 @@ def _update_gw_entities(self) -> None:
         mac_list: list[str] = []
         for entity_id, entity in self.gw_entities.items():
             data = self._get_entity_data(entity_id)
-            if entity_id == self._gateway_id:
+            if entity_id == self._gateway_id["gateway_id"]:
                 mac_list = self._detect_low_batteries()
                 self._add_or_update_notifications(entity_id, entity, data)
 
@@ -234,7 +234,7 @@ def _add_or_update_notifications(
     ) -> None:
         """Helper-function adding or updating the Plugwise notifications."""
         if (
-            entity_id == self._gateway_id
+            entity_id == self._gateway_id["gateway_id"]
             and (self._is_thermostat or self.smile_type == "power")
         ) or (
             "binary_sensors" in entity
@@ -350,7 +350,7 @@ def _get_p1_smartmeter_info(self) -> None:
             LOGGER.error("No module data found for SmartMeter")  # pragma: no cover
             return  # pragma: no cover
         appl.available = None
-        appl.entity_id = self._gateway_id
+        appl.entity_id = self._gateway_id["gateway_id"]
         appl.firmware = module_data["firmware_version"]
         appl.hardware = module_data["hardware_version"]
         appl.location = self._home_loc_id
@@ -363,8 +363,8 @@ def _get_p1_smartmeter_info(self) -> None:
         appl.zigbee_mac = None
 
         # Replace the entity_id of the gateway by the smartmeter location_id
-        self.gw_entities[self._home_loc_id] = self.gw_entities.pop(self._gateway_id)
-        self._gateway_id = self._home_loc_id
+        self.gw_entities[self._home_loc_id] = self.gw_entities.pop(self._gateway_id["gateway_id"])
+        self._gateway_id = {"gateway_id": self._home_loc_id}
 
         self._create_gw_entities(appl)
 
@@ -437,7 +437,7 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree) -> Munch:
 
     def _appl_gateway_info(self, appl: Munch, appliance: etree) -> Munch:
         """Helper-function for _appliance_info_finder()."""
-        self._gateway_id = appliance.attrib["id"]
+        self._gateway_id = {"gateway_id": appliance.attrib["id"]}
         appl.firmware = str(self.smile_fw_version)
         appl.hardware = self.smile_hw_version
         appl.mac = self.smile_mac_address
@@ -715,7 +715,7 @@ def _get_actuator_mode(
 
         Collect the requested gateway mode.
         """
-        if not (self.smile(ADAM) and entity_id == self._gateway_id):
+        if not (self.smile(ADAM) and entity_id == self._gateway_id["gateway_id"]):
             return None
 
         if (search := search_actuator_functionalities(appliance, key)) is not None:
@@ -756,7 +756,7 @@ def _get_gateway_mode(
 
     def _get_gateway_outdoor_temp(self, entity_id: str, data: GwEntityData) -> None:
         """Adam & Anna: the Smile outdoor_temperature is present in the Home location."""
-        if self._is_thermostat and entity_id == self._gateway_id:
+        if self._is_thermostat and entity_id == self._gateway_id["gateway_id"]:
             locator = "./logs/point_log[type='outdoor_temperature']/period/measurement"
             if (found := self._home_location.find(locator)) is not None:
                 value = format_measure(found.text, NONE)
@@ -1295,7 +1295,7 @@ def _climate_data(
 
     def check_reg_mode(self, mode: str) -> bool:
         """Helper-function for device_data_climate()."""
-        gateway = self.gw_entities[self._gateway_id]
+        gateway = self.gw_entities[self._gateway_id["gateway_id"]]
         return (
             "regulation_modes" in gateway and gateway["select_regulation_mode"] == mode
         )
@@ -1388,7 +1388,7 @@ async def async_update(self) -> PlugwiseData:
                         "cooling_enabled"
                     ]
             else:  # cover failed data-retrieval for P1
-                _ = self.gw_entities[self._gateway_id]["location"]
+                _ = self.gw_entities[self._gateway_id["gateway_id"]]["location"]
         except KeyError as err:
             raise DataMissingError("No Plugwise actual data received") from err
 
@@ -1521,7 +1521,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_id']}/gateway_mode_control"
         data = f"<gateway_mode_control_functionality><mode>{mode}</mode>{valid}</gateway_mode_control_functionality>"
 
         await self.call_request(uri, method="put", data=data)