smallneuron 2.2.7__tar.gz → 2.2.8__tar.gz

{smallneuron-2.2.7/src/smallneuron.egg-info → smallneuron-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smallneuron
-Version: 2.2.7
+Version: 2.2.8
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 Project-URL: Homepage, https://github.com/pypa/sampleproject

{smallneuron-2.2.7 → smallneuron-2.2.8}/pyproject.toml

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

{smallneuron-2.2.7 → smallneuron-2.2.8}/src/smallneuron/smallneuron.py

@@ -131,8 +131,8 @@ class EventManager:
     # que generaran eventos
     def watchEvent(self,event, event_params={}, data_pattern=None, 
                 callback_obj=None, callback_function_args={},
-                mode="loop",period=1):
-                watcher=SnWatcher(self,event,event_params, data_pattern)
+                mode="loop",period=1, semaphore:threading.Semaphore=None):
+                watcher=SnWatcher(self,event,event_params, data_pattern,semaphore)
                 watcher.start(callback_obj,callback_function_args,mode,period)
                 return watcher
     

{smallneuron-2.2.7 → smallneuron-2.2.8}/src/smallneuron/snwatcher.py

@@ -8,7 +8,6 @@ from datetime import datetime
 
 log= Logger("smallneuron.snwatcher")
 
-
 class SnWatcher():
     '''
     Cada instancia de esta clase monitorea la funcion callback() del bridge, con bridge_args como parametros,
@@ -21,16 +20,24 @@ class SnWatcher():
         3. Si se repiten los elementos retornados por check() con los events_params mandan los de check()
     una respuesta  hasta que  respuesta, bloqueando
     '''
-    def __init__(self, eventManager, event, event_params={}, event_pattern=None):
+    def __init__(self, eventManager, event, event_params={}, event_pattern=None,semaphore:threading.Semaphore=None):
         self.em=eventManager
         self.event=event
         self.event_params=event_params
         self.event_pattern=event_pattern
         self.stoploop=False
         self.thread=None
-        self.sem=threading.Semaphore()
+        self._sem:threading.Semaphore=semaphore
         log.debug("created")
 
+    def semAcquire(self):
+        if self._sem != None:
+            self._sem.acquire()
+
+    def semRelease(self):
+        if self._sem != None:
+            self._sem.release()
+        
     def start(self, callback_obj, callback_function_args={}, mode="loop",period=1):
         '''
         modos validos:
@@ -56,28 +63,24 @@ class SnWatcher():
         return False
         
     def _loop_callback(self, args):
-        log.debug("_loop_callback start",args)
+        log.debug(threading.get_ident(),"_loop_callback start",args)
         try:
             [callback_obj,callback_function_args,mode, period] = args
             # Pasamos como argumento a la funcion externa un diccionario para los datos
             # que necesite persistir entre llamados
-            self.sem.acquire()
+            self.semAcquire()
             while not self.stoploop:
                 try:
                     resp=callback_obj.callback(**callback_function_args)
+                    self.semRelease()
                 except Exception as e:
-                    log.warn("Exception from callback", e)
+                    log.warn(threading.get_ident(),"Exception from callback", e)
                     # Nos olvidamos de esto y saltamos al proximo ciclo
-                    self.sem.release()
+                    self.semRelease()
                     sleep(period)
-                    self.sem.acquire()
+                    self.semAcquire()
                     continue
-                    
-                    
-                    
-                self.sem.release()
-                #log.debug("_loop_callback resp",resp)
-
+                                       
                 # Si la respuesta no es un dict
                 # creamos uno con la respuesta como data
                 if type(resp) != dict:
@@ -88,30 +91,30 @@ class SnWatcher():
                     self.em.putEvent(self.event, dict(self.event_params,**resp))
                     log.info("trigger", self.event_params)
                     if mode=="match":
-                        log.debug("_check loop exit, match")
+                        log.debug(threading.get_ident(),"_check loop match")
                         break
 
                 if mode=="noloop" :
-                    log.debug("_check loop exit, noloop")
+                    log.debug(threading.get_ident(),"_check loop, noloop")
                     break
                     
                 # default mode is loop 
                 sleep(period)
-                self.sem.acquire()
-            self.sem.release()
-            
-            log.debug("_check loop exit, stop")
+                self.semAcquire()
+
+            self.semRelease()
+            log.debug(threading.get_ident(),"_check loop exit, stop")
         except Exception as e:
             log.error(e)
             log.error(traceback.format_exc())
-            log.debug("_check loop exit, exception")
-            self.sem.release()
+            log.debug(threading.get_ident(),"_check loop exit, exception")
+            self.semRelease()
 
 
     def stop(self, wait_to_finish=False):
-        self.sem.acquire()
+        self.semAcquire()
         self.stoploop=True
-        self.sem.release()
+        self.semRelease()
         if wait_to_finish:
             self.thread.join()
 

{smallneuron-2.2.7 → smallneuron-2.2.8/src/smallneuron.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smallneuron
-Version: 2.2.7
+Version: 2.2.8
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 Project-URL: Homepage, https://github.com/pypa/sampleproject