python-aidot-cameras 0.11.13__tar.gz → 0.11.14__tar.gz

{python_aidot_cameras-0.11.13/python_aidot_cameras.egg-info → python_aidot_cameras-0.11.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.13
+Version: 0.11.14
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT

{python_aidot_cameras-0.11.13 → python_aidot_cameras-0.11.14}/aidot/device_client.py

@@ -56,6 +56,7 @@ class DeviceStatusData:
     rgbw: tuple[int, int, int, int] = (255, 0, 0, 0)
     cct: int = 2700
     dimming: int = 100
+    active_color_mode: "str | None" = None
 
     def update(self, attr: DeviceAttr) -> None:
         """Update status from DeviceAttr model."""
@@ -82,6 +83,20 @@ class DeviceStatusData:
         if attr.CCT is not None:
             self.cct = attr.CCT
 
+        # Track which color mode is actually active. Bulbs report state as
+        # deltas: a CCT-mode push carries only CCT, an RGB-mode push carries
+        # only RGBW. The getDevAttr login-sync instead returns BOTH the
+        # retained RGBW register and CCT together, which is ambiguous about
+        # which mode is active; that case (and RGBW==0, which is just the
+        # register's power-on default rather than a real color pick) must
+        # update the values above without changing active_color_mode.
+        rgbw_present = attr.RGBW is not None
+        cct_present = attr.CCT is not None
+        if rgbw_present and not cct_present and attr.RGBW != 0:
+            self.active_color_mode = "rgbw"
+        elif cct_present and not rgbw_present:
+            self.active_color_mode = "cct"
+
 
 class DeviceInformation:
     """Static device metadata and capability flags parsed from the cloud record."""

{python_aidot_cameras-0.11.13 → python_aidot_cameras-0.11.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-aidot-cameras"
-version = "0.11.13"
+version = "0.11.14"
 description = "Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)"
 readme = "README.md"
 license = "MIT"

{python_aidot_cameras-0.11.13 → python_aidot_cameras-0.11.14/python_aidot_cameras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-aidot-cameras
-Version: 0.11.13
+Version: 0.11.14
 Summary: Control AiDot/Leedarson WiFi lights and cameras (WebRTC streaming, two-way audio, PTZ, controls)
 Author-email: cbrightly <chris.brightly@gmail.com>
 License-Expression: MIT

{python_aidot_cameras-0.11.13 → python_aidot_cameras-0.11.14}/python_aidot_cameras.egg-info/SOURCES.txt

@@ -92,6 +92,7 @@ tests/test_ice_config_cache.py
 tests/test_keepalive_renew.py
 tests/test_keyframe_prompter.py
 tests/test_lan_control.py
+tests/test_light_active_color_mode.py
 tests/test_live_stream_param.py
 tests/test_logging_caps.py
 tests/test_motion_poll.py

python_aidot_cameras-0.11.14/tests/test_light_active_color_mode.py

@@ -0,0 +1,58 @@
+"""Tests for DeviceStatusData.active_color_mode tracking.
+
+AiDot RGBW+CCT bulbs report state as deltas: a CCT-mode push carries only
+CCT (RGBW is None); an RGB-mode push carries only RGBW (CCT is None). But
+the getDevAttr login-sync returns BOTH the retained RGBW register and CCT
+together, which is ambiguous about which mode is actually active. This
+must update the retained values but must NOT change active_color_mode.
+"""
+
+from aidot.device_client import DeviceStatusData
+from aidot.models.device_client_model import DeviceAttr
+
+
+def test_cct_only_delta_sets_cct_mode():
+    status = DeviceStatusData()
+    status.update(DeviceAttr(OnOff=1, Dimming=100, CCT=3000))
+    assert status.active_color_mode == "cct"
+    assert status.cct == 3000
+
+
+def test_rgbw_only_delta_sets_rgbw_mode():
+    status = DeviceStatusData()
+    status.update(DeviceAttr(RGBW=0x00FF0000))
+    assert status.active_color_mode == "rgbw"
+    assert status.rgbw == (0, 255, 0, 0)
+
+
+def test_ambiguous_sync_does_not_change_mode_from_unknown():
+    # Starting from a fresh (unknown/None) mode, an ambiguous sync carrying
+    # both RGBW and CCT must update the values but leave the mode None.
+    status = DeviceStatusData()
+    assert status.active_color_mode is None
+    status.update(DeviceAttr(OnOff=1, Dimming=100, RGBW=-1660909312, CCT=3000))
+    assert status.active_color_mode is None
+    assert status.rgbw == (157, 0, 137, 0)
+    assert status.cct == 3000
+
+
+def test_ambiguous_sync_does_not_revert_established_mode():
+    status = DeviceStatusData()
+    # Unambiguous CCT-only delta establishes "cct".
+    status.update(DeviceAttr(OnOff=1, Dimming=100, CCT=3000))
+    assert status.active_color_mode == "cct"
+    # A subsequent ambiguous sync (both RGBW and CCT present) must NOT flip
+    # the mode back to "rgbw", even though RGBW is present in the payload.
+    status.update(DeviceAttr(OnOff=1, Dimming=100, RGBW=-1660909312, CCT=3000))
+    assert status.active_color_mode == "cct"
+    assert status.rgbw == (157, 0, 137, 0)
+    assert status.cct == 3000
+
+
+def test_rgbw_zero_only_does_not_set_rgbw_mode():
+    status = DeviceStatusData()
+    status.update(DeviceAttr(RGBW=0))
+    assert status.active_color_mode is None
+    # Existing default-red value behavior must be unchanged.
+    assert status.rgdb == 0xFF000000
+    assert status.rgbw == (255, 0, 0, 0)