motorcortex-python 0.23.2__tar.gz → 0.23.3__tar.gz

{motorcortex_python-0.23.2/motorcortex_python.egg-info → motorcortex_python-0.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: motorcortex-python
-Version: 0.23.2
+Version: 0.23.3
 Summary: Python bindings for Motorcortex Engine
 Home-page: https://www.motorcortex.io
 Author: Alexey Zakharov

{motorcortex_python-0.23.2 → motorcortex_python-0.23.3}/motorcortex/message_types.py

@@ -59,56 +59,56 @@ class PrimitiveTypes(object):
         self.__decoder = None
         self.__encoder = None
         self.__prepare = None
-        if (type_name == "BOOL"):
-            self.__decoder = lambda len, val: struct.unpack('%db' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%db' % len, *val)
+        if type_name == "BOOL":
+            self.__decoder = lambda length, val: struct.unpack('%db' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%db' % length, *val)
             self.__prepare = lambda val: [bool(x) for x in val.split(",")]
-        elif (type_name == "DOUBLE"):
-            self.__decoder = lambda len, val: struct.unpack('%dd' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dd' % len, *val)
+        elif type_name == "DOUBLE":
+            self.__decoder = lambda length, val: struct.unpack('%dd' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dd' % length, *val)
             self.__prepare = lambda val: [float(x) for x in val.split(",")]
-        elif (type_name == "FLOAT"):
-            self.__decoder = lambda len, val: struct.unpack('%df' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%df' % len, *val)
+        elif type_name == "FLOAT":
+            self.__decoder = lambda length, val: struct.unpack('%df' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%df' % length, *val)
             self.__prepare = lambda val: [float(x) for x in val.split(",")]
-        elif (type_name == "INT8"):
-            self.__decoder = lambda len, val: struct.unpack('%db' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%db' % len, *val)
+        elif type_name == "INT8":
+            self.__decoder = lambda length, val: struct.unpack('%db' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%db' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0x7f for x in val.split(",")]
-        elif (type_name == "UINT8"):
-            self.__decoder = lambda len, val: struct.unpack('%dB' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dB' % len, *val)
+        elif type_name == "UINT8":
+            self.__decoder = lambda length, val: struct.unpack('%dB' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dB' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0xff for x in val.split(",")]
-        elif (type_name == "INT16"):
-            self.__decoder = lambda len, val: struct.unpack('%dh' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dh' % len, *val)
+        elif type_name == "INT16":
+            self.__decoder = lambda length, val: struct.unpack('%dh' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dh' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0x7fff for x in val.split(",")]
-        elif (type_name == "UINT16"):
-            self.__decoder = lambda len, val: struct.unpack('%dH' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dH' % len, *val)
+        elif type_name == "UINT16":
+            self.__decoder = lambda length, val: struct.unpack('%dH' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dH' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0xffff for x in val.split(",")]
-        elif (type_name == "INT32"):
-            self.__decoder = lambda len, val: struct.unpack('%di' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%di' % len, *val)
+        elif type_name == "INT32":
+            self.__decoder = lambda length, val: struct.unpack('%di' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%di' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0x7fffffff for x in val.split(",")]
-        elif (type_name == "UINT32"):
-            self.__decoder = lambda len, val: struct.unpack('%dI' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dI' % len, *val)
+        elif type_name == "UINT32":
+            self.__decoder = lambda length, val: struct.unpack('%dI' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dI' % length, *val)
             self.__prepare = lambda val: [int(float(x)) & 0xffffffff for x in val.split(",")]
-        elif (type_name == "INT64"):
-            self.__decoder = lambda len, val: struct.unpack('%dq' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dq' % len, *val)
+        elif type_name == "INT64":
+            self.__decoder = lambda length, val: struct.unpack('%dq' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dq' % length, *val)
             self.__prepare = lambda val: [int(float(x)) for x in val.split(",")]
-        elif (type_name == "UINT64"):
-            self.__decoder = lambda len, val: struct.unpack('%dQ' % len, val)
-            self.__encoder = lambda len, val: struct.pack('%dQ' % len, *val)
+        elif type_name == "UINT64":
+            self.__decoder = lambda length, val: struct.unpack('%dQ' % length, val)
+            self.__encoder = lambda length, val: struct.pack('%dQ' % length, *val)
             self.__prepare = lambda val: [int(float(x)) for x in val.split(",")]
-        elif (type_name == "STRING"):
-            self.__decoder = lambda len, val: val.split(b'\0')[0].decode()
-            self.__encoder = lambda len, val: (val + '\0').encode()
-        elif (type_name == "USER_TYPE"):
-            self.__decoder = lambda len, val: val
-            self.__encoder = lambda len, val: val
+        elif type_name == "STRING":
+            self.__decoder = lambda length, val: val.split(b'\0')[0].decode()
+            self.__encoder = lambda length, val: (val + '\0').encode()
+        elif type_name == "USER_TYPE":
+            self.__decoder = lambda length, val: val
+            self.__encoder = lambda length, val: val
 
     def decode(self, value, number_of_elements):
         val = self.__decoder(number_of_elements, value)

{motorcortex_python-0.23.2 → motorcortex_python-0.23.3}/motorcortex/request.py

@@ -28,27 +28,6 @@ class ConnectionState(Enum):
     DISCONNECTING = 4
     DISCONNECTED = 5
 
-
-class Base64Encoder(json.JSONEncoder):
-    # pylint: disable=method-hidden
-    encoding = 'utf-8'
-
-    def default(self, o):
-        if isinstance(o, bytes):
-            return base64.b64encode(o).decode(Base64Encoder.encoding)
-        return json.JSONEncoder.default(self, o)
-
-
-class Base64Decoder(json.JSONDecoder):
-    # pylint: disable=method-hidden
-    encoding = 'utf-8'
-
-    def default(self, o):
-        if isinstance(o, bytes):
-            return base64.b64decode(o).encode(Base64Decoder.decode())
-        return json.Base64Decoder.default(self, o)
-
-
 class Request(object):
 
     def __init__(self, protobuf_types, parameter_tree):
@@ -81,14 +60,14 @@ class Request(object):
         self.__connected_lock = Condition()  # Create Condition instead of Queue
         self.__connected = False  # Initialize state
 
-        def pre_connect_cb(pipe):
+        def pre_connect_cb(_pipe):
             with self.__connected_lock:
                 self.__connected = True
                 self.__connection_state = ConnectionState.CONNECTION_OK
                 self.__callback_handler.notify(self, self.connectionState())
                 self.__connected_lock.notify_all()  # Wake up all waiting threads
 
-        def post_remove_cb(pipe):
+        def post_remove_cb(_pipe):
             with self.__connected_lock:
                 if self.__connection_state == ConnectionState.DISCONNECTING:
                     self.__connection_state = ConnectionState.DISCONNECTED
@@ -155,7 +134,7 @@ class Request(object):
         """Request a parameter tree hash from the server.
 
             Returns:
-                Reply(ParameterTreeMsg): A Promise, which resolves when parameter tree hash is received or fails
+                Reply(ParameterTreeMsg): A Promise, which resolves when a parameter tree hash is received or fails
                 otherwise. ParameterTreeHashMsg message has a status field to check the status of the operation.
 
             Examples:
@@ -188,14 +167,14 @@ class Request(object):
                                         self.getParameterTreeHash(), self.__protobuf_types, self.__socket))
 
     def save(self, path, file_name):
-        """Request a server to save a parameter tree to file.
+        """Request a server to save a parameter tree to a file.
 
             Args:
                 path(str): path where to save
                 file_name(str): file name
 
             Returns:
-                Reply(StatusMsg): A promise, which resolves when save operation is completed,
+                Reply(StatusMsg): A promise, which resolves when the save operation is completed,
                 fails otherwise.
 
         """
@@ -218,7 +197,7 @@ class Request(object):
                 value argument)
 
             Returns:
-                  Reply(StatusMsg): A Promise, which resolves when parameter value is updated or fails otherwise.
+                  Reply(StatusMsg): A Promise, which resolves when a parameter value is updated or fails otherwise.
 
             Examples:
                   >>> reply = req.setParameter("root/Control/activateSemiAuto", False)

{motorcortex_python-0.23.2 → motorcortex_python-0.23.3}/motorcortex/subscribe.py

@@ -1,13 +1,11 @@
 #!/usr/bin/python3
-import time
-
-import pynng
 
 #
 #   Developer: Alexey Zakharov (alexey.zakharov@vectioneer.com)
 #   All rights reserved. Copyright (c) 2016-2025 VECTIONEER.
 #
 
+import pynng
 from motorcortex.request import Request, Reply, ConnectionState
 from motorcortex.subscription import Subscription
 from motorcortex.state_callback_handler import StateCallbackHandler
@@ -69,14 +67,14 @@ class Subscribe:
         self.__connected_lock = Condition()
         self.__is_connected = False
 
-        def pre_connect_cb(pipe):
+        def pre_connect_cb(_pipe):
             with self.__connected_lock:
                 self.__is_connected = True
                 self.__connection_state = ConnectionState.CONNECTION_OK
                 self.__callback_handler.notify(self.__req, self, self.connectionState())
                 self.__connected_lock.notify_all()  # Wake up all waiting threads
 
-        def post_remove_cb(pipe):
+        def post_remove_cb(_pipe):
             with self.__connected_lock:
                 if self.__connection_state == ConnectionState.DISCONNECTING:
                     self.__connection_state = ConnectionState.DISCONNECTED
@@ -118,7 +116,15 @@ class Subscribe:
             try:
                 buffer = socket.recv()
             except pynng.Timeout:
-                continue
+                logger.debug('Socket timeout, retrying subscription loop...')
+                # Submit a no-op task to check if the pool is shutting down
+                try:
+                    self.__pool.submit(lambda: None).cancel()
+                    continue
+                except RuntimeError:
+                    logger.debug('Pool is shutting down, exiting subscription loop')
+                    break
+
             except pynng.Closed:
                 logger.debug('Socket closed, exiting subscription loop')
                 break

{motorcortex_python-0.23.2 → motorcortex_python-0.23.3}/motorcortex/subscription.py

@@ -232,7 +232,7 @@ class Subscription(object):
             Examples:
                   >>> def update(parameters):
                   >>>   print(parameters) #list of Parameter tuples
-
+                  >>> ...
                   >>> data_sub.notify(update)
 
         """

motorcortex_python-0.23.3/motorcortex/version.py

@@ -0,0 +1 @@
+__version__ = '0.23.3'

{motorcortex_python-0.23.2 → motorcortex_python-0.23.3/motorcortex_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: motorcortex-python
-Version: 0.23.2
+Version: 0.23.3
 Summary: Python bindings for Motorcortex Engine
 Home-page: https://www.motorcortex.io
 Author: Alexey Zakharov

motorcortex_python-0.23.2/motorcortex/version.py

@@ -1 +0,0 @@
-__version__ = '0.23.2'