plugwise 1.4.1__tar.gz → 1.4.2a2__tar.gz

{plugwise-1.4.1 → plugwise-1.4.2a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.4.1
+Version: 1.4.2a2
 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.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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-1.4.1 → plugwise-1.4.2a2}/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 → plugwise-1.4.2a2}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.4.1
+Version: 1.4.2a2
 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.1 → plugwise-1.4.2a2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.4.1"
+version         = "1.4.2a2"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"
@@ -112,33 +112,34 @@ good-names = [
 # too-many-ancestors - it's too strict.
 # wrong-import-order - isort guards this
 disable = [
-    "format",
     "abstract-method",
     "consider-using-f-string",
     "cyclic-import",
     "duplicate-code",
     "fixme",
+    "format",
     "inconsistent-return-statements",
     "locally-disabled",
+    "missing-class-docstring",
+    "missing-function-docstring",
+    "missing-module-docstring",
     "not-context-manager",
+    "raise-missing-from",
     "too-few-public-methods",
     "too-many-ancestors",
     "too-many-arguments",
+    "too-many-boolean-expressions",
     "too-many-branches",
     "too-many-instance-attributes",
     "too-many-lines",
     "too-many-locals",
+    "too-many-positional-arguments",
     "too-many-public-methods",
     "too-many-return-statements",
     "too-many-statements",
-    "too-many-boolean-expressions",
+    "too-many-nested-blocks",
     "unused-argument",
     "wrong-import-order",
-    "raise-missing-from",
-    "missing-class-docstring",
-    "missing-function-docstring",
-    "missing-module-docstring",
-    "too-many-nested-blocks",
 ]
 # for now (20201031) added the below while we are codemerging/-improving
 # missing-class-docstring

{plugwise-1.4.1 → plugwise-1.4.2a2}/tests/test_init.py

@@ -322,6 +322,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 username=pw_constants.DEFAULT_USERNAME,
                 password=test_password,
                 port=server.port,
+                timeout=pw_constants.DEFAULT_TIMEOUT,
                 websession=None,
             )
             lack_of_websession = False
@@ -335,11 +336,12 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             username=pw_constants.DEFAULT_USERNAME,
             password=test_password,
             port=server.port,
+            timeout=pw_constants.DEFAULT_TIMEOUT,
             websession=websession,
         )
 
         if not timeout:
-            assert smile._timeout == 30
+            assert smile._timeout == 10
 
         # Connect to the smile
         try:
@@ -403,6 +405,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
                 username=pw_constants.DEFAULT_USERNAME,
                 password=test_password,
                 port=server.port,
+                timeout=pw_constants.DEFAULT_LEGACY_TIMEOUT,
                 websession=None,
             )
             lack_of_websession = False
@@ -416,6 +419,7 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
             username=pw_constants.DEFAULT_USERNAME,
             password=test_password,
             port=server.port,
+            timeout=pw_constants.DEFAULT_LEGACY_TIMEOUT,
             websession=websession,
         )
 
@@ -570,11 +574,12 @@ class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
         self._cooling_active = False
         self._cooling_enabled = False
         if "heater_id" in data.gateway:
-            heater_id = data.gateway["heater_id"]
-            if "cooling_enabled" in data.devices[heater_id]["binary_sensors"]:
-                self._cooling_enabled = data.devices[heater_id]["binary_sensors"]["cooling_enabled"]
-            if "cooling_state" in data.devices[heater_id]["binary_sensors"]:
-                self._cooling_active = data.devices[heater_id]["binary_sensors"]["cooling_state"]
+            heat_cooler = data.devices[data.gateway["heater_id"]]
+            if "binary_sensors" in heat_cooler:
+                if "cooling_enabled" in heat_cooler["binary_sensors"]:
+                    self._cooling_enabled = heat_cooler["binary_sensors"]["cooling_enabled"]
+                if "cooling_state" in heat_cooler["binary_sensors"]:
+                    self._cooling_active = heat_cooler["binary_sensors"]["cooling_state"]
 
         self._write_json("all_data", {"gateway": data.gateway, "devices": data.devices})
 

{plugwise-1.4.1 → plugwise-1.4.2a2}/tests/test_legacy_stretch.py

@@ -69,7 +69,7 @@ class TestPlugwiseStretch(
         )
 
         await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert self.device_items == 229
+        assert self.device_items == 243
 
         switch_change = await self.tinker_switch(
             smile, "2587a7fcdd7e482dab03fda256076b4b"