PySwitchbot 0.68.2__tar.gz → 0.68.3__tar.gz

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.68.2
+Version: 0.68.3
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.68.2
+Version: 0.68.3
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/setup.py

@@ -20,7 +20,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="0.68.2",
+    version="0.68.3",
     description="A library to communicate with Switchbot",
     long_description=long_description,
     long_description_content_type="text/markdown",

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/switchbot/adv_parser.py

@@ -36,6 +36,7 @@ from .adv_parsers.motion import process_wopresence
 from .adv_parsers.plug import process_woplugmini
 from .adv_parsers.relay_switch import (
     process_garage_door_opener,
+    process_relay_switch_1pm,
     process_relay_switch_2pm,
     process_relay_switch_common_data,
 )
@@ -213,7 +214,7 @@ SUPPORTED_TYPES: dict[str | bytes, SwitchbotSupportedType] = {
     "<": {
         "modelName": SwitchbotModel.RELAY_SWITCH_1PM,
         "modelFriendlyName": "Relay Switch 1PM",
-        "func": process_relay_switch_common_data,
+        "func": process_relay_switch_1pm,
         "manufacturer_id": 2409,
     },
     ";": {

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/switchbot/adv_parsers/relay_switch.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Any
 
+from ..helpers import parse_power_data
+
 
 def process_relay_switch_common_data(
     data: bytes | None, mfr_data: bytes | None
@@ -18,6 +20,18 @@ def process_relay_switch_common_data(
     }
 
 
+def process_relay_switch_1pm(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, Any]:
+    """Process Relay Switch 1PM services data."""
+    if mfr_data is None:
+        return {}
+
+    common_data = process_relay_switch_common_data(data, mfr_data)
+    common_data["power"] = parse_power_data(mfr_data, 10)
+    return common_data
+
+
 def process_garage_door_opener(
     data: bytes | None, mfr_data: bytes | None
 ) -> dict[str, Any]:
@@ -39,10 +53,13 @@ def process_relay_switch_2pm(
     return {
         1: {
             **process_relay_switch_common_data(data, mfr_data),
+            "power": parse_power_data(mfr_data, 10),
         },
         2: {
             "switchMode": True,  # for compatibility, useless
             "sequence_number": mfr_data[6],
             "isOn": bool(mfr_data[7] & 0b01000000),
+            "power": parse_power_data(mfr_data, 12),
         },
+        "sequence_number": mfr_data[6],
     }

{pyswitchbot-0.68.2 → pyswitchbot-0.68.3}/tests/test_adv_parser.py

@@ -3236,12 +3236,15 @@ def test_humidifer_with_empty_data() -> None:
                     "isOn": True,
                     "sequence_number": 138,
                     "switchMode": True,
+                    "power": 0.0,
                 },
                 2: {
                     "isOn": True,
                     "sequence_number": 138,
                     "switchMode": True,
+                    "power": 70.0,
                 },
+                "sequence_number": 138,
             },
             "=",
             "Relay Switch 2PM",
@@ -3266,6 +3269,7 @@ def test_humidifer_with_empty_data() -> None:
                 "isOn": True,
                 "sequence_number": 71,
                 "switchMode": True,
+                "power": 49.0,
             },
             "<",
             "Relay Switch 1PM",
@@ -3400,12 +3404,15 @@ def test_adv_active(test_case: AdvTestCase) -> None:
                     "isOn": True,
                     "sequence_number": 138,
                     "switchMode": True,
+                    "power": 0.0,
                 },
                 2: {
                     "isOn": True,
                     "sequence_number": 138,
                     "switchMode": True,
+                    "power": 70.0,
                 },
+                "sequence_number": 138,
             },
             "=",
             "Relay Switch 2PM",
@@ -3430,6 +3437,7 @@ def test_adv_active(test_case: AdvTestCase) -> None:
                 "isOn": True,
                 "sequence_number": 71,
                 "switchMode": True,
+                "power": 49.0,
             },
             "<",
             "Relay Switch 1PM",