PySwitchbot 0.55.2__tar.gz → 0.55.4__tar.gz

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/PKG-INFO

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

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/PySwitchbot.egg-info/PKG-INFO

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

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/setup.py

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

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/switchbot/adv_parser.py

@@ -179,7 +179,7 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "func": process_woblindtilt,
         "manufacturer_id": 2409,
     },
-    "3": {
+    "&": {
         "modelName": SwitchbotModel.LEAK,
         "modelFriendlyName": "Leak Detector",
         "func": process_leak,

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/switchbot/devices/relay_switch.py

@@ -17,6 +17,7 @@ COMMAND_TURN_OFF = f"{COMMAND_HEADER}0f70010000"
 COMMAND_TURN_ON = f"{COMMAND_HEADER}0f70010100"
 COMMAND_TOGGLE = f"{COMMAND_HEADER}0f70010200"
 COMMAND_GET_VOLTAGE_AND_CURRENT = f"{COMMAND_HEADER}0f7106000000"
+COMMAND_GET_SWITCH_STATE = f"{COMMAND_HEADER}0f7101000000"
 PASSIVE_POLL_INTERVAL = 10 * 60
 
 
@@ -87,6 +88,15 @@ class SwitchbotRelaySwitch(SwitchbotEncryptedDevice):
             }
         return None
 
+    async def get_basic_info(self) -> dict[str, Any] | None:
+        """Get the current state of the switch."""
+        result = await self._send_command(COMMAND_GET_SWITCH_STATE)
+        if self._check_command_result(result, 0, {1}):
+            return {
+                "is_on": result[1] & 0x01 != 0,
+            }
+        return None
+
     def poll_needed(self, seconds_since_last_poll: float | None) -> bool:
         """Return if device needs polling."""
         if self._force_next_update:

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/switchbot/discovery.py

@@ -118,6 +118,10 @@ class GetSwitchbotDevices:
         """Return all WoContact/Contact sensor devices with services data."""
         return await self._get_devices_by_model("d")
 
+    async def get_leakdetectors(self) -> dict[str, SwitchBotAdvertisement]:
+        """Return all Leak Detectors with services data."""
+        return await self._get_devices_by_model("&")
+
     async def get_locks(self) -> dict[str, SwitchBotAdvertisement]:
         """Return all WoLock/Locks devices with services data."""
         locks = await self._get_devices_by_model("o")

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/tests/test_adv_parser.py

@@ -1758,7 +1758,7 @@ def test_leak_active():
                 "low_battery": False,
             },
             "isEncrypted": False,
-            "model": "3",
+            "model": "&",
             "modelFriendlyName": "Leak Detector",
             "modelName": SwitchbotModel.LEAK,
             "rawAdvData": b"&\x00N",
@@ -1782,7 +1782,7 @@ def test_leak_passive():
         data={
             "data": {},
             "isEncrypted": False,
-            "model": "3",
+            "model": "&",
             "rawAdvData": None,
         },
         device=ble_device,
@@ -1812,7 +1812,7 @@ def test_leak_no_leak_detected():
                 "low_battery": False,
             },
             "isEncrypted": False,
-            "model": "3",
+            "model": "&",
             "modelFriendlyName": "Leak Detector",
             "modelName": SwitchbotModel.LEAK,
             "rawAdvData": b"&\x00d",
@@ -1844,7 +1844,7 @@ def test_leak_leak_detected():
                 "low_battery": False,
             },
             "isEncrypted": False,
-            "model": "3",
+            "model": "&",
             "modelFriendlyName": "Leak Detector",
             "modelName": SwitchbotModel.LEAK,
             "rawAdvData": b"&\x00d",
@@ -1876,7 +1876,7 @@ def test_leak_low_battery():
                 "low_battery": False,
             },
             "isEncrypted": False,
-            "model": "3",
+            "model": "&",
             "modelFriendlyName": "Leak Detector",
             "modelName": SwitchbotModel.LEAK,
             "rawAdvData": b"&\x00d",
@@ -1885,3 +1885,35 @@ def test_leak_low_battery():
         rssi=-73,
         active=True,
     )
+
+
+def test_leak_real_data_from_ha():
+    """Test parse_advertisement_data for the leak detector."""
+    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "Any")
+    adv_data = generate_advertisement_data(
+        manufacturer_data={
+            2409: b"\\xd6407D1\\x02V\\x90\\x00\\x00\\x00\\x00\\x1e\\x05\\x00\\x00\\x00\\x00"
+        },  # no leak, low battery
+        service_data={"0000fd3d-0000-1000-8000-00805f9b34fb": b"&\\x00V"},
+        rssi=-73,
+    )
+    result = parse_advertisement_data(ble_device, adv_data, SwitchbotModel.LEAK)
+    assert result == SwitchBotAdvertisement(
+        address="aa:bb:cc:dd:ee:ff",
+        data={
+            "data": {
+                "leak": True,
+                "tampered": False,
+                "battery": 68,
+                "low_battery": False,
+            },
+            "isEncrypted": False,
+            "model": "&",
+            "modelFriendlyName": "Leak Detector",
+            "modelName": SwitchbotModel.LEAK,
+            "rawAdvData": b"&\\x00V",
+        },
+        device=ble_device,
+        rssi=-73,
+        active=True,
+    )

{pyswitchbot-0.55.2 → pyswitchbot-0.55.4}/tests/test_relay_switch.py

@@ -53,8 +53,22 @@ async def test_turn_on():
 
 
 @pytest.mark.asyncio
-async def test_trun_off():
+async def test_turn_off():
     relay_switch_device = create_device_for_command_testing()
     relay_switch_device._send_command = AsyncMock(return_value=b"\x01")
     await relay_switch_device.turn_off()
     assert relay_switch_device.is_on() is False
+
+
+@pytest.mark.asyncio
+async def test_get_basic_info():
+    relay_switch_device = create_device_for_command_testing()
+    relay_switch_device._send_command = AsyncMock(return_value=b"\x01\x01")
+    info = await relay_switch_device.get_basic_info()
+    assert info["is_on"] is True
+    relay_switch_device._send_command = AsyncMock(return_value=b"\x01\x00")
+    info = await relay_switch_device.get_basic_info()
+    assert info["is_on"] is False
+    relay_switch_device._send_command = AsyncMock(return_value=b"\x00\x00")
+    info = await relay_switch_device.get_basic_info()
+    assert info is None