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

{funcnodes_basic-0.2.2/src/funcnodes_basic.egg-info → funcnodes_basic-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.2
+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.2 → funcnodes_basic-0.2.4}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "funcnodes-basic"
-version = "0.2.2"
+version = "0.2.4"
 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-core>=0.4.1",
  "funcnodes",
 ]
 authors = [{name = "Julian Kimmig", email = "julian.kimmig@linkdlab.de"}]
@@ -43,3 +43,10 @@ shelf = "funcnodes_basic:NODE_SHELF"
 
 [tool.setuptools.packages.find]
 where = [ "src",]
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "v$version"
+version_scheme = "pep440"
+version_provider = "uv"
+update_changelog_on_bump = true

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

@@ -5,9 +5,9 @@ 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
+from .dataclass import NODE_SHELF as dataclass_shelf
 
-
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 NODE_SHELF = Shelf(
     nodes=[],
@@ -15,6 +15,7 @@ NODE_SHELF = Shelf(
         input_shelf,
         lists_shelf,
         dicts_shelf,
+        dataclass_shelf,
         strings_shelf,
         math_shelf,
         logic_shelf,

funcnodes_basic-0.2.4/src/funcnodes_basic/dataclass.py

@@ -0,0 +1,64 @@
+import dataclasses
+import funcnodes_core as fn
+from typing import Any, Dict
+
+
+@fn.NodeDecorator(
+    id="dataclass.to_dict",
+)
+def dataclass_to_dict(instance: Any) -> Dict[str, Any]:
+    """
+    Convert a dataclass instance to a dictionary.
+
+    Args:
+        instance (object): The dataclass instance to convert.
+
+    Returns:
+        dict: The dictionary representation of the dataclass instance.
+    """
+    if not dataclasses.is_dataclass(instance):
+        raise TypeError(f"Expected a dataclass instance, got {type(instance)}")
+
+    return dataclasses.asdict(instance)
+
+
+@fn.NodeDecorator(
+    id="dataclass.get_field",
+    default_io_options={
+        "instance": {
+            "on": {
+                "after_set_value": fn.decorator.update_other_io_value_options(
+                    "field_name",
+                    lambda result: {
+                        "options": [field.name for field in dataclasses.fields(result)]
+                        if dataclasses.is_dataclass(result)
+                        else None,
+                    },
+                )
+            }
+        }
+    },
+)
+def dataclass_get_field(instance: Any, field_name: str) -> Any:
+    """
+    Get a field value from a dataclass instance.
+    """
+    if not dataclasses.is_dataclass(instance):
+        raise TypeError(f"Expected a dataclass instance, got {type(instance)}")
+
+    if not hasattr(instance, field_name):
+        raise AttributeError(
+            f"{instance.__class__.__name__} has no field '{field_name}'"
+        )
+
+    return getattr(instance, field_name)
+
+
+NODE_SHELF = fn.Shelf(
+    nodes=[
+        dataclass_to_dict,
+        dataclass_get_field,
+    ],
+    name="dataclass",
+    description="Nodes for working with dataclasses",
+)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.2
+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.2 → funcnodes_basic-0.2.4}/src/funcnodes_basic.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 pyproject.toml
 src/funcnodes_basic/__init__.py
+src/funcnodes_basic/dataclass.py
 src/funcnodes_basic/dicts.py
 src/funcnodes_basic/input.py
 src/funcnodes_basic/lists.py
@@ -16,7 +17,9 @@ 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_dataclass.py
 tests/test_dict.py
+tests/test_flows.py
 tests/test_import.py
 tests/test_inputs.py
 tests/test_lists.py

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

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

funcnodes_basic-0.2.4/tests/test_dataclass.py

@@ -0,0 +1,141 @@
+from funcnodes_basic import dataclass as dc_nodes
+import pytest_funcnodes
+import pytest
+import funcnodes_core as fn
+from dataclasses import dataclass
+
+
+@dataclass
+class SimpleDataClass:
+    name: str
+    value: int
+    is_active: bool = True
+
+
+@dataclass
+class NestedDataClass:
+    id: int
+    data: SimpleDataClass
+
+
+@pytest_funcnodes.nodetest(dc_nodes.dataclass_to_dict)
+async def test_dataclass_to_dict():
+    node = dc_nodes.dataclass_to_dict()
+
+    # Test with a simple dataclass
+    instance1 = SimpleDataClass(name="Test1", value=100)
+    node.inputs["instance"].value = instance1
+    await node
+    assert node.outputs["out"].value == {
+        "name": "Test1",
+        "value": 100,
+        "is_active": True,
+    }
+
+    # Test with a nested dataclass
+    instance2 = NestedDataClass(
+        id=1, data=SimpleDataClass(name="Nested", value=200, is_active=False)
+    )
+    node.inputs["instance"].value = instance2
+    await node
+    assert node.outputs["out"].value == {
+        "id": 1,
+        "data": {"name": "Nested", "value": 200, "is_active": False},
+    }
+
+    # Test with non-dataclass input
+    node.inputs["instance"].value = {"not": "a dataclass"}
+    with pytest.raises(fn.NodeTriggerError) as excinfo:
+        await node
+    assert "Expected a dataclass instance" in str(excinfo.value)
+
+    node.inputs["instance"].value = 123
+    with pytest.raises(fn.NodeTriggerError) as excinfo:
+        await node
+    assert "Expected a dataclass instance" in str(excinfo.value)
+
+
+@pytest_funcnodes.nodetest(dc_nodes.dataclass_get_field)
+async def test_dataclass_get_field():
+    node = dc_nodes.dataclass_get_field()
+
+    instance_simple = SimpleDataClass(name="TestSimple", value=123)
+    instance_nested = NestedDataClass(
+        id=1, data=SimpleDataClass(name="Nested", value=200, is_active=False)
+    )
+
+    # Test setting instance updates field_name options
+    node.inputs["instance"].value = instance_simple
+    await node  # Initial trigger to process instance and update options
+    assert node.inputs["field_name"].value_options["options"] == [
+        "name",
+        "value",
+        "is_active",
+    ]
+
+    # Test getting a valid field 'name'
+    node.inputs["field_name"].value = "name"
+    await node
+    assert node.outputs["out"].value == "TestSimple"
+
+    # Test getting a valid field 'value'
+    node.inputs["field_name"].value = "value"
+    await node
+    assert node.outputs["out"].value == 123
+
+    # Test getting a valid field 'is_active'
+    node.inputs["field_name"].value = "is_active"
+    await node
+    assert node.outputs["out"].value is True
+
+    # Test with nested dataclass, first update options
+    node.inputs["instance"].value = instance_nested
+
+    assert node.inputs["field_name"].value_options["options"] == ["id", "data"]
+
+    # Test getting 'id' from nested
+    node.inputs["field_name"].value = "id"
+    await node
+    assert node.outputs["out"].value == 1
+
+    # Test getting 'data' (which is another dataclass)
+    node.inputs["field_name"].value = "data"
+    await node
+    assert node.outputs["out"].value == SimpleDataClass(
+        name="Nested", value=200, is_active=False
+    )
+
+    # Test getting non-existent field
+    node.inputs["instance"].value = instance_simple
+    node.inputs["field_name"].value = "non_existent_field"
+    with pytest.raises(fn.NodeTriggerError) as excinfo:
+        await node
+    assert "has no field 'non_existent_field'" in str(excinfo.value)
+
+    # Test with non-dataclass input
+    node.inputs["instance"].value = {"not": "a dataclass"}
+    node.inputs["field_name"].value = "some_field"  # field_name options will be None
+    assert node.inputs["field_name"].value_options["options"] is None
+
+    with pytest.raises(fn.NodeTriggerError) as excinfo:
+        await node  # trigger the func with invalid instance
+    assert "Expected a dataclass instance" in str(excinfo.value)
+
+    # Test dynamic update of options when instance changes
+    node.inputs["instance"].value = instance_nested
+    assert node.inputs["field_name"].value_options["options"] == ["id", "data"]
+    node.inputs["field_name"].value = "id"
+    await node
+    assert node.outputs["out"].value == 1
+
+    node.inputs["instance"].value = instance_simple
+    assert node.inputs["field_name"].value_options["options"] == [
+        "name",
+        "value",
+        "is_active",
+    ]
+    node.inputs[
+        "field_name"
+    ].value = "name"  # previous 'id' is no longer valid for options, but value remains
+    await node
+    assert node.outputs["out"].value == "TestSimple"

funcnodes_basic-0.2.4/tests/test_flows.py

@@ -0,0 +1,26 @@
+from funcnodes_basic import logic, strings
+import pytest_funcnodes
+import asyncio
+
+
+@pytest_funcnodes.nodetest(logic.ForNode)
+async def test_if_node_flow1():
+    fornode = logic.ForNode()
+    endswith = strings.string_endswith()
+    ifnode = logic.IfNode()
+
+    fornode.outputs["do"].connect(endswith.inputs["s"])
+    endswith.outputs["ends_with"].connect(ifnode.inputs["condition"])
+    fornode.outputs["do"].connect(ifnode.inputs["input"])
+    ifnode.outputs["on_true"].connect(fornode.inputs["collector"])
+
+    endswith.inputs["suffix"].value = ".txt"
+    fornode.inputs["input"].value = ["a.txt", "b.xls", "c.xls", "d.txt", "e.xls"]
+
+    # await fn.run_until_complete(fornode, ifnode, endswith)
+    await asyncio.sleep(1.5)
+    print("fornode:", fornode.in_trigger)
+    print("ifnode:", ifnode.in_trigger)
+    print("endswith:", endswith.in_trigger)
+
+    assert fornode.outputs["done"].value == ["a.txt", "d.txt"]

{funcnodes_basic-0.2.2 → funcnodes_basic-0.2.4}/tests/test_logic.py

@@ -42,8 +42,12 @@ async def test_wait_node():
 @pytest_funcnodes.nodetest(logic.ForNode)
 async def test_for_node():
     node = logic.ForNode()
+    waitnode = logic.WaitNode()
+    waitnode.inputs["delay"].value = 0.5
+    waitnode.inputs["input"].connect(node.outputs["do"])
+    waitnode.outputs["output"].connect(node.inputs["collector"])
     node.inputs["input"].value = "hello"
-    node.outputs["do"].connect(node.inputs["collector"])
+
     await node
 
     assert node.outputs["done"].value == ["h", "e", "l", "l", "o"]

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

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