python-omnilogic-local 0.14.3__tar.gz → 0.14.6__tar.gz

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: python-omnilogic-local
-Version: 0.14.3
+Version: 0.14.6
 Summary: A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API
 Home-page: https://github.com/cryptk/python-omnilogic-local
 License: Apache-2.0

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyomnilogic_local/api.py

@@ -436,12 +436,12 @@ class OmniLogicAPI:
         pool_id: int,
         equipment_id: int,
         timed_percent: int,
+        cell_type: int,
+        op_mode: int,
+        sc_timeout: int,
+        bow_type: int,
+        orp_timeout: int,
         cfg_state: int = 3,
-        op_mode: int = 1,
-        bow_type: int = 0,
-        cell_type: int = 4,
-        sc_timeout: int = 24,
-        orp_timeout: int = 24,
     ) -> None:
         body_element = ET.Element("Request", {"xmlns": "http://nextgen.hayward.com/api"})
 

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyomnilogic_local/models/mspconfig.py

@@ -15,6 +15,7 @@ from xmltodict import parse as xml_parse
 from ..exceptions import OmniParsingException
 from ..types import (
     BodyOfWaterType,
+    ChlorinatorCellType,
     ChlorinatorDispenserType,
     ColorLogicLightType,
     ColorLogicShow,
@@ -151,7 +152,9 @@ class MSPChlorinator(OmniBase):
     enabled: Literal["yes", "no"] = Field(alias="Enabled")
     timed_percent: int = Field(alias="Timed-Percent")
     superchlor_timeout: int = Field(alias="SuperChlor-Timeout")
+    orp_timeout: int = Field(alias="ORP-Timeout")
     dispenser_type: ChlorinatorDispenserType | str = Field(alias="Dispenser-Type")
+    cell_type: ChlorinatorCellType = Field(alias="Cell-Type")
     chlorinator_equipment: list[MSPChlorinatorEquip] | None
 
     def __init__(self, **data: Any) -> None:

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyomnilogic_local/models/telemetry.py

@@ -71,7 +71,7 @@ class TelemetryChlorinator(BaseModel):
     sc_mode: int = Field(alias="@scMode")
     operating_state: int = Field(alias="@operatingState")
     timed_percent: int | None = Field(alias="@Timed-Percent")
-    operating_mode: ChlorinatorOperatingMode | int = Field(alias="@operatingMode")
+    operating_mode: ChlorinatorOperatingMode = Field(alias="@operatingMode")
     enable: bool = Field(alias="@enable")
 
     # Still need to do a bit more work to determine if a chlorinator is actively chlorinating

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyomnilogic_local/models/util.py

@@ -2,7 +2,7 @@ from collections.abc import Awaitable, Callable
 import logging
 from typing import Any, Literal, TypeVar, cast, overload
 
-from pydantic.utils import GetterDict
+from pydantic.v1.utils import GetterDict
 
 from .const import XML_NS
 from .filter_diagnostics import FilterDiagnostics

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyomnilogic_local/types.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from enum import Enum, IntEnum
 
 from .util import PrettyEnum
 
@@ -87,7 +87,8 @@ class BodyOfWaterType(str, PrettyEnum):
 # Chlorinator status is a bitmask that we still need to figure out
 # class ChlorinatorStatus(str,Enum):
 #     pass
-class ChlorinatorOperatingMode(PrettyEnum):
+class ChlorinatorOperatingMode(IntEnum):
+    DISABLED = 0
     TIMED = 1
     ORP = 2
 
@@ -96,6 +97,24 @@ class ChlorinatorDispenserType(str, PrettyEnum):
     SALT = "SALT_DISPENSING"
 
 
+class ChlorinatorCellType(PrettyEnum):
+    T3 = "CELL_TYPE_T3"
+    T5 = "CELL_TYPE_T5"
+    T9 = "CELL_TYPE_T9"
+    T15 = "CELL_TYPE_T15"
+
+    # There is probably an easier way to do this
+    def __int__(self) -> int:
+        return ChlorinatorCellInt[self.name].value
+
+
+class ChlorinatorCellInt(IntEnum):
+    T3 = 1
+    T5 = 2
+    T9 = 3
+    T15 = 4
+
+
 # Lights
 class ColorLogicSpeed(PrettyEnum):
     ONE_SIXTEENTH = 0

{python_omnilogic_local-0.14.3 → python_omnilogic_local-0.14.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-omnilogic-local"
-version = "0.14.3"
+version = "0.14.6"
 description = "A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API"
 authors = ["cryptk <cryptk@users.noreply.github.com>", "djtimca", "garionphx"]
 license = "Apache-2.0"