smallneuron 1.1.0__tar.gz → 1.1.2__tar.gz

{smallneuron-1.1.0/src/smallneuron.egg-info → smallneuron-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smallneuron
-Version: 1.1.0
+Version: 1.1.2
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 Project-URL: Homepage, https://github.com/pypa/sampleproject
@@ -43,4 +43,4 @@ python3 -m twine upload  dist/*                      # prod
 Installing module
 	sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps smallneuron-pelainux    # test
   
-  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.0.0 # prod
+  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.1.1 # prod

{smallneuron-1.1.0 → smallneuron-1.1.2}/README.md

@@ -29,4 +29,4 @@ python3 -m twine upload  dist/*                      # prod
 Installing module
 	sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps smallneuron-pelainux    # test
   
-  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.0.0 # prod
+  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.1.1 # prod

{smallneuron-1.1.0 → smallneuron-1.1.2}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "setuptools-scm"]
 
 [project]
 name = "smallneuron"
-version = "1.1.0"
+version = "1.1.2"
 authors = [
   { name="Andres Artigas", email="andres@artigas.cl" },
 ]

{smallneuron-1.1.0 → smallneuron-1.1.2}/src/smallneuron/smallneuron.py

@@ -87,7 +87,7 @@ class EventManager:
         if params == None:
             params = {}
 
-        self.events.put((event, params, {}))
+        self.events.put((event, params, {})) # TODO: parece el el tercer argumento no se usa nunca
 
     def watchEvent(self,event, event_args={}, event_pattern=None, 
                 bridge=None, bridge_args={}, mode="loop",period=1):

smallneuron-1.1.0/src/smallneuron/snhttp.py → smallneuron-1.1.2/src/smallneuron/snapi.py

@@ -87,24 +87,21 @@ class HttpEvent (Resource):
         else:
             return None, 405
             
+api.add_resource(PlannerServer, '/<string:action>','/<string:action>/<string:kart_id>')  # Kart list status, and plan
+api.add_resource(Order, '/order', '/order/<int:order_id>')                        # POST New order, GET Order status ,DELETE Order    ,  '/order/<int:order_id>',  endpoint="order_id"
+api.add_resource(Task, '/task/<int:task_id>')  # End task
+api.add_resource(Kart, '/kart/<string:kart_id>', '/kart/<string:component>/<string:code>')   # Checkin and send event
 
 class SnHttp(Flask):
     def __init__(self):
         super().__init__(__name__)
         self.app = Flask(__name__)
         self.api = Api(self.app)
+    
+    def add_resource(self, resource, *urls, **kwargs):
+        self.api.add_resource(resource, urls, kwargs)
 
-    def addEvent(self, event_name, path):
-        self.api.add_resource(HttpEvent, path )
-
-    def start(self):
+    def start(self, service_port=9000):
         self.app.config['MAX_CONTENT_LENGTH'] = 1024 * 1024 * 1024
-        self.app.run(debug=False, host= '0.0.0.0')
-
+        self.app.run(debug=False, host= '0.0.0.0', port=service_port)
 
-if __name__ == '__main__': 
-    except KeyboardInterrupt:
-        pass
-    finally:
-        pass
-        #stopAllKarts()

{smallneuron-1.1.0 → smallneuron-1.1.2}/src/smallneuron/snserial.py

@@ -6,6 +6,7 @@
 # pip install pyserial
 #
 import serial
+import time
 import re
 import threading
 import os.path
@@ -17,33 +18,46 @@ log=Logger("smallneuron.SnSerial")
 def eventWait(snserial):
     try:
         log.info("reader started")
+        fails=0
         while True:
-            line = snserial.read_until(snserial.eol)
-
-            for e in snserial.events:
-                if re.search(e[1], line) != None:
-                    if snserial.eventManager == None:
-                        log.error("Warning eventManager not defined")
-                    else:
-                        snserial.eventManager.putEvent(e[0], {"data": str(line)})
-                    log.info("event ", e[0], line)
-                    break
+            try:
+                if not snserial.isOpen():
+                    snserial.rotateOpen()
+                line = snserial.read_until(snserial.eol)
+                fails=0
+                for e in snserial.events:
+                    if re.search(e[1], line) != None:
+                        if snserial.eventManager == None:
+                            log.error("Warning eventManager not defined")
+                        else:
+                            snserial.eventManager.putEvent(e[0], {"data": str(line)})
+                        log.info("event ", e[0], line)
+                        break
+            except Exception as e:
+                fails=fails+1
+                if fails > 10:
+                    raise("Falla multiples veces lectura serial "+str(fails))
+                log.error("Reintentamos lectura "+str(e) )
+                time.sleep(1)
+                snserial.close()
+                
     except Exception as e:
         log.error(e)
         log.error(traceback.format_exc())
         snserial.eventManager.putEvent("panic", str(e))
-        exit(1)
+
 
 
 class SnSerial(serial.Serial):
     def __init__(self, eventManager, port, baudrate, bytesize, parity, stopbits, endofline: bytes = b"\r"):
         super().__init__(baudrate=baudrate, bytesize=bytesize, parity=parity, stopbits=stopbits)
-        self.rotateOpen(port=port)
+        self.originalPort=port
+        self.rotateOpen()
         self.eventManager = eventManager
         self.eol = endofline
         self.events = []
         log.info("start")
-
+        
     def addEvent(self, event, pattern=".*"):
         self.events.append((event, pattern))
 
@@ -60,12 +74,13 @@ class SnSerial(serial.Serial):
         threading.Thread(target=lambda: eventWait(self)).start()
 
     # Intentara abrir la puerta termina con 0 (cero) y falla lo cambiara el final por 1 (uno)
-    def rotateOpen(self, port):
+    def rotateOpen(self):
+        port=self.originalPort
         if not os.path.exists(port):
                 port=port[:-1]+"1"
                 log.debug("snserial port not exist, trying ",port)
         self.port=port # al parecer esto abre el puerto
-        self.open()      # pero para estar seguro
+        self.open()    # pero para estar seguro
         log.debug("snserial port:", port)
 
 

{smallneuron-1.1.0 → smallneuron-1.1.2/src/smallneuron.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smallneuron
-Version: 1.1.0
+Version: 1.1.2
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 Project-URL: Homepage, https://github.com/pypa/sampleproject
@@ -43,4 +43,4 @@ python3 -m twine upload  dist/*                      # prod
 Installing module
 	sudo python3 -m pip install --upgrade --index-url https://test.pypi.org/simple/ --no-deps smallneuron-pelainux    # test
   
-  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.0.0 # prod
+  sudo python3 -m pip install --upgrade --index-url https://pypi.org/simple/ --no-deps smallneuron==1.1.1 # prod

{smallneuron-1.1.0 → smallneuron-1.1.2}/src/smallneuron.egg-info/SOURCES.txt

@@ -10,9 +10,9 @@ src/smallneuron/gpio_h3.h
 src/smallneuron/gpio_h3.so
 src/smallneuron/logger.py
 src/smallneuron/smallneuron.py
+src/smallneuron/snapi.py
 src/smallneuron/sndummy.py
 src/smallneuron/sngpio.py
-src/smallneuron/snhttp.py
 src/smallneuron/sninput.py
 src/smallneuron/snmqtt.py
 src/smallneuron/snserial.py