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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes-core
-Version: 0.2.0
+Version: 0.2.2
 Summary: core package for funcnodes
 License: MIT
 Author: Julian Kimmig

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.2"
 
 from .io import (
     NodeInput,

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/config.py

@@ -15,7 +15,7 @@ BASE_CONFIG_DIR = os.environ.get(
 DEFAULT_CONFIG = {
     "env_dir": os.path.join(BASE_CONFIG_DIR, "env"),
     "worker_manager": {
-        "host": "localhost",
+        "host": "127.0.0.1",
         "port": 9380,
     },
     "frontend": {

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/io.py

@@ -122,6 +122,9 @@ class NoValueType:
     def __str__(self):
         return "<NoValue>"
 
+    def __reduce__(self):
+        return (NoValueType, ())
+
 
 NoValue: NoValueType = NoValueType()
 
@@ -494,10 +497,14 @@ class NodeIO(EventEmitterMixin, Generic[NodeIOType]):
             return None
         return f"{self.node.uuid}__{self.uuid}"
 
+    def get_value(self) -> NodeIOType | NoValueType:
+        """Gets the current value of the NodeIO."""
+        return self._value
+
     @property
     def value(self) -> NodeIOType | NoValueType:
         """Gets the current value of the NodeIO."""
-        return self._value
+        return self.get_value()
 
     @value.setter
     def value(self, value: NodeIOType) -> None:
@@ -570,6 +577,9 @@ class NodeIO(EventEmitterMixin, Generic[NodeIOType]):
     def __gt__(self, other):
         self.connect(other)
 
+    def __lt__(self, value):
+        return self.set_value(value)
+
     @emit_before()
     @emit_after()
     def disconnect(self, other: Optional[NodeIO] = None):
@@ -795,15 +805,9 @@ class NodeInput(NodeIO, Generic[NodeIOType]):
         self._forwards: weakref.WeakSet[NodeInput] = weakref.WeakSet()
         self._forwards_from: weakref.WeakSet[NodeInput] = weakref.WeakSet()
 
-    @property
-    def value(self) -> Union[NodeIOType, NoValueType]:
-        """Gets the current value of the NodeIO."""
-        return self._value if self._value is not NoValue else self._default
-
-    @value.setter
-    def value(self, value: NodeIOType) -> None:
-        """Sets the value of the NodeIO."""
-        self.set_value(value)
+    def get_value(self):
+        v = super().get_value()
+        return v if v is not NoValue else self._default
 
     def full_serialize(self, with_value=False) -> FullNodeInputJSON:
         return FullNodeInputJSON(
@@ -1007,6 +1011,7 @@ class NodeInput(NodeIO, Generic[NodeIOType]):
             raise MultipleConnectionsError("Can only forward to unconnected inputs")
 
         self._forwards_from.add(other)
+        self.set_default(NoValue)  # set default to class default upon connection
 
         return other.forward(self, replace=replace)
 
@@ -1068,11 +1073,14 @@ class NodeInput(NodeIO, Generic[NodeIOType]):
     def connect(self, other, replace=False):
         if isinstance(other, NodeInput):
             return self.forward(other, replace=replace)
+        self.set_default(NoValue)  # set default to class default upon connection
         con = super().connect(other, replace)
         if con and self._forwards_from:
             for f in list(self._forwards_from):
                 self.unforward_from(f)
 
+        return con
+
 
 class NodeOutput(NodeIO):
     """

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/lib/__init__.py

@@ -8,6 +8,7 @@ from .lib import (
     flatten_shelf,
     flatten_shelves,
     check_shelf,
+    ShelfReferenceLost,
 )
 
 from .libparser import module_to_shelf
@@ -28,4 +29,5 @@ __all__ = [
     "flatten_shelf",
     "flatten_shelves",
     "check_shelf",
+    "ShelfReferenceLost",
 ]

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/lib/lib.py

@@ -70,6 +70,10 @@ class Shelf:
         self.subshelves.append(shelf)
 
 
+class ShelfReferenceLost(ReferenceError):
+    pass
+
+
 @dataclass
 class _InnerShelf:
     nodes_ref: List[ReferenceType[Type[Node]]]
@@ -107,7 +111,11 @@ class _InnerShelf:
     def _check_shelf(self):
         if self.shelf is not None:
             if self.shelf() is None:
-                raise ValueError("Shelf reference is lost")
+                raise ShelfReferenceLost(
+                    "Shelf reference is lost\n"
+                    "This could happen if the shelf is not permanently stored e.g. if its added to the library "
+                    "as a dictionary and the returned Shelf object is not referenced"
+                )
 
     def to_shelf(self) -> Shelf:
         self._check_shelf()
@@ -122,18 +130,23 @@ class _InnerShelf:
         )
 
     def add_node(self, node: Type[Node]):
-        self._check_shelf()
-        if self.shelf is None:
-            self.nodes_ref.append(ref(node))
-        else:
-            self.shelf().add_node(node)
+        self.nodes_ref.append(ref(node))
 
     def add_subshelf(self, shelf: Shelf):
         self._check_shelf()
-        if self.shelf is None:
-            self.inner_subshelves.append(shelf)
-        else:
-            self.shelf().add_subshelf(shelf)
+        self.inner_subshelves.append(_InnerShelf.from_shelf(shelf))
+
+    def update(self, shelf: Shelf):
+        for node in shelf.nodes:
+            if node not in self.nodes:
+                self.add_node(node)
+
+        subshelves = {subshelf.name: subshelf for subshelf in self.inner_subshelves}
+        for subshelf in shelf.subshelves:
+            if subshelf.name in subshelves:
+                subshelves[subshelf.name].update(subshelf)
+            else:
+                self.add_subshelf(subshelf)
 
 
 class SerializedShelf(TypedDict):
@@ -264,10 +277,12 @@ class Library(EventEmitterMixin):
     def add_shelf(self, shelf: Shelf):
         shelf = check_shelf(shelf)
         shelf_dict = {s.name: s for s in self._shelves}
-        if shelf.name in shelf_dict and shelf_dict[shelf.name].to_shelf() != shelf:
-            raise ValueError(f"Shelf with name {shelf['name']} already exists")
-        self._shelves.append(_InnerShelf.from_shelf(shelf))
-        return shelf
+        if shelf.name in shelf_dict:
+            shelf_dict[shelf.name].update(shelf)
+            return shelf_dict[shelf.name].to_shelf()
+        else:
+            self._shelves.append(_InnerShelf.from_shelf(shelf))
+            return shelf
 
     @emit_after()
     def remove_shelf(self, shelf: Shelf):

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/node.py

@@ -148,6 +148,7 @@ def _parse_nodeclass_io(node: Node):
         node.add_input(
             NodeInput(
                 **ser,
+                class_default=ip.default,
             )
         )
 
@@ -802,6 +803,7 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
             kwargs = {
                 ip.uuid: ip.value for ip in self._inputs if ip.value is not NoValue
             }
+
             err = None
             if "_triggerinput" in kwargs:
                 del kwargs["_triggerinput"]

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/funcnodes_core/nodemaker.py

@@ -23,7 +23,7 @@ from .utils.functions import (
 )
 
 from weakref import WeakValueDictionary
-
+import warnings
 
 try:
     from typing import Unpack
@@ -37,7 +37,7 @@ def node_class_maker(
     id: Optional[str] = None,
     func: Callable[..., ReturnType] = None,
     superclass: Type[Node] = Node,
-    seperate_thread: bool = False,
+    separate_thread: bool = False,
     separate_process: bool = False,
     **kwargs: Unpack[NodeClassDict],
 ) -> Type[Node]:
@@ -67,8 +67,8 @@ def node_class_maker(
             kwargs["node_id"] = id
     in_func = assure_exposed_method(func)
 
-    if separate_process and seperate_thread:
-        raise ValueError("seperate_thread and separate_process cannot both be True")
+    if separate_process and separate_thread:
+        raise ValueError("separate_thread and separate_process cannot both be True")
 
     inputs = [
         NodeInput.from_serialized_input(ip)
@@ -81,7 +81,7 @@ def node_class_maker(
 
     if separate_process:
         asyncfunc = make_run_in_new_process(in_func)
-    elif seperate_thread:
+    elif separate_thread:
         asyncfunc = make_run_in_new_thread(in_func)
     else:
         asyncfunc = make_async_if_needed(in_func)
@@ -91,6 +91,13 @@ def node_class_maker(
         """
         A wrapper for the exposed function that sets the output values of the node.
         """
+        print(
+            "BBBtriggering",
+            self,
+            {ip.name: ip.value for ip in self.inputs.values()},
+            args,
+            kwargs,
+        )
         outs = await asyncfunc(*args, **kwargs)
         if len(outputs) > 1:
             for op, out in zip(outputs, outs):
@@ -143,7 +150,7 @@ class NodeDecoratorKwargs(ExposedMethodKwargs, NodeClassDict, total=False):
     """
 
     superclass: Optional[Type[Node]]
-    seperate_thread: Optional[bool]
+    separate_thread: Optional[bool]
     separate_process: Optional[bool]
 
 
@@ -184,12 +191,20 @@ def NodeDecorator(
 
         func = assure_exposed_method(func, **exposed_method_kwargs)
 
+        if "seperate_thread" in kwargs:
+            warnings.warn(
+                "The 'seperate_thread' argument is deprecated (typo), use 'separate_thread' instead.",
+                DeprecationWarning,
+            )
         # Create the node class
         return node_class_maker(
             id,
             func,
             superclass=kwargs.get("superclass", Node),
-            seperate_thread=kwargs.get("seperate_thread", False),
+            separate_thread=kwargs.get(
+                "separate_thread",
+                kwargs.get("seperate_thread", False),
+            ),  # fallback for typo in old versions
             separate_process=kwargs.get("separate_process", False),
             **node_class_kwargs,
         )

{funcnodes_core-0.2.0 → funcnodes_core-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "funcnodes-core"
-version = "0.2.0"
+version = "0.2.2"
 description = "core package for funcnodes"
 authors = ["Julian Kimmig <julian.kimmig@linkdlab.de>"]
 readme = "README.md"