python-omnilogic-local 0.20.6__tar.gz → 0.20.8__tar.gz

{python_omnilogic_local-0.20.6 → python_omnilogic_local-0.20.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-omnilogic-local
-Version: 0.20.6
+Version: 0.20.8
 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>
@@ -20,9 +20,9 @@ Description-Content-Type: text/markdown
 # Python OmniLogic Local
 
 [![PyPI Version](https://img.shields.io/pypi/v/python-omnilogic-local.svg?logo=python&logoColor=fff&style=flat-square)](https://pypi.org/project/python-omnilogic-local/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/python-omnilogic-local.svg?style=flat-square&logo=python&logoColor=fff)](https://pypi.org/project/python-omnilogic-local/)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/cryptk/python-omnilogic-local/build-test.yml?style=flat-square&label=Build)](https://github.com/cryptk/python-omnilogic-local/actions)
-[![License](https://img.shields.io/pypi/l/python-omnilogic-local.svg?style=flat-square)](LICENSE)
+![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fcryptk%2Fpython-omnilogic-local%2Frefs%2Fheads%2Fmain%2Fpyproject.toml?style=flat-square)
+[![Tests](https://img.shields.io/github/actions/workflow/status/cryptk/python-omnilogic-local/ci-testing.yml?style=flat-square&label=Tests)](https://github.com/cryptk/python-omnilogic-local/actions)
+[![License](https://img.shields.io/github/license/cryptk/python-omnilogic-local?style=flat-square)](LICENSE)
 [![Buy Me A Coffee](https://img.shields.io/badge/Buy_Me_A_Coffee-FFDD00?style=flat-square&logo=buy-me-a-coffee&logoColor=000)](https://www.buymeacoffee.com/cryptk)
 
 **A modern Python library for local control of Hayward OmniLogic and OmniHub pool controllers**

{python_omnilogic_local-0.20.6 → python_omnilogic_local-0.20.8}/README.md

@@ -3,9 +3,9 @@
 # Python OmniLogic Local
 
 [![PyPI Version](https://img.shields.io/pypi/v/python-omnilogic-local.svg?logo=python&logoColor=fff&style=flat-square)](https://pypi.org/project/python-omnilogic-local/)
-[![Python Versions](https://img.shields.io/pypi/pyversions/python-omnilogic-local.svg?style=flat-square&logo=python&logoColor=fff)](https://pypi.org/project/python-omnilogic-local/)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/cryptk/python-omnilogic-local/build-test.yml?style=flat-square&label=Build)](https://github.com/cryptk/python-omnilogic-local/actions)
-[![License](https://img.shields.io/pypi/l/python-omnilogic-local.svg?style=flat-square)](LICENSE)
+![Python Version](https://img.shields.io/python/required-version-toml?tomlFilePath=https%3A%2F%2Fraw.githubusercontent.com%2Fcryptk%2Fpython-omnilogic-local%2Frefs%2Fheads%2Fmain%2Fpyproject.toml?style=flat-square)
+[![Tests](https://img.shields.io/github/actions/workflow/status/cryptk/python-omnilogic-local/ci-testing.yml?style=flat-square&label=Tests)](https://github.com/cryptk/python-omnilogic-local/actions)
+[![License](https://img.shields.io/github/license/cryptk/python-omnilogic-local?style=flat-square)](LICENSE)
 [![Buy Me A Coffee](https://img.shields.io/badge/Buy_Me_A_Coffee-FFDD00?style=flat-square&logo=buy-me-a-coffee&logoColor=000)](https://www.buymeacoffee.com/cryptk)
 
 **A modern Python library for local control of Hayward OmniLogic and OmniHub pool controllers**

{python_omnilogic_local-0.20.6 → python_omnilogic_local-0.20.8}/pyomnilogic_local/api/protocol.py

@@ -229,7 +229,12 @@ class OmniLogicProtocol(asyncio.DatagramProtocol):
             # Wait for either a message or an error
             data_task = asyncio.create_task(self.data_queue.get())
             error_task = asyncio.create_task(self.error_queue.get())
-            done, _ = await asyncio.wait([data_task, error_task], return_when=asyncio.FIRST_COMPLETED)
+            done, pending = await asyncio.wait([data_task, error_task], return_when=asyncio.FIRST_COMPLETED)
+
+            # Cancel any pending tasks to avoid "Task was destroyed but it is pending" warnings
+            for task in pending:
+                task.cancel()
+
             if error_task in done:
                 exc = error_task.result()
                 if isinstance(exc, Exception):

{python_omnilogic_local-0.20.6 → python_omnilogic_local-0.20.8}/pyomnilogic_local/colorlogiclight.py

@@ -168,7 +168,7 @@ 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.model, self.v2_active)
 
     @property
     def speed(self) -> ColorLogicSpeed:
@@ -282,7 +282,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.6 → python_omnilogic_local-0.20.8}/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.6 → python_omnilogic_local-0.20.8}/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.6 → python_omnilogic_local-0.20.8}/pyomnilogic_local/omnilogic.py

@@ -15,6 +15,7 @@ from pyomnilogic_local.system import System
 
 if TYPE_CHECKING:
     from pyomnilogic_local._base import OmniEquipment
+    from pyomnilogic_local.bow import Bow
     from pyomnilogic_local.chlorinator import Chlorinator
     from pyomnilogic_local.chlorinator_equip import ChlorinatorEquipment
     from pyomnilogic_local.colorlogiclight import ColorLogicLight
@@ -260,6 +261,12 @@ class OmniLogic:
             csads.extend(bow.csads.values())
         return EquipmentDict(csads)
 
+    @property
+    def all_bows(self) -> EquipmentDict[Bow]:
+        """Returns all Bow instances across all bows in the backyard."""
+        # Bows are stored directly in backyard as EquipmentDict already
+        return self.backyard.bow
+
     # Equipment search methods
     def get_equipment_by_name(self, name: str) -> OmniEquipment[Any, Any] | None:
         """Find equipment by name across all equipment types.
@@ -272,6 +279,7 @@ class OmniLogic:
         """
         # Search all equipment types
         all_equipment: list[OmniEquipment[Any, Any]] = []
+        all_equipment.extend([self.backyard])
         all_equipment.extend(self.all_lights.values())
         all_equipment.extend(self.all_relays.values())
         all_equipment.extend(self.all_pumps.values())
@@ -283,6 +291,7 @@ class OmniLogic:
         all_equipment.extend(self.all_chlorinator_equipment.values())
         all_equipment.extend(self.all_csads.values())
         all_equipment.extend(self.all_csad_equipment.values())
+        all_equipment.extend(self.all_bows.values())
         all_equipment.extend(self.groups.values())
 
         for equipment in all_equipment:
@@ -302,6 +311,7 @@ class OmniLogic:
         """
         # Search all equipment types
         all_equipment: list[OmniEquipment[Any, Any]] = []
+        all_equipment.extend([self.backyard])
         all_equipment.extend(self.all_lights.values())
         all_equipment.extend(self.all_relays.values())
         all_equipment.extend(self.all_pumps.values())
@@ -313,6 +323,7 @@ class OmniLogic:
         all_equipment.extend(self.all_chlorinator_equipment.values())
         all_equipment.extend(self.all_csads.values())
         all_equipment.extend(self.all_csad_equipment.values())
+        all_equipment.extend(self.all_bows.values())
         all_equipment.extend(self.groups.values())
         all_equipment.extend(self.schedules.values())
 

{python_omnilogic_local-0.20.6 → python_omnilogic_local-0.20.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-omnilogic-local"
-version = "0.20.6"
+version = "0.20.8"
 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"
@@ -47,7 +47,7 @@ python_version = "3.13"
 plugins = [
     "pydantic.mypy"
 ]
-follow_imports = "silent"
+# follow_imports = "silent"
 strict = true
 ignore_missing_imports = true
 disallow_subclassing_any = false