Merge pull request #13 from bj00rn/vnext

Vnext

.vscode/launch.json

@@ -31,6 +31,15 @@
                 "--port",
                 "3001"
             ]
+        },
+        {
+            "name": "Python: Debug Tests",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "purpose": ["debug-test"],
+            "console": "integratedTerminal",
+            "justMyCode": false
         }
     ]
 }

.vscode/settings.json

@@ -12,8 +12,9 @@
         "--no-cov",
         "-o",
         "log_cli=1",
-        "--timeout=30",
+        "--timeout=300",
         "--verbose",
         "--import-mode=prepend",
     ],
+    "autoDocstring.docstringFormat": "sphinx"
 }

README.rst

@@ -29,70 +29,29 @@ Supported devices
 
 LOKE1/Loke Basic/LS-01 using control system 4.1.5
 
-Usage with asyncio as library
+Example usage
 =============================
-
-
-Read data
----------
-
 .. code-block:: python3
 
     import asyncio
-    import aiohttp
-
-    from pysaleryd.client import Client
-
-    async def work():
-        async with aiohttp.ClientSession() as session:
-            async with Client(WEBSOCKET_URL, WEBSOCKET_PORT, session) as hrv_client:
-                await asyncio.sleep(2) # wait a bit for some data
-                print(client.data)
-
-    loop = asyncio.new_event_loop()
-    loop.run_until_complete(work())
-
-Read data using callback
-------------------------
-
-.. code-block:: python3
-
-    import asyncio
-    import aiohttp
 
     from pysaleryd.client import Client
+    from pysaleryd.const import DataKey
 
     def handle_message(data: dict):
+        # must be safe to call from event loop
+        print("message handler")
         print(data)
 
-    async def work():
-        update_interval = 10 # call handle_message every 30 seconds
-        async with aiohttp.ClientSession() as session:
-            async with Client(WEBSOCKET_URL, WEBSOCKET_PORT, session, update_interval) as hrv_client:
-                hrv_client.add_handler(handle_message)
-                await asyncio.sleep(update_interval +1 ) # wait around a bit for data
-
-    loop = asyncio.new_event_loop()
-    loop.run_until_complete(work())
-
-Send control command
---------------------
-Command syntax can be found by dissecting websocket messages in the built in web ui
-
-.. code-block:: python3
-
-    import asyncio
-    import aiohttp
-
-    from pysaleryd.client import Client
-
-    async def work():
-        async with aiohttp.ClientSession() as session:
-            async with Client(WEBSOCKET_URL, WEBSOCKET_PORT, session) as hrv_client:
-                await hrv_client.send_command("MF", 1)
+    async def main():
+        update_interval = 10
+        with Client("192.168.1.151", update_interval=update_interval) as hrv_client:
+            hrv_client.add_message_handler(handle_message)
+            await asyncio.sleep(update_interval +1 ) # wait around a bit for data
+            await hrv_client.send_command(DataKey.FIREPLACE_MODE, 1) # turn on fireplace mode
 
     loop = asyncio.new_event_loop()
-    loop.run_until_complete(work())
+    loop.run_until_complete(main())
 
 Troubleshooting
 ===============

pyproject.toml

@@ -13,4 +13,4 @@ known_first_party = ["pysaleryd"]
 profile = "black"
 
 [tool.pysaleryd]
-version = "6.0.2"
+version = "7.0.0-rc.0"

setup.cfg

@@ -48,7 +48,7 @@ python_requires = >=3.11
 # For more information, check out https://semver.org/.
 install_requires =
     importlib-metadata; python_version<"3.11"
-    aiohttp
+    websockets>=14.1,<15
 
 
 [options.packages.find]
@@ -77,8 +77,8 @@ testing =
 # console_scripts =
 #     script_name = pysaleryd.module:function
 # For example:
-console_scripts =
-    pysaleryd = pysaleryd.skeleton:run
+# console_scripts =
+#    pysaleryd = pysaleryd.skeleton:run
 # And any other entry points, for example:
 # pyscaffold.cli =
 #     awesome = pyscaffoldext.awesome.extension:AwesomeExtension
@@ -91,6 +91,8 @@ console_scripts =
 # in order to write a coverage file that can be read by Jenkins.
 # CAUTION: --cov flags may prohibit setting breakpoints while debugging.
 #          Comment those flags to avoid this pytest issue.
+# asyncio_mode = auto
+# asyncio_default_fixture_loop_scope = session
 addopts =
     --cov pysaleryd --cov-report term-missing
     --verbose --timeout 30