funcnodes-basic 0.2.3__tar.gz → 1.0.0__tar.gz

{funcnodes_basic-0.2.3/src/funcnodes_basic.egg-info → funcnodes_basic-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.3
+Version: 1.0.0
 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>=1.0.5
 Requires-Dist: funcnodes
 Dynamic: license-file
 

{funcnodes_basic-0.2.3 → funcnodes_basic-1.0.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "funcnodes-basic"
-version = "0.2.3"
+version = "1.0.0"
 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>=1.0.5",
  "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.3 → funcnodes_basic-1.0.0}/src/funcnodes_basic/__init__.py

@@ -6,8 +6,9 @@ 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
+from .pyobjects import NODE_SHELF as pyobjects_shelf
 
-__version__ = "0.2.3"
+__version__ = "1.0.0"
 
 NODE_SHELF = Shelf(
     nodes=[],
@@ -15,6 +16,7 @@ NODE_SHELF = Shelf(
         input_shelf,
         lists_shelf,
         dicts_shelf,
+        pyobjects_shelf,
         dataclass_shelf,
         strings_shelf,
         math_shelf,

{funcnodes_basic-0.2.3 → funcnodes_basic-1.0.0}/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-1.0.0/src/funcnodes_basic/pyobjects.py

@@ -0,0 +1,183 @@
+"""Utilities that expose common Python object interactions as nodes."""
+
+from __future__ import annotations
+
+from typing import Any, List, Annotated, Dict
+
+import funcnodes_core as fn
+from funcnodes_core.io import InputMeta, OutputMeta
+
+
+def _list_public_attributes(obj: Any) -> List[str]:
+    """Return a sorted list of the object's non-private attribute names."""
+    if obj is None:
+        return []
+    try:
+        attributes = dir(obj)
+    except Exception:  # pragma: no cover - dir() rarely raises but stay defensive
+        return []
+    # Sorting keeps the dropdown stable for UI components that rely on deterministic
+    # value ordering across reruns.
+    return sorted(attr for attr in attributes if not attr.startswith("_"))
+
+
+def _ensure_non_private(attribute: str) -> None:
+    """Reject attribute names that appear private."""
+
+    if attribute.startswith("_"):
+        raise AttributeError(
+            f"Access to private attribute '{attribute}' is not permitted by this node."
+        )
+
+
+@fn.NodeDecorator(
+    id="pyobject_get_attribute",
+    name="Get Attribute",
+    description="Retrieve the value of a non-private attribute from a Python object.",
+    # default_io_options=_attribute_io_options(),
+)
+def get_attribute(
+    obj: Annotated[
+        Any,
+        InputMeta(
+            description="Python object that exposes the desired attribute.",
+            on={
+                "after_set_value": fn.decorator.update_other_io_options(
+                    "attribute",
+                    _list_public_attributes,
+                )
+            }
+        ),
+    ],
+    attribute: Annotated[
+        str,
+        InputMeta(
+            description="Name of the attribute to retrieve; private attributes are rejected.",
+        ),
+    ],
+) -> Annotated[
+    Any,
+    OutputMeta(
+        description="Value read from the requested attribute.",
+    ),
+]:
+    """Return the value of the selected non-private attribute for the provided object."""
+    _ensure_non_private(attribute)
+    if not hasattr(obj, attribute):
+        raise AttributeError(
+            f"Attribute '{attribute}' is not available on object of type {type(obj).__name__}."
+        )
+    # getattr performs the actual attribute retrieval once validation is complete.
+    return getattr(obj, attribute)
+
+
+@fn.NodeDecorator(
+    id="pyobject_has_attribute",
+    name="Has Attribute",
+    description="Check whether an object exposes a given attribute.",
+)
+def has_attribute(
+    obj: Annotated[
+        Any,
+        InputMeta(
+            description="Python object that may expose the attribute.",
+        ),
+    ],
+    attribute: Annotated[
+        str,
+        InputMeta(
+            description="Attribute name to probe; private attributes are rejected.",
+        ),
+    ],
+) -> Annotated[
+    bool,
+    OutputMeta(description="True if the attribute exists on the object."),
+]:
+    """Return True when the object defines the requested attribute."""
+
+    return hasattr(obj, attribute)
+
+
+@fn.NodeDecorator(
+    id="pyobject_set_attribute",
+    name="Set Attribute",
+    description="Assign a new value to a non-private attribute on a Python object.",
+)
+def set_attribute(
+    obj: Annotated[
+        Any,
+        InputMeta(
+            description="Python object whose attribute should be updated.",
+        ),
+    ],
+    attribute: Annotated[
+        str,
+        InputMeta(
+            description="Attribute name that will receive the new value.",
+        ),
+    ],
+    value: Annotated[
+        Any,
+        InputMeta(description="Value to assign to the attribute."),
+    ],
+) -> Annotated[
+    Any,
+    OutputMeta(description="The original object after assignment."),
+]:
+    """Set an attribute on the provided object and return the object for chaining."""
+
+    _ensure_non_private(attribute)
+    setattr(obj, attribute, value)
+    return obj
+
+
+@fn.NodeDecorator(
+    id="pyobject_delete_attribute",
+    name="Delete Attribute",
+    description="Remove a non-private attribute from a Python object.",
+)
+def delete_attribute(
+    obj: Annotated[
+        Any,
+        InputMeta(
+            description="Python object whose attribute should be removed.",
+            on={
+                "after_set_value": fn.decorator.update_other_io_options(
+                    "attribute",
+                    _list_public_attributes,
+                )
+            }
+        ),
+    ],
+    attribute: Annotated[
+        str,
+        InputMeta(
+            description="Attribute name to remove from the object.",
+        ),
+    ],
+) -> Annotated[
+    Any,
+    OutputMeta(description="The original object after deletion."),
+]:
+    """Delete an attribute from the object and return the mutated object."""
+
+    _ensure_non_private(attribute)
+    if not hasattr(obj, attribute):
+        raise AttributeError(
+            f"Attribute '{attribute}' is not available on object of type {type(obj).__name__}."
+        )
+    delattr(obj, attribute)
+    return obj
+
+
+NODE_SHELF = fn.Shelf(
+    nodes=[
+        get_attribute,
+        has_attribute,
+        set_attribute,
+        delete_attribute,
+    ],
+    name="Python Objects",
+    description="Access and transform general Python objects.",
+    subshelves=[],
+)

{funcnodes_basic-0.2.3 → funcnodes_basic-1.0.0/src/funcnodes_basic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funcnodes-basic
-Version: 0.2.3
+Version: 1.0.0
 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>=1.0.5
 Requires-Dist: funcnodes
 Dynamic: license-file
 

{funcnodes_basic-0.2.3 → funcnodes_basic-1.0.0}/src/funcnodes_basic.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ src/funcnodes_basic/input.py
 src/funcnodes_basic/lists.py
 src/funcnodes_basic/logic.py
 src/funcnodes_basic/math_nodes.py
+src/funcnodes_basic/pyobjects.py
 src/funcnodes_basic/strings.py
 src/funcnodes_basic.egg-info/PKG-INFO
 src/funcnodes_basic.egg-info/SOURCES.txt
@@ -19,9 +20,11 @@ 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
 tests/test_logic.py
 tests/test_math.py
+tests/test_pyobjects.py
 tests/test_strings.py

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

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

funcnodes_basic-1.0.0/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.3 → funcnodes_basic-1.0.0}/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-1.0.0/tests/test_pyobjects.py

@@ -0,0 +1,124 @@
+import funcnodes_core as fn
+import pytest
+import pytest_funcnodes
+
+from funcnodes_basic import pyobjects
+
+
+class Sample:
+    class_attr = "class-level"
+
+    def __init__(self) -> None:
+        self.public = "value"
+        self._private = "hidden"
+
+    @property
+    def public_property(self) -> str:
+        return "prop"
+
+    def public_method(self) -> str:
+        return "method"
+
+
+@pytest_funcnodes.nodetest(pyobjects.get_attribute)
+async def test_get_attribute_node_exposes_public_attributes():
+    node = pyobjects.get_attribute()
+    sample = Sample()
+
+    # Setting the object input triggers the attribute dropdown update.
+    node.inputs["obj"].value = sample
+
+    options = node.inputs["attribute"].value_options["options"]
+    assert options == [
+        "class_attr",
+        "public",
+        "public_method",
+        "public_property",
+    ]
+
+    node.inputs["attribute"].value = "public"
+    await node
+    assert node.outputs["out"].value == "value"
+
+    node.inputs["attribute"].value = "public_property"
+    await node
+    assert node.outputs["out"].value == "prop"
+
+    node.inputs["attribute"].value = "public_method"
+    await node
+    method = node.outputs["out"].value
+    assert callable(method)
+    assert method() == "method"
+
+    with pytest.raises(fn.NodeTriggerError):
+        node.inputs["attribute"].value = "_private"
+        await node
+
+    with pytest.raises(fn.NodeTriggerError):
+        node.inputs["attribute"].value = "missing"
+        await node
+
+
+@pytest_funcnodes.nodetest(pyobjects.has_attribute)
+async def test_has_attribute_node_checks_presence():
+    node = pyobjects.has_attribute()
+    sample = Sample()
+
+    node.inputs["obj"].value = sample
+
+    node.inputs["attribute"].value = "public_property"
+    await node
+    assert node.outputs["out"].value is True
+
+    node.inputs["attribute"].value = "missing"
+    await node
+    assert node.outputs["out"].value is False
+
+    node.inputs["attribute"].value = "_private"
+    await node
+    assert node.outputs["out"].value is True
+
+
+@pytest_funcnodes.nodetest(pyobjects.set_attribute)
+async def test_set_attribute_node_updates_value():
+    node = pyobjects.set_attribute()
+    sample = Sample()
+
+    node.inputs["obj"].value = sample
+    node.inputs["attribute"].value = "public"
+    node.inputs["value"].value = "updated"
+    await node
+
+    assert sample.public == "updated"
+    assert node.outputs["out"].value is sample
+
+    node.inputs["attribute"].value = "new_attr"
+    node.inputs["value"].value = 42
+    await node
+    assert getattr(sample, "new_attr") == 42
+
+    with pytest.raises(fn.NodeTriggerError):
+        node.inputs["attribute"].value = "_private"
+        node.inputs["value"].value = "secret"
+        await node
+
+
+@pytest_funcnodes.nodetest(pyobjects.delete_attribute)
+async def test_delete_attribute_node_removes_value():
+    node = pyobjects.delete_attribute()
+    sample = Sample()
+
+    node.inputs["obj"].value = sample
+    node.inputs["attribute"].value = "public"
+    await node
+
+    assert not hasattr(sample, "public")
+    assert node.outputs["out"].value is sample
+
+    with pytest.raises(fn.NodeTriggerError):
+        node.inputs["attribute"].value = "_private"
+        await node
+
+    with pytest.raises(fn.NodeTriggerError):
+        node.inputs["attribute"].value = "missing"
+        await node

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

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