xaal.lib 0.7.9__py3-none-any.whl → 0.7.11__py3-none-any.whl

xaal/lib/aioengine.py

@@ -36,7 +36,7 @@ class HookType(Enum):
 class Hook(object):
     __slots__ = ['type', 'func', 'args', 'kwargs']
 
-    def __init__(self, type_:HookType, func: core.FuncT, *args, **kwargs):
+    def __init__(self, type_: HookType, func: core.FuncT, *args, **kwargs):
         # func has to be a callable, but it can be a coroutine or a function
         self.type = type_
         self.func = func
@@ -58,7 +58,8 @@ class AsyncEngine(core.EngineMixin):
     ]
 
     def __init__(
-        self, address: str = config.address, port: int = config.port, hops: int = config.hops, key: bytes = config.key):
+        self, address: str = config.address, port: int = config.port, hops: int = config.hops, key: bytes = config.key
+    ):
         core.EngineMixin.__init__(self, address, port, hops, key)
 
         self.__txFifo = asyncio.Queue()  # tx msg fifo
@@ -167,7 +168,7 @@ class AsyncEngine(core.EngineMixin):
 
     async def handle_action_request(self, msg: 'Message', target: 'Device'):
         if msg.action is None:
-            return # should not happen, but pyright need this check
+            return  # should not happen, but pyright need this check
 
         try:
             result = await run_action(msg, target)
@@ -250,7 +251,8 @@ class AsyncEngine(core.EngineMixin):
         self.new_task(self.receive_task(), name='RecvQ')
         self.new_task(self.send_task(), name='SendQ')
         self.new_task(self.timer_task(), name='Timers')
-        self.new_task(console(locals()), name='Console')
+        if config.remote_console:
+            self.new_task(console(locals()), name='Console')
 
     def setup_alives_timer(self):
         # needed on stop-start sequence
@@ -259,7 +261,7 @@ class AsyncEngine(core.EngineMixin):
         # process alives every 10 seconds
         self.add_timer(self.process_alives, 10)
 
-    async def stop(self): # pyright: ignore
+    async def stop(self):  # pyright: ignore
         logger.info("Stopping engine")
         await self.run_hooks(HookType.stop)
         self.running_event.clear()
@@ -268,7 +270,6 @@ class AsyncEngine(core.EngineMixin):
         for task in self.all_tasks():
             if task != self._watchdog_task:
                 task.cancel()
-                await asyncio.sleep(0.1)
 
     def sigkill_handler(self, signal, frame):
         print("", end="\r")  # remove the uggly ^C
@@ -340,7 +341,7 @@ class AsyncEngine(core.EngineMixin):
         self.dump_hooks()
 
     def get_device(self, uuid: UUID) -> Optional['Device']:
-        # TODO:Check if this method is usefull 
+        # TODO:Check if this method is usefull
         for dev in self.devices:
             if dev.address == uuid:
                 return dev
@@ -391,7 +392,8 @@ async def console(locals=locals(), port: Optional[int] = None):
         # let's find a free port if not specified
         def find_free_port():
             import socketserver
-            with socketserver.TCPServer(('localhost', 0), None) as s: # pyright: ignore pyright reject the None here
+
+            with socketserver.TCPServer(('localhost', 0), None) as s:  # pyright: ignore pyright reject the None here
                 return s.server_address[1]
 
         port = find_free_port()
@@ -407,6 +409,8 @@ async def console(locals=locals(), port: Optional[int] = None):
     # start the console
     try:
         # debian with ipv6 disabled still state that localhost is ::1, which broke aioconsole
-        await aioconsole.start_interactive_server(host="127.0.0.1", port=port, factory=factory, banner=banner) # pyright: ignore
+        await aioconsole.start_interactive_server(
+            host="127.0.0.1", port=port, factory=factory, banner=banner
+        )  # pyright: ignore
     except OSError:
         logger.warning("Unable to run console")

xaal/lib/core.py

@@ -56,7 +56,7 @@ class EngineMixin(object):
     __slots__ = ['devices', 'timers', 'subscribers', 'msg_filter', '_attributesChange', 'network', 'msg_factory']
 
     def __init__(self, address: str, port: int, hops: int, key: bytes):
-        self.devices:list[Device] = []  # list of devices / use (un)register_devices()
+        self.devices: list[Device] = []  # list of devices / use (un)register_devices()
         self.timers: list[Timer] = []  # functions to call periodic
         self.subscribers: list[SubFuncT] = []  # message receive workflow
         self.msg_filter = None  # message filter
@@ -134,7 +134,7 @@ class EngineMixin(object):
         self.queue_msg(msg)
         dev.update_alive()
 
-    def send_is_alive(self, dev: 'Device', targets: list = [ALIVE_ADDR,], dev_types: list = ["any.any", ] ):
+    def send_is_alive(self, dev: 'Device', targets: list = [ALIVE_ADDR], dev_types: list = ["any.any"]):
         """Send a is_alive message, w/ dev_types filtering"""
         body = {'dev_types': dev_types}
         self.send_request(dev, targets, MessageAction.IS_ALIVE.value, body)

xaal/lib/helpers.py

@@ -7,7 +7,7 @@ import logging
 import logging.handlers
 import os
 import time
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 import coloredlogs
 from decorator import decorator
@@ -40,14 +40,13 @@ def set_console_title(value: str):
     # set xterm title
     print("\x1b]0;xAAL => %s\x07" % value, end="\r")
 
-
-def setup_console_logger(level: str = config.log_level):
+def setup_console_logger(level: Union[str, int] = config.log_level):
     fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s"
     # fmt = '[%(name)s] %(funcName)s %(levelname)s: %(message)s'
     coloredlogs.install(level=level, fmt=fmt)
 
 
-def setup_file_logger(name: str, level: str = config.log_level, filename: Optional[str] = None):
+def setup_file_logger(name: str, level: Union[str, int] = config.log_level, filename: Optional[str] = None):
     filename = filename or os.path.join(config.log_path, "%s.log" % name)
     formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
     handler = logging.handlers.RotatingFileHandler(filename, "a", 10000, 1, "utf8")

{xaal.lib-0.7.9.dist-info → xaal.lib-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xaal.lib
-Version: 0.7.9
+Version: 0.7.11
 Summary: Official Python stack for xAAL protocol
 Author-email: Jerome Kerdreux <Jerome.Kerdreux@imt-atlantique.fr>
 License: GPL License

{xaal.lib-0.7.9.dist-info → xaal.lib-0.7.11.dist-info}/RECORD

@@ -1,22 +1,22 @@
 xaal/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 xaal/lib/__init__.py,sha256=yI2lG7uSbedjp1h2FCdcAUGzkyuJxYyNbK13SHvwNew,491
 xaal/lib/__main__.py,sha256=xsVqqoIh3UeJIXxeexSfmGSUP4YxUcibdZExjEzk4lE,30
-xaal/lib/aioengine.py,sha256=3l5wCRV9ZySfJOpKxDD_yO81NtL1v246mMveR28q9ms,13959
+xaal/lib/aioengine.py,sha256=u7P7tlSYg1X4TlfprgtMGtvLudIqWNPDMbn7NZoq7yA,13988
 xaal/lib/aiohelpers.py,sha256=O1oQX8XHxuvCL1ual509chjoR52AwV_ZGqeAbSlvFrE,1010
 xaal/lib/aionetwork.py,sha256=WSYwxwEHJaQDlfVocX8ow2tAtssWcH9LxPAazx4Qx_o,2547
 xaal/lib/bindings.py,sha256=V77bFfeVFj0GyGuwH8b4k7qSyA7zApZYJ8QTjq_3DwI,2140
 xaal/lib/cbor.py,sha256=XX0zgTU0uwQD9QXctGLT4lEISohi1whMUdyWKMevH8c,1647
 xaal/lib/config.py,sha256=KR28xC8NGyGjvFD9QcAoWfwyf7xcXDEP7aSenNmaRzM,3019
-xaal/lib/core.py,sha256=WUdG1k7H589FpVbTkotHX574KiSYISZ622eWy3Af3B0,11985
+xaal/lib/core.py,sha256=IBTrCCZhBKKYOuZWImxETbLZ5_upH5MRoIKKBXYEXvU,11982
 xaal/lib/devices.py,sha256=CaUH3i_xTQD0W63fW93glI-Ck2_YVvMpdn8y7BqQqzw,10696
 xaal/lib/engine.py,sha256=oFiBIma5M6Qv0W2wMmWdyCRuu7BwqR-DRUvqWfajh-A,8141
 xaal/lib/exceptions.py,sha256=4cKKkDDcZIPyVrLv3Q19apbn_pIqDGqXb1s1d2sZnpI,573
-xaal/lib/helpers.py,sha256=lPtEwP82Ssd9igmxJGq2UzmPVCyRBMHULBBVyAH4Blg,2827
+xaal/lib/helpers.py,sha256=Qw7EMk7ssF85KvOuPJYzjtjavlqBi-ZUoSZH5iY0ts4,2857
 xaal/lib/messages.py,sha256=FpdIZ5flzUfgXaVVptv_tirvq5jL__mjUGimExwK9Z0,12388
 xaal/lib/network.py,sha256=oHpyHXkFT31RS6UKMZstC33dgC_sTtYKzfpgugY26oU,3277
 xaal/lib/test.py,sha256=GTjIwdqRupdqO4lNhAnc4iH0azfCCMN9BEpJpgAUors,2944
 xaal/lib/tools.py,sha256=Py_RUmLcOVjYDcm7muQ6jZPJLdOKzBfOKstX73K4Jqg,4157
-xaal.lib-0.7.9.dist-info/METADATA,sha256=sqdfCDzjK0rQ-rmIYzAoK3-e62injIc0HOgpapB0Fe4,4350
-xaal.lib-0.7.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-xaal.lib-0.7.9.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
-xaal.lib-0.7.9.dist-info/RECORD,,
+xaal.lib-0.7.11.dist-info/METADATA,sha256=btOq5w5CNlRbMZ_-5zkMm9H94Epvp9DvhRTrRuhI6Ds,4351
+xaal.lib-0.7.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xaal.lib-0.7.11.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
+xaal.lib-0.7.11.dist-info/RECORD,,

{xaal.lib-0.7.9.dist-info → xaal.lib-0.7.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any