python-omnilogic-local 0.14.3__py3-none-any.whl → 0.14.6__py3-none-any.whl

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"})
 

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:

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

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

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.dist-info → python_omnilogic_local-0.14.6.dist-info}/METADATA

@@ -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.dist-info → python_omnilogic_local-0.14.6.dist-info}/RECORD

@@ -1,19 +1,19 @@
 pyomnilogic_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyomnilogic_local/api.py,sha256=3Xdd1ouAcSrSiLvmQnwrJl_3hgRl6KiloBXp0_JDVkE,28134
+pyomnilogic_local/api.py,sha256=48_NxsDwZXOVgkbl1NJ4lUfNAS6qMDrRNdTr_eXBMJU,28112
 pyomnilogic_local/cli.py,sha256=RwzKydC612-ay6TGrlSg8UEQPjYIlylxjf11S062bsk,3931
 pyomnilogic_local/exceptions.py,sha256=7-EYTP-_VgGrA8WWGwQPUE1NGjJEDWB-ovyvSM2iaNY,164
 pyomnilogic_local/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyomnilogic_local/models/const.py,sha256=j4HSiPJW5If296yJ-AiIsBI9EdlckF4QkVFIpTLb5C4,51
 pyomnilogic_local/models/filter_diagnostics.py,sha256=DnkbjOsmfa39-sbD5qO5PV_Ltn5FHSiImrPBxr7Y0cI,1535
 pyomnilogic_local/models/leadmessage.py,sha256=XnzXTpLLQzhLQR1OgfAjKmW5N8BBgM7OrntUi1I2VRY,410
-pyomnilogic_local/models/mspconfig.py,sha256=mXfryaHSA8ecJGazpD_4rmrA2vhWtl32_OBmoSCmxGU,10427
-pyomnilogic_local/models/telemetry.py,sha256=pBebgBKLClXyLH831GzQdfxbFR7NqyMlktwZzGf1ROg,10632
-pyomnilogic_local/models/util.py,sha256=3Qch98NOl5eO-KIOUBnE9ar86MlzbZ0g2LRApMgj-co,1476
+pyomnilogic_local/models/mspconfig.py,sha256=sa_fn5VOVlzVfZhl60ly8XkDb4T8r5om40mFE7dxV2A,10564
+pyomnilogic_local/models/telemetry.py,sha256=oud_Tusqahw1bagiLFE_dN6cyC4ykMiMuRYSKrq_iMQ,10626
+pyomnilogic_local/models/util.py,sha256=MgqHmDy7OE-62vFX5Rq1tRxs6GmzamBuWoaLYGm-fPI,1479
 pyomnilogic_local/protocol.py,sha256=1Z7U70mV0sUlqrp3XK1Fvj6NuChRKLz0ejzKaQLSPE8,10194
-pyomnilogic_local/types.py,sha256=km_tagtJ43m4_cIynalis7oiDa1LUUR-ta5B9HQUG1Q,7264
+pyomnilogic_local/types.py,sha256=c9Ujw67lZFZ2V7gl-J6EVYa-OlQQig_IF0z6g5Cxw8Y,7639
 pyomnilogic_local/util.py,sha256=agbRBKnecrYycC9iUmo1aJDjbVg9VxHyq4QY0D8-bfA,359
-python_omnilogic_local-0.14.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-python_omnilogic_local-0.14.3.dist-info/METADATA,sha256=k8Kin3aHuB15MaJ6rxTDiEG9mqxVZTXuLydLXwSISf0,2984
-python_omnilogic_local-0.14.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-python_omnilogic_local-0.14.3.dist-info/entry_points.txt,sha256=PUvdumqSijeB0dHH_s5oE2TnWtPWdJSNpSOsn8yTtOo,56
-python_omnilogic_local-0.14.3.dist-info/RECORD,,
+python_omnilogic_local-0.14.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+python_omnilogic_local-0.14.6.dist-info/METADATA,sha256=nYBd5MLkh270MdCpAGd_LZOKje_MVdExeF25GqGsL0s,2984
+python_omnilogic_local-0.14.6.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+python_omnilogic_local-0.14.6.dist-info/entry_points.txt,sha256=PUvdumqSijeB0dHH_s5oE2TnWtPWdJSNpSOsn8yTtOo,56
+python_omnilogic_local-0.14.6.dist-info/RECORD,,

{python_omnilogic_local-0.14.3.dist-info → python_omnilogic_local-0.14.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any