python-omnilogic-local 0.20.7__tar.gz → 0.20.9__tar.gz

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-omnilogic-local
-Version: 0.20.7
+Version: 0.20.9
 Summary: A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API
 Author: Chris Jowett, djtimca, garionphx
 Author-email: Chris Jowett <421501+cryptk@users.noreply.github.com>

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/pyomnilogic_local/colorlogiclight.py

@@ -117,7 +117,7 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
         super().__init__(omni, mspconfig, telemetry)
 
     @property
-    def model(self) -> ColorLogicLightType:
+    def equip_type(self) -> ColorLogicLightType:
         """Returns the model of the light."""
         return self.mspconfig.equip_type
 
@@ -168,12 +168,17 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
     @property
     def show(self) -> LightShows:
         """Returns the current light show."""
-        return self.telemetry.show
+        return self.telemetry.show_name(self.equip_type, self.v2_active)
 
     @property
     def speed(self) -> ColorLogicSpeed:
         """Returns the current speed."""
-        if self.model in [ColorLogicLightType.SAM, ColorLogicLightType.TWO_FIVE, ColorLogicLightType.FOUR_ZERO, ColorLogicLightType.UCL]:
+        if self.equip_type in [
+            ColorLogicLightType.SAM,
+            ColorLogicLightType.TWO_FIVE,
+            ColorLogicLightType.FOUR_ZERO,
+            ColorLogicLightType.UCL,
+        ]:
             return self.telemetry.speed
         # Non color-logic lights only support 1x speed
         return ColorLogicSpeed.ONE_TIMES
@@ -181,7 +186,12 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
     @property
     def brightness(self) -> ColorLogicBrightness:
         """Returns the current brightness."""
-        if self.model in [ColorLogicLightType.SAM, ColorLogicLightType.TWO_FIVE, ColorLogicLightType.FOUR_ZERO, ColorLogicLightType.UCL]:
+        if self.equip_type in [
+            ColorLogicLightType.SAM,
+            ColorLogicLightType.TWO_FIVE,
+            ColorLogicLightType.FOUR_ZERO,
+            ColorLogicLightType.UCL,
+        ]:
             return self.telemetry.brightness
         # Non color-logic lights only support 100% brightness
         return ColorLogicBrightness.ONE_HUNDRED_PERCENT
@@ -262,17 +272,17 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
             and a warning will be logged.
         """
         # Non color-logic lights do not support speed or brightness control
-        if self.model not in [
+        if self.equip_type not in [
             ColorLogicLightType.SAM,
             ColorLogicLightType.TWO_FIVE,
             ColorLogicLightType.FOUR_ZERO,
             ColorLogicLightType.UCL,
         ]:
             if speed is not None:
-                _LOGGER.warning("Non colorlogic lights do not support speed control %s", self.model.name)
+                _LOGGER.warning("Non colorlogic lights do not support speed control %s", self.equip_type.name)
                 speed = ColorLogicSpeed.ONE_TIMES
             if brightness is not None:
-                _LOGGER.warning("Non colorlogic lights do not support brightness control %s", self.model.name)
+                _LOGGER.warning("Non colorlogic lights do not support brightness control %s", self.equip_type.name)
                 brightness = ColorLogicBrightness.ONE_HUNDRED_PERCENT
 
         if self.bow_id is None or self.system_id is None:
@@ -282,7 +292,7 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
         await self._api.async_set_light_show(
             self.bow_id,
             self.system_id,
-            show or self.show,  # use current value if None
-            speed or self.speed,  # use current value if None
-            brightness or self.brightness,  # use current value if None
+            show if show is not None else self.show,  # use current value if None
+            speed if speed is not None else self.speed,  # use current value if None
+            brightness if brightness is not None else self.brightness,  # use current value if None
         )

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/pyomnilogic_local/models/mspconfig.py

@@ -289,14 +289,13 @@ class MSPColorLogicLight(OmniBase):
 
     omni_type: OmniType = OmniType.CL_LIGHT
 
-    equip_type: ColorLogicLightType = Field(alias="Type")
     v2_active: bool = Field(alias="V2-Active", default=False)
+    equip_type: ColorLogicLightType = Field(alias="Type")
     effects: list[LightShows] | None = None
 
-    def __init__(self, **data: Any) -> None:
-        super().__init__(**data)
-
-        # Get the available light shows depending on the light type.
+    @model_validator(mode="after")
+    def set_effects(self) -> Any:
+        """Set the available light shows based on the light type."""
         match self.equip_type:
             case ColorLogicLightType.TWO_FIVE:
                 self.effects = list(ColorLogicShow25)
@@ -311,6 +310,7 @@ class MSPColorLogicLight(OmniBase):
                 self.effects = list(PentairShow)
             case ColorLogicLightType.ZODIAC_COLOR:
                 self.effects = list(ZodiacShow)
+        return self
 
 
 class MSPGroup(OmniBase):

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/pyomnilogic_local/models/telemetry.py

@@ -267,7 +267,7 @@ class TelemetryColorLogicLight(BaseModel):
 
     def show_name(
         self, model: ColorLogicLightType, v2: bool
-    ) -> ColorLogicShow25 | ColorLogicShow40 | ColorLogicShowUCL | ColorLogicShowUCLV2 | PentairShow | ZodiacShow | int:
+    ) -> ColorLogicShow25 | ColorLogicShow40 | ColorLogicShowUCL | ColorLogicShowUCLV2 | PentairShow | ZodiacShow:
         """Get the current light show depending on the light type.
 
         Returns:
@@ -287,7 +287,8 @@ class TelemetryColorLogicLight(BaseModel):
                 return PentairShow(self.show)
             case ColorLogicLightType.ZODIAC_COLOR:
                 return ZodiacShow(self.show)
-        return self.show  # Return raw int if type is unknown
+        msg = f"Unknown ColorLogicLightType {model} for show name parsing"
+        raise OmniParsingError(msg)
 
 
 class TelemetryFilter(BaseModel):

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/pyomnilogic_local/sensor.py

@@ -86,7 +86,7 @@ class Sensor(OmniEquipment[MSPSensor, None]):
         super().__init__(omni, mspconfig, telemetry)
 
     @property
-    def sensor_type(self) -> SensorType | str:
+    def equip_type(self) -> SensorType | str:
         """Returns the type of sensor.
 
         Can be AIR_TEMP, SOLAR_TEMP, WATER_TEMP, FLOW, ORP, or EXT_INPUT.

{python_omnilogic_local-0.20.7 → python_omnilogic_local-0.20.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-omnilogic-local"
-version = "0.20.7"
+version = "0.20.9"
 description = "A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API"
 readme = "README.md"
 requires-python = ">=3.13,<4.0.0"