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

plugwise/common.py

@@ -52,6 +52,7 @@ class SmileCommon:
         self,
         appl: Munch,
         xml_1: etree,
+        legacy: bool,
         xml_2: etree = None,
         xml_3: etree = None,
     ) -> Munch:
@@ -68,8 +69,8 @@ class SmileCommon:
         #  Info for On-Off device
         if self._on_off_device:
             appl.name = "OnOff"  # pragma: no cover
-            appl.vendor_name = None  # pragma: no cover
             appl.model = "Unknown"  # pragma: no cover
+            appl.vendor_name = None  # pragma: no cover
             return appl  # pragma: no cover
 
         # Info for OpenTherm device
@@ -85,13 +86,12 @@ class SmileCommon:
             module_data = self._get_module_data(xml_1, locator_2, mod_type, xml_3)
         appl.vendor_name = module_data["vendor_name"]
         appl.hardware = module_data["hardware_version"]
-        appl.model = module_data["vendor_model"]
-        if appl.model is None:
-            appl.model = (
-                "Generic heater/cooler"
-                if self._cooling_present
-                else "Generic heater"
-            )
+        appl.model_id = module_data["vendor_model"] if not legacy else None
+        appl.model = (
+            "Generic heater/cooler"
+            if self._cooling_present
+            else "Generic heater"
+        )
 
         return appl
 
@@ -102,7 +102,11 @@ class SmileCommon:
         xml_2 = return_valid(xml_2, self._domain_objects)
         module_data = self._get_module_data(xml_1, locator, mod_type, xml_2)
         appl.vendor_name = module_data["vendor_name"]
-        appl.model = check_model(module_data["vendor_model"], appl.vendor_name)
+        appl.model = module_data["vendor_model"]
+        if appl.model != "ThermoTouch":  # model_id for Anna not present as stand-alone device
+            appl.model_id = appl.model
+            appl.model = check_model(appl.model, appl.vendor_name)
+
         appl.hardware = module_data["hardware_version"]
         appl.firmware = module_data["firmware_version"]
         appl.zigbee_mac = module_data["zigbee_mac_address"]
@@ -197,6 +201,7 @@ class SmileCommon:
             "location": appl.location,
             "mac_address": appl.mac,
             "model": appl.model,
+            "model_id": appl.model_id,
             "name": appl.name,
             "zigbee_mac_address": appl.zigbee_mac,
             "vendor": appl.vendor_name,

plugwise/constants.py

@@ -258,13 +258,13 @@ ApplianceType = Literal[
 ]
 
 BinarySensorType = Literal[
-    "battery_state",
     "compressor_state",
     "cooling_enabled",
     "cooling_state",
     "dhw_state",
     "flame_state",
     "heating_state",
+    "low_battery",
     "plugwise_notification",
     "secondary_boiler_state",
 ]
@@ -410,13 +410,13 @@ class ModelData(TypedDict):
 class SmileBinarySensors(TypedDict, total=False):
     """Smile Binary Sensors class."""
 
-    battery_state: bool
     compressor_state: bool
     cooling_enabled: bool
     cooling_state: bool
     dhw_state: bool
     flame_state: bool
     heating_state: bool
+    low_battery: bool
     plugwise_notification: bool
     secondary_boiler_state: bool
 

plugwise/data.py

@@ -62,25 +62,21 @@ class SmileData(SmileHelper):
                 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 "low_battery" 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)
-                )
+                and device["dev_class"] in ("thermo_sensor", "thermostatic_radiator_valve", "zone_thermometer", "zone_thermostat")
             )
             if is_battery_low:
-                device["binary_sensors"]["battery_state"] = True
+                device["binary_sensors"]["low_battery"] = 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."""
+        """Helper-function updating the low-battery 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"]
@@ -88,12 +84,15 @@ class SmileData(SmileHelper):
             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)):
+                warning: str | None = notification.get("warning")
+                notify = message or warning
+                if notify is not None and all(x in notify for x in matches) and (mac_addresses := mac_pattern.findall(notify)):
                     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)
+                    if message is not None:  # only block message-type notifications
+                        self._notifications.pop(msg_id)
 
         return mac_address_list
 

plugwise/helper.py

@@ -285,7 +285,8 @@ class SmileHelper(SmileCommon):
 
             appl.dev_id = appliance.attrib["id"]
             appl.name = appliance.find("name").text
-            appl.model = appl.pwclass.replace("_", " ").title()
+            appl.model = None
+            appl.model_id = None
             appl.firmware = None
             appl.hardware = None
             appl.mac = None
@@ -350,7 +351,8 @@ class SmileHelper(SmileCommon):
         appl.dev_id = self.gateway_id
         appl.location = loc_id
         appl.mac = None
-        appl.model = self.smile_model
+        appl.model = self._domain_objects.find("./gateway/vendor_model").text
+        appl.model_id = None
         appl.name = "P1"
         appl.pwclass = "smartmeter"
         appl.zigbee_mac = None
@@ -370,7 +372,7 @@ class SmileHelper(SmileCommon):
                 return self._appl_thermostat_info(appl, appliance)
             case "heater_central":
                 # Collect heater_central device info
-                self._appl_heater_central_info(appl, appliance)
+                self._appl_heater_central_info(appl, appliance, False)  # False means non-legacy device
                 self._appl_dhw_mode_info(appl, appliance)
                 return appl
             case _:
@@ -380,14 +382,14 @@ class SmileHelper(SmileCommon):
     def _energy_device_info_finder(self, appl: Munch, appliance: etree) -> Munch:
         """Helper-function for _appliance_info_finder().
 
-        Collect energy device info (Smartmeter, Plug): firmware, model and vendor name.
+        Collect energy device info (Smartmeter): firmware, model and vendor name.
         """
         if self.smile_type == "power":
             locator = "./logs/point_log/electricity_point_meter"
             mod_type = "electricity_point_meter"
             module_data = self._get_module_data(appliance, locator, mod_type)
             appl.hardware = module_data["hardware_version"]
-            appl.model = module_data["vendor_model"]
+            appl.model = module_data["vendor_model"]  # don't use model_id for Smartmeter
             appl.vendor_name = module_data["vendor_name"]
             appl.firmware = module_data["firmware_version"]
 
@@ -403,7 +405,8 @@ class SmileHelper(SmileCommon):
                 return None
 
             appl.vendor_name = module_data["vendor_name"]
-            appl.model = check_model(module_data["vendor_model"], appl.vendor_name)
+            appl.model_id = module_data["vendor_model"]
+            appl.model = check_model(appl.model_id, appl.vendor_name)
             appl.hardware = module_data["hardware_version"]
             appl.firmware = module_data["firmware_version"]
 
@@ -418,6 +421,7 @@ class SmileHelper(SmileCommon):
         appl.hardware = self.smile_hw_version
         appl.mac = self.smile_mac_address
         appl.model = self.smile_model
+        appl.model_id = self._domain_objects.find("./gateway/vendor_model").text
         appl.name = self.smile_name
         appl.vendor_name = "Plugwise"
 

plugwise/legacy/helper.py

@@ -117,6 +117,7 @@ class SmileLegacyHelper(SmileCommon):
             appl.dev_id = appliance.attrib["id"]
             appl.name = appliance.find("name").text
             appl.model = appl.pwclass.replace("_", " ").title()
+            appl.model_id = None
             appl.firmware = None
             appl.hardware = None
             appl.mac = None
@@ -207,7 +208,9 @@ class SmileLegacyHelper(SmileCommon):
                 return self._appl_thermostat_info(appl, appliance, self._modules)
         # Collect heater_central device info
             case "heater_central":
-                return self._appl_heater_central_info(appl, appliance, self._appliances, self._modules)
+                return self._appl_heater_central_info(
+                    appl, appliance, True, self._appliances, self._modules
+                )  # True means legacy device
         # Collect info from Stretches
             case _:
                 return self._energy_device_info_finder(appliance, appl)
@@ -246,6 +249,7 @@ class SmileLegacyHelper(SmileCommon):
         appl.location = loc_id
         appl.mac = None
         appl.model = self.smile_model
+        appl.model_id = None
         appl.name = "P1"
         appl.pwclass = "smartmeter"
         appl.zigbee_mac = None

plugwise/util.py

@@ -110,6 +110,9 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None:
     if vendor_name == "Plugwise" and ((model := version_to_model(name)) != "Unknown"):
         return model
 
+    if name is not None and "lumi.plug" in name:
+        return "Aqara Smart Plug"
+
     return name
 
 
@@ -139,7 +142,7 @@ def common_match_cases(
             data[sp_key] = value
 
     if "battery" in data["sensors"]:
-        data["binary_sensors"]["battery_state"] = False
+        data["binary_sensors"]["low_battery"] = False
 
 
 def escape_illegal_xml_characters(xmldata: str) -> str:

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

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

@@ -0,0 +1,17 @@
+plugwise/__init__.py,sha256=EXiTp-N8kQqOUAaczDbULS176NwA2C1FcfWiKkBzNdI,16887
+plugwise/common.py,sha256=geZd-kVQ0F1OTJoUd2WMPxNBVpSLgZ2ID_47ainOMnk,12746
+plugwise/constants.py,sha256=O2sEAUjoOgvuM5dsS7jzZOMDcy6h8WI1p-od9WzJvQ4,16722
+plugwise/data.py,sha256=I4w3ABqmcj_uSnfxTWPYQH8WP6HaywVMx1aQ-feBdU0,10734
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=2oSUV2Wj0LkfhAvfXwMvfDrJ9x5SWlen4IVCs4twYSU,44123
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=TyDXl1NSMFxsZehtopawpYpL6vie3NM3gVcez_bfjvA,18681
+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.3.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.3.0.dist-info/METADATA,sha256=7JzpaCXGkFUFcdvHvbCjsKLbKKackFQFjC9moyvg60o,9097
+plugwise-1.3.0.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+plugwise-1.3.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.3.0.dist-info/RECORD,,

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

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

plugwise-1.1.0a0.dist-info/RECORD

@@ -1,17 +0,0 @@
-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,,