Add cooling_present as a property

Author: bouwew

plugwise/__init__.py

@@ -62,6 +62,7 @@ def __init__(
             websession,
         )
 
+        self._cooling_present = False
         self._elga = False
         self._is_thermostat = False
         self._last_active: dict[str, str | None] = {}
@@ -73,7 +74,6 @@ def __init__(
         self._smile_props: SmileProps = {}
         self._stretch_v2 = False
         self._target_smile: str = NONE
-        self.cooling_present = False
         self.smile_hostname: str = NONE
         self.smile_hw_version: str | None = None
         self.smile_legacy = False
@@ -85,6 +85,11 @@ def __init__(
         self.smile_version: Version | None = None
         self.smile_zigbee_mac_address: str | None = None
 
+    @property
+    def cooling_present(self) -> str:
+        """Return the cooling capability."""
+        return self._smile_props["cooling_present"]
+
     @property
     def gateway_id(self) -> str:
         """Return the gateway-id."""
@@ -148,6 +153,7 @@ async def connect(self) -> Version | None:
 
         self._smile_api = (
             SmileAPI(
+                self._cooling_present,
                 self._elga,
                 self._is_thermostat,
                 self._last_active,
@@ -157,7 +163,6 @@ async def connect(self) -> Version | None:
                 self._request,
                 self._schedule_old_states,
                 self._smile_props,
-                self.cooling_present,
                 self.smile_hostname,
                 self.smile_hw_version,
                 self.smile_mac_address,
@@ -262,7 +267,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

@@ -35,9 +35,9 @@ class SmileCommon:
     def __init__(self) -> None:
         """Init."""
         self._appliances: etree
+        self._cooling_present: bool
         self._count: int
         self._domain_objects: etree
-        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._smile_props["smile_name"] = self.smile_name
         if self._is_thermostat:
             self._smile_props["heater_id"] = self._heater_id
-            self._smile_props["cooling_present"] = self.cooling_present
+            self._smile_props["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
@@ -653,14 +653,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:
@@ -700,7 +700,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

@@ -78,8 +78,6 @@ def __init__(self) -> None:
         self._status: etree
         self._stretch_v2: bool
         self._system: etree
-
-        self.cooling_present: bool
         self.gateway_id: str
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile_hw_version: str | None

plugwise/legacy/smile.py

@@ -55,6 +55,7 @@ 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
@@ -63,7 +64,6 @@ def __init__(
         self._smile_props = _smile_props
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
-        self.cooling_present = False
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address

plugwise/smile.py

@@ -44,6 +44,7 @@ class SmileAPI(SmileData):
 
     def __init__(
         self,
+        _cooling_present: bool,
         _elga: bool,
         _is_thermostat: bool,
         _last_active: dict[str, str | None],
@@ -53,7 +54,6 @@ def __init__(
         _request: Callable[..., Awaitable[Any]],
         _schedule_old_states: dict[str, dict[str, str]],
         _smile_props: SmileProps,
-        cooling_present: bool,
         smile_hostname: str | None,
         smile_hw_version: str | None,
         smile_mac_address: str | None,
@@ -65,6 +65,7 @@ def __init__(
     ) -> None:
         """Set the constructor for this class."""
         self._cooling_enabled = False
+        self._cooling_present = _cooling_present
         self._elga = _elga
         self._gateway_id: str = NONE
         self._heater_id: str = NONE
@@ -76,7 +77,6 @@ def __init__(
         self._request = _request
         self._schedule_old_states = _schedule_old_states
         self._smile_props = _smile_props
-        self.cooling_present = cooling_present
         self.smile_hostname = smile_hostname
         self.smile_hw_version = smile_hw_version
         self.smile_mac_address = smile_mac_address
@@ -430,7 +430,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"