funcnodes-basic 0.1.2__tar.gz → 0.1.4__tar.gz

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-basic
-Version: 0.1.2
+Version: 0.1.4
 Summary: Basic functionalities for funcnodes
 Author: Julian Kimmig
 Author-email: julian.kimmig@gmx.net

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/funcnodes_basic/__init__.py

@@ -3,13 +3,15 @@ from .logic import NODE_SHELF as logic_shelf
 from .math 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.2"
+__version__ = "0.1.4"
 
 NODE_SHELF = Shelf(
     nodes=[],
     subshelves=[
         lists_shelf,
+        dicts_shelf,
         strings_shelf,
         math_shelf,
         logic_shelf,

funcnodes_basic-0.1.4/funcnodes_basic/dicts.py

@@ -0,0 +1,104 @@
+"""
+work with python dictionaries
+"""
+import funcnodes as fn
+from typing import Any, List, Tuple
+
+
+class DictGetNode(fn.Node):
+    node_id = "dict_get"
+    node_name = "Dict Get"
+    dictionary = fn.NodeInput(id="dictionary", type=dict)
+    key = fn.NodeInput(id="key", type=str)
+    value = fn.NodeOutput(id="value", type=Any)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._keymap = {}
+        self.get_input("dictionary").on("after_set_value", self._update_keys)
+
+    def _update_keys(self, **kwargs):
+        try:
+            d = self.get_input("dictionary").value
+            keys = list(d.keys())
+        except KeyError:
+            return
+        keymap = dict({str(i): k for i, k in enumerate(keys)})
+        reversed_keymap = {v: k for k, v in keymap.items()}
+        self.get_input("key").update_value_options(options=reversed_keymap)
+        self._keymap = keymap
+
+    async def func(self, dictionary: dict, key: str) -> None:
+        v = dictionary.get(self._keymap[key], fn.NoValue)
+        self.outputs["value"].value = v
+        return v
+
+
+@fn.NodeDecorator(
+    id="dict_keys",
+    name="Dict Keys",
+)
+def dict_keys(dictionary: dict) -> List[Any]:
+    return list(dictionary.keys())
+
+
+@fn.NodeDecorator(
+    id="dict_values",
+    name="Dict Values",
+)
+def dict_values(dictionary: dict) -> List[Any]:
+    return list(dictionary.values())
+
+
+@fn.NodeDecorator(
+    id="dict_items",
+    name="Dict Items",
+)
+def dict_items(dictionary: dict) -> List[tuple]:
+    return list(dictionary.items())
+
+
+@fn.NodeDecorator(
+    id="dict_from_items",
+    name="Dict From Items",
+)
+def dict_from_items(items: List[tuple]) -> dict:
+    return dict(items)
+
+
+@fn.NodeDecorator(
+    id="dict_from_keys_values",
+    name="Dict From Keys Values",
+)
+def dict_from_keys_values(keys: List[Any], values: List[Any]) -> dict:
+    return dict(zip(keys, values))
+
+
+@fn.NodeDecorator(
+    id="dict_to_lists",
+    name="Dict to List",
+    outputs=[
+        {"name": "keys"},
+        {
+            "name": "values",
+        },
+    ],
+)
+def dict_to_list(dictionary: dict) -> Tuple[List[Any], List[Any]]:
+    return list(dictionary.items())
+
+
+NODE_SHELF = fn.Shelf(
+    nodes=[
+        DictGetNode,
+        dict_keys,
+        dict_values,
+        dict_items,
+        dict_from_items,
+        dict_from_keys_values,
+        dict_to_list,
+    ],
+    name="Dicts",
+    description="Work with dictionaries",
+    subshelves=[],
+)

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/funcnodes_basic/lists.py

@@ -32,8 +32,8 @@ class GetIndexNode(fn.Node):
         uuid="element",
     )
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.get_input("inputlist").on("after_set_value", self._update_indices)
 
     def _update_indices(self, **kwargs):
@@ -61,6 +61,6 @@ class GetIndexNode(fn.Node):
 NODE_SHELF = fn.Shelf(
     nodes=[contains, GetIndexNode],
     subshelves=[],
-    name="Logic",
-    description="Control flow and decision making nodes.",
+    name="Lists",
+    description="List operations",
 )

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/funcnodes_basic/logic.py

@@ -32,8 +32,10 @@ class WhileNode(Node):
     done = NodeOutput(id="done", type=Any)
 
     async def func(self, condition: bool, input: Any) -> None:
-        if condition:
+        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
@@ -69,14 +71,11 @@ class ForNode(Node):
 
     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()
-            try:
-                await self.outputs["do"].trigger(triggerstack)
-                await triggerstack
-            except Exception as e:
-                pass
+            await self.outputs["do"].trigger(triggerstack)
             v = self.inputs["collector"].value
             if v is not NoValue:
                 results.append(v)

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/funcnodes_basic/strings.py

@@ -574,7 +574,7 @@ def string_encode(
 )
 def string_decode(
     b: bytes,
-    encoding: POSSIBLE_DECODINGS_TYPE = "utf-8",
+    encoding: POSSIBLE_DECODINGS_TYPE = "utf_8",
     errors: Literal[
         "strict",
         "replace",
@@ -718,6 +718,19 @@ regex_shelf = fn.Shelf(
     description="Basic regular expression operations.",
 )
 
+
+@fn.NodeDecorator(
+    node_id="string.input",
+    node_name="Input",
+    description="Input a string",
+    outputs=[
+        {"name": "string"},
+    ],
+)
+def string_input(s: str) -> str:
+    return s
+
+
 NODE_SHELF = fn.Shelf(
     nodes=[
         string_length,
@@ -758,6 +771,7 @@ NODE_SHELF = fn.Shelf(
         string_isdecimal,
         string_isnumeric,
         string_isascii,
+        string_input,
     ],
     subshelves=[regex_shelf],
     name="Strings",

{funcnodes_basic-0.1.2 → funcnodes_basic-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-basic"
-version = "0.1.2"
+version = "0.1.4"
 description = "Basic functionalities for funcnodes"
 authors = ["Julian Kimmig <julian.kimmig@gmx.net>"]
 readme = "README.md"