PySwitchbot 0.62.0__tar.gz → 0.62.2__tar.gz

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.62.0
+Version: 0.62.2
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -31,7 +31,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# pySwitchbot [![Build Status](https://travis-ci.org/sblibs/pySwitchbot.svg?branch=master)](https://travis-ci.org/sblibs/pySwitchbot)
+# pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
 Library to control Switchbot IoT devices https://www.switch-bot.com/bot
 

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.62.0
+Version: 0.62.2
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -31,7 +31,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# pySwitchbot [![Build Status](https://travis-ci.org/sblibs/pySwitchbot.svg?branch=master)](https://travis-ci.org/sblibs/pySwitchbot)
+# pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
 Library to control Switchbot IoT devices https://www.switch-bot.com/bot
 

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/README.md

@@ -1,4 +1,4 @@
-# pySwitchbot [![Build Status](https://travis-ci.org/sblibs/pySwitchbot.svg?branch=master)](https://travis-ci.org/sblibs/pySwitchbot)
+# pySwitchbot [![codecov](https://codecov.io/gh/sblibs/pySwitchbot/graph/badge.svg?token=TI027U5ISQ)](https://codecov.io/gh/sblibs/pySwitchbot)
 
 Library to control Switchbot IoT devices https://www.switch-bot.com/bot
 

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/setup.py

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

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/switchbot/adv_parser.py

@@ -282,14 +282,14 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "manufacturer_id": 2409,
     },
     "7": {
-        "modelName": SwitchbotModel.AIR_PURIFIER,
-        "modelFriendlyName": "Air Purifier",
+        "modelName": SwitchbotModel.AIR_PURIFIER_TABLE,
+        "modelFriendlyName": "Air Purifier Table",
         "func": process_air_purifier,
         "manufacturer_id": 2409,
     },
     "8": {
-        "modelName": SwitchbotModel.AIR_PURIFIER,
-        "modelFriendlyName": "Air Purifier",
+        "modelName": SwitchbotModel.AIR_PURIFIER_TABLE,
+        "modelFriendlyName": "Air Purifier Table",
         "func": process_air_purifier,
         "manufacturer_id": 2409,
     },

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/switchbot/const/__init__.py

@@ -74,6 +74,7 @@ class SwitchbotModel(StrEnum):
     K10_PRO_VACUUM = "K10+ Pro Vacuum"
     K10_PRO_COMBO_VACUUM = "K10+ Pro Combo Vacuum"
     AIR_PURIFIER = "Air Purifier"
+    AIR_PURIFIER_TABLE = "Air Purifier Table"
 
 
 __all__ = [

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/switchbot/const/air_purifier.py

@@ -8,8 +8,8 @@ class AirPurifierMode(Enum):
     LEVEL_2 = 2
     LEVEL_3 = 3
     AUTO = 4
-    PET = 5
-    SLEEP = 6
+    SLEEP = 5
+    PET = 6
 
     @classmethod
     def get_modes(cls) -> list[str]:

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/switchbot/devices/air_purifier.py

@@ -28,8 +28,8 @@ COMMAND_SET_MODE = {
     AirPurifierMode.LEVEL_2.name.lower(): f"{COMMAND_HEAD}01010132",
     AirPurifierMode.LEVEL_3.name.lower(): f"{COMMAND_HEAD}01010164",
     AirPurifierMode.AUTO.name.lower(): f"{COMMAND_HEAD}01010200",
-    AirPurifierMode.PET.name.lower(): f"{COMMAND_HEAD}01010300",
-    AirPurifierMode.SLEEP.name.lower(): f"{COMMAND_HEAD}01010400",
+    AirPurifierMode.SLEEP.name.lower(): f"{COMMAND_HEAD}01010300",
+    AirPurifierMode.PET.name.lower(): f"{COMMAND_HEAD}01010400",
 }
 DEVICE_GET_BASIC_SETTINGS_KEY = "570f4d81"
 

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/tests/test_adv_parser.py

@@ -11,6 +11,8 @@ from switchbot.adv_parser import parse_advertisement_data
 from switchbot.const.lock import LockStatus
 from switchbot.models import SwitchBotAdvertisement
 
+from . import AirPurifierTestCase
+
 ADVERTISEMENT_DATA_DEFAULTS = {
     "local_name": "",
     "manufacturer_data": {},
@@ -2647,9 +2649,9 @@ def test_s10_with_empty_data() -> None:
 
 
 @pytest.mark.parametrize(
-    ("manufacturer_data", "service_data", "data", "model"),
+    "test_case",
     [
-        (
+        AirPurifierTestCase(
             b"\xf0\x9e\x9e\x96j\xd6\xa1\x81\x88\xe4\x00\x01\x95\x00\x00",
             b"7\x00\x00\x95-\x00",
             {
@@ -2664,8 +2666,10 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 161,
             },
             "7",
+            "Air Purifier Table",
+            SwitchbotModel.AIR_PURIFIER_TABLE,
         ),
-        (
+        AirPurifierTestCase(
             b'\xcc\x8d\xa2\xa7\x92>\t"\x80\x000\x00\x0f\x00\x00',
             b"*\x00\x00\x15\x04\x00",
             {
@@ -2680,13 +2684,15 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 9,
             },
             "*",
+            "Air Purifier",
+            SwitchbotModel.AIR_PURIFIER,
         ),
-        (
+        AirPurifierTestCase(
             b"\xcc\x8d\xa2\xa7\xe4\xa6\x0b\x83\x88d\x00\xea`\x00\x00",
             b"+\x00\x00\x15\x04\x00",
             {
                 "isOn": True,
-                "mode": "pet",
+                "mode": "sleep",
                 "isAqiValid": False,
                 "child_lock": False,
                 "speed": 100,
@@ -2696,8 +2702,10 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 11,
             },
             "+",
+            "Air Purifier",
+            SwitchbotModel.AIR_PURIFIER,
         ),
-        (
+        AirPurifierTestCase(
             b"\xcc\x8d\xa2\xa7\xc1\xae\x9b\x81\x8c\xb2\x00\x01\x94\x00\x00",
             b"8\x00\x00\x95-\x00",
             {
@@ -2712,8 +2720,10 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 155,
             },
             "8",
+            "Air Purifier Table",
+            SwitchbotModel.AIR_PURIFIER_TABLE,
         ),
-        (
+        AirPurifierTestCase(
             b"\xcc\x8d\xa2\xa7\xc1\xae\x9e\xa1\x8c\x800\x01\x95\x00\x00",
             b"8\x00\x00\x95-\x00",
             {
@@ -2728,8 +2738,10 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 158,
             },
             "8",
+            "Air Purifier Table",
+            SwitchbotModel.AIR_PURIFIER_TABLE,
         ),
-        (
+        AirPurifierTestCase(
             b"\xcc\x8d\xa2\xa7\xc1\xae\x9e\x05\x8c\x800\x01\x95\x00\x00",
             b"8\x00\x00\x95-\x00",
             {
@@ -2744,26 +2756,28 @@ def test_s10_with_empty_data() -> None:
                 "sequence_number": 158,
             },
             "8",
+            "Air Purifier Table",
+            SwitchbotModel.AIR_PURIFIER_TABLE,
         ),
     ],
 )
-def test_air_purifier_active(manufacturer_data, service_data, data, model) -> None:
+def test_air_purifier_active(test_case: AirPurifierTestCase) -> None:
     ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
     adv_data = generate_advertisement_data(
-        manufacturer_data={2409: manufacturer_data},
-        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": service_data},
+        manufacturer_data={2409: test_case.manufacturer_data},
+        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": test_case.service_data},
         rssi=-97,
     )
     result = parse_advertisement_data(ble_device, adv_data)
     assert result == SwitchBotAdvertisement(
         address="aa:bb:cc:dd:ee:ff",
         data={
-            "rawAdvData": service_data,
-            "data": data,
+            "rawAdvData": test_case.service_data,
+            "data": test_case.data,
             "isEncrypted": False,
-            "model": model,
-            "modelFriendlyName": "Air Purifier",
-            "modelName": SwitchbotModel.AIR_PURIFIER,
+            "model": test_case.model,
+            "modelFriendlyName": test_case.modelFriendlyName,
+            "modelName": test_case.modelName,
         },
         device=ble_device,
         rssi=-97,
@@ -2796,7 +2810,7 @@ def test_air_purifier_passive() -> None:
                 "sequence_number": 161,
             },
             "isEncrypted": False,
-            "model": "8",
+            "model": "+",
             "modelFriendlyName": "Air Purifier",
             "modelName": SwitchbotModel.AIR_PURIFIER,
         },

{pyswitchbot-0.62.0 → pyswitchbot-0.62.2}/tests/test_air_purifier.py

@@ -171,7 +171,7 @@ async def test__get_basic_info(rawAdvData, model, response, expected):
             bytearray(
                 b"\x01\xa8\xec\x8c\x08\x00\xb2\x01\x96\x00\x00\x00\xf0\x00\x00\x17"
             ),
-            [True, 2, "sleep", True, False, "excellent", 50, 240, 2.3],
+            [True, 2, "pet", True, False, "excellent", 50, 240, 2.3],
         ),
     ],
 )
@@ -226,6 +226,6 @@ def test_get_modes():
         "level_2",
         "level_3",
         "auto",
-        "pet",
         "sleep",
+        "pet",
     ]