smallneuron 2.4.9__tar.gz → 2.4.12__tar.gz

{smallneuron-2.4.9/src/smallneuron.egg-info → smallneuron-2.4.12}/PKG-INFO

@@ -1,16 +1,17 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: smallneuron
-Version: 2.4.9
+Version: 2.4.12
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/pypa/sampleproject
 Project-URL: Issues, https://github.com/pypa/sampleproject/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # smallneuron
 Network Programming platform

smallneuron-2.4.12/pyproject.toml

@@ -0,0 +1,25 @@
+[build-system]
+requires = [ "setuptools",]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "smallneuron"
+version = "2.4.12"
+license = "MIT"
+description = "Small Neuron Workflow"
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers = [ "Programming Language :: Python :: 3", "Operating System :: OS Independent",]
+[[project.authors]]
+name = "Andres Artigas"
+email = "andres@artigas.cl"
+
+[project.urls]
+Homepage = "https://github.com/pypa/sampleproject"
+Issues = "https://github.com/pypa/sampleproject/issues"
+
+[tool.setuptools.package-data]
+smallneuron = [ "*.c", "*.h", "build",]
+
+[tool.setuptools.packages.find]
+where = [ "src",]

{smallneuron-2.4.9 → smallneuron-2.4.12}/src/smallneuron/logger.py

@@ -84,6 +84,8 @@ class Logger:
                 msg = msg + " " + str(a)
 
             syslog.syslog(severity, msg)
+            if syslog.LOG_ERR >= severity:
+                print(msg)
             syslog.closelog()
         except Exception as e:
             print("Syslog fail ", e)

{smallneuron-2.4.9 → smallneuron-2.4.12}/src/smallneuron/smallneuron.py

@@ -294,44 +294,44 @@ class EventManager:
                 validUntil = eventTuple[2]  # valid Until
 
                 log.perfMark(f"[%d] start event %s"%(self.count,event))
-                log.notice("[",self.count,"] Event:", event, params)
                 
 
                 if validUntil != 0 and validUntil < self.count:
-                    log.warn("[",self.count,"] ", event, " is caduced ", validUntil, "<", self.count)
-
-                elif 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!")
-                    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)
-                        
-                        # Cambiamos de estado
-                        self.change_state(event, original_params, node_to)
+                    log.notice("[",self.count,"] Caduced:", event, " ", validUntil, "<", self.count)
+                else:
+                    log.notice("[",self.count,"] Event:", event, params)
+                    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!")
+                        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)
+                            
+                            # Cambiamos de estado
+                            self.change_state(event, original_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")
+                        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)
-                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")
-                    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")
+                        log.warn("[",self.count,"] ", event, " not exist")
         except Exception as e:
             log.error(e)
             log.error(traceback.format_exc())

{smallneuron-2.4.9 → smallneuron-2.4.12}/src/smallneuron/snwatcher.py

@@ -54,9 +54,10 @@ class SnWatcher():
         return False
         
     def _loop_callback(self, args):
-        log.debug( " _loop_callback start, tid ",threading.get_native_id(), args)
         try:
             [callback_obj,callback_function_args,mode, period] = args
+
+            log.debug( "Watcher START, tid ",threading.get_native_id(), [callback_obj.__class__.__name__, callback_function_args, mode,period])
             # Pasamos como argumento a la funcion externa un diccionario para los datos
             # que necesite persistir entre llamados
             while not self.stoploop:
@@ -89,11 +90,11 @@ class SnWatcher():
                 # default mode is loop 
                 sleep(period)
 
-            log.debug(threading.get_ident(),"_check loop exit, stop")
+            log.debug( "Watcher END, tid ",threading.get_native_id(), [callback_obj.__class__.__name__, callback_function_args, mode,period])
         except Exception as e:
             log.error(e)
             log.error(traceback.format_exc())
-            log.debug(threading.get_ident(),f"_check loop exit, exception for event {self.event}")
+            log.debug( "Watcher FAIL, tid ",threading.get_native_id(),f"_check loop exit, exception for event {self.event}")
 
 
     def stop(self, wait_to_finish=False):

{smallneuron-2.4.9 → smallneuron-2.4.12/src/smallneuron.egg-info}/PKG-INFO

@@ -1,16 +1,17 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: smallneuron
-Version: 2.4.9
+Version: 2.4.12
 Summary: Small Neuron Workflow
 Author-email: Andres Artigas <andres@artigas.cl>
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/pypa/sampleproject
 Project-URL: Issues, https://github.com/pypa/sampleproject/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # smallneuron
 Network Programming platform

smallneuron-2.4.9/pyproject.toml

@@ -1,27 +0,0 @@
-[build-system]
-requires = ["setuptools", "setuptools-scm"]
-
-[project]
-name = "smallneuron"
-version = "2.4.9"
-authors = [
-  { name="Andres Artigas", email="andres@artigas.cl" },
-]
-description = "Small Neuron Workflow"
-readme = "README.md"
-requires-python = ">=3.7"
-classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
-]
-
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools.package-data]
-smallneuron = ["*.c", "*.h", "build"]
-
-[project.urls]
-Homepage = "https://github.com/pypa/sampleproject"
-Issues = "https://github.com/pypa/sampleproject/issues"