funcnodes-basic 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

funcnodes_basic/__init__.py

@@ -1,11 +1,12 @@
 from funcnodes import Shelf
 from .logic import NODE_SHELF as logic_shelf
-from .math import NODE_SHELF as math_shelf
+from .math_nodes import NODE_SHELF as math_shelf
 from .lists import NODE_SHELF as lists_shelf
 from .strings import NODE_SHELF as strings_shelf
 from .dicts import NODE_SHELF as dicts_shelf
 
-__version__ = "0.1.4"
+
+__version__ = "0.1.5"
 
 NODE_SHELF = Shelf(
     nodes=[],

funcnodes_basic/dicts.py

@@ -85,7 +85,8 @@ def dict_from_keys_values(keys: List[Any], values: List[Any]) -> dict:
     ],
 )
 def dict_to_list(dictionary: dict) -> Tuple[List[Any], List[Any]]:
-    return list(dictionary.items())
+    keys, values = zip(*dictionary.items())
+    return list(keys), list(values)
 
 
 NODE_SHELF = fn.Shelf(

funcnodes_basic/logic.py

@@ -1,113 +1,114 @@
-"""Logic Nodes for control flow and decision making."""
-
-from funcnodes.node import Node, TriggerStack
-from typing import Any, List, Optional, Union
-from funcnodes.io import NodeInput, NodeOutput, NoValue
-import asyncio
-
-import funcnodes as fn
-
-
-class IfNode(Node):
-    node_id = "if_node"
-    node_name = "If"
-    on_true = NodeOutput(id="on_true", type=Any)
-    on_false = NodeOutput(id="on_false", type=Any)
-    condition = NodeInput(id="condition", type=bool)
-    input = NodeInput(id="input", type=Any)
-
-    async def func(self, condition: bool, input: Any) -> None:
-        if condition:
-            self.outputs["on_true"].value = input
-        else:
-            self.outputs["on_false"].value = input
-
-
-class WhileNode(Node):
-    node_id = "while_node"
-    node_name = "While"
-    condition = NodeInput(id="condition", type=bool)
-    input = NodeInput(id="input", type=Any)
-    do = NodeOutput(id="do", type=Any)
-    done = NodeOutput(id="done", type=Any)
-
-    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)
-            self.request_trigger()
-        else:
-            self.outputs["done"].value = input
-
-
-class WaitNode(Node):
-    node_id = "wait_node"
-    node_name = "Wait"
-    delay = NodeInput(
-        id="delay",
-        type=float,
-        required=True,
-        default=1.0,
-        does_trigger=False,
-        render_options={"step": "0.1"},
-        value_options={"min": 0.0},
-    )
-    input = NodeInput(id="input", type=Any)
-    output = NodeOutput(id="output", type=Any)
-
-    async def func(self, delay: float, input: Any) -> None:
-        await asyncio.sleep(delay)
-        self.outputs["output"].value = input
-
-
-class ForNode(Node):
-    node_id = "for_node"
-    node_name = "For"
-    input = NodeInput(id="input", type=List[Any])
-    do = NodeOutput(id="do", type=Any)
-    collector = NodeInput(id="collector", type=Any, does_trigger=False, required=False)
-    done = NodeOutput(id="done", type=List[Any])
-
-    async def func(self, input: list, collector: Optional[Any] = None) -> None:
-        results = []
-        self.outputs["done"].value = NoValue
-        for i in input:
-            self.outputs["do"].set_value(i, does_trigger=False)
-            triggerstack = TriggerStack()
-            await self.outputs["do"].trigger(triggerstack)
-            v = self.inputs["collector"].value
-            if v is not NoValue:
-                results.append(v)
-                self.inputs["collector"].value = NoValue
-        self.outputs["done"].value = results
-
-
-class CollectorNode(Node):
-    node_id = "collector_node"
-    node_name = "Collector"
-
-    reset = NodeInput(id="reset", type=Any, does_trigger=True, required=False)
-    input = NodeInput(id="input", type=Any)
-
-    output = NodeOutput(id="output", type=List[Any])
-    default_reset_inputs_on_trigger = True
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.collection = []
-
-    async def func(self, input: Any, reset: Any = NoValue) -> None:
-        if reset != NoValue:
-            self.collection = []
-
-        self.collection.append(input)
-        self.outputs["output"].value = self.collection
-
-
-NODE_SHELF = fn.Shelf(
-    nodes=[IfNode, WhileNode, WaitNode, ForNode, CollectorNode],
-    subshelves=[],
-    name="Logic",
-    description="Control flow and decision making nodes.",
-)
+"""Logic Nodes for control flow and decision making."""
+
+from funcnodes.node import Node, TriggerStack
+from typing import Any, List, Optional, Union
+from funcnodes.io import NodeInput, NodeOutput, NoValue
+import asyncio
+
+import funcnodes as fn
+
+
+class IfNode(Node):
+    node_id = "if_node"
+    node_name = "If"
+    on_true = NodeOutput(id="on_true", type=Any)
+    on_false = NodeOutput(id="on_false", type=Any)
+    condition = NodeInput(id="condition", type=bool)
+    input = NodeInput(id="input", type=Any)
+
+    async def func(self, condition: bool, input: Any) -> None:
+        if condition:
+            self.outputs["on_true"].value = input
+        else:
+            self.outputs["on_false"].value = input
+
+
+class WhileNode(Node):
+    node_id = "while_node"
+    node_name = "While"
+    condition = NodeInput(id="condition", type=bool)
+    input = NodeInput(id="input", type=Any)
+    do = NodeOutput(id="do", type=Any)
+    done = NodeOutput(id="done", type=Any)
+
+    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)
+            self.request_trigger()
+        else:
+            self.outputs["done"].value = input
+
+
+class WaitNode(Node):
+    node_id = "wait_node"
+    node_name = "Wait"
+    delay = NodeInput(
+        id="delay",
+        type=float,
+        required=True,
+        default=1.0,
+        does_trigger=False,
+        render_options={"step": "0.1"},
+        value_options={"min": 0.0},
+    )
+    input = NodeInput(id="input", type=Any)
+    output = NodeOutput(id="output", type=Any)
+
+    async def func(self, delay: float, input: Any) -> None:
+        await asyncio.sleep(delay)
+        self.outputs["output"].value = input
+
+
+class ForNode(Node):
+    node_id = "for_node"
+    node_name = "For"
+    input = NodeInput(id="input", type=List[Any])
+    do = NodeOutput(id="do", type=Any)
+    collector = NodeInput(id="collector", type=Any, does_trigger=False, required=False)
+    done = NodeOutput(id="done", type=List[Any])
+
+    async def func(self, input: list, collector: Optional[Any] = None) -> None:
+        results = []
+        self.outputs["done"].value = NoValue
+        for i in input:
+            self.outputs["do"].set_value(i, does_trigger=False)
+            triggerstack = TriggerStack()
+            await self.outputs["do"].trigger(triggerstack)
+            v = self.inputs["collector"].value
+            if v is not NoValue:
+                results.append(v)
+                self.inputs["collector"].value = NoValue
+        self.outputs["done"].value = results
+
+
+class CollectorNode(Node):
+    node_id = "collector_node"
+    node_name = "Collector"
+
+    reset = NodeInput(id="reset", type=Any, does_trigger=True, required=False)
+    input = NodeInput(id="input", type=Any)
+
+    output = NodeOutput(id="output", type=List[Any])
+    default_reset_inputs_on_trigger = True
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.collection = []
+
+    async def func(self, input: Any, reset: Any = NoValue) -> None:
+        if reset != NoValue:
+            self.collection = []
+            self.inputs["reset"].value = NoValue
+            
+        self.collection.append(input)
+        self.outputs["output"].value = self.collection
+
+
+NODE_SHELF = fn.Shelf(
+    nodes=[IfNode, WhileNode, WaitNode, ForNode, CollectorNode],
+    subshelves=[],
+    name="Logic",
+    description="Control flow and decision making nodes.",
+)