funcnodes-core 0.2.2__tar.gz → 0.2.3__tar.gz

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-core
-Version: 0.2.2
+Version: 0.2.3
 Summary: core package for funcnodes
 License: MIT
 Author: Julian Kimmig

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/funcnodes_core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 from .io import (
     NodeInput,

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/funcnodes_core/lib/lib.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import List, Optional, TypedDict, Dict, Type, Tuple, Set
+from typing import List, Optional, TypedDict, Dict, Type, Tuple, Set, Sequence
 from funcnodes_core.node import Node, SerializedNodeClass
 from funcnodes_core.utils.serialization import JSONEncoder, Encdata
 from dataclasses import dataclass, field
@@ -180,7 +180,7 @@ def get_node_in_shelf(shelf: Shelf, nodeid: str) -> Tuple[int, Type[Node]]:
     raise NodeClassNotFoundError(f"Node with id {nodeid} not found")
 
 
-def update_nodes_in_shelf(shelf: Shelf, nodes: List[Type[Node]]):
+def update_nodes_in_shelf(shelf: Shelf, nodes: Sequence[Type[Node]]):
     """
     Adds nodes to a shelf
     """
@@ -347,7 +347,7 @@ class Library(EventEmitterMixin):
     @emit_after()
     def add_nodes(
         self,
-        nodes: List[Type[Node]],
+        nodes: Sequence[Type[Node]],
         shelf: str | List[str],
     ):
         if isinstance(shelf, str):
@@ -403,7 +403,7 @@ class Library(EventEmitterMixin):
             i, _ = get_node_in_shelf(shelf, node.node_id)
             shelf.nodes.pop(i)
 
-    def remove_nodeclasses(self, nodes: List[Type[Node]]):
+    def remove_nodeclasses(self, nodes: Sequence[Type[Node]]):
         for node in nodes:
             self.remove_nodeclass(node)
 

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/funcnodes_core/node.py

@@ -345,6 +345,7 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
         self._inputs: List[NodeInput] = []
         self._outputs: List[NodeOutput] = []
         self._triggerstack: Optional[TriggerStack] = None
+        self._trigger_open = False
         self._requests_trigger = False
         self.asynceventmanager = AsyncEventManager(self)
         if uuid is None and id is not None:
@@ -797,6 +798,8 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
             """Wraps the node's function to handle the triggering of events before and after its execution."""
             # set the trigger event
             await self.asynceventmanager.set_and_clear("triggered")
+            await asyncio.sleep(self._pretrigger_delay)
+            self._trigger_open = False
             self.emit("triggerstart")
             # run the function
 
@@ -852,6 +855,8 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
         # if the node is ready to trigger, trigger it
         if self.ready_to_trigger():
             self.trigger()
+        elif self._trigger_open:
+            return
         else:
             # otherwise set the _requests_trigger attribute to True
             self._requests_trigger = True
@@ -914,6 +919,8 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
             raise InTriggerError("Node is already in trigger")
         if triggerstack is None:
             triggerstack = TriggerStack()
+        self._pretrigger_delay = 0.02  # 20ms
+        self._trigger_open = True
         triggerlogger.debug(f"triggering {self}")
         self._triggerstack = triggerstack
         self._triggerstack.append(self())

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/funcnodes_core/nodemaker.py

@@ -91,13 +91,6 @@ def node_class_maker(
         """
         A wrapper for the exposed function that sets the output values of the node.
         """
-        print(
-            "BBBtriggering",
-            self,
-            {ip.name: ip.value for ip in self.inputs.values()},
-            args,
-            kwargs,
-        )
         outs = await asyncfunc(*args, **kwargs)
         if len(outputs) > 1:
             for op, out in zip(outputs, outs):

{funcnodes_core-0.2.2 → funcnodes_core-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-core"
-version = "0.2.2"
+version = "0.2.3"
 description = "core package for funcnodes"
 authors = ["Julian Kimmig <julian.kimmig@linkdlab.de>"]
 readme = "README.md"