funcnodes-basic 0.2.0__tar.gz → 0.2.2__tar.gz

funcnodes_basic-0.2.2/MANIFEST.in

@@ -0,0 +1,14 @@
+graft src
+graft tests
+
+global-exclude __pycache__/*
+prune __pycache__
+prune */__pycache__
+recursive-exclude */__pycache__ *
+
+global-exclude .venv/*
+global-exclude .venv/**/*
+prune .venv
+prune */.venv
+recursive-exclude .venv *
+recursive-exclude */.venv *

{funcnodes_basic-0.2.0 → funcnodes_basic-0.2.2}/PKG-INFO

@@ -1,24 +1,20 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.0
+Version: 0.2.2
 Summary: Basic functionalities for funcnodes
+Author-email: Julian Kimmig <julian.kimmig@linkdlab.de>
 License: AGPL-3.0
-Author: Julian Kimmig
-Author-email: julian.kimmig@gmx.net
-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)
-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
+Project-URL: download, https://pypi.org/project/funcnodes-basic/#files
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: funcnodes-core>=0.3.9
+Requires-Dist: funcnodes
+Dynamic: license-file
 
 # FuncNodes Basic
 
@@ -53,4 +49,3 @@ This project is licensed under the MIT License.
 ## Contact
 
 For any questions or issues, please open an issue on the GitHub repository.
-

funcnodes_basic-0.2.2/pyproject.toml

@@ -0,0 +1,45 @@
+[project]
+name = "funcnodes-basic"
+version = "0.2.2"
+description = "Basic functionalities for funcnodes"
+readme = "README.md"
+classifiers = [ "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",]
+requires-python = ">=3.11"
+dependencies = [
+ "funcnodes-core>=0.3.9",
+ "funcnodes",
+]
+authors = [{name = "Julian Kimmig", email = "julian.kimmig@linkdlab.de"}]
+
+
+[dependency-groups]
+dev = [
+ "funcnodes-module>=0.2.9",
+ "pre-commit>=4.1.0",
+ "pytest>=8.3.4",
+ "pytest-funcnodes>=0.1.0",
+]
+
+[build-system]
+requires = [ "setuptools>=42",]
+build-backend = "setuptools.build_meta"
+
+[project.license]
+text = "AGPL-3.0"
+
+[project.urls]
+homepage = "https://github.com/Linkdlab/funcnodes_basic"
+source = "https://github.com/Linkdlab/funcnodes_basic"
+tracker = "https://github.com/Linkdlab/funcnodes_basic/issues"
+download = "https://pypi.org/project/funcnodes-basic/#files"
+
+[project.entry-points."funcnodes.module"]
+module = "funcnodes_basic"
+shelf = "funcnodes_basic:NODE_SHELF"
+
+[tool.setuptools.package-dir]
+"" = "src"
+
+
+[tool.setuptools.packages.find]
+where = [ "src",]

funcnodes_basic-0.2.2/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{funcnodes_basic-0.2.0 → funcnodes_basic-0.2.2/src}/funcnodes_basic/__init__.py

@@ -4,13 +4,15 @@ 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
+from .input import NODE_SHELF as input_shelf
 
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 
 NODE_SHELF = Shelf(
     nodes=[],
     subshelves=[
+        input_shelf,
         lists_shelf,
         dicts_shelf,
         strings_shelf,

funcnodes_basic-0.2.2/src/funcnodes_basic/input.py

@@ -0,0 +1,84 @@
+from typing import Union
+import funcnodes_core as fn
+
+
+@fn.NodeDecorator(
+    node_id="input.any",
+    node_name="Input",
+    description="Any input",
+    outputs=[
+        {"name": "out"},
+    ],
+)
+def any_input(input: Union[str, float, int, bool]) -> str:
+    return input
+
+
+@fn.NodeDecorator(
+    node_id="input.str",
+    node_name="String Input",
+    description="Input a string",
+    outputs=[
+        {"name": "string"},
+    ],
+)
+def str_input(input: str) -> str:
+    return str(input)
+
+
+@fn.NodeDecorator(
+    node_id="input.int",
+    node_name="Integer Input",
+    description="Input an integer",
+    outputs=[
+        {"name": "integer"},
+    ],
+)
+def int_input(input: int) -> int:
+    return int(input)
+
+
+@fn.NodeDecorator(
+    node_id="input.float",
+    node_name="Float Input",
+    description="Input a float",
+    outputs=[
+        {"name": "float"},
+    ],
+)
+def float_input(input: float) -> float:
+    return float(input)
+
+
+@fn.NodeDecorator(
+    node_id="input.bool",
+    node_name="Boolean Input",
+    description="Input a boolean",
+    outputs=[
+        {"name": "boolean"},
+    ],
+)
+def bool_input(input: bool) -> bool:
+    if isinstance(input, str):
+        if input.lower() in ("true", "1", "yes"):
+            input = True
+        elif input.lower() in ("false", "0", "no"):
+            input = False
+    elif isinstance(input, (int, float)):
+        input = bool(input)
+    else:
+        input = bool(input)
+    return bool(input)
+
+
+NODE_SHELF = fn.Shelf(
+    nodes=[
+        any_input,
+        str_input,
+        int_input,
+        float_input,
+        bool_input,
+    ],
+    name="Input",
+    description="Simple input nodes",
+)

{funcnodes_basic-0.2.0 → funcnodes_basic-0.2.2/src}/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.2/src/funcnodes_basic.egg-info/PKG-INFO

@@ -0,0 +1,51 @@
+Metadata-Version: 2.4
+Name: funcnodes-basic
+Version: 0.2.2
+Summary: Basic functionalities for funcnodes
+Author-email: Julian Kimmig <julian.kimmig@linkdlab.de>
+License: AGPL-3.0
+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
+Project-URL: download, https://pypi.org/project/funcnodes-basic/#files
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: funcnodes-core>=0.3.9
+Requires-Dist: funcnodes
+Dynamic: license-file
+
+# FuncNodes Basic
+
+## Overview
+
+`funcnodes-basic` is a collection of essential nodes designed to handle fundamental operations in [Funcnodes](https://github.com/linkdlab/funcnodes), such as list manipulation, dictionary operations, logic control, mathematical functions, and string processing. It provides a foundation of commonly needed functionalities in computational graphs built with the FuncNodes framework. Each module within this package contains a set of nodes, grouped by their operation type, allowing seamless integration into broader systems.
+
+## Installation
+
+Install the package with:
+
+```bash
+pip install funcnodes-basic
+```
+
+## Getting Started
+
+Please refere to the [Funcnodes](https://github.com/linkdlab/funcnodes) package
+
+## Example Usage
+
+You can integrate the provided nodes in your computational graphs, connecting inputs and outputs between nodes to build complex workflows that utilize dictionaries, lists, logic, math, and string operations.
+
+## Contribution
+
+Feel free to contribute to this project by submitting pull requests. You can help by adding new nodes, fixing bugs, or enhancing documentation.
+
+## License
+
+This project is licensed under the MIT License.
+
+## Contact
+
+For any questions or issues, please open an issue on the GitHub repository.

funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info/SOURCES.txt

@@ -0,0 +1,25 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+src/funcnodes_basic/__init__.py
+src/funcnodes_basic/dicts.py
+src/funcnodes_basic/input.py
+src/funcnodes_basic/lists.py
+src/funcnodes_basic/logic.py
+src/funcnodes_basic/math_nodes.py
+src/funcnodes_basic/strings.py
+src/funcnodes_basic.egg-info/PKG-INFO
+src/funcnodes_basic.egg-info/SOURCES.txt
+src/funcnodes_basic.egg-info/dependency_links.txt
+src/funcnodes_basic.egg-info/entry_points.txt
+src/funcnodes_basic.egg-info/requires.txt
+src/funcnodes_basic.egg-info/top_level.txt
+tests/test_all_nodes_pytest.py
+tests/test_dict.py
+tests/test_import.py
+tests/test_inputs.py
+tests/test_lists.py
+tests/test_logic.py
+tests/test_math.py
+tests/test_strings.py

funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[funcnodes.module]
+module = funcnodes_basic
+shelf = funcnodes_basic:NODE_SHELF

funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info/requires.txt

@@ -0,0 +1,2 @@
+funcnodes-core>=0.3.9
+funcnodes

funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info/top_level.txt

@@ -0,0 +1 @@
+funcnodes_basic

funcnodes_basic-0.2.2/tests/test_all_nodes_pytest.py

@@ -0,0 +1,6 @@
+from pytest_funcnodes import all_nodes_tested
+import funcnodes_basic as fnmodule  # noqa
+
+
+def test_all_nodes_tested(all_nodes):
+    all_nodes_tested(all_nodes, fnmodule.NODE_SHELF, ignore=[])

funcnodes_basic-0.2.2/tests/test_dict.py

@@ -0,0 +1,101 @@
+from funcnodes_basic import dicts
+import pytest_funcnodes
+# DictGetNode,
+# dict_keys,
+# dict_values,
+# dict_items,
+# dict_from_items,
+# dict_from_keys_values,
+# dict_to_list,
+
+
+@pytest_funcnodes.nodetest(dicts.DictGetNode)
+async def test_dict_get():
+    testdict = {"a": 1, "b": 2, "c": 3}
+
+    node = dicts.DictGetNode()
+
+    node.inputs["dictionary"].value = testdict
+    await node
+
+    assert node.inputs["key"].value_options["options"] == {"a": "0", "b": "1", "c": "2"}
+
+    node.inputs["key"].value = "0"
+    await node
+
+    assert node.outputs["value"].value == 1
+
+
+@pytest_funcnodes.nodetest(dicts.dict_keys)
+async def test_dict_keys():
+    testdict = {"a": 1, "b": 2, "c": 3}
+
+    node = dicts.dict_keys()
+
+    node.inputs["dictionary"].value = testdict
+    await node
+
+    assert node.outputs["out"].value == ["a", "b", "c"]
+
+
+@pytest_funcnodes.nodetest(dicts.dict_values)
+async def test_dict_values():
+    testdict = {"a": 1, "b": 2, "c": 3}
+
+    node = dicts.dict_values()
+
+    node.inputs["dictionary"].value = testdict
+    await node
+
+    assert node.outputs["out"].value == [1, 2, 3]
+
+
+@pytest_funcnodes.nodetest(dicts.dict_items)
+async def test_dict_items():
+    testdict = {"a": 1, "b": 2, "c": 3}
+
+    node = dicts.dict_items()
+
+    node.inputs["dictionary"].value = testdict
+    await node
+
+    assert node.outputs["out"].value == [("a", 1), ("b", 2), ("c", 3)]
+
+
+@pytest_funcnodes.nodetest(dicts.dict_from_items)
+async def test_dict_from_items():
+    testitems = [("a", 1), ("b", 2), ("c", 3)]
+
+    node = dicts.dict_from_items()
+
+    node.inputs["items"].value = testitems
+    await node
+
+    assert node.outputs["out"].value == {"a": 1, "b": 2, "c": 3}
+
+
+@pytest_funcnodes.nodetest(dicts.dict_from_keys_values)
+async def test_dict_from_keys_values():
+    testkeys = ["a", "b", "c"]
+    testvalues = [1, 2, 3]
+
+    node = dicts.dict_from_keys_values()
+
+    node.inputs["keys"].value = testkeys
+    node.inputs["values"].value = testvalues
+    await node
+
+    assert node.outputs["out"].value == {"a": 1, "b": 2, "c": 3}
+
+
+@pytest_funcnodes.nodetest(dicts.dict_to_list)
+async def test_dict_to_list():
+    testdict = {"a": 1, "b": 2, "c": 3}
+
+    node = dicts.dict_to_list()
+
+    node.inputs["dictionary"].value = testdict
+    await node
+
+    assert node.outputs["keys"].value == ["a", "b", "c"]
+    assert node.outputs["values"].value == [1, 2, 3]

funcnodes_basic-0.2.2/tests/test_import.py

@@ -0,0 +1,8 @@
+import funcnodes as fn
+
+
+def test_find():
+    res = fn.lib.libfinder.find_shelf_from_module("funcnodes_basic")
+
+    assert res[0].name == "basics", res
+    len(res[0].subshelves) > 0

funcnodes_basic-0.2.2/tests/test_inputs.py

@@ -0,0 +1,123 @@
+from funcnodes_basic import input
+import pytest_funcnodes
+import pytest
+import funcnodes_core as fn
+
+
+@pytest_funcnodes.nodetest(input.any_input)
+async def test_any_input():
+    node = input.any_input()
+
+    node.inputs["input"].value = 1
+    await node
+
+    assert node.outputs["out"].value == 1
+
+    node.inputs["input"].value = "test"
+    await node
+
+    assert node.outputs["out"].value == "test"
+
+    node.inputs["input"].value = [1, 2, 3]
+    await node
+
+    assert node.outputs["out"].value == [1, 2, 3]
+
+
+@pytest_funcnodes.nodetest(input.str_input)
+async def test_str_input():
+    node = input.str_input()
+
+    node.inputs["input"].value = 1
+    await node
+
+    assert node.outputs["string"].value == "1"
+
+    node.inputs["input"].value = "test"
+    await node
+
+    assert node.outputs["string"].value == "test"
+
+    node.inputs["input"].value = [1, 2, 3]
+    await node
+
+    assert node.outputs["string"].value == "[1, 2, 3]"
+
+
+@pytest_funcnodes.nodetest(input.int_input)
+async def test_int_input():
+    node = input.int_input()
+
+    node.inputs["input"].value = 1
+    await node
+    node.inputs["input"].value = "test"
+
+    with pytest.raises(fn.NodeTriggerError):
+        await node
+
+    node.inputs["input"].value = [1, 2, 3]
+
+    with pytest.raises(fn.NodeTriggerError):
+        await node
+
+    node.inputs["input"].value = 1.5
+    await node
+    assert node.outputs["integer"].value == 1
+
+
+@pytest_funcnodes.nodetest(input.float_input)
+async def test_float_input():
+    node = input.float_input()
+
+    node.inputs["input"].value = 1
+    await node
+
+    assert node.outputs["float"].value == 1.0
+
+    node.inputs["input"].value = "test"
+
+    with pytest.raises(fn.NodeTriggerError):
+        await node
+
+    node.inputs["input"].value = [1, 2, 3]
+
+    with pytest.raises(fn.NodeTriggerError):
+        await node
+
+    node.inputs["input"].value = "1.5"
+    await node
+    assert node.outputs["float"].value == 1.5
+
+
+@pytest_funcnodes.nodetest(input.bool_input)
+async def test_bool_input():
+    node = input.bool_input()
+
+    node.inputs["input"].value = 1
+    await node
+
+    assert node.outputs["boolean"].value is True
+
+    node.inputs["input"].value = "test"
+    await node
+    assert node.outputs["boolean"].value is True
+
+    node.inputs["input"].value = ""
+    await node
+    assert node.outputs["boolean"].value is False
+
+    node.inputs["input"].value = [1, 2, 3]
+    await node
+    assert node.outputs["boolean"].value is True
+
+    node.inputs["input"].value = None
+    await node
+    assert node.outputs["boolean"].value is False
+
+    node.inputs["input"].value = "True"
+    await node
+    assert node.outputs["boolean"].value is True
+
+    node.inputs["input"].value = "False"
+    await node
+    assert node.outputs["boolean"].value is False