Python3.12 compat tweaks, simplified scan() result handling.

Updated pyproject config with likely repo location.

Author: jmattsson

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "powersensor-local"
-version = "1.0.0"
+version = "1.0.1"
 description = "Network-local (non-cloud) interface for Powersensor devices"
 authors = [
   { name = "Jade Mattsson", email = "jmattsson@dius.com.au" },
@@ -16,9 +16,9 @@ classifiers = [
 ]
 
 [project.urls]
-Repository = "https://github.com/DiUS/powersensor-local.git"
-Homepage = "https://github.com/DiUS/powersensor-local"
-Issues = "https://github.com/DiUS/powersensor-local/issues"
+Repository = "https://github.com/DiUS/python-powersensor_local.git"
+Homepage = "https://github.com/DiUS/python-powersensor_local"
+Issues = "https://github.com/DiUS/python-powersensor_local/issues"
 
 [project.scripts]
 ps-events = "powersensor_local.events:app"

src/powersensor_local/devices.py

@@ -126,13 +126,13 @@ async def yourcallback(event: dict)
             }
         """
         self._event_cb = async_event_cb
-        await self._ps.scan(self._on_scanned)
+        await self._on_scanned(await self._ps.scan())
         self._timer = self._Timer(EXPIRY_CHECK_INTERVAL_S, self._on_timer)
 
     async def rescan(self):
         """Performs a fresh scan of the network to discover added devices,
         or devices which have changed their IP address for some reason."""
-        await self._ps.scan(self._on_scanned)
+        await self._on_scanned(await self._ps.scan())
 
     async def stop(self):
         """Stops the event streaming and disconnects from the devices.
@@ -165,7 +165,7 @@ async def _on_scanned(self, ips):
             }
             await self._event_cb(ev)
 
-        asyncio.create_task(self._ps.subscribe(self._on_msg))
+        await self._ps.subscribe(self._on_msg)
 
     async def _on_msg(self, obj):
         mac = obj.get('mac')
@@ -303,10 +303,11 @@ def __init__(self, interval_s, callback):
             self._terminate = False
             self._interval = interval_s
             self._callback = callback
-            asyncio.create_task(self._run())
+            self._task = asyncio.create_task(self._run())
 
         def terminate(self):
             self._terminate = True
+            self._task.cancel()
 
         async def _run(self):
             while not self._terminate:

src/powersensor_local/events.py

@@ -52,7 +52,7 @@ def handle_sigint(signum, frame):
         await asyncio.sleep(1)
 
 def app():
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
     loop.run_until_complete(main())
     loop.stop()
 

src/powersensor_local/listener.py

@@ -18,8 +18,10 @@ def __init__(self, bcast_addr='<broadcast>'):
         self._exiting = False
         self._bcast = bcast_addr
 
-    async def scan(self, completion_callback):
-        """Scans the local network for discoverable devices with a timeout."""
+    async def scan(self):
+        """Scans the local network for discoverable devices with a timeout.
+        Returns the list of IP addresses of the discovered gateways (plugs).
+        """
         self._known_addresses.clear()
         loop = asyncio.get_running_loop()
         transport, _ = await loop.create_datagram_endpoint(
@@ -37,7 +39,7 @@ async def scan(self, completion_callback):
             timeout -= 0.5
 
         transport.close()
-        await completion_callback(set(self._known_addresses.keys()))
+        return self._known_addresses.keys()
 
     def protocol_factory(self):
         return self

src/powersensor_local/rawfirehose.py

@@ -44,14 +44,15 @@ def handle_sigint(signum, frame):
     signal.signal(signal.SIGINT, handle_sigint)
 
     # Scan for devices and subscribe upon completion
-    await ps.scan(lambda ips: asyncio.create_task(ps.subscribe(on_msg)))
+    await ps.scan()
+    await ps.subscribe(on_msg)
 
     # Keep the event loop running until Ctrl+C is pressed
     while not exiting:
         await asyncio.sleep(1)
 
 def app():
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop()
     loop.run_until_complete(main())
     loop.stop()