smallneuron 2.4.14__tar.gz → 2.4.15__tar.gz

{smallneuron-2.4.14/src/smallneuron.egg-info → smallneuron-2.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smallneuron
-Version: 2.4.14
+Version: 2.4.15
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 License-Expression: MIT

{smallneuron-2.4.14 → smallneuron-2.4.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "smallneuron"
-version = "2.4.14"
+version = "2.4.15"
 license = "MIT"
 description = "Small Neuron Workflow"
 readme = "README.md"

{smallneuron-2.4.14 → smallneuron-2.4.15}/src/smallneuron/smallneuron.py

@@ -273,20 +273,44 @@ class EventManager:
         threading.Thread(target=self.loop).start()
         self.putEvent("_start_")  # lanzamos evento de inicio
 
-    def change_state(self,event, params,node_to:Node):       
+    def change_state_deprecated(self,event, params,node_to:Node):       
         self.currentNode=node_to
         self.prevState = self.currentState
         self.currentState = node_to.state
         self.currentArgs = params
         self.count = self.count + 1  # increment event count
         log.perfMark(f"     print graph")
+
+
+    def do_change(self,event, params,node_to:Node):
+        # copiamos por si leave o enter los modifica y reportar lo que llego
+        original_params=copy.deepcopy(params) 
+
+
+        # indicamos al nodo actual que salimos
+        log.info("[",self.count,"] Leave:", self.currentNode.state)
+        self.currentNode.leave(event,params,node_to.state)
+
+        
+        # Cambiamos de estado
+        self.currentNode=node_to
+        self.prevState = self.currentState
+        self.currentState = node_to.state
+        self.currentArgs = original_params
+        self.count = self.count + 1  # increment event count
+
+        # Entramos al nodo nuevo
+        log.info("[",self.count,"] Enter:", node_to.state, params)
+        node_to.enter(event, params, self.currentState)
+
+
         
     def loop(self):
         log.debug( "main loop start, tid ",threading.get_native_id())
         try:
             self.printGraph()
             while True:
-                log.notice("[-",self.count,"-] State:", self.currentState)
+                log.notice("[",self.count,"] State:", self.currentState)
                 log.perfMark("event end:")
                 eventTuple = self.events.get()
                 event      = eventTuple[0]  # text del evento
@@ -303,35 +327,26 @@ class EventManager:
                     if event in self.net:
                         log.perfMark(f"     event in net")
                         if not self.currentState in self.net[event]:
-                            log.warn("[",self.count,"] ", event, " not valid for state ", self.currentState, "discarted!")
+                            log.warn("[",self.count,"] Invalid:", event, "not valid for state ", self.currentState, "discarted!")
                         else:
                             node_to: Node = self.net[event][self.currentState][0]
-                                            
-                            # indicamos al nodo actual que salimos
-                            log.info("[",self.count,"] leave ", self.currentNode.state)
-                            self.currentNode.leave(event,params,node_to.state)
                             
-                            # Entramos al nodo nuevo
-                            original_params=copy.deepcopy(params) # por si enter los modifica y reportar lo que llego
-                            log.info("[",self.count,"] enter ", node_to.state, params)
-                            node_to.enter(event, params, self.currentState)
+                            self.do_change(event, params, node_to)                
                             
-                            # Cambiamos de estado
-                            self.change_state(event, original_params, node_to)
+                            # Imprimimos el estado actual despues del enter
                             self.printGraph(event)
                     elif event in self.cmds:
-                        log.info("[", self.count, "] Manager new  cmd ", event)
+                        log.info("[", self.count, "] Command:", event)
                         node_to: Node = self.cmds[event][0]
                         log.perfMark(f"     enter cmd")
                         if node_to.change_state:
-                            self.currentNode.leave(event,params,node_to.state)
-                            node_to.enter(event, params, self.currentState)
-                            self.change_state(event, params, node_to)
+                            self.do_change(event, params, node_to)
                         else:
+                            log.info("[",self.count,"] Enter:", node_to.state, params)
                             node_to.enter(event, params, self.currentState)
                         self.printGraph(event)
                     else:
-                        log.warn("[",self.count,"] ", event, " not exist")
+                        log.warn("[",self.count,"] Unknown:", event, " not exist")
         except Exception as e:
             log.error(e)
             log.error(traceback.format_exc())

{smallneuron-2.4.14 → smallneuron-2.4.15/src/smallneuron.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smallneuron
-Version: 2.4.14
+Version: 2.4.15
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
 License-Expression: MIT