motorcortex-python 0.22.3__tar.gz → 0.22.5__tar.gz

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/PKG-INFO

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

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/motorcortex/request.py

@@ -93,7 +93,7 @@ class Request(object):
 
         self.__socket.add_post_pipe_connect_cb(pre_connect_cb)
         self.__socket.add_post_pipe_remove_cb(post_remove_cb)
-        self.__socket.dial(url)
+        self.__socket.dial(url, block=False)
 
         return Reply(self.__pool.submit(self.waitForConnection, self.__connected_lock,
                                         conn_timeout_ms / 1000.0))

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/motorcortex/subscribe.py

@@ -77,7 +77,7 @@ class Subscribe:
 
         self.__socket.add_pre_pipe_connect_cb(pre_connect_cb)
         self.__socket.add_post_pipe_remove_cb(post_remove_cb)
-        self.__socket.dial(url)
+        self.__socket.dial(url, block=False)
 
         self.__pool.submit(self.run, self.__socket)
 

motorcortex-python-0.22.5/motorcortex/version.py

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

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/motorcortex_python.egg-info/PKG-INFO

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

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/motorcortex_python.egg-info/SOURCES.txt

@@ -25,7 +25,6 @@ sandbox/req_test.py
 sandbox/test.crt
 test/api_test.py
 test/async_test.py
-test/mcx.cert.pem
 test/nng_tls_client.py
 test/motorcortex-msg/motionSL_hash.json
 test/motorcortex-msg/motionSL_pb2.py

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/sandbox/req_test.py

@@ -9,14 +9,14 @@ if __name__ == '__main__':
     # Vectioneer camera
     endpoint_1 = "ws://motorcortex:5558:5557"
     req, sub = motorcortex.connect(endpoint_1, motorcortex_types, parameter_tree,
-                                   certificate="mcx.cert.pem", timeout_ms=1000,
+                                   certificate="mcx.cert.crt", timeout_ms=1000,
                                    login="", password="")
 
 
     # Local processing
     endpoint_2 = "wss://localhost:5568:5567"
     req1, sub1 = motorcortex.connect(endpoint_2, motorcortex.MessageTypes(), motorcortex.ParameterTree(),
-                                   certificate="mcx.cert.pem", timeout_ms=1000,
+                                   certificate="mcx.cert.crt", timeout_ms=1000,
                                    login="", password="")
 
     print("Sending data from {} to {}".format(endpoint_1, endpoint_2))

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/test/api_test.py

@@ -111,7 +111,7 @@ class Reconnection(unittest.TestCase):
 
         # Open request connection
         req, sub = motorcortex.connect("wss://127.0.0.1:5568:5567", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=5000,
+                                       certificate="mcx.cert.crt", timeout_ms=5000,
                                        login="root", password="vectioneer")
 
         sub.subscribe(["root/Comm_task/actual_cycle_max"], "test", 2000).notify(lambda x: print(f"1:{x}"))
@@ -235,7 +235,7 @@ class ParameterTree(unittest.TestCase):
         # logging.basicConfig(level=logging.INFO)
         # Open request connection
         req, sub = motorcortex.connect("wss://localhost:5568:5567", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=1000, login="", password="")
+                                       certificate="mcx.cert.crt", timeout_ms=1000, login="", password="")
 
         path = tempfile.gettempdir() + '/' + 'mcx-python-ParameterTree-hash'
         tree = req.getParameterTree().get()
@@ -312,7 +312,7 @@ class OverwriteReleaseParameter(unittest.TestCase):
 
         # Open request connection
         req, sub = motorcortex.connect("wss://127.0.0.1:5568:5567", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=5000,
+                                       certificate="mcx.cert.crt", timeout_ms=5000,
                                        login="root", password="vectioneer")
 
         ## test non-existing path
@@ -383,7 +383,7 @@ class StreamTest(unittest.TestCase):
 
         # Open request connection
         req, sub = motorcortex.connect("ws://localhost:5558:5557", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=5000,
+                                       certificate="mcx.cert.crt", timeout_ms=5000,
                                        login="", password="")
 
         subscription = sub.subscribe(["root/Comm_task/utilization_max",
@@ -426,7 +426,7 @@ class ConnectionTimeout(unittest.TestCase):
 
         # Open request connection
         req, sub = motorcortex.connect("wss://localhost:5568:5567", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=5000,
+                                       certificate="mcx.cert.crt", timeout_ms=5000,
                                        login="test", password="test", state_update=self.stateChange)
 
         while True:
@@ -449,7 +449,7 @@ class GetParameter(unittest.TestCase):
 
         # Open request connection
         req, sub = motorcortex.connect("wss://192.168.179.85:5568:5567", motorcortex_types, parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=5000,
+                                       certificate="mcx.cert.crt", timeout_ms=5000,
                                        login="test", password="test")
 
         rep = req.getParameterList(["root/Logic/mode",
@@ -474,7 +474,7 @@ class SubParameter(unittest.TestCase):
 
         parameter_tree = motorcortex.ParameterTree()
         req = motorcortex.Request(motorcortex_types, parameter_tree)
-        if req.connect("wss://%s:5568" % SERVER, certificate="mcx.cert.pem").get(5000):
+        if req.connect("wss://%s:5568" % SERVER, certificate="mcx.cert.crt").get(5000):
             print("Request connection is etablished")
         else:
             print("Failed to establish Request connection")
@@ -499,7 +499,7 @@ class SubParameter(unittest.TestCase):
             self.assertTrue(False)
 
         sub = motorcortex.Subscribe(req, motorcortex_types)
-        if sub.connect("wss://%s:5567" % SERVER, certificate="mcx.cert.pem").get(1000):
+        if sub.connect("wss://%s:5567" % SERVER, certificate="mcx.cert.crt").get(1000):
             print("Subscribe connection is etablished")
         else:
             print("Failed to establish Subscribe connection")
@@ -531,7 +531,7 @@ class SetString(unittest.TestCase):
         parameter_tree = motorcortex.ParameterTree()
         # Open request and subscribe connection
         req, sub = motorcortex.connect("wss://localhost:5568:5567", motorcortex.MessageTypes(), parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=1000,
+                                       certificate="mcx.cert.crt", timeout_ms=1000,
                                        login="root", password="secret")
         res = req.setParameter("root/Control/dummyChar", "Hallo robot!")
         res.get()
@@ -542,7 +542,7 @@ class SetParameterWithOffset(unittest.TestCase):
         parameter_tree = motorcortex.ParameterTree()
         # Open request and subscribe connection
         req, sub = motorcortex.connect("wss://localhost:5568:5567", motorcortex.MessageTypes(), parameter_tree,
-                                       certificate="mcx.cert.pem", timeout_ms=1000,
+                                       certificate="mcx.cert.crt", timeout_ms=1000,
                                        login="root", password="secret")
         res = req.setParameter("root/Control/hostInJointTrajectory", [6, 5])
         res.get()

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/test/async_test.py

@@ -30,7 +30,7 @@ def main(id):
 
     # Open request connection
     req, sub = motorcortex.connect("wss://192.168.2.100:5568:5567", motorcortex_types, parameter_tree,
-                                   certificate="mcx.cert.pem", timeout_ms=1000,
+                                   certificate="mcx.cert.crt", timeout_ms=1000,
                                    login="", password="")
 
     start = time.time()

{motorcortex-python-0.22.3 → motorcortex-python-0.22.5}/test/nng_tls_client.py

@@ -25,7 +25,7 @@ if __name__ == '__main__':
 
     threads = []
     for i in range(50):
-        threads.append(threading.Thread(target=test, args=(i, 'wss://localhost:5555', 'mcx.cert.pem')))
+        threads.append(threading.Thread(target=test, args=(i, 'wss://localhost:5555', 'mcx.cert.crt')))
         threads[-1].start()
         time.sleep(0.01)
 

motorcortex-python-0.22.3/motorcortex/version.py

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

motorcortex-python-0.22.3/test/mcx.cert.pem

@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEkDCCA3igAwIBAgITbTjd78AWwnYgjliiB1pdOZrHuzANBgkqhkiG9w0BAQsF
-ADCBzzELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB0xpbWJ1cmcxKzApBgNVBAcMIkth
-cnZlZWx3ZWcgMTlCLCA2MjIyIE5KIE1hYXN0cmljaHQxKTAnBgNVBAoMIFZlY3Rp
-b25lZXIgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRQwEgYDVQQLDAtEZXZlbG9wbWVu
-dDEcMBoGA1UEAwwTTW90b3Jjb3J0ZXggUm9vdCBDQTEiMCAGCSqGSIb3DQEJARYT
-aW5mb0B2ZWN0aW9uZWVyLmNvbTAeFw0yMTAxMDkxMTAwMDJaFw00MTAxMDQxMTAw
-MDJaMIHPMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHTGltYnVyZzErMCkGA1UEBwwi
-S2FydmVlbHdlZyAxOUIsIDYyMjIgTkogTWFhc3RyaWNodDEpMCcGA1UECgwgVmVj
-dGlvbmVlciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFDASBgNVBAsMC0RldmVsb3Bt
-ZW50MRwwGgYDVQQDDBNNb3RvcmNvcnRleCBSb290IENBMSIwIAYJKoZIhvcNAQkB
-FhNpbmZvQHZlY3Rpb25lZXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvrEyPo22JE+G414ISR8H7f1HtlxXqy3wsoSdFPyfcVsPYXhbR8p67VaV
-GRT3kNhC3ncmcwBOaZzdq9h81MovZF+pb1N7llahng6sl4Dw3rOQaQ8aLUGYYGv3
-px1tVH8Xn980UDqdvLNbkkaVzd0nb4pa6RH7SYoj7h1kbBB1FssG1ssIsKKlREzq
-d+tgRavj5pXdqVY8bLO1L66CzAxuKhvhZxzttVY08tsEBOmUI7wbL6l/xDCJxgiG
-LNcJeMOtcRo8aPvBSfZ853Pjh/GmxdaxhgC3+rQ4Hurfd7lS1Sg+nKBj3foP9ucQ
-djsaLqhFp8wncKJcj/QgyZHyhHtuNwIDAQABo2MwYTAdBgNVHQ4EFgQUtzGS2JIv
-V/KKVj32EaIM9Qi0zSMwHwYDVR0jBBgwFoAUtzGS2JIvV/KKVj32EaIM9Qi0zSMw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggEBAKuhGCfp9UIQIRZJBqqD3r4g/IBvZDP89rWjYRF47mQeAdBzYcaGW+5x+hN3
-rYBiR4I4tw2gM3zou+O2gdKWz3sPrGbgdjUdqYDkLDr2do2Cl7p5pfJSDGsRvsCM
-tiEkZdvB+ho7CrYmeEHoivR1PD7qzUNQxKyZnjIeRKWbE4iCoD5CIhY/3SU1z+RU
-O4IScuz8suY+T28vdbfpEtVLeWv1o6W+yu1Wsn7K+rEgRNDCa7lgMmDUZGnNLNQ6
-JCr9T9li7H3aJKZjS6Z6v/tOt0rMWI+l4GDZe5JXVXGuL8/UDqg07DvIhyJ/INKH
-1akNPVcMllNpbuLM0dx+TuTDqdQ=
------END CERTIFICATE-----