plugwise 1.0.0__py3-none-any.whl → 1.1.0a0__py3-none-any.whl

plugwise/constants.py

@@ -258,6 +258,7 @@ ApplianceType = Literal[
 ]
 
 BinarySensorType = Literal[
+    "battery_state",
     "compressor_state",
     "cooling_enabled",
     "cooling_state",
@@ -409,6 +410,7 @@ class ModelData(TypedDict):
 class SmileBinarySensors(TypedDict, total=False):
     """Smile Binary Sensors class."""
 
+    battery_state: bool
     compressor_state: bool
     cooling_enabled: bool
     cooling_state: bool

plugwise/data.py

@@ -4,6 +4,8 @@ Plugwise Smile protocol data-collection helpers.
 """
 from __future__ import annotations
 
+import re
+
 from plugwise.constants import (
     ADAM,
     ANNA,
@@ -52,13 +54,49 @@ class SmileData(SmileHelper):
 
         Collect data for each device and add to self.gw_devices.
         """
+        mac_list: list[str] = []
         for device_id, device in self.gw_devices.items():
             data = self._get_device_data(device_id)
-            self._add_or_update_notifications(device_id, device, data)
+            if device_id == self.gateway_id:
+                mac_list = self._detect_low_batteries()
+                self._add_or_update_notifications(device_id, device, data)
+
             device.update(data)
+
+            is_battery_low = (
+                mac_list
+                and "battery_state" in device["binary_sensors"]
+                and device["zigbee_mac_address"] in mac_list
+                and (
+                    (device["dev_class"] in ("thermo_sensor", "thermostatic_radiator_valve") and device["sensors"]["battery"] < 30)
+                    or (device["dev_class"] in ("zone_thermometer", "zone_thermostat") and device["sensors"]["battery"] < 15)
+                )
+            )
+            if is_battery_low:
+                device["binary_sensors"]["battery_state"] = True
+
             self._update_for_cooling(device)
+
             remove_empty_platform_dicts(device)
 
+    def _detect_low_batteries(self) -> list[str]:
+        """Helper-function updating the battery_state binary_sensor status from a Battery-is-low message."""
+        mac_address_list: list[str] = []
+        mac_pattern = re.compile(r"(?:[0-9A-F]{2}){8}")
+        matches = ["Battery", "below"]
+        if self._notifications:
+            for msg_id, notification in list(self._notifications.items()):
+                mac_address: str | None = None
+                message: str | None = notification.get("message")
+                if message is not None and all(x in message for x in matches) and (mac_addresses := mac_pattern.findall(message)):
+                    mac_address = mac_addresses[0]  # re.findall() outputs a list
+
+                if mac_address is not None:
+                    self._notifications.pop(msg_id)
+                    mac_address_list.append(mac_address)
+
+        return mac_address_list
+
     def _add_or_update_notifications(
         self, device_id: str, device: DeviceData, data: DeviceData
     ) -> None:

plugwise/smile.py

@@ -129,7 +129,6 @@ class SmileAPI(SmileComm, SmileData):
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
-        # Perform a full update at day-change
         self.gw_data: GatewayData = {}
         self.gw_devices: dict[str, DeviceData] = {}
         try:

plugwise/util.py

@@ -138,6 +138,9 @@ def common_match_cases(
             sp_key = cast(SpecialType, measurement)
             data[sp_key] = value
 
+    if "battery" in data["sensors"]:
+        data["binary_sensors"]["battery_state"] = False
+
 
 def escape_illegal_xml_characters(xmldata: str) -> str:
     """Replace illegal &-characters."""

{plugwise-1.0.0.dist-info → plugwise-1.1.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.0.0
+Version: 1.1.0a0
 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.1.0a0.dist-info/RECORD

@@ -0,0 +1,17 @@
+plugwise/__init__.py,sha256=EXiTp-N8kQqOUAaczDbULS176NwA2C1FcfWiKkBzNdI,16887
+plugwise/common.py,sha256=P4sUYzgVcFsIR2DmQxeVeOiZvFZWpZXgwHA3XRc1Sx0,12538
+plugwise/constants.py,sha256=Vuy_N7ZXxO3y2Z2BdlkOia82IPuHD3gNtMyxPmS4zcE,16726
+plugwise/data.py,sha256=zNNhl2Y0fl8TJvMexVdPYd7QM_3fAxfiYKeG9GjCDlI,10712
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=NFcxVtY9qdM2TtBbGs-_eh7xKO6G_M3Q4W9bXUCpH84,43861
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=TyDXl1NSMFxsZehtopawpYpL6vie3NM3gVcez_bfjvA,18681
+plugwise/util.py,sha256=nuFJccqrvHv7s8Ox24NQvDKMRXjFLKAwsgQ7nYaJne0,7924
+plugwise/legacy/data.py,sha256=DsHR9xgiFDg_Vh_6ZpOskw8ZhNQ3CmwjstI3yiH6MEk,3048
+plugwise/legacy/helper.py,sha256=6-tYQMEXepE5rec-hn6lt2EeknADI3J8UFuBSLgu8dk,17878
+plugwise/legacy/smile.py,sha256=7oaPZuvxrYRvoA8qWFvtWSwQRFfQl1XXpPjWXn3_xFs,11314
+plugwise-1.1.0a0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.1.0a0.dist-info/METADATA,sha256=6BXYBWp6gBDkWiE1DrEinbUtLpHf7G7WqpJjHZfU5U8,9099
+plugwise-1.1.0a0.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+plugwise-1.1.0a0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.1.0a0.dist-info/RECORD,,

{plugwise-1.0.0.dist-info → plugwise-1.1.0a0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

plugwise-1.0.0.dist-info/RECORD

@@ -1,17 +0,0 @@
-plugwise/__init__.py,sha256=EXiTp-N8kQqOUAaczDbULS176NwA2C1FcfWiKkBzNdI,16887
-plugwise/common.py,sha256=P4sUYzgVcFsIR2DmQxeVeOiZvFZWpZXgwHA3XRc1Sx0,12538
-plugwise/constants.py,sha256=Y8DeuZSK2_2ZDPMwFtlGkNZKvqaE-WYl-s4fZsj4XZ4,16681
-plugwise/data.py,sha256=HA3OoLrTad4ytns6_rfygwu8eGfopHJBNADGs-hvaQk,9054
-plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=NFcxVtY9qdM2TtBbGs-_eh7xKO6G_M3Q4W9bXUCpH84,43861
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=EgQHGl6kRghB5Ub_TBmUfIFMHI8AZ6INJl1nLoIjQ0Q,18727
-plugwise/util.py,sha256=9ld46KJHWFze2eUrVSgUYn0g3zNerlpboM0iUa0H3ak,7830
-plugwise/legacy/data.py,sha256=DsHR9xgiFDg_Vh_6ZpOskw8ZhNQ3CmwjstI3yiH6MEk,3048
-plugwise/legacy/helper.py,sha256=6-tYQMEXepE5rec-hn6lt2EeknADI3J8UFuBSLgu8dk,17878
-plugwise/legacy/smile.py,sha256=7oaPZuvxrYRvoA8qWFvtWSwQRFfQl1XXpPjWXn3_xFs,11314
-plugwise-1.0.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.0.0.dist-info/METADATA,sha256=AOW18FYvwY2m9USnOIiPiF3YOHB9c3ll-Y2ac5M4MW0,9097
-plugwise-1.0.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-plugwise-1.0.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.0.0.dist-info/RECORD,,