PySwitchbot 0.55.3__tar.gz → 0.56.0__tar.gz

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PySwitchbot
-Version: 0.55.3
+Version: 0.56.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -20,6 +20,15 @@ Requires-Dist: bleak>=0.19.0
 Requires-Dist: bleak-retry-connector>=3.4.0
 Requires-Dist: cryptography>=39.0.0
 Requires-Dist: pyOpenSSL>=23.0.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+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-0.55.3 → pyswitchbot-0.56.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PySwitchbot
-Version: 0.55.3
+Version: 0.56.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -20,6 +20,15 @@ Requires-Dist: bleak>=0.19.0
 Requires-Dist: bleak-retry-connector>=3.4.0
 Requires-Dist: cryptography>=39.0.0
 Requires-Dist: pyOpenSSL>=23.0.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+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-0.55.3 → pyswitchbot-0.56.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -31,6 +31,7 @@ switchbot/adv_parsers/meter.py
 switchbot/adv_parsers/motion.py
 switchbot/adv_parsers/plug.py
 switchbot/adv_parsers/relay_switch.py
+switchbot/adv_parsers/remote.py
 switchbot/devices/__init__.py
 switchbot/devices/base_cover.py
 switchbot/devices/base_light.py

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/setup.py

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

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/switchbot/adv_parser.py

@@ -29,6 +29,7 @@ from .adv_parsers.relay_switch import (
     process_worelay_switch_1,
     process_worelay_switch_1pm,
 )
+from .adv_parsers.remote import process_woremote
 from .const import SwitchbotModel
 from .models import SwitchBotAdvertisement
 
@@ -203,6 +204,12 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "func": process_worelay_switch_1,
         "manufacturer_id": 2409,
     },
+    "b": {
+        "modelName": SwitchbotModel.REMOTE,
+        "modelFriendlyName": "Remote",
+        "func": process_woremote,
+        "manufacturer_id": 89,
+    },
 }
 
 _SWITCHBOT_MODEL_TO_CHAR = {

pyswitchbot-0.56.0/switchbot/adv_parsers/remote.py

@@ -0,0 +1,24 @@
+"""Remote adv parser."""
+
+from __future__ import annotations
+
+import logging
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def process_woremote(
+    data: bytes | None, mfr_data: bytes | None
+) -> dict[str, int | None]:
+    """Process WoRemote adv data."""
+
+    if data is None:
+        return {
+            "battery": None,
+        }
+
+    _LOGGER.debug("data: %s", data.hex())
+
+    return {
+        "battery": data[2] & 0b01111111,
+    }

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/switchbot/const.py

@@ -57,6 +57,7 @@ class SwitchbotModel(StrEnum):
     KEYPAD = "WoKeypad"
     RELAY_SWITCH_1PM = "Relay Switch 1PM"
     RELAY_SWITCH_1 = "Relay Switch 1"
+    REMOTE = "WoRemote"
 
 
 class LockStatus(Enum):

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/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.3 → pyswitchbot-0.56.0}/tests/test_adv_parser.py

@@ -1917,3 +1917,55 @@ def test_leak_real_data_from_ha():
         rssi=-73,
         active=True,
     )
+
+
+def test_remote_active() -> None:
+    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
+    adv_data = generate_advertisement_data(
+        manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+        service_data={"00000d00-0000-1000-8000-00805f9b34fb": b"b V\x00"},
+        service_uuids=["cba20d00-224d-11e6-9fb8-0002a5d5c51b"],
+        rssi=-95,
+    )
+    result = parse_advertisement_data(ble_device, adv_data)
+    assert result == SwitchBotAdvertisement(
+        address="aa:bb:cc:dd:ee:ff",
+        data={
+            "data": {
+                "battery": 86,
+            },
+            "isEncrypted": False,
+            "model": "b",
+            "modelFriendlyName": "Remote",
+            "modelName": SwitchbotModel.REMOTE,
+            "rawAdvData": b"b V\x00",
+        },
+        device=ble_device,
+        rssi=-95,
+        active=True,
+    )
+
+
+def test_remote_passive() -> None:
+    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
+    adv_data = generate_advertisement_data(
+        manufacturer_data={89: b"\xaa\xbb\xcc\xdd\xee\xff"},
+        rssi=-97,
+    )
+    result = parse_advertisement_data(ble_device, adv_data, SwitchbotModel.REMOTE)
+    assert result == SwitchBotAdvertisement(
+        address="aa:bb:cc:dd:ee:ff",
+        data={
+            "data": {
+                "battery": None,
+            },
+            "isEncrypted": False,
+            "model": "b",
+            "modelFriendlyName": "Remote",
+            "modelName": SwitchbotModel.REMOTE,
+            "rawAdvData": None,
+        },
+        device=ble_device,
+        rssi=-97,
+        active=False,
+    )

{pyswitchbot-0.55.3 → pyswitchbot-0.56.0}/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