python-omnilogic-local 0.16.0__py3-none-any.whl → 0.18.0__py3-none-any.whl

pyomnilogic_local/cli/cli.py

@@ -0,0 +1,25 @@
+import asyncio
+
+import click
+
+from pyomnilogic_local.api import OmniLogicAPI
+from pyomnilogic_local.cli.debug import commands as debug
+from pyomnilogic_local.cli.get import commands as get
+
+
+async def get_omni(host: str) -> OmniLogicAPI:
+    return OmniLogicAPI(host, 10444, 5.0)
+
+
+@click.group()
+@click.pass_context
+@click.option("--host", default="127.0.0.1", help="Hostname or IP address of omnilogic system")
+def entrypoint(ctx: click.Context, host: str) -> None:
+    ctx.ensure_object(dict)
+    omni = asyncio.run(get_omni(host))
+
+    ctx.obj["OMNI"] = omni
+
+
+entrypoint.add_command(debug.debug)
+entrypoint.add_command(get.get)

pyomnilogic_local/cli/debug/commands.py

@@ -0,0 +1,95 @@
+# Need to figure out how to resolve the 'Untyped decorator makes function "..." untyped' errors in mypy when using click decorators
+# mypy: disable-error-code="misc"
+import asyncio
+from typing import Literal, overload
+
+import click
+
+from pyomnilogic_local.api import OmniLogicAPI
+from pyomnilogic_local.cli.utils import async_get_mspconfig, async_get_telemetry
+from pyomnilogic_local.models.filter_diagnostics import FilterDiagnostics
+
+
+@click.group()
+@click.option("--raw/--no-raw", default=False, help="Output the raw XML from the OmniLogic, do not parse the response")
+@click.pass_context
+def debug(ctx: click.Context, raw: bool) -> None:
+    # Container for all get commands
+
+    ctx.ensure_object(dict)
+    ctx.obj["RAW"] = raw
+
+
+@debug.command()
+@click.pass_context
+def get_mspconfig(ctx: click.Context) -> None:
+    mspconfig = asyncio.run(async_get_mspconfig(ctx.obj["OMNI"], ctx.obj["RAW"]))
+    click.echo(mspconfig)
+
+
+@debug.command()
+@click.pass_context
+def get_telemetry(ctx: click.Context) -> None:
+    telemetry = asyncio.run(async_get_telemetry(ctx.obj["OMNI"], ctx.obj["RAW"]))
+    click.echo(telemetry)
+
+
+@debug.command()
+@click.pass_context
+def get_alarm_list(ctx: click.Context) -> None:
+    alarm_list = asyncio.run(async_get_alarm_list(ctx.obj["OMNI"]))
+    click.echo(alarm_list)
+
+
+async def async_get_alarm_list(omni: OmniLogicAPI) -> str:
+    alarm_list = await omni.async_get_alarm_list()
+    return alarm_list
+
+
+@debug.command()
+@click.option("--pool-id", help="System ID of the Body Of Water the filter is associated with")
+@click.option("--filter-id", help="System ID of the filter to request diagnostics for")
+@click.pass_context
+def get_filter_diagnostics(ctx: click.Context, pool_id: int, filter_id: int) -> None:
+    filter_diags = asyncio.run(async_get_filter_diagnostics(ctx.obj["OMNI"], pool_id, filter_id, ctx.obj["RAW"]))
+    if ctx.obj["RAW"]:
+        click.echo(filter_diags)
+    else:
+        drv1 = chr(filter_diags.get_param_by_name("DriveFWRevisionB1"))
+        drv2 = chr(filter_diags.get_param_by_name("DriveFWRevisionB2"))
+        drv3 = chr(filter_diags.get_param_by_name("DriveFWRevisionB3"))
+        drv4 = chr(filter_diags.get_param_by_name("DriveFWRevisionB4"))
+        dfw1 = chr(filter_diags.get_param_by_name("DisplayFWRevisionB1"))
+        dfw2 = chr(filter_diags.get_param_by_name("DisplayFWRevisionB2"))
+        dfw3 = chr(filter_diags.get_param_by_name("DisplayFWRevisionB3"))
+        dfw4 = chr(filter_diags.get_param_by_name("DisplayFWRevisionB4"))
+        pow1 = filter_diags.get_param_by_name("PowerMSB")
+        pow2 = filter_diags.get_param_by_name("PowerLSB")
+        errs = filter_diags.get_param_by_name("ErrorStatus")
+        click.echo(
+            f"DRIVE FW REV: {drv1}{drv2}.{drv3}{drv4}\n"
+            f"DISPLAY FW REV: {dfw1}{dfw2}.{dfw3}.{dfw4}\n"
+            f"POWER: {pow1:x}{pow2:x}W\n"
+            f"ERROR STATUS: {errs}"
+        )
+
+
+@overload
+async def async_get_filter_diagnostics(omni: OmniLogicAPI, pool_id: int, filter_id: int, raw: Literal[True]) -> str: ...
+@overload
+async def async_get_filter_diagnostics(omni: OmniLogicAPI, pool_id: int, filter_id: int, raw: Literal[False]) -> FilterDiagnostics: ...
+async def async_get_filter_diagnostics(omni: OmniLogicAPI, pool_id: int, filter_id: int, raw: bool) -> FilterDiagnostics | str:
+    filter_diags = await omni.async_get_filter_diagnostics(pool_id, filter_id, raw=raw)
+    return filter_diags
+
+
+@debug.command()
+@click.pass_context
+def get_log_config(ctx: click.Context) -> None:
+    log_config = asyncio.run(async_get_log_config(ctx.obj["OMNI"]))
+    click.echo(log_config)
+
+
+async def async_get_log_config(omni: OmniLogicAPI) -> str:
+    log_config = await omni.async_get_log_config()
+    return log_config

pyomnilogic_local/cli/get/commands.py

@@ -0,0 +1,33 @@
+# Need to figure out how to resolve the 'Untyped decorator makes function "..." untyped' errors in mypy when using click decorators
+# mypy: disable-error-code="misc"
+import asyncio
+
+import click
+
+from pyomnilogic_local.cli.utils import async_get_mspconfig
+
+
+@click.group()
+@click.pass_context
+def get(ctx: click.Context) -> None:
+    # Container for all get commands
+
+    ctx.ensure_object(dict)
+
+
+@get.command()
+@click.pass_context
+def lights(ctx: click.Context) -> None:
+    mspconfig = asyncio.run(async_get_mspconfig(ctx.obj["OMNI"]))
+    # Return data about lights in the backyard
+    if mspconfig.backyard.colorlogic_light:
+        for light in mspconfig.backyard.colorlogic_light:
+            click.echo(light)
+
+    # Return data about lights in the Body of Water
+    if mspconfig.backyard.bow:
+        for bow in mspconfig.backyard.bow:
+            if bow.colorlogic_light:
+                for cl_light in bow.colorlogic_light:
+                    for k, v in cl_light:
+                        click.echo(f"{k:15}\t{str(v)}")

pyomnilogic_local/cli/utils.py

@@ -0,0 +1,15 @@
+from pyomnilogic_local.api import OmniLogicAPI
+from pyomnilogic_local.models.mspconfig import MSPConfig
+from pyomnilogic_local.models.telemetry import Telemetry
+
+
+async def async_get_mspconfig(omni: OmniLogicAPI, raw: bool = False) -> MSPConfig:
+    mspconfig: MSPConfig
+    mspconfig = await omni.async_get_config(raw=raw)
+    return mspconfig
+
+
+async def async_get_telemetry(omni: OmniLogicAPI, raw: bool = False) -> Telemetry:
+    telemetry: Telemetry
+    telemetry = await omni.async_get_telemetry(raw=raw)
+    return telemetry

pyomnilogic_local/models/mspconfig.py

@@ -174,6 +174,12 @@ class MSPCSAD(OmniBase):
     calibration_value: float = Field(alias="CalibrationValue")
     ph_low_alarm_value: float = Field(alias="PHLowAlarmLevel")
     ph_high_alarm_value: float = Field(alias="PHHighAlarmLevel")
+    orp_target_level: int = Field(alias="ORP-Target-Level")
+    orp_runtime_level: int = Field(alias="ORP-Runtime-Level")
+    orp_low_alarm_level: int = Field(alias="ORP-Low-Alarm-Level")
+    orp_high_alarm_level: int = Field(alias="ORP-High-Alarm-Level")
+    orp_forced_on_time: int = Field(alias="ORP-Forced-On-Time")
+    orp_forced_enabled: bool = Field(alias="ORP-Forced-Enabled")
 
 
 class MSPColorLogicLight(OmniBase):

pyomnilogic_local/omnitypes.py

@@ -64,6 +64,9 @@ class OmniType(str, Enum):
     VALVE_ACTUATOR = "ValveActuator"
     VIRT_HEATER = "VirtualHeater"
 
+    def __str__(self) -> str:
+        return OmniType[self.name].value
+
 
 # Backyard/BoW
 class BackyardState(PrettyEnum):
@@ -173,6 +176,9 @@ class ColorLogicShow(PrettyEnum):
     WARM_WHITE = 25
     BRIGHT_YELLOW = 26
 
+    def __str__(self) -> str:
+        return self.name
+
 
 class ColorLogicPowerState(PrettyEnum):
     OFF = 0
@@ -188,6 +194,9 @@ class ColorLogicLightType(str, PrettyEnum):
     FOUR_ZERO = "COLOR_LOGIC_4_0"
     TWO_FIVE = "COLOR_LOGIC_2_5"
 
+    def __str__(self) -> str:
+        return ColorLogicLightType[self.name].value
+
 
 class CSADType(str, PrettyEnum):
     ACID = "ACID"

{python_omnilogic_local-0.16.0.dist-info → python_omnilogic_local-0.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-omnilogic-local
-Version: 0.16.0
+Version: 0.18.0
 Summary: A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API
 License: Apache-2.0
 Author: Chris Jowett
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: click (>=8.0.0,<8.1.0)
 Requires-Dist: pydantic (>=1.10.17)
 Requires-Dist: xmltodict (>=0.13.0,<0.14.0)
 Description-Content-Type: text/markdown

python_omnilogic_local-0.18.0.dist-info/RECORD

@@ -0,0 +1,26 @@
+pyomnilogic_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyomnilogic_local/api.py,sha256=0yC7OMBUZfzBkBiLHT3QBA-B9m30conKzO9TDYruXLw,30540
+pyomnilogic_local/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyomnilogic_local/cli/cli.py,sha256=JP3IIwMlV0CtJXa-Zr5Kp_HfzTG-N-B-TADDjPzErNY,633
+pyomnilogic_local/cli/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyomnilogic_local/cli/debug/commands.py,sha256=1G3I_qJzwby0zYnjofr_tCrT7D4XSw4TZK_ujX9ifkI,3747
+pyomnilogic_local/cli/get/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyomnilogic_local/cli/get/commands.py,sha256=EE0WjN3sd9-bslothw4pMs7fi0czk1ACb4ZBSE5A1WQ,1034
+pyomnilogic_local/cli/utils.py,sha256=b485Pe33bumwIOg4v_fmylZ6LN8Vh9cS6SRNaNpL5IE,532
+pyomnilogic_local/cli_legacy.py,sha256=YsLPDuBUM9hDmSiYVfz0H346OtPUgRwiLHfKWUKbD7Q,3930
+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=74-VjHB-Rf6imeJTYawybA40_m_wb1Dww-Eu4ucGBdo,1577
+pyomnilogic_local/models/leadmessage.py,sha256=XnzXTpLLQzhLQR1OgfAjKmW5N8BBgM7OrntUi1I2VRY,410
+pyomnilogic_local/models/mspconfig.py,sha256=UgqWrAOcABlpIsBGzEmtWLEpHOe_vwMOfdnrCJz5yzg,10979
+pyomnilogic_local/models/telemetry.py,sha256=8ncC-10SRQneFmrH-LrnlVTS3Q-oqeXS_EtYKiIfDks,10612
+pyomnilogic_local/models/util.py,sha256=X9jCiU3hFbI0Nc6NSCnvwyVK9XyA3BsiA9W7JYCJmKs,1462
+pyomnilogic_local/omnitypes.py,sha256=31CvXH4FmyelTdZA7NAJQvkilho9qbIPwnymEEQ8d5Y,8067
+pyomnilogic_local/protocol.py,sha256=M2vyj8o_PCKyLEswb6JGpUIdyj_swEJC18KrqcQV4kI,10356
+pyomnilogic_local/util.py,sha256=sLkCn2eWbwP4FRiEgYlfmNxiHPeiWYjeUyvRRhWuNYE,359
+python_omnilogic_local-0.18.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+python_omnilogic_local-0.18.0.dist-info/METADATA,sha256=nMPRkiowV_ru3p5SjE41OMndPBlqobEYD_bf5OG1BWM,2672
+python_omnilogic_local-0.18.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+python_omnilogic_local-0.18.0.dist-info/entry_points.txt,sha256=We3r6ccF9wjWKBBSywFoYUJyL1TdGI1Pjw8-0L44kvw,66
+python_omnilogic_local-0.18.0.dist-info/RECORD,,

{python_omnilogic_local-0.16.0.dist-info → python_omnilogic_local-0.18.0.dist-info}/WHEEL

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

python_omnilogic_local-0.18.0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+omnilogic=pyomnilogic_local.cli.cli:entrypoint
+

python_omnilogic_local-0.16.0.dist-info/RECORD

@@ -1,19 +0,0 @@
-pyomnilogic_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyomnilogic_local/api.py,sha256=0yC7OMBUZfzBkBiLHT3QBA-B9m30conKzO9TDYruXLw,30540
-pyomnilogic_local/cli.py,sha256=YsLPDuBUM9hDmSiYVfz0H346OtPUgRwiLHfKWUKbD7Q,3930
-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=74-VjHB-Rf6imeJTYawybA40_m_wb1Dww-Eu4ucGBdo,1577
-pyomnilogic_local/models/leadmessage.py,sha256=XnzXTpLLQzhLQR1OgfAjKmW5N8BBgM7OrntUi1I2VRY,410
-pyomnilogic_local/models/mspconfig.py,sha256=6YUz5e1V25KX0VynT6iwyZyzi8cPUvZwwLSY0M2bTV0,10594
-pyomnilogic_local/models/telemetry.py,sha256=8ncC-10SRQneFmrH-LrnlVTS3Q-oqeXS_EtYKiIfDks,10612
-pyomnilogic_local/models/util.py,sha256=X9jCiU3hFbI0Nc6NSCnvwyVK9XyA3BsiA9W7JYCJmKs,1462
-pyomnilogic_local/omnitypes.py,sha256=GU1DN32vcOUMHA4rAj-OKQNhPncNGLbjzRANU9vVr8w,7856
-pyomnilogic_local/protocol.py,sha256=M2vyj8o_PCKyLEswb6JGpUIdyj_swEJC18KrqcQV4kI,10356
-pyomnilogic_local/util.py,sha256=sLkCn2eWbwP4FRiEgYlfmNxiHPeiWYjeUyvRRhWuNYE,359
-python_omnilogic_local-0.16.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-python_omnilogic_local-0.16.0.dist-info/METADATA,sha256=3mfFKGti96Pdt8jP4awcvR0hXIoVhMGRuFwP5gCtE70,2634
-python_omnilogic_local-0.16.0.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-python_omnilogic_local-0.16.0.dist-info/entry_points.txt,sha256=PUvdumqSijeB0dHH_s5oE2TnWtPWdJSNpSOsn8yTtOo,56
-python_omnilogic_local-0.16.0.dist-info/RECORD,,

python_omnilogic_local-0.16.0.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-omnilogic=pyomnilogic_local.cli:main
-