xaal.lib 0.7.10__tar.gz → 0.7.12__tar.gz

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: xaal.lib
-Version: 0.7.10
+Version: 0.7.12
 Summary: Official Python stack for xAAL protocol
 Author-email: Jerome Kerdreux <Jerome.Kerdreux@imt-atlantique.fr>
 License: GPL License
-Project-URL: Homepage, https://recherche.imt-atlantique.fr/xaal/
-Project-URL: Documentation, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/entry/code/Python/branches/0.7/libs/lib/README.rst
-Project-URL: Source, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/show/code/Python/branches/0.7/libs/lib
+Project-URL: Homepage, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/packages.rst
+Project-URL: Documentation, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/libs/lib/README.rst
+Project-URL: Source, https://gitlab.imt-atlantique.fr/xaal/code/python/-/tree/main/libs/lib
 Keywords: xaal,home-automation
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xaal.lib"
-version = "0.7.10"
+version = "0.7.12"
 description = "Official Python stack for xAAL protocol"
 readme = "README.rst"
 authors = [
@@ -26,9 +26,9 @@ dependencies = [
 
 
 [project.urls]
-Homepage = "https://recherche.imt-atlantique.fr/xaal/"
-Documentation = "https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/entry/code/Python/branches/0.7/libs/lib/README.rst"
-Source = "https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/show/code/Python/branches/0.7/libs/lib"
+Homepage = "https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/packages.rst"
+Documentation = "https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/libs/lib/README.rst"
+Source = "https://gitlab.imt-atlantique.fr/xaal/code/python/-/tree/main/libs/lib"
 
 
 [tool.ruff]

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/tests/test_message.py

@@ -6,7 +6,7 @@ from xaal.lib import tools,cbor
 from xaal.lib.exceptions import MessageParserError  
 
 
-def test_message():
+def fake_message():
     msg = Message()
     msg.msg_type = MessageType.REQUEST
     msg.source = tools.get_random_uuid()
@@ -16,7 +16,7 @@ def test_message():
     msg.timestamp = messages.build_timestamp()
     return msg
 
-def test_factory():
+def fake_factory():
     # create the factory
     cypher = tools.pass2key('test')
     mf = MessageFactory(cypher)
@@ -39,20 +39,20 @@ class TestMessage(unittest.TestCase):
             msg.targets = ["foo"]
 
     def test_display(self):
-        msg = test_message()
+        msg = fake_message()
         print()
         # dump
         msg.dump()
         print(msg)
 
     def test_targets_as_string(self):
-        msg = test_message()
+        msg = fake_message()
         addr = tools.get_random_uuid()
         msg.targets = [addr]
         self.assertEqual(msg.targets_as_string(), [str(addr),] )
 
     def test_is_request(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 1
         self.assertTrue(msg.is_request())
         msg.msg_type = 2
@@ -60,21 +60,21 @@ class TestMessage(unittest.TestCase):
 
 
     def test_is_reply(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 2
         self.assertTrue(msg.is_reply())
         msg.msg_type = 1
         self.assertFalse(msg.is_reply()) 
 
     def test_is_notify(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 0
         self.assertTrue(msg.is_notify())
         msg.msg_type = 1
         self.assertFalse(msg.is_notify())
 
     def test_is_alive(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 0
         msg.action = 'alive'
         self.assertTrue(msg.is_alive())
@@ -82,7 +82,7 @@ class TestMessage(unittest.TestCase):
         self.assertFalse(msg.is_alive())
 
     def test_is_request_isalive(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 1
         msg.action = 'is_alive'
         self.assertTrue(msg.is_request_isalive())
@@ -90,7 +90,7 @@ class TestMessage(unittest.TestCase):
         self.assertFalse(msg.is_request_isalive())
 
     def test_is_attributes_change(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 0
         msg.action = 'attributes_change'
         self.assertTrue(msg.is_attributes_change())
@@ -98,7 +98,7 @@ class TestMessage(unittest.TestCase):
         self.assertFalse(msg.is_attributes_change())
 
     def test_is_get_attribute_reply(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 2
         msg.action = 'get_attributes'
         self.assertTrue(msg.is_get_attribute_reply())
@@ -106,7 +106,7 @@ class TestMessage(unittest.TestCase):
         self.assertFalse(msg.is_get_attribute_reply())
     
     def test_is_get_description_reply(self):
-        msg = test_message()
+        msg = fake_message()
         msg.msg_type = 2
         msg.action = 'get_description'
         self.assertTrue(msg.is_get_description_reply())
@@ -117,9 +117,9 @@ class TestMessage(unittest.TestCase):
 class TestMessageFactory(unittest.TestCase):
 
     def test_encode_decode(self):
-        msg1 = test_message()
+        msg1 = fake_message()
 
-        mf = test_factory()
+        mf = fake_factory()
         data = mf.encode_msg(msg1)
         msg2 = mf.decode_msg(data)
 
@@ -134,14 +134,14 @@ class TestMessageFactory(unittest.TestCase):
 
     def test_build_alive_for(self):
         dev = Device("test.basic",tools.get_random_uuid())
-        mf  = test_factory()
+        mf  = fake_factory()
         data = mf.build_alive_for(dev)
         msg  = mf.decode_msg(data)
         self.assertTrue(msg.is_alive())
 
     def test_build_error_msg(self):
         dev = Device("test.basic",tools.get_random_uuid())
-        mf  = test_factory()
+        mf  = fake_factory()
         data = mf.build_error_msg(dev, 500,"Internal Error")
         msg  = mf.decode_msg(data)
         self.assertTrue(msg.is_notify())
@@ -149,13 +149,13 @@ class TestMessageFactory(unittest.TestCase):
         self.assertEqual(msg.body['code'], 500)
 
     def test_decode_cbor_parse_error(self):
-        mf = test_factory()
+        mf = fake_factory()
         with self.assertRaises(MessageParserError):
             mf.decode_msg("not_cbor")
 
     def test_decode_cbor_fields(self):
         # test missing fields
-        mf = test_factory()
+        mf = fake_factory()
         l = [7,12346.5,[]]
         data=cbor.dumps(l)
         # IndexError
@@ -163,17 +163,17 @@ class TestMessageFactory(unittest.TestCase):
             mf.decode_msg(data)
 
     def test_decode_filter_func(self):
-        msg1 = test_message()
+        msg1 = fake_message()
         filter = lambda msg: False
-        mf = test_factory()
+        mf = fake_factory()
         data = mf.encode_msg(msg1)
         msg2 = mf.decode_msg(data,filter_func=filter)
         self.assertEqual(msg2, None)
 
     def test_replay_error(self):
-        mf = test_factory()
+        mf = fake_factory()
         # too young
-        msg = test_message()
+        msg = fake_message()
         target = (msg.timestamp[0] + 60*5, msg.timestamp[1])
         msg.timestamp = target
         data = mf.encode_msg(msg)
@@ -188,8 +188,8 @@ class TestMessageFactory(unittest.TestCase):
             mf.decode_msg(data)
 
     def test_decode_sanity_check(self):
-        mf = test_factory()
-        msg = test_message()
+        mf = fake_factory()
+        msg = fake_message()
         # WARNING: Only testing dev_type because alterring source is impossible
         # without rewriting a big chunk of encoding here
         msg.dev_type = "test"
@@ -198,8 +198,8 @@ class TestMessageFactory(unittest.TestCase):
             mf.decode_msg(data)
 
     def test_decode_nopayload(self):
-        mf = test_factory()
-        msg = test_message()
+        mf = fake_factory()
+        msg = fake_message()
         data = mf.encode_msg(msg)
         l=cbor.loads(data)
         l.pop()
@@ -208,8 +208,8 @@ class TestMessageFactory(unittest.TestCase):
             mf.decode_msg(data)
 
     def test_decode_decrypt_error(self):
-        mf = test_factory()
-        msg = test_message()
+        mf = fake_factory()
+        msg = fake_message()
         data = mf.encode_msg(msg)
         mf.cipher_key = tools.pass2key('bar')
         with self.assertRaises(MessageParserError):

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/xaal/lib/aioengine.py

@@ -268,9 +268,8 @@ class AsyncEngine(core.EngineMixin):
         self.started_event.clear()
         # cancel all tasks
         for task in self.all_tasks():
-            if task != self._watchdog_task:
+            if task != self._watchdog_task and not task.cancelled():
                 task.cancel()
-                await asyncio.sleep(0.1)
 
     def sigkill_handler(self, signal, frame):
         print("", end="\r")  # remove the uggly ^C

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/xaal/lib/config.py

@@ -87,9 +87,12 @@ class Config:
         return False
 
 
+config_dir = os.environ.get("XAAL_CONF_DIR", None)
 config = Config()
-try:
-    config.load()
-except Exception as e:
-    print(e)
-    sys.exit(-1)
+
+if config_dir is None or config_dir != '':
+    try:
+        config.load()
+    except Exception as e:
+        print(e)
+        sys.exit(-1)

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/xaal/lib/devices.py

@@ -247,21 +247,21 @@ class Device(object):
         r.append(['address', self.address])
         for k, v in self._get_description().items():
             r.append([k, v])
-        print(tabulate(r, tablefmt='fancy_grid'))
+        print(tabulate(r, tablefmt='psql'))
 
         # attributes
         if len(self._get_attributes()) > 0:
             r = []
             for k, v in self._get_attributes().items():
                 r.append([k, str(v)])
-            print(tabulate(r, tablefmt='fancy_grid'))
+            print(tabulate(r, tablefmt='psql'))
 
         # methods
         if len(self.methods) > 0:
             r = []
             for k, v in self.methods.items():
                 r.append([k, v.__name__])
-            print(tabulate(r, tablefmt='fancy_grid'))
+            print(tabulate(r, tablefmt='psql'))
 
     def __repr__(self) -> str:
         return f"<xaal.Device {id(self):x} {self.address} {self.dev_type}>"

{xaal_lib-0.7.10 → xaal_lib-0.7.12}/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
@@ -41,13 +41,14 @@ def set_console_title(value: str):
     print("\x1b]0;xAAL => %s\x07" % value, end="\r")
 
 
-def setup_console_logger(level: str = config.log_level):
-    fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s"
+def setup_console_logger(level: Union[str, int] = config.log_level):
+    # fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s"
+    fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(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.10 → xaal_lib-0.7.12}/xaal.lib.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: xaal.lib
-Version: 0.7.10
+Version: 0.7.12
 Summary: Official Python stack for xAAL protocol
 Author-email: Jerome Kerdreux <Jerome.Kerdreux@imt-atlantique.fr>
 License: GPL License
-Project-URL: Homepage, https://recherche.imt-atlantique.fr/xaal/
-Project-URL: Documentation, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/entry/code/Python/branches/0.7/libs/lib/README.rst
-Project-URL: Source, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/show/code/Python/branches/0.7/libs/lib
+Project-URL: Homepage, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/packages.rst
+Project-URL: Documentation, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/libs/lib/README.rst
+Project-URL: Source, https://gitlab.imt-atlantique.fr/xaal/code/python/-/tree/main/libs/lib
 Keywords: xaal,home-automation
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules