lifx-async 4.5.1__py3-none-any.whl → 4.6.0__py3-none-any.whl

lifx/__init__.py

@@ -17,6 +17,7 @@ from lifx.api import (
 from lifx.color import HSBK, Colors
 from lifx.devices import (
     CeilingLight,
+    CeilingLightState,
     Device,
     DeviceInfo,
     DeviceVersion,
@@ -73,6 +74,7 @@ __all__ = [
     "MatrixLight",
     "MatrixLightState",
     "CeilingLight",
+    "CeilingLightState",
     # Color
     "HSBK",
     "Colors",

lifx/devices/__init__.py

@@ -10,7 +10,7 @@ from lifx.devices.base import (
     FirmwareInfo,
     WifiInfo,
 )
-from lifx.devices.ceiling import CeilingLight
+from lifx.devices.ceiling import CeilingLight, CeilingLightState
 from lifx.devices.hev import HevLight, HevLightState
 from lifx.devices.infrared import InfraredLight, InfraredLightState
 from lifx.devices.light import Light, LightState
@@ -19,6 +19,7 @@ from lifx.devices.multizone import MultiZoneEffect, MultiZoneLight, MultiZoneLig
 
 __all__ = [
     "CeilingLight",
+    "CeilingLightState",
     "CollectionInfo",
     "Device",
     "DeviceInfo",

lifx/devices/base.py

@@ -26,7 +26,14 @@ from lifx.protocol import packets
 from lifx.protocol.models import Serial
 
 if TYPE_CHECKING:
-    from lifx.devices import HevLight, InfraredLight, Light, MatrixLight, MultiZoneLight
+    from lifx.devices import (
+        CeilingLight,
+        HevLight,
+        InfraredLight,
+        Light,
+        MatrixLight,
+        MultiZoneLight,
+    )
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -509,7 +516,7 @@ class Device(Generic[StateT]):
         port: int = LIFX_UDP_PORT,
         timeout: float = DEFAULT_REQUEST_TIMEOUT,
         max_retries: int = DEFAULT_MAX_RETRIES,
-    ) -> Light | HevLight | InfraredLight | MultiZoneLight | MatrixLight:
+    ) -> Light | HevLight | InfraredLight | MultiZoneLight | MatrixLight | CeilingLight:
         """Create and return a fully initialized device instance.
 
         This factory method creates the appropriate device type (Light, etc)
@@ -610,7 +617,14 @@ class Device(Generic[StateT]):
 
             device_class: type[Device] = cls
 
-            if product_info.has_matrix:
+            # Check for ceiling products first (subset of matrix devices)
+            from lifx.products import is_ceiling_product
+
+            if is_ceiling_product(version.product):
+                from lifx.devices.ceiling import CeilingLight
+
+                device_class = CeilingLight
+            elif product_info.has_matrix:
                 from lifx.devices.matrix import MatrixLight
 
                 device_class = MatrixLight

lifx/devices/ceiling.py

@@ -20,11 +20,13 @@ from __future__ import annotations
 
 import json
 import logging
+import time
+from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, cast
 
 from lifx.color import HSBK
-from lifx.devices.matrix import MatrixLight
+from lifx.devices.matrix import MatrixLight, MatrixLightState
 from lifx.exceptions import LifxError
 from lifx.products import get_ceiling_layout, is_ceiling_product
 
@@ -34,6 +36,81 @@ if TYPE_CHECKING:
 _LOGGER = logging.getLogger(__name__)
 
 
+@dataclass
+class CeilingLightState(MatrixLightState):
+    """Ceiling light device state with uplight/downlight component control.
+
+    Extends MatrixLightState with ceiling-specific component information.
+
+    Attributes:
+        uplight_color: Current HSBK color of the uplight component
+        downlight_colors: List of HSBK colors for each downlight zone
+        uplight_is_on: Whether uplight component is on (brightness > 0)
+        downlight_is_on: Whether downlight component is on (any zone brightness > 0)
+        uplight_zone: Zone index for the uplight component
+        downlight_zones: Slice representing downlight component zones
+    """
+
+    uplight_color: HSBK
+    downlight_colors: list[HSBK]
+    uplight_is_on: bool
+    downlight_is_on: bool
+    uplight_zone: int
+    downlight_zones: slice
+
+    @property
+    def as_dict(self) -> Any:
+        """Return CeilingLightState as dict."""
+        return asdict(self)
+
+    @classmethod
+    def from_matrix_state(
+        cls,
+        matrix_state: MatrixLightState,
+        uplight_color: HSBK,
+        downlight_colors: list[HSBK],
+        uplight_zone: int,
+        downlight_zones: slice,
+    ) -> CeilingLightState:
+        """Create CeilingLightState from MatrixLightState.
+
+        Args:
+            matrix_state: Base MatrixLightState to extend
+            uplight_color: Current uplight zone color
+            downlight_colors: Current downlight zone colors
+            uplight_zone: Zone index for uplight component
+            downlight_zones: Slice representing downlight component zones
+
+        Returns:
+            CeilingLightState with all matrix state plus ceiling components
+        """
+        return cls(
+            model=matrix_state.model,
+            label=matrix_state.label,
+            serial=matrix_state.serial,
+            mac_address=matrix_state.mac_address,
+            power=matrix_state.power,
+            capabilities=matrix_state.capabilities,
+            host_firmware=matrix_state.host_firmware,
+            wifi_firmware=matrix_state.wifi_firmware,
+            location=matrix_state.location,
+            group=matrix_state.group,
+            color=matrix_state.color,
+            chain=matrix_state.chain,
+            tile_orientations=matrix_state.tile_orientations,
+            tile_colors=matrix_state.tile_colors,
+            tile_count=matrix_state.tile_count,
+            effect=matrix_state.effect,
+            uplight_color=uplight_color,
+            downlight_colors=downlight_colors,
+            uplight_is_on=uplight_color.brightness > 0,
+            downlight_is_on=any(c.brightness > 0 for c in downlight_colors),
+            uplight_zone=uplight_zone,
+            downlight_zones=downlight_zones,
+            last_updated=time.time(),
+        )
+
+
 class CeilingLight(MatrixLight):
     """LIFX Ceiling Light with independent uplight and downlight control.
 
@@ -111,6 +188,63 @@ class CeilingLight(MatrixLight):
 
         return self
 
+    async def _initialize_state(self) -> CeilingLightState:
+        """Initialize ceiling light state transactionally.
+
+        Extends MatrixLight implementation to add ceiling-specific component state.
+
+        Returns:
+            CeilingLightState instance with all device, light, matrix,
+            and ceiling component information.
+
+        Raises:
+            LifxTimeoutError: If device does not respond within timeout
+            LifxDeviceNotFoundError: If device cannot be reached
+            LifxProtocolError: If responses are invalid
+        """
+        matrix_state = await super()._initialize_state()
+
+        # Get ceiling component colors
+        uplight_color = await self.get_uplight_color()
+        downlight_colors = await self.get_downlight_colors()
+
+        # Create ceiling state from matrix state
+        ceiling_state = CeilingLightState.from_matrix_state(
+            matrix_state=matrix_state,
+            uplight_color=uplight_color,
+            downlight_colors=downlight_colors,
+            uplight_zone=self.uplight_zone,
+            downlight_zones=self.downlight_zones,
+        )
+
+        # Store in _state - cast is used in state property to access ceiling fields
+        self._state = ceiling_state
+
+        return ceiling_state
+
+    async def refresh_state(self) -> None:
+        """Refresh ceiling light state from hardware.
+
+        Fetches color, tiles, tile colors, effect, and ceiling component state.
+
+        Raises:
+            RuntimeError: If state has not been initialized
+            LifxTimeoutError: If device does not respond
+            LifxDeviceNotFoundError: If device cannot be reached
+        """
+        await super().refresh_state()
+
+        # Get ceiling component colors
+        uplight_color = await self.get_uplight_color()
+        downlight_colors = await self.get_downlight_colors()
+
+        # Update ceiling-specific state fields
+        state = cast(CeilingLightState, self._state)
+        state.uplight_color = uplight_color
+        state.downlight_colors = downlight_colors
+        state.uplight_is_on = uplight_color.brightness > 0
+        state.downlight_is_on = any(c.brightness > 0 for c in downlight_colors)
+
     @classmethod
     async def from_ip(
         cls,
@@ -148,6 +282,20 @@ class CeilingLight(MatrixLight):
         ceiling.connection = device.connection
         return ceiling
 
+    @property
+    def state(self) -> CeilingLightState:
+        """Get Ceiling light state.
+
+        Returns:
+            CeilingLightState with current state information.
+
+        Raises:
+            RuntimeError: If accessed before state initialization.
+        """
+        if self._state is None:
+            raise RuntimeError("State not found.")
+        return cast(CeilingLightState, self._state)
+
     @property
     def uplight_zone(self) -> int:
         """Zone index of the uplight component.

{lifx_async-4.5.1.dist-info → lifx_async-4.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lifx-async
-Version: 4.5.1
+Version: 4.6.0
 Summary: A modern, type-safe, async Python library for controlling LIFX lights
 Author-email: Avi Miller <me@dje.li>
 Maintainer-email: Avi Miller <me@dje.li>

{lifx_async-4.5.1.dist-info → lifx_async-4.6.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-lifx/__init__.py,sha256=Kn1QXDD2xcT5rgqGLfXFtnVF8ATtlg0FVxOvpaG4Z1M,2562
+lifx/__init__.py,sha256=aiMLKLhmcXADJyeISNHIZ_Nuc6jEhPG8-I_R3peWpwo,2610
 lifx/api.py,sha256=PFS2b28ow40kCQvT_MKvBLZD6fKCbvsoOQFtiODDrPE,33861
 lifx/color.py,sha256=wcmeeiBmOAjunInERNd6rslKvBEpV4vfjwwiZ8v7H8A,17877
 lifx/const.py,sha256=cf_O_3TqJjIBXF1tI35PkJ1JOhmy4tRt14PSa63pilA,3471
 lifx/exceptions.py,sha256=pikAMppLn7gXyjiQVWM_tSvXKNh-g366nG_UWyqpHhc,815
 lifx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lifx/devices/__init__.py,sha256=QQxJ6FewWEbihnjayjXwWPESsrwOWmylpwXKillQkuY,1017
-lifx/devices/base.py,sha256=x2RlGeCv60QLKklP6kA9wbCc3rmcHHhmvkSJHqTow5s,63151
-lifx/devices/ceiling.py,sha256=hpzSDxUzPvvgr3RSiqljek6u5IYTocbLcqTt82pr_18,27542
+lifx/devices/__init__.py,sha256=4b5QtO0EFWxIqN2lUYgM8uLjWyHI5hUcReiF9QCjCGw,1061
+lifx/devices/base.py,sha256=0G2PCJRNeIPkMCIw68x0ijn6gUIwh2jFlex8SN4Hs1Y,63530
+lifx/devices/ceiling.py,sha256=Y4lwLWyQr8KtrwX3FMo3R_WKBn7CBxk-pNUsjfPXLgk,32981
 lifx/devices/hev.py,sha256=T5hvt2q_vdgPBvThx_-M7n5pZu9pL0y9Fs3Zz_KL0NM,15588
 lifx/devices/infrared.py,sha256=ePk9qxX_s-hv5gQMvio1Vv8FYiCd68HF0ySbWgSrvuU,8130
 lifx/devices/light.py,sha256=gk92lhViUWINGaxDWbs4qn8Stnn2fGCfRkC5Kk0Q-hI,34087
@@ -42,7 +42,7 @@ lifx/theme/canvas.py,sha256=4h7lgN8iu_OdchObGDgbxTqQLCb-FRKC-M-YCWef_i4,8048
 lifx/theme/generators.py,sha256=nq3Yvntq_h-eFHbmmow3LcAdA_hEbRRaP5mv9Bydrjk,6435
 lifx/theme/library.py,sha256=tKlKZNqJp8lRGDnilWyDm_Qr1vCRGGwuvWVS82anNpQ,21326
 lifx/theme/theme.py,sha256=qMEx_8E41C0Cc6f083XHiAXEglTv4YlXW0UFsG1rQKg,5521
-lifx_async-4.5.1.dist-info/METADATA,sha256=OjmlAONCtPMp3Ur3aNJB8HHmkSDq8wKmu9I00zsXvnk,2609
-lifx_async-4.5.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lifx_async-4.5.1.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
-lifx_async-4.5.1.dist-info/RECORD,,
+lifx_async-4.6.0.dist-info/METADATA,sha256=MONJFD1mggSLhTieobasroj1mECAgXBS2IndKq9Poq0,2609
+lifx_async-4.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lifx_async-4.6.0.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
+lifx_async-4.6.0.dist-info/RECORD,,