python-omnilogic-local 0.14.0__py3-none-any.whl → 0.14.2__py3-none-any.whl

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

pyomnilogic_local/models/filter_diagnostics.py

@@ -31,7 +31,7 @@ class FilterDiagnostics(BaseModel):
             xml,
             # Some things will be lists or not depending on if a pool has more than one of that piece of equipment.  Here we are coercing
             # everything that *could* be a list into a list to make the parsing more consistent.
-            force_list=("Parameter", "Parameters"),
+            force_list=("Parameter"),
         )
         # The XML nests the Parameter entries under a Parameters entry, this is annoying to work with.  Here we are adjusting the data to
         # remove that extra level in the data

{python_omnilogic_local-0.14.0.dist-info → python_omnilogic_local-0.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-omnilogic-local
-Version: 0.14.0
+Version: 0.14.2
 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.0.dist-info → python_omnilogic_local-0.14.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pyomnilogic_local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyomnilogic_local/api.py,sha256=3Xdd1ouAcSrSiLvmQnwrJl_3hgRl6KiloBXp0_JDVkE,28134
-pyomnilogic_local/cli.py,sha256=jHAhN_VfjgEVbXlvLsPdgNSab-jY8XntpXoek0I1Vfc,3921
+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=bTcf5b94eUtP50vAEnr4rkG6Nczm8hCiBRjdZMY8uR0,1581
+pyomnilogic_local/models/filter_diagnostics.py,sha256=ELj-M4NCFhxWg-4ghpAPidlE5u-jNY4nBplyLv5qozU,1567
 pyomnilogic_local/models/leadmessage.py,sha256=9r6PbIHHzD0tyeKiFUve3WLcjS8uL2Gj6r_96X7l5H8,407
 pyomnilogic_local/models/mspconfig.py,sha256=GgkLvpKVlcZdeWFjd56AK_6DQXIO31Z1yHDGx2pLEj8,10424
 pyomnilogic_local/models/telemetry.py,sha256=86WPCmemNLwXAg-dHp1EvgpJzqQIHfwkNtO1eGF4eZk,10629
@@ -12,8 +12,8 @@ pyomnilogic_local/models/util.py,sha256=3Qch98NOl5eO-KIOUBnE9ar86MlzbZ0g2LRApMgj
 pyomnilogic_local/protocol.py,sha256=1Z7U70mV0sUlqrp3XK1Fvj6NuChRKLz0ejzKaQLSPE8,10194
 pyomnilogic_local/types.py,sha256=km_tagtJ43m4_cIynalis7oiDa1LUUR-ta5B9HQUG1Q,7264
 pyomnilogic_local/util.py,sha256=agbRBKnecrYycC9iUmo1aJDjbVg9VxHyq4QY0D8-bfA,359
-python_omnilogic_local-0.14.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-python_omnilogic_local-0.14.0.dist-info/METADATA,sha256=u0v90dYX9gJCvY245L5blJ36fGgD_r8UnYlvVbhTQ30,2939
-python_omnilogic_local-0.14.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-python_omnilogic_local-0.14.0.dist-info/entry_points.txt,sha256=PUvdumqSijeB0dHH_s5oE2TnWtPWdJSNpSOsn8yTtOo,56
-python_omnilogic_local-0.14.0.dist-info/RECORD,,
+python_omnilogic_local-0.14.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+python_omnilogic_local-0.14.2.dist-info/METADATA,sha256=OZwrsm0Et9d3RuLqcz_xGNaT_A1aPO_95TB779QEhwU,2939
+python_omnilogic_local-0.14.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+python_omnilogic_local-0.14.2.dist-info/entry_points.txt,sha256=PUvdumqSijeB0dHH_s5oE2TnWtPWdJSNpSOsn8yTtOo,56
+python_omnilogic_local-0.14.2.dist-info/RECORD,,