plugwise 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

plugwise/__init__.py

@@ -5,7 +5,6 @@ Plugwise backend module for Home Assistant Core.
 from __future__ import annotations
 
 from plugwise.constants import (
-    DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
     DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
@@ -44,28 +43,27 @@ class Smile(SmileComm):
         self,
         host: str,
         password: str,
+        timeout: int,
         websession: aiohttp.ClientSession,
-        username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
-        timeout: float = DEFAULT_LEGACY_TIMEOUT,
-
+        username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
-            websession,
-            username,
             port,
             timeout,
-        )
+            username,
+            websession,
+         )
 
         self._host = host
         self._passwd = password
-        self._websession = websession
-        self._user = username
         self._port = port
         self._timeout = timeout
+        self._user = username
+        self._websession = websession
 
         self._cooling_present = False
         self._elga = False
@@ -149,8 +147,8 @@ class Smile(SmileComm):
             self.smile_model_id,
             self.smile_name,
             self.smile_type,
-            self._user,
             self._port,
+            self._user,
          ) if not self.smile_legacy else SmileLegacyAPI(
             self._host,
             self._passwd,
@@ -170,8 +168,8 @@ class Smile(SmileComm):
             self.smile_name,
             self.smile_type,
             self.smile_zigbee_mac_address,
-            self._user,
             self._port,
+            self._user,
         )
 
         # Update all endpoints on first connect

plugwise/common.py

@@ -57,10 +57,6 @@ class SmileCommon:
         xml_3: etree = None,
     ) -> Munch:
         """Helper-function for _appliance_info_finder()."""
-        # Remove heater_central when no active device present
-        if not self._opentherm_device and not self._on_off_device:
-            return None
-
         # Find the valid heater_central
         # xml_2 self._appliances for legacy, self._domain_objects for actual
         xml_2 = return_valid(xml_2, self._domain_objects)

plugwise/helper.py

@@ -71,10 +71,10 @@ class SmileComm:
         self,
         host: str,
         password: str,
-        websession: ClientSession | None,
-        username: str,
         port: int,
-        timeout: float,
+        timeout: int,
+        username: str,
+        websession: ClientSession | None,
     ) -> None:
         """Set the constructor for this class."""
         if not websession:
@@ -269,6 +269,13 @@ class SmileHelper(SmileCommon):
         for appliance in self._domain_objects.findall("./appliance"):
             appl = Munch()
             appl.pwclass = appliance.find("type").text
+            # Extend device_class name of Plugs (Plugwise and Aqara) - Pw-Beta Issue #739
+            description = appliance.find("description").text
+            if description is not None and (
+                "ZigBee protocol" in description or "smart plug" in description
+            ):
+                appl.pwclass = f"{appl.pwclass}_plug"
+
             # Skip thermostats that have this key, should be an orphaned device (Core #81712)
             if (
                 appl.pwclass == "thermostat"

plugwise/legacy/helper.py

@@ -116,6 +116,13 @@ class SmileLegacyHelper(SmileCommon):
             appl.location = self._home_location
             appl.dev_id = appliance.attrib["id"]
             appl.name = appliance.find("name").text
+            # Extend device_class name when a Circle/Stealth is type heater_central -- Pw-Beta Issue #739
+            if (
+                appl.pwclass == "heater_central"
+                and appl.name != "Central heating boiler"
+            ):
+                appl.pwclass = "heater_central_plug"
+
             appl.model = appl.pwclass.replace("_", " ").title()
             appl.model_id = None
             appl.firmware = None

plugwise/legacy/smile.py

@@ -40,7 +40,7 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         self,
         host: str,
         password: str,
-        timeout: float,
+        timeout: int,
         websession: aiohttp.ClientSession,
         _is_thermostat: bool,
         _on_off_device: bool,
@@ -56,18 +56,18 @@ class SmileLegacyAPI(SmileComm, SmileLegacyData):
         smile_name: str,
         smile_type: str,
         smile_zigbee_mac_address: str | None,
-        username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
+        username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
-            websession,
-            username,
             port,
             timeout,
-        )
+            username,
+            websession,
+         )
         SmileLegacyData.__init__(self)
 
         self._cooling_present = False

plugwise/smile.py

@@ -46,7 +46,7 @@ class SmileAPI(SmileComm, SmileData):
         self,
         host: str,
         password: str,
-        timeout: float,
+        timeout: int,
         websession: aiohttp.ClientSession,
         _cooling_present: bool,
         _elga: bool,
@@ -65,17 +65,17 @@ class SmileAPI(SmileComm, SmileData):
         smile_model_id: str | None,
         smile_name: str,
         smile_type: str,
-        username: str = DEFAULT_USERNAME,
         port: int = DEFAULT_PORT,
+        username: str = DEFAULT_USERNAME,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__(
             host,
             password,
-            websession,
-            username,
             port,
             timeout,
+            username,
+            websession,
         )
         SmileData.__init__(self)
 
@@ -137,9 +137,12 @@ class SmileAPI(SmileComm, SmileData):
             await self.full_update_device()
             self.get_all_devices()
             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"]:
-                    self._cooling_enabled = self.gw_devices[self._heater_id]["binary_sensors"]["cooling_enabled"]
+                heat_cooler = self.gw_devices[self.gw_data["heater_id"]]
+                if (
+                    "binary_sensors" in heat_cooler
+                    and "cooling_enabled" in heat_cooler["binary_sensors"]
+                ):
+                    self._cooling_enabled = heat_cooler["binary_sensors"]["cooling_enabled"]
         except KeyError as err:
             raise DataMissingError("No Plugwise data received") from err
 

plugwise/util.py

@@ -91,7 +91,9 @@ def check_heater_central(xml: etree) -> str:
         has_actuators: bool = (
             heater_central.find("actuator_functionalities/") is not None
         )
-        hc_list.append({hc_id: has_actuators})
+        # Filter for Plug/Circle/Stealth heater_central -- Pw-Beta Issue #739
+        if heater_central.find("name").text == "Central heating boiler":
+            hc_list.append({hc_id: has_actuators})
 
     heater_central_id = list(hc_list[0].keys())[0]
     if hc_count > 1:

{plugwise-1.4.1.dist-info → plugwise-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.4.1
+Version: 1.4.2
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

plugwise-1.4.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+plugwise/__init__.py,sha256=QeUbOAPOcSOGIpB8YYjrJZB9O4-fTU7Gy0Q6aUD5rn4,16980
+plugwise/common.py,sha256=WltDqYlW5D3KqIcm5U_gVY4izLZSk_Uk-MEJl6RDNbs,12592
+plugwise/constants.py,sha256=kVNrr4zeKFMiGBogVLZ6B925FHAIgy1PY2BBxaT1vkk,16742
+plugwise/data.py,sha256=I4w3ABqmcj_uSnfxTWPYQH8WP6HaywVMx1aQ-feBdU0,10734
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=uOmxYr4ic1F8nYLHb1c1dC7-WphM82VT9vMLQet3CU8,44418
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=5johCmwFuAHbTf05lWpdZ4WaUhVzt9Vb7bksSbFVeq4,18827
+plugwise/util.py,sha256=u2qQt6ubQW1ioiDIIzOMnyydxQH5_48_Tbw_vEgCpyg,8161
+plugwise/legacy/data.py,sha256=DsHR9xgiFDg_Vh_6ZpOskw8ZhNQ3CmwjstI3yiH6MEk,3048
+plugwise/legacy/helper.py,sha256=DjdyU5kwXg4N5ZU9H65w7MSUY6SADcaAy_OziyFKDis,18311
+plugwise/legacy/smile.py,sha256=GFmeceLb4zTx4K7EP-7QMqHSkNvnzEq7GtCWhR55YbE,11313
+plugwise-1.4.2.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.4.2.dist-info/METADATA,sha256=4jWvFMqOXKlCS6aVAzRthFtlYEh0rrbejMJXWiBvh0o,9097
+plugwise-1.4.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+plugwise-1.4.2.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.4.2.dist-info/RECORD,,

plugwise-1.4.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-plugwise/__init__.py,sha256=wA-xl4Cd2mioaKhP31D6dHNu-CM2X-5n8TlQbSIra3k,17035
-plugwise/common.py,sha256=geZd-kVQ0F1OTJoUd2WMPxNBVpSLgZ2ID_47ainOMnk,12746
-plugwise/constants.py,sha256=kVNrr4zeKFMiGBogVLZ6B925FHAIgy1PY2BBxaT1vkk,16742
-plugwise/data.py,sha256=I4w3ABqmcj_uSnfxTWPYQH8WP6HaywVMx1aQ-feBdU0,10734
-plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=05dG0FYCBNwO10P5l7LfeouO5Jrs8i-e0jzftZbgFIw,44074
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=QEztzHr3dzwoZv6lgXKZqDwwCy4WD-2LlS5FhWBHk48,18762
-plugwise/util.py,sha256=lCasQDzYO3CNAIHbLKTK16YJxQKoBrTQkJ1nCMmF17g,8006
-plugwise/legacy/data.py,sha256=DsHR9xgiFDg_Vh_6ZpOskw8ZhNQ3CmwjstI3yiH6MEk,3048
-plugwise/legacy/helper.py,sha256=7QCJyaR9FaM4EEQxGt2oFJac6Pu5OKoi_LG_GQKzRs4,18012
-plugwise/legacy/smile.py,sha256=7oaPZuvxrYRvoA8qWFvtWSwQRFfQl1XXpPjWXn3_xFs,11314
-plugwise-1.4.1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.4.1.dist-info/METADATA,sha256=PgAeHxciq6Lly984b9uD3x_UZFm9Tj4xl12w6qPQCOA,9097
-plugwise-1.4.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-plugwise-1.4.1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.4.1.dist-info/RECORD,,