smallneuron 2.3.12__tar.gz → 2.4.1__tar.gz

{smallneuron-2.3.12/src/smallneuron.egg-info → smallneuron-2.4.1}/PKG-INFO

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

{smallneuron-2.3.12 → smallneuron-2.4.1}/pyproject.toml

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

{smallneuron-2.3.12 → smallneuron-2.4.1}/src/smallneuron/smallneuron.py

@@ -131,19 +131,24 @@ class EventManager:
             nodeTo._cmd =True
 
     # Agregamos un evento a la cola
-    def putEvent(self, event, params=None):  # lanzamos un evento ahora
-        log.debug("putEvent:", event, "params:", params) 
+    def putEvent(self, event, params=None, valid_until=0):  # lanzamos un evento ahora
+        log.debug("putEvent:", event, "params:", params, "valid_until", valid_until) 
         if params == None:
             params = {}
 
-        self.events.put((event, params, {})) # TODO: parece el tercer argumento no se usa nunca
+        self.events.put((event, params, valid_until))
 
     # lanza un thread para leer de un callback en varias modalidades
     # 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)
+    def watchEvent(self,event, # Evento que se generara 
+                   event_params={}, # Parametros del evento
+                   data_pattern=None, # patron buscado en el retorno del callback
+                    callback_obj=None, # objeto del callback
+                    callback_function_args={}, #paramatros de l afuncion de callback
+                    mode="loop",period=1,
+                    valid_until=0 #  validUntil
+                ):
+                watcher=SnWatcher(self,event,event_params,event_pattern=data_pattern, valid_until=valid_until)
                 watcher.start(callback_obj,callback_function_args,mode,period)
                 return watcher
     
@@ -280,19 +285,15 @@ class EventManager:
                 log.notice("[-",self.count,"-] State:", self.currentState)
                 log.perfMark("event end:")
                 eventTuple = self.events.get()
-                event  = eventTuple[0]  # text del evento
-                params = eventTuple[1]  # argumentos del evento
+                event      = eventTuple[0]  # text del evento
+                params     = eventTuple[1]  # argumentos del evento
+                validUntil = eventTuple[2]  # valid Until
 
                 log.perfMark(f"[%d] start event %s"%(self.count,event))
                 log.notice("[",self.count,"] Event:", event, params)
                 
 
-                # eliminamos el validUntil, para que no quede en un loop
-                validUntil=self.count
-                if type(params) == dict:
-                    validUntil=params.pop("validUntil", self.count)
-
-                if validUntil < self.count:
+                if validUntil != 0 and validUntil < self.count:
                     log.warn("[",self.count,"] ", event, " is caduced ", validUntil, "<", self.count)
 
                 elif event in self.net:

{smallneuron-2.3.12 → smallneuron-2.4.1}/src/smallneuron/sntimer.py

@@ -6,7 +6,7 @@ import re
 import threading
 import os.path
 import traceback
-from .logger import Logger
+from .logger import Logger, logger_with_method
 from time import sleep
 from .smallneuron import  EventManager
 
@@ -24,13 +24,15 @@ class SnTimer():
 
     # Los eventos agregado con timer son por defecto 
     # solo validos para el siguiente estado
+    @logger_with_method(log)
     def watchEvent(self, event, event_params={}, time=1.0, valid=1):
-        log.debug("putEvent:", event,event_params,time,valid)
-        if valid != None:
-            event_params["validUntil"] = self.eventManager.count+valid
-
-        return self.eventManager.watchEvent(event=event, event_params=event_params, 
-                callback_obj=self, callback_function_args={"time":time},
-                mode="noloop")
+        until=self.eventManager.count+valid
+        log.debug(f"event:{event}, params:{event_params} time:{time}s valid:{valid} until:{until}")
+        return self.eventManager.watchEvent(event=event,
+                                            event_params=event_params, 
+                                            callback_obj=self, 
+                                            callback_function_args={"time":time},
+                                            mode="noloop", 
+                                            valid_until=until)
 
 

{smallneuron-2.3.12 → smallneuron-2.4.1}/src/smallneuron/snwatcher.py

@@ -19,11 +19,12 @@ class SnWatcher():
            seran parte del argumento del evento junto a los event_params
         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=ModuleNotFoundError):
+    def __init__(self, eventManager, event, event_params={}, event_pattern=ModuleNotFoundError, valid_until=0):
         self.em=eventManager
         self.event=event
         self.event_params=event_params
         self.event_pattern=event_pattern
+        self.event_valid_until=valid_until
         self.stoploop=False
         self.thread=None
         log.debug("created")
@@ -74,7 +75,7 @@ class SnWatcher():
                     resp={"data":data}
 
                 if self.event_pattern == None or re.search(self.event_pattern, resp["data"]) != None:
-                    self.em.putEvent(self.event, dict(self.event_params,**resp))
+                    self.em.putEvent(self.event, dict(self.event_params,**resp),self.event_valid_until)
                     log.info("trigger", self.event_params)
                     if mode=="match":
                         log.debug(threading.get_ident(),"_check loop match")

{smallneuron-2.3.12 → smallneuron-2.4.1/src/smallneuron.egg-info}/PKG-INFO

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