funcnodes-basic 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

funcnodes_basic/logic.py

@@ -1,6 +1,6 @@
 """Logic Nodes for control flow and decision making."""
 
-from funcnodes_core.node import Node, TriggerStack
+from funcnodes_core.node import Node
 from typing import Any, List, Optional
 from funcnodes_core.io import NodeInput, NodeOutput, NoValue
 import asyncio
@@ -35,8 +35,19 @@ class WhileNode(Node):
     async def func(self, condition: bool, input: Any) -> None:
         if self.inputs["condition"].value:
             self.outputs["do"].value = input
-            triggerstack = TriggerStack()
-            await self.outputs["do"].trigger(triggerstack)
+            datapaths = [
+                ip.datapath
+                for ip in self.outputs["do"].connections
+                if ip.datapath is not None
+            ]
+
+            while datapaths:
+                for dp in datapaths:
+                    if dp.done(breaking_nodes=[self]):
+                        datapaths.remove(dp)
+                        break
+                else:
+                    await asyncio.sleep(0.1)
             self.request_trigger()
         else:
             self.outputs["done"].value = input
@@ -94,9 +105,21 @@ class ForNode(Node):
             pass
 
         for i in self.progress(input, desc="Iterating", unit="it", total=iplen):
-            self.outputs["do"].set_value(i, does_trigger=False)
-            triggerstack = TriggerStack()
-            await self.outputs["do"].trigger(triggerstack)
+            self.outputs["do"].set_value(i, does_trigger=True)
+            datapaths = [
+                ip.datapath
+                for ip in self.outputs["do"].connections
+                if ip.datapath is not None
+            ]
+
+            while datapaths:
+                for dp in datapaths:
+                    if dp.done(breaking_nodes=[self]):
+                        datapaths.remove(dp)
+                        break
+                else:
+                    await asyncio.sleep(0.1)
+
             v = self.inputs["collector"].value
             if v is not NoValue:
                 results.append(v)

{funcnodes_basic-0.2.3.dist-info → funcnodes_basic-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.3
+Version: 0.2.4
 Summary: Basic functionalities for funcnodes
 Author-email: Julian Kimmig <julian.kimmig@linkdlab.de>
 License: AGPL-3.0
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or l
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: funcnodes-core>=0.3.9
+Requires-Dist: funcnodes-core>=0.4.1
 Requires-Dist: funcnodes
 Dynamic: license-file
 

{funcnodes_basic-0.2.3.dist-info → funcnodes_basic-0.2.4.dist-info}/RECORD

@@ -3,12 +3,12 @@ funcnodes_basic/dataclass.py,sha256=p7IjTek7XnHOxZCJnFHhmNtmYM1DpacmfuaUePvDQ7Y,
 funcnodes_basic/dicts.py,sha256=koNJEwIq9ryC7evBpnI-QmR7MBIbgUWqpPpwhB3M69Y,2507
 funcnodes_basic/input.py,sha256=FSHS1bIJ2dJc9NqWaJO0MxegRBERhfxFdkmDiwAuE6o,1654
 funcnodes_basic/lists.py,sha256=9kGnovK-oClFatslbIeYne27l2-EPEXZbr_6yQ1B1cY,5835
-funcnodes_basic/logic.py,sha256=YwIcAgDqxnmJoLVN_hk9XgqrOJvkx3zczx2DxgBliHU,4304
+funcnodes_basic/logic.py,sha256=HrJzM9h34PJUWiULU9Ol5iQ2tI6rl7c39iTt6RO6mRg,4952
 funcnodes_basic/math_nodes.py,sha256=PasNf-1wAvbJ_c-_qeiIDaUVfgPQEREJApeUcTS4FQg,10586
 funcnodes_basic/strings.py,sha256=O6rcxBQJ5eYd765w_tolaD6xMwsNmtBjiPgJ_69tKyA,16429
-funcnodes_basic-0.2.3.dist-info/licenses/LICENSE,sha256=21Lj2q2SYKHMY4768_a3pr3q0jY2VYamAHipoodhMDc,34273
-funcnodes_basic-0.2.3.dist-info/METADATA,sha256=d_LxJhdF-wi7JwpXRlJwrIrWcnBNlK79CZu4DSCEfAo,2001
-funcnodes_basic-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-funcnodes_basic-0.2.3.dist-info/entry_points.txt,sha256=HZ0g1oDO8PrL_f6b09lfTrS-jXqbZrP0qYf1Km_pVxw,79
-funcnodes_basic-0.2.3.dist-info/top_level.txt,sha256=xYbcX5Jx-Ow3N3kgXtyvh8kuhCahb3eHBIZfMvkpVKI,16
-funcnodes_basic-0.2.3.dist-info/RECORD,,
+funcnodes_basic-0.2.4.dist-info/licenses/LICENSE,sha256=21Lj2q2SYKHMY4768_a3pr3q0jY2VYamAHipoodhMDc,34273
+funcnodes_basic-0.2.4.dist-info/METADATA,sha256=Y6AOiZG7PW9kf_TEg2NJ0lTN50eAAaU67lmKc08JSNk,2001
+funcnodes_basic-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+funcnodes_basic-0.2.4.dist-info/entry_points.txt,sha256=HZ0g1oDO8PrL_f6b09lfTrS-jXqbZrP0qYf1Km_pVxw,79
+funcnodes_basic-0.2.4.dist-info/top_level.txt,sha256=xYbcX5Jx-Ow3N3kgXtyvh8kuhCahb3eHBIZfMvkpVKI,16
+funcnodes_basic-0.2.4.dist-info/RECORD,,