smallneuron 2.2.0__tar.gz → 2.2.2__tar.gz

{smallneuron-2.2.0/src/smallneuron.egg-info → smallneuron-2.2.2}/PKG-INFO

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

{smallneuron-2.2.0 → smallneuron-2.2.2}/pyproject.toml

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

{smallneuron-2.2.0 → smallneuron-2.2.2}/src/smallneuron/smallneuron.py

@@ -29,8 +29,9 @@ def ttfmt(txt):
 class Node:
     nodelist = {}
 
-    def __init__(self, state, desc="", style=""):
+    def __init__(self, state, change_state=False, desc="", style=""):
         self.state = state
+        self.change_state=change_state
         self.event_manager = None  # Este link es llenado durante addEdge del event manager
         self.desc = desc
         self.style = style
@@ -38,6 +39,9 @@ class Node:
         if state in Node.nodelist:
             raise "Estado ya existe como Nodo" + state
         Node.nodelist[state] = self
+        
+    def leave(self, event, params, stateTo):
+        log.perfMark("     In Node.leave()")
 
     def enter(self, event, params, stateFrom):
         log.perfMark("     In Node.enter()")
@@ -88,10 +92,7 @@ class EventManager:
         log.notice("*** STARTED ***")
  
     def linkEdge(self, event, nodeFrom: Node, nodeTo: Node, desc=""):
-        if nodeTo == None or nodeTo == None:
-            print("Error node can't be None ")
-            raise "Error node can't be None "
-        elif event in self.cmds:
+        if event in self.cmds:
             print("Error event already in cmds ", event)
             raise "Error event already in cmds"
         elif event in self.net:               
@@ -231,13 +232,6 @@ class EventManager:
         self.putEvent("_start_")  # lanzamos evento de inicio
 
     def change_state(self,event, params,node_to:Node):       
-        # 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
-        log.info("[",self.count,"] enter ", node_to.state, params)
-        node_to.enter(event, params, self.currentState)
         self.currentNode=node_to
         self.prevState = self.currentState
         self.currentState = node_to.state
@@ -272,24 +266,29 @@ class EventManager:
                     if not self.currentState in self.net[event]:
                         log.warn("[",self.count,"] ", event, " not valid for state ", self.currentState, "discarted!")
                     else:
-                        node_to: Node = self.net[event][self.currentState][0]                        
+                        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
+                        log.info("[",self.count,"] enter ", node_to.state, params)
+                        node_to.enter(event, params, self.currentState)
+                        
+                        # Cambiamos de estado
                         self.change_state(event, params, node_to)
                         self.printGraph(event)
                 elif event in self.cmds:
                     log.info("[", self.count, "] Manager new  cmd ", event)
                     node_to: Node = self.cmds[event][0]
                     log.perfMark(f"     enter cmd")
-                    res=node_to.enter(event, params, self.currentState)
-                    if type(res) == tuple:
-                        try:
-                            new_params,new_state = res
-                            if not new_state in Node.nodelist:
-                                log.error(f"Invalid respond on cmd {event}  new node {new_state} not exist")
-                            else:
-                                self.printGraph(event)
-                                self.change_state(event, new_params, Node.nodelist[new_state])                                
-                        except:
-                            log.error(f"Invalid respond of cmd {event} in node {node_to.state}")
+                    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)
+                    else:
+                        node_to.enter(event, params, self.currentState)
                     self.printGraph(event)
                 else:
                     log.warn("[",self.count,"] ", event, " not exist")

{smallneuron-2.2.0 → smallneuron-2.2.2/src/smallneuron.egg-info}/PKG-INFO

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