xaal.lib 0.7.2__tar.gz → 0.7.3__tar.gz

{xaal_lib-0.7.2 → xaal_lib-0.7.3}/PKG-INFO

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: xaal.lib
-Version: 0.7.2
-Summary: xaal.lib is the official Python stack of xAAL protocol dedicated to home automation systems
+Version: 0.7.3
+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
 Keywords: xaal,home-automation
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Home Automation
 Description-Content-Type: text/x-rst
 Requires-Dist: cbor2==5.4.2
 Requires-Dist: pysodium
@@ -20,7 +24,7 @@ Requires-Dist: aioconsole
 xaal.lib
 ========
 **xaal.lib** is the official Python stack to develop home-automation devices and gateways
-with the xAAL protocol. For a full description of the protocol check out 
+with the xAAL protocol. For a full description of the protocol check out
 http://recherche.imt-atlantique.fr/xaal/
 
 
@@ -38,8 +42,8 @@ xaal.lib depends on :
 
 Install
 ~~~~~~~
-Please refer to the official `full documentation to install the lib in a virtualenv 
-<https://redmine.telecom-bretagne.eu/svn/xaal/code/Python/branches/0.7/README.html>`_
+Please refer to the official `full documentation to install the lib in a virtualenv
+<https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7/README.html>`_
 
 
 Usage
@@ -52,7 +56,7 @@ To receive / parse / display incoming xAAL messages, you can simply try somethin
 this:
 
 .. code-block:: python
-   
+
    from xaal.lib import Engine
 
    def display(msg):
@@ -61,31 +65,31 @@ this:
    eng = Engine()
    eng.subscribe(display)
    eng.run()
-   
+
 The Engine will call the display function every time it receive a xAAL message.
 
-Let's take a look at a simple lamp device : 
+Let's take a look at a simple lamp device :
 
 .. code-block:: python
-   
+
    from xaal.lib import Device,Engine,tools
-   
+
    # create and configure the lamp device, with a random address
-   dev = Device("lamp.basic", tools.get_random_uuid()) 
+   dev = Device("lamp.basic", tools.get_random_uuid())
    dev.product_id = 'Dummy Lamp'
    dev.url  = 'http://www.acme.org'
    dev.info = 'My fake lamp'
 
    # add an xAAL attribute 'light'
    light = dev.new_attribute('light')
-   
+
    # declare two device methods ON & OFF
    def on():
        light.value = True
 
    def off():
        light.value = False
-       
+
    dev.add_method('turn_on',on)
    dev.add_method('turn_off',off)
 
@@ -93,8 +97,8 @@ Let's take a look at a simple lamp device :
    eng = Engine()
    eng.add_device(dev)
    eng.run()
-   
-   
+
+
 FAQ
 ~~~
 The core engine run forever so how can I use it in webserver, GUI or to develop device
@@ -103,17 +107,17 @@ exactly know what's going on. Anyways, you have several options to fix this issu
 
 * You can use you own loop and periodically call *eng.loop()*
   for example, you can do something like this:
-  
+
   .. code:: python
-     
+
      while 1:
          do_some_stuff()
          eng.loop()
 
 * You can use a engine timer, to perform some stuff.
-  
+
   .. code:: python
-     
+
      def read_io():
          pass
 
@@ -126,6 +130,5 @@ exactly know what's going on. Anyways, you have several options to fix this issu
   *coroutines* in device methods, timers functions and callbacks. It provides additionals features
   like the *on_start* and *on_stop* callbacks.
 
-* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at 
-  apps/rest for a simple greenlet example. 
-  
+* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at
+  apps/rest for a simple greenlet example.

{xaal_lib-0.7.2 → xaal_lib-0.7.3}/README.rst

@@ -2,7 +2,7 @@
 xaal.lib
 ========
 **xaal.lib** is the official Python stack to develop home-automation devices and gateways
-with the xAAL protocol. For a full description of the protocol check out 
+with the xAAL protocol. For a full description of the protocol check out
 http://recherche.imt-atlantique.fr/xaal/
 
 
@@ -20,8 +20,8 @@ xaal.lib depends on :
 
 Install
 ~~~~~~~
-Please refer to the official `full documentation to install the lib in a virtualenv 
-<https://redmine.telecom-bretagne.eu/svn/xaal/code/Python/branches/0.7/README.html>`_
+Please refer to the official `full documentation to install the lib in a virtualenv
+<https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7/README.html>`_
 
 
 Usage
@@ -34,7 +34,7 @@ To receive / parse / display incoming xAAL messages, you can simply try somethin
 this:
 
 .. code-block:: python
-   
+
    from xaal.lib import Engine
 
    def display(msg):
@@ -43,31 +43,31 @@ this:
    eng = Engine()
    eng.subscribe(display)
    eng.run()
-   
+
 The Engine will call the display function every time it receive a xAAL message.
 
-Let's take a look at a simple lamp device : 
+Let's take a look at a simple lamp device :
 
 .. code-block:: python
-   
+
    from xaal.lib import Device,Engine,tools
-   
+
    # create and configure the lamp device, with a random address
-   dev = Device("lamp.basic", tools.get_random_uuid()) 
+   dev = Device("lamp.basic", tools.get_random_uuid())
    dev.product_id = 'Dummy Lamp'
    dev.url  = 'http://www.acme.org'
    dev.info = 'My fake lamp'
 
    # add an xAAL attribute 'light'
    light = dev.new_attribute('light')
-   
+
    # declare two device methods ON & OFF
    def on():
        light.value = True
 
    def off():
        light.value = False
-       
+
    dev.add_method('turn_on',on)
    dev.add_method('turn_off',off)
 
@@ -75,8 +75,8 @@ Let's take a look at a simple lamp device :
    eng = Engine()
    eng.add_device(dev)
    eng.run()
-   
-   
+
+
 FAQ
 ~~~
 The core engine run forever so how can I use it in webserver, GUI or to develop device
@@ -85,17 +85,17 @@ exactly know what's going on. Anyways, you have several options to fix this issu
 
 * You can use you own loop and periodically call *eng.loop()*
   for example, you can do something like this:
-  
+
   .. code:: python
-     
+
      while 1:
          do_some_stuff()
          eng.loop()
 
 * You can use a engine timer, to perform some stuff.
-  
+
   .. code:: python
-     
+
      def read_io():
          pass
 
@@ -108,6 +108,5 @@ exactly know what's going on. Anyways, you have several options to fix this issu
   *coroutines* in device methods, timers functions and callbacks. It provides additionals features
   like the *on_start* and *on_stop* callbacks.
 
-* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at 
-  apps/rest for a simple greenlet example. 
-  
+* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at
+  apps/rest for a simple greenlet example.

xaal_lib-0.7.3/pyproject.toml

@@ -0,0 +1,31 @@
+[project]
+name = "xaal.lib"
+version = "0.7.3"
+description = "Official Python stack for xAAL protocol"
+readme = "README.rst"
+authors = [
+    { name = "Jerome Kerdreux", email = "Jerome.Kerdreux@imt-atlantique.fr" },
+]
+license = { text = "GPL License" }
+classifiers = [
+    "Programming Language :: Python",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Home Automation",
+]
+
+keywords = ['xaal', 'home-automation']
+dependencies = [
+    'cbor2==5.4.2',
+    'pysodium',
+    'configobj',
+    'coloredlogs',
+    'decorator',
+    'tabulate',
+    'aioconsole',
+]
+
+
+[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"

{xaal_lib-0.7.2 → xaal_lib-0.7.3}/xaal/lib/cbor.py

@@ -1,13 +1,13 @@
 from io import BytesIO
 import cbor2
 from cbor2 import CBORTag
-# from cbor2 import CBORDecoder
-from cbor2.decoder import CBORDecoder
+from cbor2 import CBORDecoder
+# from cbor2.decoder import CBORDecoder
 
 from . import bindings
 
 # ugly patch to remove default UUID decodeur
-cbor2.decoder.semantic_decoders.pop(37)
+cbor2._decoder.semantic_decoders.pop(37)
 
 
 def tag_hook(decoder, tag, shareable_index=None):
@@ -17,6 +17,11 @@ def tag_hook(decoder, tag, shareable_index=None):
         return bindings.URL(tag.value)
     return tag
 
+def object_hook(decoder, data):
+    #print("hook [%s]" % data)
+    return data
+
+
 def default_encoder(encoder, value):
     if isinstance(value,bindings.UUID):
         encoder.encode(CBORTag(37, value.bytes))
@@ -29,7 +34,7 @@ def dumps(obj, **kwargs):
 
 def loads(payload, **kwargs):
     #return cbor2.loads(payload,tag_hook=tag_hook,**kwargs)
-    return _loads(payload,tag_hook=tag_hook,**kwargs)
+    return _loads(payload,tag_hook=tag_hook,object_hook=object_hook,**kwargs)
 
 def _loads(s, **kwargs):
     with BytesIO(s) as fp:

{xaal_lib-0.7.2 → xaal_lib-0.7.3}/xaal.lib.egg-info/PKG-INFO

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: xaal.lib
-Version: 0.7.2
-Summary: xaal.lib is the official Python stack of xAAL protocol dedicated to home automation systems
+Version: 0.7.3
+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
 Keywords: xaal,home-automation
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Home Automation
 Description-Content-Type: text/x-rst
 Requires-Dist: cbor2==5.4.2
 Requires-Dist: pysodium
@@ -20,7 +24,7 @@ Requires-Dist: aioconsole
 xaal.lib
 ========
 **xaal.lib** is the official Python stack to develop home-automation devices and gateways
-with the xAAL protocol. For a full description of the protocol check out 
+with the xAAL protocol. For a full description of the protocol check out
 http://recherche.imt-atlantique.fr/xaal/
 
 
@@ -38,8 +42,8 @@ xaal.lib depends on :
 
 Install
 ~~~~~~~
-Please refer to the official `full documentation to install the lib in a virtualenv 
-<https://redmine.telecom-bretagne.eu/svn/xaal/code/Python/branches/0.7/README.html>`_
+Please refer to the official `full documentation to install the lib in a virtualenv
+<https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7/README.html>`_
 
 
 Usage
@@ -52,7 +56,7 @@ To receive / parse / display incoming xAAL messages, you can simply try somethin
 this:
 
 .. code-block:: python
-   
+
    from xaal.lib import Engine
 
    def display(msg):
@@ -61,31 +65,31 @@ this:
    eng = Engine()
    eng.subscribe(display)
    eng.run()
-   
+
 The Engine will call the display function every time it receive a xAAL message.
 
-Let's take a look at a simple lamp device : 
+Let's take a look at a simple lamp device :
 
 .. code-block:: python
-   
+
    from xaal.lib import Device,Engine,tools
-   
+
    # create and configure the lamp device, with a random address
-   dev = Device("lamp.basic", tools.get_random_uuid()) 
+   dev = Device("lamp.basic", tools.get_random_uuid())
    dev.product_id = 'Dummy Lamp'
    dev.url  = 'http://www.acme.org'
    dev.info = 'My fake lamp'
 
    # add an xAAL attribute 'light'
    light = dev.new_attribute('light')
-   
+
    # declare two device methods ON & OFF
    def on():
        light.value = True
 
    def off():
        light.value = False
-       
+
    dev.add_method('turn_on',on)
    dev.add_method('turn_off',off)
 
@@ -93,8 +97,8 @@ Let's take a look at a simple lamp device :
    eng = Engine()
    eng.add_device(dev)
    eng.run()
-   
-   
+
+
 FAQ
 ~~~
 The core engine run forever so how can I use it in webserver, GUI or to develop device
@@ -103,17 +107,17 @@ exactly know what's going on. Anyways, you have several options to fix this issu
 
 * You can use you own loop and periodically call *eng.loop()*
   for example, you can do something like this:
-  
+
   .. code:: python
-     
+
      while 1:
          do_some_stuff()
          eng.loop()
 
 * You can use a engine timer, to perform some stuff.
-  
+
   .. code:: python
-     
+
      def read_io():
          pass
 
@@ -126,6 +130,5 @@ exactly know what's going on. Anyways, you have several options to fix this issu
   *coroutines* in device methods, timers functions and callbacks. It provides additionals features
   like the *on_start* and *on_stop* callbacks.
 
-* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at 
-  apps/rest for a simple greenlet example. 
-  
+* Use an alternate coroutine lib, you can use **gevent** or **greenlet** for example. Look at
+  apps/rest for a simple greenlet example.

xaal_lib-0.7.2/pyproject.toml

@@ -1,11 +0,0 @@
-[project]
-name = "xaal.lib"
-version = "0.7.2"
-description = "xaal.lib is the official Python stack of xAAL protocol dedicated to home automation systems"
-readme = "README.rst"
-authors = [ { name = "Jerome Kerdreux", email = "Jerome.Kerdreux@imt-atlantique.fr" } ]
-license = { text = "GPL License"}
-classifiers = ['Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules']
-keywords = ['xaal', 'home-automation']
-dependencies = ['cbor2==5.4.2', 'pysodium', 'configobj', 'coloredlogs', 'decorator', 'tabulate', 'aioconsole']
-