plugwise 0.36.2__py3-none-any.whl → 0.37.0__py3-none-any.whl

plugwise/util.py

@@ -3,16 +3,27 @@ from __future__ import annotations
 
 import re
 
-from .constants import (
+from plugwise.constants import (
+    ATTR_UNIT_OF_MEASUREMENT,
     ELECTRIC_POTENTIAL_VOLT,
     ENERGY_KILO_WATT_HOUR,
     HW_MODELS,
     PERCENTAGE,
+    POWER_WATT,
     SPECIAL_FORMAT,
     TEMP_CELSIUS,
+    DeviceData,
 )
 
 
+def check_model(name: str | None, vendor_name: str | None) -> str | None:
+    """Model checking before using version_to_model."""
+    if vendor_name == "Plugwise" and ((model := version_to_model(name)) != "Unknown"):
+        return model
+
+    return name
+
+
 def escape_illegal_xml_characters(xmldata: str) -> str:
     """Replace illegal &-characters."""
     return re.sub(r"&([^a-zA-Z#])", r"&\1", xmldata)
@@ -47,6 +58,19 @@ def format_measure(measure: str, unit: str) -> float | int:
     return result
 
 
+def power_data_local_format(
+    attrs: dict[str, str], key_string: str, val: str
+) -> float | int:
+    """Format power data."""
+    # Special formatting of P1_MEASUREMENT POWER_WATT values, do not move to util-format_measure() function!
+    if all(item in key_string for item in ("electricity", "cumulative")):
+        return format_measure(val, ENERGY_KILO_WATT_HOUR)
+    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
+        return int(round(float(val)))
+
+    return format_measure(val, attrs_uom)
+
+
 # NOTE: this function version_to_model is shared between Smile and USB
 def version_to_model(version: str | None) -> str | None:
     """Translate hardware_version to device type."""
@@ -62,3 +86,13 @@ def version_to_model(version: str | None) -> str | None:
         model = HW_MODELS.get(version[-2:] + version[-4:-2] + version[-6:-4])
 
     return model if model is not None else "Unknown"
+
+
+def remove_empty_platform_dicts(data: DeviceData) -> None:
+    """Helper-function for removing any empty platform dicts."""
+    if not data["binary_sensors"]:
+        data.pop("binary_sensors")
+    if not data["sensors"]:
+        data.pop("sensors")
+    if not data["switches"]:
+        data.pop("switches")

{plugwise-0.36.2.dist-info → plugwise-0.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 0.36.2
+Version: 0.37.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
@@ -48,7 +48,7 @@ Requires-Dist: defusedxml
 Requires-Dist: munch
 Requires-Dist: pyserial
 Requires-Dist: python-dateutil
-Requires-Dist: semver (>=3.0.0)
+Requires-Dist: semver >=3.0.0
 
 # Plugwise python module
 

plugwise-0.37.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+plugwise/__init__.py,sha256=TMpDJgS-Nz7zwiuM8CTZk9wMenrxzFanRDxmloUAM08,15257
+plugwise/constants.py,sha256=_IO-MQQu_gFZ71VTNlmNY5Lqr6u0t5rWaQTQJqe_xRc,16467
+plugwise/data.py,sha256=6yJ7G-0ujwuGFwgHiHIxmomATohVmgwFmiEKwinr3EM,9535
+plugwise/exceptions.py,sha256=rymGtWnXosdFkzSehc_41HVl2jXJEg_9Hq9APDEUwrk,1223
+plugwise/helper.py,sha256=Iud_UPXqmXXq_U_EA7L4IRhXgg187dfynZ9tVEfFJIM,56508
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=7p5KAdl_vorthsRWYHpWkXLqbe27yS3o_OmbpL4H9Yc,16709
+plugwise/util.py,sha256=es3NZ8AlT9_CNkod4IXEJ-MgH_Al4vqD4XNcnLv315Y,3117
+plugwise/legacy/data.py,sha256=_Ijoq4XaUlSbmpelx5wRR2cl5dwfSZIRDD0UBygd0uE,4252
+plugwise/legacy/helper.py,sha256=vVk1fk-h3pCnvjrHcT5vBJq_eHm9K-HDftqA-C3Sl-Y,30991
+plugwise/legacy/smile.py,sha256=EegTdPb_baIOCGpPXtQ5c9SFPYrhkC4ARGk4_Pc8jK0,10336
+plugwise-0.37.0.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-0.37.0.dist-info/METADATA,sha256=KZ1fI7O1i0wRcywhDBolxksc93nV3t2iYORw7NVU2h0,9095
+plugwise-0.37.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+plugwise-0.37.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-0.37.0.dist-info/RECORD,,

{plugwise-0.36.2.dist-info → plugwise-0.37.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

plugwise-0.36.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-plugwise/__init__.py,sha256=MeHRSYO6XfOPsBGNNcnA7ipYPfYu5t1ALtjCsAtYbV0,36705
-plugwise/constants.py,sha256=_IO-MQQu_gFZ71VTNlmNY5Lqr6u0t5rWaQTQJqe_xRc,16467
-plugwise/exceptions.py,sha256=rymGtWnXosdFkzSehc_41HVl2jXJEg_9Hq9APDEUwrk,1223
-plugwise/helper.py,sha256=H3LxEMrakIZmNG80FoObOevRx90Y34sIO-LTwDtXbb4,65502
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/util.py,sha256=rK7LUmfM_1tXUrmmUovWiz7rw44dz9hpomOZEcky16E,1949
-plugwise-0.36.2.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-0.36.2.dist-info/METADATA,sha256=en-5Yyk9bPWHdDUGtmDMj1D8Sap35ovGfB9Khi7pBLs,9097
-plugwise-0.36.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-plugwise-0.36.2.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-0.36.2.dist-info/RECORD,,