nodebpy 0.10.2__tar.gz → 0.11.1__tar.gz

{nodebpy-0.10.2 → nodebpy-0.11.1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 0.10.2
+Version: 0.11.1
 Summary: Build nodes trees in Blender more elegantly with code
 Author: Brady Johnston
 Author-email: Brady Johnston <brady.johnston@me.com>
 License: GPL-3.0-or-later
-Requires-Dist: bpy>=5.0.1 ; extra == 'bpy'
+Requires-Dist: bpy>=5.1.0 ; extra == 'bpy'
 Requires-Dist: networkx>=3.6.1 ; extra == 'networkx'
-Requires-Python: >=3.11
+Requires-Python: >=3.13
 Provides-Extra: bpy
 Provides-Extra: networkx
 Description-Content-Type: text/markdown

{nodebpy-0.10.2 → nodebpy-0.11.1}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "nodebpy"
-version = "0.10.2"
+version = "0.11.1"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [
     { name = "Brady Johnston", email = "brady.johnston@me.com" }
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 license = { text = "GPL-3.0-or-later" }
 
 [project.scripts]
@@ -17,7 +17,7 @@ networkx = [
     "networkx>=3.6.1",
 ]
 bpy = [
-    "bpy>=5.0.1",
+    "bpy>=5.1.0",
 ]
 
 [build-system]

{nodebpy-0.10.2 → nodebpy-0.11.1}/src/nodebpy/__init__.py

@@ -1,4 +1,4 @@
-from . import nodes, screenshot, sockets
+from . import nodes, diagram, sockets
 from .builder import TreeBuilder, NodeGroupBuilder
 from .nodes import compositor, geometry, shader
 
@@ -8,7 +8,7 @@ __all__ = [
     "geometry",
     "shader",
     "sockets",
-    "screenshot",
+    "diagram",
     "TreeBuilder",
     "NodeGroupBuilder",
 ]

{nodebpy-0.10.2 → nodebpy-0.11.1}/src/nodebpy/builder/__init__.py

@@ -35,6 +35,7 @@ from .socket import (
     CollectionSocket,
     ColorSocket,
     FloatSocket,
+    FontSocket,
     GeometrySocket,
     ImageSocket,
     IntegerSocket,
@@ -93,6 +94,7 @@ __all__ = [
     "MenuSocket",
     "GeometrySocket",
     "ObjectSocket",
+    "FontSocket",
     "MaterialSocket",
     "ImageSocket",
     "CollectionSocket",
@@ -120,6 +122,7 @@ __all__ = [
     "SocketMenu",
     "SocketObject",
     "SocketGeometry",
+    "SocketFont",
     "SocketCollection",
     "SocketImage",
     "SocketMaterial",

{nodebpy-0.10.2 → nodebpy-0.11.1}/src/nodebpy/builder/accessor.py

@@ -1,12 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Literal, overload
 
 import bpy
 from bpy.types import NodeSocket
 
 from ._registry import _get_socket_linker
-from ._utils import SocketError, _allow_innactive_sockets, denormalize_name
+from ._utils import (
+    SocketError,
+    _allow_innactive_sockets,
+    denormalize_name,
+    normalize_name,
+)
 
 if TYPE_CHECKING:
     from .socket import Socket
@@ -43,6 +48,10 @@ class SocketAccessor:
         for candidate in (key, denorm):
             if candidate in ids:
                 return ids.index(candidate)
+        # Normalized identifier match: 'value_001' matches identifier 'Value_001'
+        normalized_ids = [normalize_name(id) for id in ids]
+        if key in normalized_ids:
+            return normalized_ids.index(key)
         names = [s.name for s in self._collection]
         for key in (key, denorm):
             if key in names:
@@ -58,11 +67,24 @@ class SocketAccessor:
             f"{self._node.bl_idname}. Available sockets (id: name): {list(zip(ids, names))}"
         )
 
-    def _get(self, key: str | int) -> "Socket":
+    @overload
+    def _get(self, key: slice) -> "list[Socket]": ...
+    @overload
+    def _get(self, key: str | int) -> "Socket": ...
+    def _get(self, key: str | int | slice) -> "Socket | list[Socket]":
         """Get a Socket for a socket by identifier, name, or index."""
+        if isinstance(key, slice):
+            return [
+                _get_socket_linker(self._collection[i])
+                for i in range(*key.indices(len(self._collection)))
+            ]
         return _get_socket_linker(self._collection[self._index(key)])
 
-    def __getitem__(self, key: str | int) -> "Socket":
+    @overload
+    def __getitem__(self, key: slice) -> "list[Socket]": ...
+    @overload
+    def __getitem__(self, key: str | int) -> "Socket": ...
+    def __getitem__(self, key: str | int | slice) -> "Socket | list[Socket]":
         """Access by identifier, name, or integer index."""
         return self._get(key)
 

{nodebpy-0.10.2 → nodebpy-0.11.1}/src/nodebpy/builder/mixins.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 from types import EllipsisType
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from bpy.types import NodeLink, NodeSocket
 
 from ._registry import _get_socket_linker
 from ._utils import SocketError, _resolve_promotion, _SocketLike
 
+_RShiftT = TypeVar("_RShiftT")
+
 if TYPE_CHECKING:
+    from ..nodes.geometry import Compare, Math
     from ..types import InputLinkable
     from .node import BaseNode
     from .socket import Socket
@@ -26,7 +29,7 @@ class OperatorMixin:
 
     def _apply_math_operation(
         self, other: Any, operation: str, reverse: bool = False
-    ) -> "BaseNode":
+    ) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
@@ -34,43 +37,43 @@ class OperatorMixin:
         )
         return _get_socket_linker(socket)._dispatch_math(other, operation, reverse)
 
-    def __mul__(self, other: Any) -> "BaseNode":
+    def __mul__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "multiply")
 
-    def __rmul__(self, other: Any) -> "BaseNode":
+    def __rmul__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "multiply", reverse=True)
 
-    def __truediv__(self, other: Any) -> "BaseNode":
+    def __truediv__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "divide")
 
-    def __rtruediv__(self, other: Any) -> "BaseNode":
+    def __rtruediv__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "divide", reverse=True)
 
-    def __add__(self, other: Any) -> "BaseNode":
+    def __add__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "add")
 
-    def __radd__(self, other: Any) -> "BaseNode":
+    def __radd__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "add", reverse=True)
 
-    def __sub__(self, other: Any) -> "BaseNode":
+    def __sub__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "subtract")
 
-    def __rsub__(self, other: Any) -> "BaseNode":
+    def __rsub__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "subtract", reverse=True)
 
-    def __pow__(self, other: Any) -> "BaseNode":
+    def __pow__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "power")
 
-    def __rpow__(self, other: Any) -> "BaseNode":
+    def __rpow__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "power", reverse=True)
 
-    def __mod__(self, other: Any) -> "BaseNode":
+    def __mod__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "modulo")
 
-    def __rmod__(self, other: Any) -> "BaseNode":
+    def __rmod__(self, other: Any) -> "Math":
         return self._apply_math_operation(other, "modulo", reverse=True)
 
-    def __floordiv__(self, other: Any) -> "BaseNode":
+    def __floordiv__(self, other: Any) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
@@ -78,7 +81,7 @@ class OperatorMixin:
         )
         return _get_socket_linker(socket)._dispatch_floordiv(other, reverse)
 
-    def __rfloordiv__(self, other: Any) -> "BaseNode":
+    def __rfloordiv__(self, other: Any) -> "Math":
         socket, other, reverse = _resolve_promotion(
             self._default_output_socket,
             other,
@@ -86,37 +89,37 @@ class OperatorMixin:
         )
         return _get_socket_linker(socket)._dispatch_floordiv(other, reverse)
 
-    def __neg__(self) -> "BaseNode":
+    def __neg__(self) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_unary(  # type: ignore[attr-defined]
             "negate"
         )
 
-    def __abs__(self) -> "BaseNode":
+    def __abs__(self) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_unary(  # type: ignore[attr-defined]
             "absolute"
         )
 
-    def _apply_compare_operation(self, other: Any, operation: str) -> "BaseNode":
+    def _apply_compare_operation(self, other: Any, operation: str) -> "Math":
         return _get_socket_linker(self._default_output_socket)._dispatch_compare(  # type: ignore[attr-defined]
             other, operation
         )
 
-    def __lt__(self, other: Any) -> "BaseNode":
+    def __lt__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "less_than")
 
-    def __gt__(self, other: Any) -> "BaseNode":
+    def __gt__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "greater_than")
 
-    def __le__(self, other: Any) -> "BaseNode":
+    def __le__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "less_equal")
 
-    def __ge__(self, other: Any) -> "BaseNode":
+    def __ge__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "greater_equal")
 
-    def __eq__(self, other: Any) -> "BaseNode":  # type: ignore[override]
+    def __eq__(self, other: Any) -> "Compare":  # type: ignore[override]
         return self._apply_compare_operation(other, "equal")
 
-    def __ne__(self, other: Any) -> "BaseNode":  # type: ignore[override]
+    def __ne__(self, other: Any) -> "Compare":  # type: ignore[override]
         return self._apply_compare_operation(other, "not_equal")
 
     def _apply_boolean_operation(self, other: Any, operation: str):
@@ -273,7 +276,7 @@ class LinkingMixin:
         else:
             self._link(source, input)
 
-    def __rshift__(self, other: "BaseNode | Socket") -> "BaseNode | Socket":
+    def __rshift__(self, other: _RShiftT) -> _RShiftT:
         """Chain nodes using >> operator. Links output to input.
 
         Usage:

{nodebpy-0.10.2 → nodebpy-0.11.1}/src/nodebpy/builder/node.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Iterable, Literal
+from typing import TYPE_CHECKING, Iterable, Literal, Self
 
 import bpy
 from bpy.types import Node, NodeSocket
@@ -25,7 +25,7 @@ class BaseNode(_NodeLike, OperatorMixin, LinkingMixin):
     _default_output_id: str | None = None
     _placeholder_inputs: list[str]
 
-    def __init__(self):
+    def __init__(self, node: bpy.types.Node | None = None):
         tree = (
             TreeBuilder._tree_contexts[-1] if len(TreeBuilder._tree_contexts) else None
         )
@@ -39,7 +39,7 @@ class BaseNode(_NodeLike, OperatorMixin, LinkingMixin):
 
         self._tree = tree
         self._placeholder_inputs = []
-        self.node: bpy.types.Node = self._tree.add(self.__class__._bl_idname)
+        self.node = node if node else self._tree.add(self.__class__._bl_idname)
 
     @property
     def tree(self) -> TreeBuilder:
@@ -71,6 +71,33 @@ class BaseNode(_NodeLike, OperatorMixin, LinkingMixin):
             socket = self.node.outputs[counter]
         return socket
 
+    @classmethod
+    def _from_node(cls, node: bpy.types.Node) -> Self:
+        builder = cls()
+        builder.tree.nodes.remove(builder.node)
+        builder.node = node
+        return builder
+
+    @classmethod
+    def _find_or_create_linked(cls, socket: NodeSocket) -> Self:
+        if socket.is_output:
+            if socket.links:
+                for link in socket.links:
+                    assert link.to_node
+                    if link.to_node.bl_idname == cls._bl_idname:
+                        return cls._from_node(link.to_node)
+            return cls(socket)
+        else:
+            if socket.links:
+                for link in socket.links:
+                    assert link.from_node
+                    if link.from_node.bl_idname == cls._bl_idname:
+                        return cls._from_node(link.from_node)
+
+            node = cls()
+            node >> socket
+            return node
+
     def _set_input_default_value(self, input, value):
         """Set the default value for an input socket, handling type conversions."""
         if (