Rework cooling_present related

Author: bouwew

plugwise/__init__.py

@@ -63,7 +63,6 @@ def __init__(
             websession,
         )
 
-        self._cooling_present = False
         self._elga = False
         self._is_thermostat = False
         self._last_active: dict[str, str | None] = {}
@@ -74,6 +73,7 @@ def __init__(
         self._smile_api: SmileAPI | SmileLegacyAPI
         self._stretch_v2 = False
         self._target_smile: str = NONE
+        self.cooling_present = False
         self.gw_data: GatewayData = {}
         self.smile_fw_version: Version | None = None
         self.smile_hostname: str = NONE
@@ -89,14 +89,29 @@ def __init__(
 
     @property
     def gateway_id(self) -> str:
-        """Return the Smile gateway-id."""
+        """Return the gateway-id."""
         return self.gw_data["gateway_id"]
 
     @property
     def heater_id(self) -> str:
-        """Return the Smile heater-id."""
+        """Return the heater-id."""
         return self.gw_data["heater_id"]
 
+    @property
+    def item_count(self) -> int:
+        """Return the item-count."""
+        return self.gw_data["item_count"]
+
+    @property
+    def notifications(self) -> dict[str, dict[str, str]]:
+        """Return the Plugwise notifications."""
+        return self.gw_data["notifications"]
+
+    @property
+    def reboot(self) -> bool:
+        """Return the reboot capability."""
+        return self.gw_data["reboot"]
+
     async def connect(self) -> Version | None:
         """Connect to the Plugwise Gateway and determine its name, type, version, and other data."""
         result = await self._request(DOMAIN_OBJECTS)
@@ -136,7 +151,7 @@ async def connect(self) -> Version | None:
         self._smile_api = (
             SmileAPI(
                 self._request,
-                self._cooling_present,
+                self.cooling_present,
                 self._elga,
                 self._is_thermostat,
                 self._last_active,
@@ -251,7 +266,7 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
             locator_1 = "./gateway/features/cooling"
             locator_2 = "./gateway/features/elga_support"
             if result.find(locator_1) is not None:
-                self._cooling_present = True
+                self.cooling_present = True
             if result.find(locator_2) is not None:
                 self._elga = True
 

plugwise/common.py

@@ -37,7 +37,7 @@ def __init__(self) -> None:
         self._appliances: etree
         self._count: int
         self._domain_objects: etree
-        self._cooling_present: bool
+        self.cooling_present: bool
         self._heater_id: str
         self._on_off_device: bool
         self._opentherm_device: bool
@@ -84,7 +84,7 @@ def _appl_heater_central_info(
         appl.hardware = module_data["hardware_version"]
         appl.model_id = module_data["vendor_model"] if not legacy else None
         appl.model = (
-            "Generic heater/cooler" if self._cooling_present else "Generic heater"
+            "Generic heater/cooler" if self.cooling_present else "Generic heater"
         )
 
         return appl

plugwise/data.py

@@ -47,7 +47,7 @@ def _all_entity_data(self) -> None:
         self.gw_data["smile_name"] = self.smile_name
         if self._is_thermostat:
             self.gw_data["heater_id"] = self._heater_id
-            self.gw_data["cooling_present"] = self._cooling_present
+            self.gw_data["cooling_present"] = self.cooling_present
 
     def _update_zones(self) -> None:
         """Helper-function for _all_entity_data() and async_update().
@@ -134,7 +134,7 @@ def _update_for_cooling(self, entity: GwEntityData) -> None:
         # For Anna and heating + cooling, replace setpoint with setpoint_high/_low
         if (
             self.smile(ANNA)
-            and self._cooling_present
+            and self.cooling_present
             and entity["dev_class"] == "thermostat"
         ):
             thermostat = entity["thermostat"]
@@ -243,7 +243,7 @@ def _get_adam_data(self, entity: GwEntityData, data: GwEntityData) -> None:
             if "binary_sensors" in data:
                 if (
                     "cooling_enabled" not in data["binary_sensors"]
-                    and self._cooling_present
+                    and self.cooling_present
                 ):
                     data["binary_sensors"]["cooling_enabled"] = self._cooling_enabled
 
@@ -287,7 +287,7 @@ def _climate_data(
         self._count += 1
         if sel_schedule in (NONE, OFF):
             data["climate_mode"] = "heat"
-            if self._cooling_present:
+            if self.cooling_present:
                 data["climate_mode"] = (
                     "cool" if self.check_reg_mode("cooling") else "heat_cool"
                 )

plugwise/helper.py

@@ -71,7 +71,7 @@ class SmileHelper(SmileCommon):
 
     def __init__(self) -> None:
         """Set the constructor for this class."""
-        self._cooling_present: bool
+        self.cooling_present: bool
         self._count: int
         self._dhw_allowed_modes: list[str] = []
         self._domain_objects: etree
@@ -327,15 +327,9 @@ def _get_appl_actuator_modes(
         ) is not None and (modes := search.find("allowed_modes")) is not None:
             for mode in modes:
                 mode_list.append(mode.text)
-                self._check_cooling_mode(mode.text)
 
         return mode_list
 
-    def _check_cooling_mode(self, mode: str) -> None:
-        """Check if cooling mode is present and update state."""
-        if mode == "cooling":
-            self._cooling_present = True
-
     def _get_appliances_with_offset_functionality(self) -> list[str]:
         """Helper-function collecting all appliance that have offset_functionality."""
         therm_list: list[str] = []
@@ -660,14 +654,14 @@ def _update_anna_cooling(self, entity_id: str, data: GwEntityData) -> None:
 
         if "elga_status_code" in data:
             self._update_elga_cooling(data)
-        elif self._cooling_present and "cooling_state" in data["binary_sensors"]:
+        elif self.cooling_present and "cooling_state" in data["binary_sensors"]:
             self._update_loria_cooling(data)
 
     def _update_elga_cooling(self, data: GwEntityData) -> None:
         """# Anna+Elga: base cooling_state on the elga-status-code."""
         if data["thermostat_supports_cooling"]:
             # Techneco Elga has cooling-capability
-            self._cooling_present = True
+            self.cooling_present = True
             data["model"] = "Generic heater/cooler"
             # Cooling_enabled in xml does NOT show the correct status!
             # Setting it specifically:
@@ -707,7 +701,7 @@ def _cleanup_data(self, data: GwEntityData) -> None:
         """
         # Don't show cooling-related when no cooling present,
         # but, keep cooling_enabled for Elga
-        if not self._cooling_present:
+        if not self.cooling_present:
             if "cooling_state" in data["binary_sensors"]:
                 data["binary_sensors"].pop("cooling_state")
                 self._count -= 1

plugwise/legacy/helper.py

@@ -79,6 +79,7 @@ def __init__(self) -> None:
         self._stretch_v2: bool
         self._system: etree
 
+        self.cooling_present: bool
         self.gateway_id: str
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile_fw_version: Version | None

plugwise/legacy/smile.py

@@ -55,13 +55,13 @@ def __init__(
         smile_zigbee_mac_address: str | None,
     ) -> None:
         """Set the constructor for this class."""
-        self._cooling_present = False
         self._is_thermostat = _is_thermostat
         self._loc_data = _loc_data
         self._on_off_device = _on_off_device
         self._opentherm_device = _opentherm_device
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
+        self.cooling_present = False
         self.gw_data = gw_data
         self.request = request
         self.smile_fw_version = smile_fw_version

plugwise/smile.py

@@ -45,7 +45,7 @@ class SmileAPI(SmileData):
     def __init__(
         self,
         request: Callable[..., Awaitable[Any]],
-        _cooling_present: bool,
+        cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
@@ -66,7 +66,7 @@ def __init__(
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_enabled = False
-        self._cooling_present = _cooling_present
+        self.cooling_present = cooling_present
         self._elga = _elga
         self._gateway_id: str = NONE
         self._heater_id: str = NONE
@@ -432,7 +432,7 @@ async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         if "setpoint" in items:
             setpoint = items["setpoint"]
 
-        if self.smile(ANNA) and self._cooling_present:
+        if self.smile(ANNA) and self.cooling_present:
             if "setpoint_high" not in items:
                 raise PlugwiseError(
                     "Plugwise: failed setting temperature: no valid input provided"