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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-omnilogic-local
-Version: 0.14.1
+Version: 0.14.3
 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
@@ -16,8 +16,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: pydantic (>=1.10.7,<2.0.0)
+Requires-Dist: pydantic (>=1.10.17)
 Requires-Dist: xmltodict (>=0.13.0,<0.14.0)
 Project-URL: Repository, https://github.com/cryptk/python-omnilogic-local
 Description-Content-Type: text/markdown

{python_omnilogic_local-0.14.1 → python_omnilogic_local-0.14.3}/pyomnilogic_local/cli.py

@@ -18,44 +18,43 @@ RELAY_SYSTEM_ID = 13
 
 
 async def async_main() -> None:
-    diags: FilterDiagnostics  # noqa: F842
-    mspconfig: MSPConfig  # noqa: F842
-    telem: Telemetry  # noqa: F842
+    filter_diags: FilterDiagnostics  # pylint: disable=unused-variable # noqa: F842
+    mspconfig: MSPConfig
+    telem: Telemetry
 
     omni = OmniLogicAPI(os.environ.get("OMNILOGIC_HOST", "127.0.0.1"), 10444, 5.0)
+    get_raw = os.environ.get("OMNILOGIC_RAW", False)
 
     # Some basic calls to run some testing against the library
 
-    # Fetch the MSPConfig data parsed into a model
-    mspconfig = await omni.async_get_config()
-    # Fetch the MSPConfig data as the raw XML
-    # mspconfig = await omni.async_get_config(raw=True)
-    print(mspconfig)
+    # Fetch the MSPConfig data
+    mspconfig = await omni.async_get_config(raw=get_raw)  # pylint: disable=unexpected-keyword-arg
 
-    # Fetch the current telemetry data parsed into a model
-    telem = await omni.async_get_telemetry()
-    # Fetch the current telemetry data as the raw XML
-    # telem = await omni.async_get_telemetry(raw=True)
-    print(telem)
+    # Fetch the current telemetry data
+    telem = await omni.async_get_telemetry(raw=get_raw)  # pylint: disable=unexpected-keyword-arg
 
     # Fetch a list of current alarms
     # print(await omni.async_get_alarm_list())
 
     # Fetch diagnostic data for a filter pump
-    diags = await omni.async_get_filter_diagnostics(POOL_ID, PUMP_EQUIPMENT_ID)
-    print(diags)
+    # filter_diags = await omni.async_get_filter_diagnostics(POOL_ID, PUMP_EQUIPMENT_ID, raw=get_raw)
+
+    print(mspconfig)
+    print(telem)
+    # print(filter_diags)
+
     # Decode the filter display revision
-    # b1=chr(diags.get_param_by_name("DisplayFWRevisionB1"))
-    # b2=chr(diags.get_param_by_name("DisplayFWRevisionB2"))
-    # b3=chr(diags.get_param_by_name("DisplayFWRevisionB3"))
-    # b4=chr(diags.get_param_by_name("DisplayFWRevisionB4"))
+    # b1=chr(filter_diags.get_param_by_name("DisplayFWRevisionB1"))
+    # b2=chr(filter_diags.get_param_by_name("DisplayFWRevisionB2"))
+    # b3=chr(filter_diags.get_param_by_name("DisplayFWRevisionB3"))
+    # b4=chr(filter_diags.get_param_by_name("DisplayFWRevisionB4"))
     # b5 and b6 are whitespace and a null terminator
-    # b5=chr(diags.get_param_by_name("DisplayFWRevisionB5"))
-    # b6=chr(diags.get_param_by_name("DisplayFWRevisionB6"))
+    # b5=chr(filter_diags.get_param_by_name("DisplayFWRevisionB5"))
+    # b6=chr(filter_diags.get_param_by_name("DisplayFWRevisionB6"))
     # print(f"{b1}{b2}.{b3}.{b4}")
     # Decode the filter power consumption (don't do this, it's returned already decoded in the telemetry)
-    # p1=diags.get_param_by_name("PowerMSB")
-    # p2=diags.get_param_by_name("PowerLSB")
+    # p1=filter_diags.get_param_by_name("PowerMSB")
+    # p2=filter_diags.get_param_by_name("PowerLSB")
     # The f-string below converts the bytes to hex and displays them.  Just get this value from the telemetry, it's easier
     # print(f"{p1:x}{p2:x}")
 

{python_omnilogic_local-0.14.1 → python_omnilogic_local-0.14.3}/pyomnilogic_local/models/filter_diagnostics.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 from xmltodict import parse as xml_parse
 
 
@@ -23,7 +23,7 @@ class FilterDiagnostics(BaseModel):
         orm_mode = True
 
     def get_param_by_name(self, name: str) -> int:
-        return [param.value for param in self.parameters if param.name == name][0]  # pylint: disable=not-an-iterable
+        return [param.value for param in self.parameters if param.name == name][0]
 
     @staticmethod
     def load_xml(xml: str) -> FilterDiagnostics:

{python_omnilogic_local-0.14.1 → python_omnilogic_local-0.14.3}/pyomnilogic_local/models/leadmessage.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from pydantic import BaseModel, Field
+from pydantic.v1 import BaseModel, Field
 
 from .util import ParameterGetter
 

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

@@ -9,7 +9,7 @@ if sys.version_info >= (3, 11):
 else:
     from typing_extensions import Self
 
-from pydantic import BaseModel, Field, ValidationError
+from pydantic.v1 import BaseModel, Field, ValidationError
 from xmltodict import parse as xml_parse
 
 from ..exceptions import OmniParsingException

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

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Any, SupportsInt, TypeAlias, TypeVar, cast, overload
 
-from pydantic import BaseModel, Field, ValidationError
+from pydantic.v1 import BaseModel, Field, ValidationError
 from xmltodict import parse as xml_parse
 
 from ..exceptions import OmniParsingException

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-omnilogic-local"
-version = "0.14.1"
+version = "0.14.3"
 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"
@@ -20,7 +20,7 @@ omnilogic = "pyomnilogic_local.cli:main"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pydantic = "^1.10.7"
+pydantic = ">=1.10.17"
 xmltodict = "^0.13.0"
 
 [tool.poetry.group.dev.dependencies]