smallneuron 2.1.4__tar.gz → 2.2.1__tar.gz

{smallneuron-2.1.4/src/smallneuron.egg-info → smallneuron-2.2.1}/PKG-INFO

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

{smallneuron-2.1.4 → smallneuron-2.2.1}/pyproject.toml

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

{smallneuron-2.1.4 → smallneuron-2.2.1}/src/smallneuron/smallneuron.py

@@ -47,7 +47,7 @@ class Node:
 
     def __eq__(self, other):
         return self.state == other.state
-
+       
 
 class LambdaNode(Node):
     def __init__(self, state, lambdaEnter, desc="", style=""):
@@ -91,7 +91,7 @@ class EventManager:
         if event in self.cmds:
             print("Error event already in cmds ", event)
             raise "Error event already in cmds"
-        elif event in self.net:
+        elif event in self.net:               
             if nodeFrom.state in self.net[event]:
                 print("Error edge already included ", event, nodeFrom, nodeTo)
                 raise "Error edge already included"
@@ -227,6 +227,21 @@ class EventManager:
         threading.Thread(target=self.loop).start()
         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
+        self.currentArgs = params
+        self.count = self.count + 1  # increment event count
+        log.perfMark(f"     print graph")
+        
     def loop(self):
         try:
             self.printGraph()
@@ -254,29 +269,24 @@ class EventManager:
                     if not self.currentState in self.net[event]:
                         log.warn("[",self.count,"] ", event, " not valid for state ", self.currentState, "discarted!")
                     else:
-                        log.perfMark(f"     get node")
-                        node: Node = self.net[event][self.currentState][0]
-                        log.info("[",self.count,"] entqer ", node.state, params, self.currentState)
-                        
-                        # indicamos al nodo actual que salimos
-                        log.perfMark(f"     leave old node")
-                        self.currentNode.leave(event,params,node.state)
-                        
-                        # Entramos al nodo nuevo
-                        log.perfMark(f"     enter node")
-                        node.enter(event, params, self.currentState)
-                        self.currentNode=node
-                        self.prevState = self.currentState
-                        self.currentState = node.state
-                        self.currentArgs = params
-                        self.count = self.count + 1  # increment event count
-                        log.perfMark(f"     print graph")
+                        node_to: Node = self.net[event][self.currentState][0]                        
+                        self.change_state(event, params, node_to)
                         self.printGraph(event)
                 elif event in self.cmds:
                     log.info("[", self.count, "] Manager new  cmd ", event)
-                    node: Node = self.cmds[event][0]
+                    node_to: Node = self.cmds[event][0]
                     log.perfMark(f"     enter cmd")
-                    node.enter(event, params, self.currentState)
+                    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}")
                     self.printGraph(event)
                 else:
                     log.warn("[",self.count,"] ", event, " not exist")

{smallneuron-2.1.4 → smallneuron-2.2.1/src/smallneuron.egg-info}/PKG-INFO

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