PySwitchbot 0.57.0__tar.gz → 0.58.0__tar.gz

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.57.0
+Version: 0.58.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -26,6 +26,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.57.0
+Version: 0.58.0
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer
@@ -26,6 +26,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/PySwitchbot.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ switchbot/adv_parsers/relay_switch.py
 switchbot/adv_parsers/remote.py
 switchbot/const/__init__.py
 switchbot/const/evaporative_humidifier.py
+switchbot/const/hub2.py
 switchbot/const/lock.py
 switchbot/devices/__init__.py
 switchbot/devices/base_cover.py
@@ -60,4 +61,5 @@ tests/test_base_cover.py
 tests/test_blind_tilt.py
 tests/test_curtain.py
 tests/test_evaporative_humidifier.py
+tests/test_hub2.py
 tests/test_relay_switch.py

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/setup.py

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

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/switchbot/adv_parser.py

@@ -41,8 +41,6 @@ SERVICE_DATA_ORDER = (
 )
 MFR_DATA_ORDER = (2409, 741, 89)
 
-APPLE_MANUFACTURER_ID = 76
-
 
 class SwitchbotSupportedType(TypedDict):
     """Supported type of Switchbot."""
@@ -250,14 +248,10 @@ def parse_advertisement_data(
 
     _mfr_data = None
     _mfr_id = None
-    manufacturer_data = advertisement_data.manufacturer_data
-    if APPLE_MANUFACTURER_ID in manufacturer_data:
-        return None
-
     for mfr_id in MFR_DATA_ORDER:
-        if mfr_id in manufacturer_data:
+        if mfr_id in advertisement_data.manufacturer_data:
             _mfr_id = mfr_id
-            _mfr_data = manufacturer_data[mfr_id]
+            _mfr_data = advertisement_data.manufacturer_data[mfr_id]
             break
 
     if _mfr_data is None and _service_data is None:

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/switchbot/adv_parsers/hub2.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Any
 
+from ..const.hub2 import LIGHT_INTENSITY_MAP
+
 
 def process_wohub2(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]:
     """Process woHub2 sensor manufacturer data."""
@@ -35,6 +37,20 @@ def process_wohub2(data: bytes | None, mfr_data: bytes | None) -> dict[str, Any]
         "fahrenheit": bool(temp_data[2] & 0b10000000),
         "humidity": humidity,
         "lightLevel": light_level,
+        "illuminance": calculate_light_intensity(light_level),
     }
 
     return _wohub2_data
+
+
+def calculate_light_intensity(light_level: int) -> int:
+    """
+    Convert Hub 2 light level (1-21) to actual light intensity value
+    Args:
+        light_level: Integer from 1-21
+    Returns:
+        Corresponding light intensity value or 0 if invalid input
+    """
+    if not light_level:
+        return 0
+    return LIGHT_INTENSITY_MAP.get(max(0, min(light_level, 22)), 0)

pyswitchbot-0.58.0/switchbot/const/hub2.py

@@ -0,0 +1,29 @@
+"""
+Mapping of light levels to lux measurement values for SwitchBot Hub 2.
+
+Source: After-sales consultation, line chart data provided by switchbot developers
+"""
+
+LIGHT_INTENSITY_MAP = {
+    1: 0,
+    2: 10,
+    3: 20,
+    4: 30,
+    5: 40,
+    6: 50,
+    7: 60,
+    8: 70,
+    9: 80,
+    10: 90,
+    11: 105,
+    12: 205,
+    13: 317,
+    14: 416,
+    15: 510,
+    16: 610,
+    17: 707,
+    18: 801,
+    19: 897,
+    20: 1023,
+    21: 1091,
+}

{pyswitchbot-0.57.0 → pyswitchbot-0.58.0}/tests/test_adv_parser.py

@@ -947,6 +947,7 @@ def test_wohub2_passive_and_active():
                 "fahrenheit": False,
                 "humidity": 50,
                 "lightLevel": 2,
+                "illuminance": 10,
                 "temp": {"c": 26.7, "f": 80.06},
                 "temperature": 26.7,
             },
@@ -1970,28 +1971,3 @@ def test_remote_passive() -> None:
         rssi=-97,
         active=False,
     )
-
-
-def test_parse_advertisement_ignores_devices_with_apple_manufacturer_id():
-    """Test parse_advertisement_data ignores devices with apple manufacturer id."""
-    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
-    adv_data = generate_advertisement_data(
-        local_name="WoCurtain",
-        manufacturer_data={
-            89: b"\xcc\xf4\xc4\xf9\xacl",
-            2409: b"\xcc\xf4\xc4\xf9\xacl\xe2\x0f\x00\x12\x04",
-            76: b"\x10",
-        },
-        service_data={
-            "00000d00-0000-1000-8000-00805f9b34fb": b"c\xd0Yd\x11\x04",
-            "0000fd3d-0000-1000-8000-00805f9b34fb": b"c\xc0d\x00\x12\x04",
-        },
-        service_uuids=[
-            "00001800-0000-1000-8000-00805f9b34fb",
-            "00001801-0000-1000-8000-00805f9b34fb",
-            "cba20d00-224d-11e6-9fb8-0002a5d5c51b",
-        ],
-        rssi=-2,
-    )
-    result = parse_advertisement_data(ble_device, adv_data)
-    assert result is None

pyswitchbot-0.58.0/tests/test_hub2.py

@@ -0,0 +1,18 @@
+from switchbot.adv_parsers.hub2 import calculate_light_intensity
+
+
+def test_calculate_light_intensity():
+    """Test calculating light intensity from Hub 2 light level."""
+    # Test valid inputs
+    assert calculate_light_intensity(1) == 0
+    assert calculate_light_intensity(2) == 10
+    assert calculate_light_intensity(10) == 90
+    assert calculate_light_intensity(15) == 510
+    assert calculate_light_intensity(21) == 1091
+
+    # Test invalid inputs
+    assert calculate_light_intensity(0) == 0
+    assert calculate_light_intensity(22) == 0
+    assert calculate_light_intensity(-1) == 0
+    assert calculate_light_intensity(3.5) == 0
+    assert calculate_light_intensity(None) == 0