PySwitchbot 0.57.1__tar.gz → 0.58.0__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PySwitchbot
-Version: 0.57.1
+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.1 → 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.1
+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.1 → 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.1 → pyswitchbot-0.58.0}/setup.py

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

{pyswitchbot-0.57.1 → 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.1 → 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,
             },

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