plugwise 1.7.3a1__py3-none-any.whl → 1.7.3a2__py3-none-any.whl

plugwise/common.py

@@ -76,6 +76,9 @@ class SmileCommon:
         xml_2 = return_valid(xml_2, self._domain_objects)
         self._heater_id = check_heater_central(xml_2)
 
+        if self._heater_id == NONE:
+            return Munch()  # pragma: no cover
+
         #  Info for On-Off device
         if self._on_off_device:
             appl.name = "OnOff"  # pragma: no cover

plugwise/helper.py

@@ -253,7 +253,7 @@ class SmileHelper(SmileCommon):
                 appl.zigbee_mac = module_data["zigbee_mac_address"]
                 return appl
             case _:  # pragma: no cover
-                return appl
+                return Munch()
 
     def _appl_gateway_info(self, appl: Munch, appliance: etree.Element) -> Munch:
         """Helper-function for _appliance_info_finder()."""

plugwise/util.py

@@ -13,6 +13,7 @@ from plugwise.constants import (
     ELECTRIC_POTENTIAL_VOLT,
     ENERGY_KILO_WATT_HOUR,
     HW_MODELS,
+    NONE,
     OBSOLETE_MEASUREMENTS,
     PERCENTAGE,
     POWER_WATT,
@@ -93,14 +94,16 @@ def check_heater_central(xml: etree.Element) -> str:
         if heater_central.find("name").text == "Central heating boiler":
             hc_list.append({hc_id: has_actuators})
 
+    if not hc_list:
+        return NONE  # pragma: no cover
+
     heater_central_id = list(hc_list[0].keys())[0]
     if hc_count > 1:
-        for item in hc_list:  # pragma: no cover
-            for key, value in item.items():  # pragma: no cover
-                if value:  # pragma: no cover
-                    heater_central_id = key  # pragma: no cover
-                    # Stop when a valid id is found
-                    break  # pragma: no cover
+        for item in hc_list:
+            hc_id, has_actuators = next(iter(item.items()))
+            if has_actuators:
+                heater_central_id = hc_id
+                break
 
     return heater_central_id
 
@@ -135,7 +138,7 @@ def collect_power_values(
         if not loc.found:
             continue
 
-        data = power_data_energy_diff(loc.measurement, loc.net_string, loc.f_val, data)
+        power_data_energy_diff(loc.measurement, loc.net_string, loc.f_val, data)
         key = cast(SensorType, loc.key_string)
         data["sensors"][key] = loc.f_val
 
@@ -192,8 +195,6 @@ def escape_illegal_xml_characters(xmldata: str) -> str:
 
 def format_measure(measure: str, unit: str) -> float | int:
     """Format measure to correct type."""
-    result: float | int = 0
-
     float_measure = float(measure)
     if unit == PERCENTAGE and 0 < float_measure <= 1:
         return int(float_measure * 100)
@@ -202,13 +203,13 @@ def format_measure(measure: str, unit: str) -> float | int:
         float_measure = float_measure / 1000
 
     if unit in SPECIAL_FORMAT:
-        result = float(f"{round(float_measure, 3):.3f}")
+        result = round(float_measure, 3)
     elif unit == ELECTRIC_POTENTIAL_VOLT:
-        result = float(f"{round(float_measure, 1):.1f}")
+        result = round(float_measure, 1)
     elif abs(float_measure) < 10:
-        result = float(f"{round(float_measure, 2):.2f}")
-    elif abs(float_measure) >= 10:
-        result = float(f"{round(float_measure, 1):.1f}")
+        result = round(float_measure, 2)
+    else:  # abs(float_measure) >= 10
+        result = round(float_measure, 1)
 
     return result
 
@@ -228,31 +229,21 @@ def power_data_energy_diff(
     net_string: SensorType,
     f_val: float | int,
     data: GwEntityData,
-) -> GwEntityData:
+) -> None:
     """Calculate differential energy."""
     if (
         "electricity" in measurement
         and "phase" not in measurement
         and "interval" not in net_string
     ):
-        diff = 1
-        if "produced" in measurement:
-            diff = -1
-        if net_string not in data["sensors"]:
-            tmp_val: float | int = 0
-        else:
-            tmp_val = data["sensors"][net_string]
-
-        if isinstance(f_val, int):
-            tmp_val += f_val * diff
-        else:
-            tmp_val += float(f_val * diff)
-            tmp_val = float(f"{round(tmp_val, 3):.3f}")
+        diff = 1 if "consumed" in measurement else -1
+        tmp_val = data["sensors"].get(net_string, 0)
+        tmp_val += f_val * diff
+        if isinstance(f_val, float):
+            tmp_val = round(tmp_val, 3)
 
         data["sensors"][net_string] = tmp_val
 
-    return data
-
 
 def power_data_local_format(
     attrs: dict[str, str], key_string: str, val: str

{plugwise-1.7.3a1.dist-info → plugwise-1.7.3a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: plugwise
-Version: 1.7.3a1
+Version: 1.7.3a2
 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.7.3a1.dist-info → plugwise-1.7.3a2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 plugwise/__init__.py,sha256=9Bc3Kaajvr-W060CVW135rPxkdQIh6wlv0jeo57zmWA,17786
-plugwise/common.py,sha256=I89l9Q_RvUSBUIQO163za7oIVr-uSnKNyvkA2NCU1FM,9391
+plugwise/common.py,sha256=Q2P4iyLcrGLeZwNd8Z8soWhI3L5L9IWMgaIMnppsIEs,9475
 plugwise/constants.py,sha256=Vd8tvOHsRtZxtUUFXBXolZj3QiKnxRt0bnwDT9DoEqE,17073
 plugwise/data.py,sha256=SUXbyjCu-wS6l3tXnAhItEOhnYtAfd79nPiUlS5MnzY,12955
 plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=2ZY2ok4kXUkNK3PNR7qwvzVnI5U-5dncmqimac4qWXw,39480
+plugwise/helper.py,sha256=U1EUqX3ErmmFH4L5uXRAXNj20toeMufzyKp2-WRpIXc,39483
 plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plugwise/smile.py,sha256=BHgOp9FaaupOghF54t53qpgnQoVdG4WfdOSUPI2dmKc,19559
 plugwise/smilecomm.py,sha256=DRQ3toRNEf3oo_mej49fPJ47m5das-jvo-8GnIrSPzw,5208
-plugwise/util.py,sha256=aPRA-5SURMvIHTtPrJ5f6Vj-cLktSwZXqJsxBdiJJrk,11071
+plugwise/util.py,sha256=rMcqfaB4dkQEZFJY-bBJISmlYgTnb6Ns3-Doxelf92Q,10689
 plugwise/legacy/data.py,sha256=s2WYjgxwcuAGS8UOxJVf7xLSxS38Zgr8GsjxlxfD98w,3574
 plugwise/legacy/helper.py,sha256=MLEeZO4vcHTrjRUb0ZMch_5aHABXmdEiQZNpCmJdWiw,17156
 plugwise/legacy/smile.py,sha256=bbhuD0kT9xuzdRd6shl-IBRUkBlforYv-iggJXYYrU0,12850
-plugwise-1.7.3a1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.7.3a1.dist-info/METADATA,sha256=1tkUvvjdH1rBMopp6RYsF3VfJyXsyh_uqZ9ly3Bh8v4,9330
-plugwise-1.7.3a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-plugwise-1.7.3a1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.7.3a1.dist-info/RECORD,,
+plugwise-1.7.3a2.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.7.3a2.dist-info/METADATA,sha256=sF2g1_meY9DJgPi8QtlWJlU95lC77Y3hGdGj7olCdXA,9330
+plugwise-1.7.3a2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+plugwise-1.7.3a2.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.7.3a2.dist-info/RECORD,,