smallneuron 2.2.8__tar.gz → 2.3.1__tar.gz

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

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

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

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

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

@@ -9,6 +9,7 @@ from .snwatcher import SnWatcher
 import traceback
 from datetime import datetime
 import sys
+import glob
 
 #
 # Para que funcione el tooltip debe set en formato svg, para generarlo usar:
@@ -131,13 +132,15 @@ class EventManager:
     # que generaran eventos
     def watchEvent(self,event, event_params={}, data_pattern=None, 
                 callback_obj=None, callback_function_args={},
-                mode="loop",period=1, semaphore:threading.Semaphore=None):
-                watcher=SnWatcher(self,event,event_params, data_pattern,semaphore)
+                mode="loop",period=1):
+                watcher=SnWatcher(self,event,event_params, data_pattern)
                 watcher.start(callback_obj,callback_function_args,mode,period)
                 return watcher
     
 
-    def graph(self, f, bold_event=None):
+    def graph(self, f, bold_event=None, filename=None):
+        if filename !=None:
+           f.write("//{filename}\n\n")            
         f.write("digraph { \n")
         f.write('  layout="dot" \n')
         f.write("  //rankdir=LR \n")
@@ -218,8 +221,29 @@ class EventManager:
         )
 
         with open(desc, 'w') as f:
-            self.graph(f, bold_event)
+            self.graph(f, bold_event, filename=filename)
     
+    def readGraphFile(self, file, delta=0):
+        dotList=glob.glob(self.graphDir+'*.dot')
+        dotList.sort()
+        
+        index=-1
+        if len(dotList) == 0:
+            return ""        
+        try:
+            index=dotList.index(file)+delta
+            if index < 0:
+                index=0
+            elif index >= len(dotList):
+                index=-1
+        except ValueError as e:
+            index=-1
+            
+        nextfile= dotList[index]
+        with open(nextfile, 'r') as content_file:
+            return content_file.read()
+        return ""
+            
     def start(self, n_first: Node):
         n_start = Node(
             "_start_",

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

@@ -13,31 +13,21 @@ class SnWatcher():
     Cada instancia de esta clase monitorea la funcion callback() del bridge, con bridge_args como parametros,
     Si la respuesta contiene el bridge_pattern se dispara el evento con event_params que se le agrega "data": respuesta
 
-    Consideraciones importantes de la funcion check:
+    Consideraciones importantes de la funcion callback:
         1. Debe recibir como parametros los mismo elementos del dict bridge_args de enter()
         2. Debe retornar un diccionario con almenos el elemento data, todo el diccionario retornado
            seran parte del argumento del evento junto a los event_params
-        3. Si se repiten los elementos retornados por check() con los events_params mandan los de check()
-    una respuesta  hasta que  respuesta, bloqueando
+        3. Si se repiten los elementos retornados por callback() con los events_params mandan los de callback()
     '''
-    def __init__(self, eventManager, event, event_params={}, event_pattern=None,semaphore:threading.Semaphore=None):
+    def __init__(self, eventManager, event, event_params={}, event_pattern=ModuleNotFoundError):
         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=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:
@@ -68,17 +58,13 @@ class SnWatcher():
             [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.semAcquire()
             while not self.stoploop:
                 try:
                     resp=callback_obj.callback(**callback_function_args)
-                    self.semRelease()
                 except Exception as e:
                     log.warn(threading.get_ident(),"Exception from callback", e)
                     # Nos olvidamos de esto y saltamos al proximo ciclo
-                    self.semRelease()
                     sleep(period)
-                    self.semAcquire()
                     continue
                                        
                 # Si la respuesta no es un dict
@@ -100,21 +86,16 @@ class SnWatcher():
                     
                 # default mode is loop 
                 sleep(period)
-                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(threading.get_ident(),"_check loop exit, exception")
-            self.semRelease()
 
 
     def stop(self, wait_to_finish=False):
-        self.semAcquire()
         self.stoploop=True
-        self.semRelease()
         if wait_to_finish:
             self.thread.join()
 

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

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