funcnodes-basic 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

funcnodes_basic/__init__.py

@@ -6,7 +6,7 @@ from .strings import NODE_SHELF as strings_shelf
 from .dicts import NODE_SHELF as dicts_shelf
 
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 NODE_SHELF = Shelf(
     nodes=[],

funcnodes_basic/logic.py

@@ -6,6 +6,7 @@ from funcnodes_core.io import NodeInput, NodeOutput, NoValue
 import asyncio
 
 import funcnodes_core as fn
+import time
 
 
 class IfNode(Node):
@@ -57,17 +58,18 @@ class WaitNode(Node):
     output = NodeOutput(id="output", type=Any)
 
     async def func(self, delay: float, input: Optional[Any] = NoValue) -> None:
-        if delay > 1:
-            total_seconds = int(delay)
-            remaining_seconds = delay - total_seconds
-            self.progress.unit = "s"
-            self.progress.reset(total=total_seconds)
-            self.progress.set_description("Waiting")
-            for _ in range(total_seconds):
-                await asyncio.sleep(1)
-                self.progress.update()
-            await asyncio.sleep(remaining_seconds)
+        start = time.time()
+        remaining_seconds = delay
 
+        if delay > 1:
+            with self.progress(desc="Waiting", unit="s", total=delay) as pbar:
+                while remaining_seconds > 0:
+                    interval = min(remaining_seconds, 1)
+                    await asyncio.sleep(interval)
+                    now = time.time()
+                    elapsed = now - start
+                    remaining_seconds = max(0, delay - elapsed)
+                    pbar.update(interval)
         else:
             await asyncio.sleep(delay)
         self.outputs["output"].value = input
@@ -85,12 +87,13 @@ class ForNode(Node):
         results = []
         self.outputs["done"].value = NoValue
 
-        iplen = len(input)
-        self.progress.unit = "it"
-        self.progress.reset(total=iplen)
-        self.progress.set_description("Iterating")
+        iplen = None
+        try:
+            iplen = len(input)
+        except Exception:
+            pass
 
-        for i in input:
+        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)
@@ -98,7 +101,6 @@ class ForNode(Node):
             if v is not NoValue:
                 results.append(v)
                 self.inputs["collector"].value = NoValue
-            self.progress.update()
         self.outputs["done"].value = results
 
 

{funcnodes_basic-0.2.0.dist-info → funcnodes_basic-0.2.1.dist-info}/METADATA

@@ -1,21 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: funcnodes-basic
-Version: 0.2.0
+Version: 0.2.1
 Summary: Basic functionalities for funcnodes
 License: AGPL-3.0
 Author: Julian Kimmig
-Author-email: julian.kimmig@gmx.net
+Author-email: julian.kimmig@linkdlab.de>
 Requires-Python: >=3.11
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: funcnodes
-Requires-Dist: funcnodes-core (>=0.3.4)
+Requires-Dist: funcnodes-core (>=0.3.9)
+Project-URL: Homepage, https://github.com/Linkdlab/funcnodes_basic
 Project-URL: download, https://pypi.org/project/funcnodes-basic/#files
-Project-URL: homepage, https://github.com/Linkdlab/funcnodes_basic
 Project-URL: source, https://github.com/Linkdlab/funcnodes_basic
 Project-URL: tracker, https://github.com/Linkdlab/funcnodes_basic/issues
 Description-Content-Type: text/markdown

funcnodes_basic-0.2.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+funcnodes_basic/__init__.py,sha256=zmYrXkQBz7FVRpwBlCsirF_PlMcCfInJ7vnEeVkFbPA,517
+funcnodes_basic/dicts.py,sha256=koNJEwIq9ryC7evBpnI-QmR7MBIbgUWqpPpwhB3M69Y,2507
+funcnodes_basic/lists.py,sha256=9kGnovK-oClFatslbIeYne27l2-EPEXZbr_6yQ1B1cY,5835
+funcnodes_basic/logic.py,sha256=YwIcAgDqxnmJoLVN_hk9XgqrOJvkx3zczx2DxgBliHU,4304
+funcnodes_basic/math_nodes.py,sha256=PasNf-1wAvbJ_c-_qeiIDaUVfgPQEREJApeUcTS4FQg,10586
+funcnodes_basic/strings.py,sha256=O6rcxBQJ5eYd765w_tolaD6xMwsNmtBjiPgJ_69tKyA,16429
+funcnodes_basic-0.2.1.dist-info/LICENSE,sha256=21Lj2q2SYKHMY4768_a3pr3q0jY2VYamAHipoodhMDc,34273
+funcnodes_basic-0.2.1.dist-info/METADATA,sha256=yQQi_2DTK5h44zXyRO-d-pNxC_DLS6qRBrfwLOOI5wY,1968
+funcnodes_basic-0.2.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+funcnodes_basic-0.2.1.dist-info/entry_points.txt,sha256=Y7-9Rw_0qbyg8MrdLG6zjiEmUYBug_K4TBdJz9MAKxA,76
+funcnodes_basic-0.2.1.dist-info/RECORD,,

{funcnodes_basic-0.2.0.dist-info → funcnodes_basic-0.2.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any

funcnodes_basic-0.2.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-funcnodes_basic/__init__.py,sha256=qxQVn3gdrmJZH7jwmFnxBL5Q9p-y0PBegd6zlt4cydw,517
-funcnodes_basic/dicts.py,sha256=koNJEwIq9ryC7evBpnI-QmR7MBIbgUWqpPpwhB3M69Y,2507
-funcnodes_basic/lists.py,sha256=9kGnovK-oClFatslbIeYne27l2-EPEXZbr_6yQ1B1cY,5835
-funcnodes_basic/logic.py,sha256=SLA2ISn22or2YmuROM8lss_bGNImiWR_ljlcL8Q0zec,4244
-funcnodes_basic/math_nodes.py,sha256=PasNf-1wAvbJ_c-_qeiIDaUVfgPQEREJApeUcTS4FQg,10586
-funcnodes_basic/strings.py,sha256=O6rcxBQJ5eYd765w_tolaD6xMwsNmtBjiPgJ_69tKyA,16429
-funcnodes_basic-0.2.0.dist-info/LICENSE,sha256=21Lj2q2SYKHMY4768_a3pr3q0jY2VYamAHipoodhMDc,34273
-funcnodes_basic-0.2.0.dist-info/METADATA,sha256=SpomJcIAhnTrqOwVmCtVunBFyaYIG7oAx088Y4gQkts,2240
-funcnodes_basic-0.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-funcnodes_basic-0.2.0.dist-info/entry_points.txt,sha256=Y7-9Rw_0qbyg8MrdLG6zjiEmUYBug_K4TBdJz9MAKxA,76
-funcnodes_basic-0.2.0.dist-info/RECORD,,