PySwitchbot 0.37.6__tar.gz → 0.39.0__tar.gz

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/PKG-INFO

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

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/PySwitchbot.egg-info/PKG-INFO

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

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/README.md

@@ -6,9 +6,29 @@ Using the script `scripts/get_encryption_key.py` you can manually obtain locks e
 
 Usage:
 ```shell
-python3 get_encryption_key.py MAC USERNAME
+$ python3 get_encryption_key.py MAC USERNAME
+Key ID: xx
+Encryption key: xxxxxxxxxxxxxxxx
 ```
+
 Where `MAC` is MAC address of the lock and `USERNAME` is your SwitchBot account username, after that script will ask for your password.
 If authentication succeeds then script should output your key id and encryption key.
 
+Examples:
+
+* WoLock
+
+```python
+import asyncio
+from switchbot.discovery import GetSwitchbotDevices
+from switchbot.devices import lock
+
 
+async def main():
+    wolock = await GetSwitchbotDevices().get_locks()
+    await lock.SwitchbotLock(wolock['32C0F607-18B8-xxxx-xxxx-xxxxxxxxxx'].device, "key-id", "encryption-key").get_lock_status()
+
+
+asyncio.run(main())
+
+```

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/setup.py

@@ -12,7 +12,7 @@ setup(
         "boto3>=1.20.24",
         "requests>=2.28.1",
     ],
-    version="0.37.6",
+    version="0.39.0",
     description="A library to communicate with Switchbot",
     author="Daniel Hjelseth Hoyer",
     url="https://github.com/Danielhiversen/pySwitchbot/",

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/adv_parser.py

@@ -77,6 +77,12 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "func": process_wocurtain,
         "manufacturer_id": 2409,
     },
+    "w": {
+        "modelName": SwitchbotModel.IO_METER,
+        "modelFriendlyName": "Indoor/Outdoor Meter",
+        "func": process_wosensorth,
+        "manufacturer_id": 2409,
+    },
     "i": {
         "modelName": SwitchbotModel.METER,
         "modelFriendlyName": "Meter Plus",
@@ -93,7 +99,6 @@ SUPPORTED_TYPES: dict[str, SwitchbotSupportedType] = {
         "modelName": SwitchbotModel.PLUG_MINI,
         "modelFriendlyName": "Plug Mini",
         "func": process_woplugmini,
-        "manufacturer_data_length": 12,
         "manufacturer_id": 2409,
     },
     "j": {

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/adv_parsers/blind_tilt.py

@@ -23,5 +23,5 @@ def process_woblindtilt(
         "inMotion": _in_motion,
         "tilt": (100 - _tilt) if reverse else _tilt,
         "lightLevel": _light_level,
-        "sequence_number": device_data[0]
+        "sequence_number": device_data[0],
     }

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/adv_parsers/lock.py

@@ -27,4 +27,5 @@ def process_wolock(data: bytes | None, mfr_data: bytes | None) -> dict[str, bool
         "unclosed_alarm": bool(mfr_data[8] & 0b00100000),
         "unlocked_alarm": bool(mfr_data[8] & 0b00010000),
         "auto_lock_paused": bool(mfr_data[8] & 0b00000010),
+        "night_latch": bool(mfr_data[9] & 0b00000001),
     }

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/adv_parsers/meter.py

@@ -6,12 +6,15 @@ from typing import Any
 
 def process_wosensorth(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woSensorTH/Temp sensor services data."""
+    temp_data = None
+    battery = None
+
     if mfr_data:
         temp_data = mfr_data[8:11]
-        battery = None
 
     if data:
-        temp_data = data[3:6]
+        if not temp_data:
+            temp_data = data[3:6]
         battery = data[2] & 0b01111111
 
     if not temp_data:

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/const.py

@@ -34,6 +34,7 @@ class SwitchbotModel(StrEnum):
     CONTACT_SENSOR = "WoContact"
     LIGHT_STRIP = "WoStrip"
     METER = "WoSensorTH"
+    IO_METER = "WoIOSensorTH"
     MOTION_SENSOR = "WoPresence"
     COLOR_BULB = "WoBulb"
     CEILING_LIGHT = "WoCeiling"

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/devices/blind_tilt.py

@@ -4,7 +4,11 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from switchbot.devices.device import REQ_HEADER, update_after_operation, SwitchbotSequenceDevice
+from switchbot.devices.device import (
+    REQ_HEADER,
+    SwitchbotSequenceDevice,
+    update_after_operation,
+)
 
 from .curtain import CURTAIN_EXT_SUM_KEY, SwitchbotCurtain
 

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/devices/lock.py

@@ -26,6 +26,7 @@ COMMAND_HEADER = "57"
 COMMAND_GET_CK_IV = f"{COMMAND_HEADER}0f2103"
 COMMAND_LOCK_INFO = f"{COMMAND_HEADER}0f4f8101"
 COMMAND_UNLOCK = f"{COMMAND_HEADER}0f4e01011080"
+COMMAND_UNLOCK_WITHOUT_UNLATCH = f"{COMMAND_HEADER}0f4e010110a0"
 COMMAND_LOCK = f"{COMMAND_HEADER}0f4e01011000"
 COMMAND_ENABLE_NOTIFICATIONS = f"{COMMAND_HEADER}0e01001e00008101"
 COMMAND_DISABLE_NOTIFICATIONS = f"{COMMAND_HEADER}0e00"
@@ -164,11 +165,17 @@ class SwitchbotLock(SwitchbotDevice):
         )
 
     async def unlock(self) -> bool:
-        """Send unlock command."""
+        """Send unlock command. If unlatch feature is enabled in EU firmware, also unlatches door"""
         return await self._lock_unlock(
             COMMAND_UNLOCK, {LockStatus.UNLOCKED, LockStatus.UNLOCKING}
         )
 
+    async def unlock_without_unlatch(self) -> bool:
+        """Send unlock command. This command will not unlatch the door."""
+        return await self._lock_unlock(
+            COMMAND_UNLOCK_WITHOUT_UNLATCH, {LockStatus.UNLOCKED, LockStatus.UNLOCKING, LockStatus.NOT_FULLY_LOCKED}
+        )
+
     def _parse_basic_data(self, basic_data: bytes) -> dict[str, Any]:
         """Parse basic data from lock."""
         return {
@@ -239,6 +246,10 @@ class SwitchbotLock(SwitchbotDevice):
         """Return True if auto lock is paused."""
         return self._get_adv_value("auto_lock_paused")
 
+    def is_night_latch_enabled(self) -> bool:
+        """Return True if Night Latch is enabled on EU firmware."""
+        return self._get_adv_value("night_latch")
+        
     async def _get_lock_info(self) -> bytes | None:
         """Return lock info of device."""
         _data = await self._send_command(key=COMMAND_LOCK_INFO, retry=self._retry_count)

{PySwitchbot-0.37.6 → PySwitchbot-0.39.0}/switchbot/discovery.py

@@ -103,7 +103,8 @@ class GetSwitchbotDevices:
         """Return all WoSensorTH/Temp sensor devices with services data."""
         base_meters = await self._get_devices_by_model("T")
         plus_meters = await self._get_devices_by_model("i")
-        return {**base_meters, **plus_meters}
+        io_meters = await self._get_devices_by_model("w")
+        return {**base_meters, **plus_meters, **io_meters}
 
     async def get_contactsensors(self) -> dict[str, SwitchBotAdvertisement]:
         """Return all WoContact/Contact sensor devices with services data."""