PySwitchbot 2.0.0__tar.gz → 2.1.0__tar.gz

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.0.0
+Version: 2.1.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -33,7 +33,15 @@ Dynamic: summary
 
 # 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
+Library to control Switchbot IoT devices https://www.switch-bot.com/
+
+## Setting up the environment
+
+```shell
+python3 -m venv .venv
+source .venv/bin/activate
+pip install .
+```
 
 ## Obtaining encryption key for Switchbot Locks
 
@@ -42,7 +50,7 @@ Using the script `scripts/get_encryption_key.py` you can manually obtain locks e
 Usage:
 
 ```shell
-$ python3 get_encryption_key.py MAC USERNAME
+$ python3 scripts/get_encryption_key.py MAC USERNAME
 Key ID: XX
 Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ```

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 2.0.0
+Version: 2.1.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -33,7 +33,15 @@ Dynamic: summary
 
 # 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
+Library to control Switchbot IoT devices https://www.switch-bot.com/
+
+## Setting up the environment
+
+```shell
+python3 -m venv .venv
+source .venv/bin/activate
+pip install .
+```
 
 ## Obtaining encryption key for Switchbot Locks
 
@@ -42,7 +50,7 @@ Using the script `scripts/get_encryption_key.py` you can manually obtain locks e
 Usage:
 
 ```shell
-$ python3 get_encryption_key.py MAC USERNAME
+$ python3 scripts/get_encryption_key.py MAC USERNAME
 Key ID: XX
 Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ```

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/README.md

@@ -1,6 +1,14 @@
 # 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
+Library to control Switchbot IoT devices https://www.switch-bot.com/
+
+## Setting up the environment
+
+```shell
+python3 -m venv .venv
+source .venv/bin/activate
+pip install .
+```
 
 ## Obtaining encryption key for Switchbot Locks
 
@@ -9,7 +17,7 @@ Using the script `scripts/get_encryption_key.py` you can manually obtain locks e
 Usage:
 
 ```shell
-$ python3 get_encryption_key.py MAC USERNAME
+$ python3 scripts/get_encryption_key.py MAC USERNAME
 Key ID: XX
 Encryption key: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 ```

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/setup.py

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

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/switchbot/adv_parsers/keypad_vision.py

@@ -19,6 +19,7 @@ def process_common_mfr_data(mfr_data: bytes | None) -> dict[str, bool | int]:
     low_temperature = bool(mfr_data[8] & 0b10000000)
     high_temperature = bool(mfr_data[8] & 0b01000000)
     doorbell = bool(mfr_data[12] & 0b00001000)
+    doorbell_seq = mfr_data[12] & 0b00000111
 
     return {
         "sequence_number": sequence_number,
@@ -30,6 +31,7 @@ def process_common_mfr_data(mfr_data: bytes | None) -> dict[str, bool | int]:
         "low_temperature": low_temperature,
         "high_temperature": high_temperature,
         "doorbell": doorbell,
+        "doorbell_seq": doorbell_seq,
     }
 
 

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/switchbot/devices/lock.py

@@ -10,7 +10,11 @@ from bleak.backends.device import BLEDevice
 
 from ..const import SwitchbotModel
 from ..const.lock import LockStatus
-from .device import SwitchbotEncryptedDevice, SwitchbotSequenceDevice
+from .device import (
+    SwitchbotEncryptedDevice,
+    SwitchbotOperationError,
+    SwitchbotSequenceDevice,
+)
 
 COMMAND_HEADER = "57"
 COMMAND_LOCK_INFO = {
@@ -49,6 +53,10 @@ COMMAND_LOCK = {
     SwitchbotModel.LOCK_VISION: f"{COMMAND_HEADER}0f4e0101000000",
     SwitchbotModel.LOCK_PRO_WIFI: f"{COMMAND_HEADER}0f4e0101000000",
 }
+COMMAND_HALF_LOCK = {
+    SwitchbotModel.LOCK_ULTRA: f"{COMMAND_HEADER}0f4e0101000008",
+}
+
 COMMAND_ENABLE_NOTIFICATIONS = {
     SwitchbotModel.LOCK: f"{COMMAND_HEADER}0e01001e00008101",
     SwitchbotModel.LOCK_LITE: f"{COMMAND_HEADER}0e01001e00008101",
@@ -129,6 +137,19 @@ class SwitchbotLock(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
             {LockStatus.UNLOCKED, LockStatus.UNLOCKING, LockStatus.NOT_FULLY_LOCKED},
         )
 
+    async def half_lock(self) -> bool:
+        """Send half lock command (Lock Ultra EU type only)."""
+        if self._model not in COMMAND_HALF_LOCK:
+            raise SwitchbotOperationError(
+                f"Half lock is not supported on {self._model}"
+            )
+        if not self.is_half_lock_calibrated():
+            raise SwitchbotOperationError("Half lock is not calibrated")
+        return await self._lock_unlock(
+            COMMAND_HALF_LOCK[self._model],
+            {LockStatus.HALF_LOCKED, LockStatus.LOCKING},
+        )
+
     def _parse_basic_data(self, basic_data: bytes) -> dict[str, Any]:
         """Parse basic data from lock."""
         return {
@@ -207,6 +228,10 @@ class SwitchbotLock(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
         """Return True if Night Latch is enabled on EU firmware."""
         return self._get_adv_value("night_latch")
 
+    def is_half_lock_calibrated(self) -> bool | None:
+        """Return True if half lock position is calibrated (Lock Ultra only)."""
+        return self._get_adv_value("half_lock_calibration")
+
     async def _get_lock_info(self) -> bytes | None:
         """Return lock info of device."""
         _data = await self._send_command(
@@ -268,10 +293,13 @@ class SwitchbotLock(SwitchbotSequenceDevice, SwitchbotEncryptedDevice):
                 "status": LockStatus((data[0] & 0b01110000) >> 4),
                 "unlocked_alarm": bool(data[1] & 0b00010000),
             }
-        return {
+        result = {
             "calibration": bool(data[0] & 0b10000000),
             "status": LockStatus((data[0] & 0b01111000) >> 3),
             "door_open": bool(data[1] & 0b00010000),
             "unclosed_alarm": bool(data[5] & 0b10000000),
             "unlocked_alarm": bool(data[5] & 0b01000000),
         }
+        if model is SwitchbotModel.LOCK_ULTRA:
+            result["half_lock_calibration"] = bool(data[1] & 0b00000001)
+        return result

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/tests/test_adv_parser.py

@@ -3718,6 +3718,7 @@ def test_humidifer_with_empty_data() -> None:
                 "battery": 95,
                 "battery_charging": True,
                 "doorbell": False,
+                "doorbell_seq": 0,
                 "duress_alarm": False,
                 "high_temperature": False,
                 "lockout_alarm": False,
@@ -3737,6 +3738,7 @@ def test_humidifer_with_empty_data() -> None:
                 "battery": 96,
                 "battery_charging": False,
                 "doorbell": False,
+                "doorbell_seq": 0,
                 "duress_alarm": False,
                 "high_temperature": False,
                 "lockout_alarm": False,
@@ -4057,6 +4059,7 @@ def test_adv_active(test_case: AdvTestCase) -> None:
                 "battery": 95,
                 "battery_charging": True,
                 "doorbell": False,
+                "doorbell_seq": 0,
                 "duress_alarm": False,
                 "high_temperature": False,
                 "lockout_alarm": False,
@@ -4076,6 +4079,7 @@ def test_adv_active(test_case: AdvTestCase) -> None:
                 "battery": 96,
                 "battery_charging": False,
                 "doorbell": False,
+                "doorbell_seq": 0,
                 "duress_alarm": False,
                 "high_temperature": False,
                 "lockout_alarm": False,

{pyswitchbot-2.0.0 → pyswitchbot-2.1.0}/tests/test_lock.py

@@ -6,6 +6,7 @@ import pytest
 from switchbot import SwitchbotModel
 from switchbot.const.lock import LockStatus
 from switchbot.devices import lock
+from switchbot.devices.device import SwitchbotOperationError
 
 from .test_adv_parser import generate_ble_device
 
@@ -624,6 +625,7 @@ def test_update_lock_status(model: str):
                 "door_open": True,
                 "unclosed_alarm": True,
                 "unlocked_alarm": True,
+                "half_lock_calibration": False,
             },
         ),
         (
@@ -712,6 +714,7 @@ def test_parse_lock_data(model: str, data: bytes, expected: dict):
                 "door_open": False,
                 "unclosed_alarm": False,
                 "unlocked_alarm": True,  # bit 6 of byte 5
+                "half_lock_calibration": False,
             },
         ),
         (
@@ -760,6 +763,75 @@ async def test_lock_with_update(model: str):
         assert result is True
 
 
+def test_is_half_lock_calibrated():
+    """Test is_half_lock_calibrated method."""
+    device = create_device_for_command_testing(SwitchbotModel.LOCK_ULTRA)
+    device._get_adv_value = Mock(return_value=True)
+    assert device.is_half_lock_calibrated() is True
+
+    device._get_adv_value = Mock(return_value=False)
+    assert device.is_half_lock_calibrated() is False
+
+
+@pytest.mark.asyncio
+async def test_half_lock_calibrated():
+    """Test half_lock succeeds when calibrated."""
+    device = create_device_for_command_testing(SwitchbotModel.LOCK_ULTRA)
+    device._get_adv_value = Mock(side_effect=[True, LockStatus.LOCKED])
+    with (
+        patch.object(device, "_send_command", return_value=b"\x01\x00"),
+        patch.object(device, "_enable_notifications", return_value=True),
+        patch.object(device, "_get_basic_info", return_value=b"\x01\x64\x01"),
+    ):
+        result = await device.half_lock()
+        assert result is True
+
+
+@pytest.mark.asyncio
+async def test_half_lock_not_calibrated():
+    """Test half_lock raises SwitchbotOperationError when not calibrated."""
+    device = create_device_for_command_testing(SwitchbotModel.LOCK_ULTRA)
+    device._get_adv_value = Mock(return_value=False)
+    with pytest.raises(SwitchbotOperationError, match="not calibrated"):
+        await device.half_lock()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "model",
+    [
+        SwitchbotModel.LOCK,
+        SwitchbotModel.LOCK_LITE,
+        SwitchbotModel.LOCK_PRO,
+        SwitchbotModel.LOCK_VISION,
+        SwitchbotModel.LOCK_VISION_PRO,
+        SwitchbotModel.LOCK_PRO_WIFI,
+    ],
+)
+async def test_half_lock_unsupported_model(model: str):
+    """Test half_lock raises SwitchbotOperationError on unsupported models."""
+    device = create_device_for_command_testing(model)
+    with pytest.raises(SwitchbotOperationError, match="not supported"):
+        await device.half_lock()
+
+
+@pytest.mark.asyncio
+async def test_half_lock():
+    """Test half_lock method."""
+    device = create_device_for_command_testing(SwitchbotModel.LOCK_ULTRA)
+    device._get_adv_value = Mock(side_effect=[True, LockStatus.LOCKED])
+    with (
+        patch.object(device, "_send_command", return_value=b"\x01\x00") as mock_send,
+        patch.object(device, "_enable_notifications", return_value=True),
+        patch.object(device, "_get_basic_info", return_value=b"\x01\x64\x01"),
+    ):
+        result = await device.half_lock()
+        assert result is True
+        mock_send.assert_awaited_once_with(
+            lock.COMMAND_HALF_LOCK[SwitchbotModel.LOCK_ULTRA]
+        )
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     ("model", "status"),