nodebpy 0.12.0__tar.gz → 0.13.0__tar.gz

{nodebpy-0.12.0 → nodebpy-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 0.12.0
+Version: 0.13.0
 Summary: Build nodes trees in Blender more elegantly with code
 Author: Brady Johnston
 Author-email: Brady Johnston <brady.johnston@me.com>

{nodebpy-0.12.0 → nodebpy-0.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "0.12.0"
+version = "0.13.0"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/__init__.py

@@ -1,9 +1,5 @@
 from . import diagram, nodes, sockets
 from .builder import (
-    CustomCompositorGroup,
-    CustomGeometryGroup,
-    CustomShaderGroup,
-    NodeGroupBuilder,
     TreeBuilder,
 )
 from .nodes import compositor, geometry, shader
@@ -16,8 +12,4 @@ __all__ = [
     "sockets",
     "diagram",
     "TreeBuilder",
-    "NodeGroupBuilder",
-    "GeometryNodeGroup",
-    "ShaderNodeGroup",
-    "CompositorNodeGroup",
 ]

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/__init__.py

@@ -89,6 +89,9 @@ __all__ = [
     "DynamicInputsMixin",
     # Node groups
     "NodeGroupBuilder",
+    "CustomCompositorGroup",
+    "CustomGeometryGroup",
+    "CustomShaderGroup",
     "GeometryNodeGroup",
     "ShaderNodeGroup",
     "CompositorNodeGroup",

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/_utils.py

@@ -67,7 +67,10 @@ def _resolve_promotion(
 
     if other_prec > self_prec:
         # Other side is dominant — swap so the linker wraps the vector/higher socket
-        other_socket = other._default_output_socket
+        if isinstance(other, NodeSocket):
+            other_socket = other
+        else:
+            other_socket = other._default_output_socket
         return other_socket, self_socket, not reverse
 
     return self_socket, other, reverse

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/accessor.py

@@ -28,7 +28,7 @@ class SocketAccessor:
 
     def __init__(
         self,
-        collection: bpy.types.NodeInputs | bpy.types.NodeOutputs,
+        collection: bpy.types.NodeInputs | bpy.types.NodeOutputs | list[NodeSocket],
         direction: Literal["input", "output"],
     ):
         self._direction = direction

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/mixins.py

@@ -100,9 +100,12 @@ class OperatorMixin:
         )
 
     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
+        socket, other, _ = _resolve_promotion(
+            self._default_output_socket,  # type: ignore[attr-defined]
+            other,
+            False,
         )
+        return _get_socket_linker(socket)._dispatch_compare(other, operation)
 
     def __lt__(self, other: Any) -> "Compare":
         return self._apply_compare_operation(other, "less_than")
@@ -236,6 +239,11 @@ class LinkingMixin:
         else:
             inputs = [target]
 
+        # NodeReroute adapts its type to whatever is linked — skip type matching
+        if getattr(getattr(target, "node", None), "bl_idname", None) == "NodeReroute":
+            if outputs and inputs:
+                return inputs[0], outputs[0]
+
         for output in outputs:
             compat_sockets = SOCKET_COMPATIBILITY.get(output.type, ())
             for input in inputs:

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/node.py

@@ -15,10 +15,13 @@ from typing import (
 
 import bpy
 from bpy.types import (
+    CompositorNodeGroup,
     CompositorNodeTree,
+    GeometryNodeGroup,
     GeometryNodeTree,
     Node,
     NodeSocket,
+    ShaderNodeGroup,
     ShaderNodeTree,
 )
 
@@ -50,7 +53,7 @@ class BaseNode(_NodeLike, OperatorMixin, LinkingMixin):
     _default_output_id: str | None = None
     _placeholder_inputs: list[str]
 
-    def __init__(self, node: bpy.types.Node | None = None):
+    def __init__(self, node: Node | None = None):
         tree = (
             TreeBuilder._tree_contexts[-1] if len(TreeBuilder._tree_contexts) else None
         )
@@ -97,7 +100,7 @@ class BaseNode(_NodeLike, OperatorMixin, LinkingMixin):
         return socket
 
     @classmethod
-    def _from_node(cls, node: bpy.types.Node) -> Self:
+    def _from_node(cls, node: Node) -> Self:
         builder = cls()
         builder.tree.nodes.remove(builder.node)
         builder.node = node
@@ -274,6 +277,12 @@ class NodeGroupBuilder(BaseNode, ABC, Generic[_T]):
         self.node.show_options = False
         self._establish_links(**kwargs)
 
+    @property
+    @abstractmethod
+    def node_tree(self) -> _T:
+        """The internal node tree for this group node."""
+        ...
+
     @abstractmethod
     def _setup_node_group(self) -> None:
         """Set ``self.node.node_tree`` and any node-type-specific properties.
@@ -304,7 +313,12 @@ class CustomGeometryGroup(NodeGroupBuilder[GeometryNodeTree]):
     """Node group in a Geometry Nodes tree."""
 
     _bl_idname = "GeometryNodeGroup"
-    node: bpy.types.GeometryNodeGroup
+    node: GeometryNodeGroup
+
+    @property
+    def node_tree(self) -> GeometryNodeTree:
+        assert self.node.node_tree is not None
+        return self.node.node_tree
 
     def _setup_node_group(self) -> None:
         self.node.node_tree = self._get_or_create_group()
@@ -324,7 +338,12 @@ class CustomShaderGroup(NodeGroupBuilder[ShaderNodeTree]):
     """Node group in a Shader (Material) node tree."""
 
     _bl_idname = "ShaderNodeGroup"
-    node: bpy.types.ShaderNodeGroup
+    node: ShaderNodeGroup
+
+    @property
+    def node_tree(self) -> ShaderNodeTree:
+        assert self.node.node_tree is not None
+        return self.node.node_tree
 
     def _setup_node_group(self) -> None:
         self.node.node_tree = self._get_or_create_group()
@@ -343,7 +362,12 @@ class CustomCompositorGroup(NodeGroupBuilder[CompositorNodeTree]):
     """Node group in a Compositor node tree."""
 
     _bl_idname = "CompositorNodeGroup"
-    node: bpy.types.CompositorNodeGroup
+    node: CompositorNodeGroup
+
+    @property
+    def node_tree(self) -> CompositorNodeTree:
+        assert self.node.node_tree is not None
+        return self.node.node_tree
 
     def _setup_node_group(self) -> None:
         self.node.node_tree = self._get_or_create_group()

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/socket.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Iterator, overload
+from typing import TYPE_CHECKING, Any, Iterator, cast, overload
 
 import bpy
 from bpy.types import (
@@ -25,6 +25,7 @@ from bpy.types import (
     NodeSocketShader,
     NodeSocketString,
     NodeSocketVector,
+    NodeTree,
 )
 from mathutils import Euler
 
@@ -55,7 +56,7 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
         self.socket = socket
         self.node = socket.node
         self._default_output_id = socket.identifier
-        self._tree = TreeBuilder(socket.node.id_data)  # type: ignore
+        self._tree = TreeBuilder(cast(NodeTree, socket.node.id_data))
 
     @property
     def tree(self) -> TreeBuilder:
@@ -100,7 +101,7 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
 
     def _dispatch_math(
         self, other: Any, operation: str, reverse: bool = False
-    ) -> "BaseNode":
+    ) -> "Math":
         """Scalar math dispatch (float). Uses the Math node."""
         from ..nodes.geometry.converter import Math
 
@@ -108,7 +109,7 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
         math_operation = "floored_modulo" if operation == "modulo" else operation
         return getattr(Math, math_operation)(*values)
 
-    def _dispatch_unary(self, operation: str) -> "BaseNode":
+    def _dispatch_unary(self, operation: str) -> "Math":
         """Scalar unary dispatch (float). Uses the Math node."""
         from ..nodes.geometry.converter import Math
 
@@ -118,7 +119,7 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
             return Math.absolute(self.socket)
         raise ValueError(f"Unknown unary operation: {operation}")
 
-    def _dispatch_floordiv(self, other: Any, reverse: bool = False) -> "BaseNode":
+    def _dispatch_floordiv(self, other: Any, reverse: bool = False) -> "Math":
         """Scalar floor division: divide then floor."""
         from ..nodes.geometry.converter import Math
 
@@ -126,7 +127,7 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
         divided = Math.divide(*values)
         return Math.floor(divided)
 
-    def _dispatch_compare(self, other: Any, operation: str) -> "BaseNode":
+    def _dispatch_compare(self, other: Any, operation: str) -> "Compare | Math":
         """Scalar comparison dispatch."""
         if isinstance(self._tree.tree, GeometryNodeTree):
             from ..nodes.geometry.manual import Compare
@@ -140,9 +141,12 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
                 "greater_than": ("greater_than", False),
                 "less_equal": ("greater_than", True),
                 "greater_equal": ("less_than", True),
+                "equal": ("compare", False),
             }
             math_op, negate = _MATH_COMPARE_MAP[operation]
             result = getattr(Math, math_op)(self.socket, other)
+            if operation == "equal":
+                result.i.value_002.default_value = 0.00001
             if negate:
                 result = Math.subtract(1.0, result._default_output_socket)
             return result
@@ -167,8 +171,8 @@ class Socket(_SocketLike, OperatorMixin, LinkingMixin):
         def __gt__(self, other: Any) -> "Compare": ...
         def __le__(self, other: Any) -> "Compare": ...
         def __ge__(self, other: Any) -> "Compare": ...
-        def __eq__(self, other: Any) -> "Compare": ...  # type: ignore[override]
-        def __ne__(self, other: Any) -> "Compare": ...  # type: ignore[override]
+        def __eq__(self, other: Any) -> "Compare": ...
+        def __ne__(self, other: Any) -> "Compare": ...
 
 
 # ---------------------------------------------------------------------------
@@ -308,7 +312,7 @@ class _VectorMixin:
 
             return getattr(Compare.vector, operation)(self.socket, other)
         else:
-            return Socket._dispatch_compare(self, other, operation)  # type: ignore[arg-type]
+            return Socket._dispatch_compare(cast("Socket", self), other, operation)
 
     if TYPE_CHECKING:
 
@@ -324,12 +328,10 @@ class _VectorMixin:
         def __rfloordiv__(self, other: Any) -> "VectorMath": ...
         def __neg__(self) -> "VectorMath": ...
         def __abs__(self) -> "VectorMath": ...
-        def __lt__(self, other: Any) -> "Compare": ...
-        def __gt__(self, other: Any) -> "Compare": ...
-        def __le__(self, other: Any) -> "Compare": ...
-        def __ge__(self, other: Any) -> "Compare": ...
-        def __eq__(self, other: Any) -> "Compare": ...  # type: ignore[override]
-        def __ne__(self, other: Any) -> "Compare": ...  # type: ignore[override]
+        def __lt__(self, other: Any) -> "Compare[NodeSocketVector]": ...
+        def __gt__(self, other: Any) -> "Compare[NodeSocketVector]": ...
+        def __le__(self, other: Any) -> "Compare[NodeSocketVector]": ...
+        def __ge__(self, other: Any) -> "Compare[NodeSocketVector]": ...
 
 
 _SEPARATE_COLOR_IDNAMES = (
@@ -356,7 +358,9 @@ class _ColorMixin:
         return SeparateColor
 
     def _separated_channel(self, channel: str) -> Socket:
+        assert self.socket.links is not None
         for link in self.socket.links:
+            assert link.to_node is not None
             if link.to_node.bl_idname in _SEPARATE_COLOR_IDNAMES:
                 return Socket(link.to_node.outputs[channel])
 
@@ -438,6 +442,40 @@ class _ColorMixin:
     def __len__(self) -> int:
         return 4
 
+    def _dispatch_math(
+        self, other: Any, operation: str, reverse: bool = False
+    ) -> "BaseNode":
+        from ..nodes.geometry import VectorMath
+
+        values = (self.socket, other) if not reverse else (other, self.socket)
+
+        if operation == "multiply":
+            if isinstance(other, (int, float)):
+                return VectorMath.scale(self.socket, other)
+            elif isinstance(other, NodeSocket) and other.type in (
+                "VALUE",
+                "FLOAT",
+                "INT",
+            ):
+                return VectorMath.scale(self.socket, other)
+            elif isinstance(other, (_SocketLike, _NodeLike)) and getattr(
+                other, "type", None
+            ) in ("VALUE", "FLOAT", "INT"):
+                return VectorMath.scale(self.socket, other._default_output_socket)
+            else:
+                return VectorMath.multiply(*values)
+        else:
+            vector_method = getattr(VectorMath, operation, None)
+            assert vector_method is not None
+            if isinstance(other, (int, float)):
+                scalar_vector = (other, other, other)
+                return (
+                    vector_method(self.socket, scalar_vector)
+                    if not reverse
+                    else vector_method(scalar_vector, self.socket)
+                )
+            return vector_method(*values)
+
 
 class _IntegerMixin:
     """Integer-specific dispatch — uses IntegerMath in geometry trees."""
@@ -475,7 +513,7 @@ class _IntegerMixin:
 
             values = (self.socket, other) if not reverse else (other, self.socket)
             return getattr(IntegerMath, operation)(*values)
-        return Socket._dispatch_math(self, other, operation, reverse)  # type: ignore[arg-type]
+        return Socket._dispatch_math(cast("Socket", self), other, operation, reverse)
 
     def _dispatch_unary(self, operation: str) -> "BaseNode":
         if self._is_geometry_tree:
@@ -485,7 +523,7 @@ class _IntegerMixin:
                 return IntegerMath.negate(self.socket)
             elif operation == "absolute":
                 return IntegerMath.absolute(self.socket)
-        return Socket._dispatch_unary(self, operation)  # type: ignore[arg-type]
+        return Socket._dispatch_unary(cast("Socket", self), operation)
 
     def _dispatch_floordiv(self, other: Any, reverse: bool = False) -> "BaseNode":
         if self._is_geometry_tree and self._other_is_integer(other):
@@ -493,14 +531,14 @@ class _IntegerMixin:
 
             values = (self.socket, other) if not reverse else (other, self.socket)
             return IntegerMath.divide_floor(*values)
-        return Socket._dispatch_floordiv(self, other, reverse)  # type: ignore[arg-type]
+        return Socket._dispatch_floordiv(cast("Socket", self), other, reverse)
 
-    def _dispatch_compare(self, other: Any, operation: str) -> "BaseNode":
+    def _dispatch_compare(self, other: Any, operation: str) -> "Compare | Math":
         if isinstance(self._tree.tree, GeometryNodeTree):
             from ..nodes.geometry.manual import Compare
 
             return getattr(Compare.integer, operation)(self.socket, other)
-        return Socket._dispatch_compare(self, other, operation)  # type: ignore[arg-type]
+        return Socket._dispatch_compare(cast("Socket", self), other, operation)
 
     if TYPE_CHECKING:
 
@@ -516,12 +554,10 @@ class _IntegerMixin:
         def __rfloordiv__(self, other: Any) -> "IntegerMath": ...
         def __neg__(self) -> "IntegerMath": ...
         def __abs__(self) -> "IntegerMath": ...
-        def __lt__(self, other: Any) -> "Compare": ...
-        def __gt__(self, other: Any) -> "Compare": ...
-        def __le__(self, other: Any) -> "Compare": ...
-        def __ge__(self, other: Any) -> "Compare": ...
-        def __eq__(self, other: Any) -> "Compare": ...  # type: ignore[override]
-        def __ne__(self, other: Any) -> "Compare": ...  # type: ignore[override]
+        def __lt__(self, other: Any) -> "Compare[NodeSocketInt]": ...
+        def __gt__(self, other: Any) -> "Compare[NodeSocketInt]": ...
+        def __le__(self, other: Any) -> "Compare[NodeSocketInt]": ...
+        def __ge__(self, other: Any) -> "Compare[NodeSocketInt]": ...
 
 
 # ---------------------------------------------------------------------------

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/builder/tree.py

@@ -823,8 +823,14 @@ class TreeBuilder(Generic[_TreeT]):
         if not isinstance(socket2, NodeSocket):
             socket2 = socket2.socket  # type: ignore[attr-defined]
 
+        is_reroute = (
+            getattr(socket1.node, "bl_idname", None) == "NodeReroute"
+            or getattr(socket2.node, "bl_idname", None) == "NodeReroute"
+        )
         if (
-            socket1.type not in SOCKET_COMPATIBILITY.get(socket2.type, ())
+            not is_reroute
+            and socket1.type not in SOCKET_COMPATIBILITY.get(socket2.type, ())
+            and socket1.type != "CUSTOM"
             and socket2.type != "CUSTOM"
         ):
             raise SocketError(

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/nodes/compositor/__init__.py

@@ -4,6 +4,9 @@ from .manual import (
     MenuSwitch,
     Frame,
     tree,
+    Float,
+    Image,
+    Cryptomatte,
 )
 from ..geometry.color import (
     Gamma,
@@ -41,6 +44,9 @@ from ..geometry.texture import (
     WaveTexture,
     WhiteNoiseTexture,
 )
+from ..geometry.utilities import (
+    Reroute,
+)
 from ..geometry.vector import (
     RadialTiling,
     VectorCurves,
@@ -80,6 +86,20 @@ from .filter import (
     Pixelate,
     VectorBlur,
 )
+from .input import (
+    BokehImage,
+    Color,
+    ImageCoordinates,
+    ImageInfo,
+    Mask,
+    MovieClip,
+    Normal,
+    RenderLayers,
+    SceneTime,
+    SequencerStripInfo,
+    TimeCurve,
+    TrackPosition,
+)
 from .matte import (
     BoxMask,
     ChannelKey,
@@ -103,7 +123,7 @@ from .converter import (
     IndexSwitch,
     Levels,
     Mix,
-    RGBToBw,
+    RGBToBW,
     RelativeToPixel,
     SeparateColor,
     SetAlpha,
@@ -129,17 +149,6 @@ from .distort import (
 from .group import (
     Group,
 )
-from .input import (
-    Color,
-    Mask,
-    MovieClip,
-    Normal,
-    RenderLayers,
-    SceneTime,
-    SequencerStripInfo,
-    TimeCurve,
-    TrackPosition,
-)
 from .vector import (
     Normalize,
 )
@@ -159,6 +168,7 @@ __all__ = (
     "Blackbody",
     "Blur",
     "BokehBlur",
+    "BokehImage",
     "Boolean",
     "BoxMask",
     "BrickTexture",
@@ -180,6 +190,7 @@ __all__ = (
     "Convolve",
     "CornerPin",
     "Crop",
+    "Cryptomatte",
     "Defocus",
     "Denoise",
     "DepthCombine",
@@ -196,6 +207,7 @@ __all__ = (
     "FileOutput",
     "Filter",
     "Flip",
+    "Float",
     "FloatCurve",
     "Frame",
     "GaborTexture",
@@ -208,6 +220,9 @@ __all__ = (
     "HueCorrect",
     "Huesaturationvalue",
     "IDMask",
+    "Image",
+    "ImageCoordinates",
+    "ImageInfo",
     "IndexSwitch",
     "Inpaint",
     "Integer",
@@ -235,10 +250,11 @@ __all__ = (
     "PlaneTrackDeform",
     "Posterize",
     "RGBCurves",
-    "RGBToBw",
+    "RGBToBW",
     "RadialTiling",
     "RelativeToPixel",
     "RenderLayers",
+    "Reroute",
     "Rotate",
     "Scale",
     "SceneTime",

{nodebpy-0.12.0 → nodebpy-0.13.0}/src/nodebpy/nodes/compositor/converter.py

@@ -1111,7 +1111,7 @@ class Mix(NodeBuilder):
         self.node.clamp_result = value
 
 
-class RGBToBw(NodeBuilder):
+class RGBToBW(NodeBuilder):
     """
     Convert RGB input into grayscale using luminance