nodebpy 0.7.0__tar.gz → 0.7.2__tar.gz

{nodebpy-0.7.0 → nodebpy-0.7.2}/PKG-INFO

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

{nodebpy-0.7.0 → nodebpy-0.7.2}/pyproject.toml

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

{nodebpy-0.7.0 → nodebpy-0.7.2}/src/nodebpy/builder.py

@@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, Iterable, Literal
 
 if TYPE_CHECKING:
     from .nodes.geometry import IntegerMath, Math, VectorMath
-    from .nodes.geometry.converter import BooleanMath, MultiplyMatrices
+    from .nodes.geometry.converter import BooleanMath, MultiplyMatrices, TransformPoint
     from .nodes.geometry.manual import Compare
 
 import bpy
@@ -139,7 +139,7 @@ class SocketContext:
 class DirectionalContext(SocketContext):
     """Base class for directional socket contexts"""
 
-    _direction: Literal["INPUT", "OUTPUT"] = "INPUT"
+    _direction = "INPUT"
     _active_context = None
 
 
@@ -249,14 +249,14 @@ class TreeBuilder:
 
     @fake_user.setter
     def fake_user(self, value: bool) -> None:
-        self.tree.use_extra_user = value
+        self.tree.use_fake_user = value
 
     def activate_tree(self) -> None:
         """Make this tree the active tree for all new node creation."""
         TreeBuilder._tree_contexts.append(self)
 
     def deactivate_tree(self) -> None:
-        """Whatever tree ws previously active is set to be the active one (or None if no previously active tree)."""
+        """Whatever tree was previously active is set to be the active one (or None if no previously active tree)."""
         TreeBuilder._tree_contexts.pop()
 
     def __enter__(self):
@@ -271,9 +271,9 @@ class TreeBuilder:
 
     def _apply_input_defaults(self) -> None:
         for key, value in self._menu_defaults.items():
-            for item in self.tree.interface.items_tree:
-                if item.identifier == key:
-                    item.default_value = value
+            for item in self.tree.interface.items_tree:  # type: ignore
+                if item.identifier == key:  # type: ignore
+                    item.default_value = value  # type: ignore
                     break
 
     def __len__(self) -> int:
@@ -335,9 +335,13 @@ class TreeBuilder:
             # the warning message should report which sockets from which nodes were linked and which were innactive
             for socket in [socket1, socket2]:
                 # we want to be loud about it if we end up linking an inactive socket to a node that is not a switch
-                if socket.is_inactive and socket.node.bl_idname not in (  # type: ignore
-                    "GeometryNodeIndexSwitch",
-                    "GeometryNodeMenuSwitch",
+                if socket.is_inactive and (
+                    socket.node.bl_idname  # type: ignore
+                    not in (  # type: ignore
+                        "GeometryNodeIndexSwitch",
+                        "GeometryNodeMenuSwitch",
+                        "ShaderNodeMixShader",
+                    )
                 ):
                     message = f"Socket {socket.name} from node {socket.node.name} is inactive."  # type: ignore
                     message += f" It is linked to socket {socket2.name} from node {socket2.node.name}."
@@ -356,13 +360,14 @@ class TreeBuilder:
 class NodeBuilder:
     """Base class for all geometry node wrappers."""
 
-    node: Any
+    node: bpy.types.Node
     _bl_idname: str
     _tree: "TreeBuilder"
     _link_target: str | None = None
     _from_socket: NodeSocket | None = None
     _default_input_id: str | None = None
     _default_output_id: str | None = None
+    _placeholder_inputs: list[str]
     __array_ufunc__ = None
 
     def __init__(self):
@@ -380,6 +385,7 @@ class NodeBuilder:
 
         self._tree = tree
         self._link_target = None
+        self._placeholder_inputs = []
         if self.__class__.name is not None:
             self.node = self._tree.add(self.__class__._bl_idname)
         else:
@@ -502,7 +508,7 @@ class NodeBuilder:
             return sorted(possible_combos, key=lambda x: x[0])[0][1]
 
         raise SocketError(
-            f"Cannot link any output from {source.node.name} to any input of {target.node.name}. "
+            f"Cannot link any output from {source.node.name} to any input of {target.node.name}. "  # type: ignore
             f"Available output types: {[f'{o.name}:{o.type}' for o in outputs]}, "
             f"Available input types: {[f'{i.name}:{i.type}' for i in inputs]}"
         )
@@ -526,7 +532,10 @@ class NodeBuilder:
         if identifier in input_names:
             return input_names.index(identifier)
 
-        raise RuntimeError()
+        raise RuntimeError(
+            f"Input '{identifier}' not found on {self.node.bl_idname}. "
+            f"Available inputs: {input_names}"
+        )
 
     def _output_idx(self, identifier: str) -> int:
         output_ids = [output.identifier for output in self.node.outputs]
@@ -589,10 +598,11 @@ class NodeBuilder:
                 value = node
 
             if value is ...:
-                # Ellipsis indicates this input should receive links from >> operator
-                # which can potentially target multiple inputs on the new node
+                # Ellipsis marks this input as a placeholder for the >> operator
+                self._placeholder_inputs.append(name)
                 if self._from_socket is not None:
                     self._link_from(self._from_socket, name)
+                continue
 
             elif isinstance(value, SocketLinker):
                 self._link_from(value, name)
@@ -624,6 +634,14 @@ class NodeBuilder:
             source = self._default_output_socket
             target = other.socket
             other._from_socket = source
+        elif getattr(other, "_placeholder_inputs", None):
+            # Link to the first placeholder input marked with ...
+            name = other._placeholder_inputs.pop(0)
+            try:
+                target = other.node.inputs[name]
+            except KeyError:
+                target = other.node.inputs[other._input_idx(name)]
+            source = self._best_output_socket(target.type)
         else:
             try:
                 source, target = self._find_best_socket_pair(self, other)
@@ -697,7 +715,7 @@ class NodeBuilder:
 
             # only the Geometry Node Tree supports integer math currently, potential
             # to support other trees when Blender supports it
-            is_geometry_tree = self._tree.tree.bl_idname in ["GeometryNodeTree"]
+            is_geometry_tree = self._tree.tree.bl_idname == "GeometryNodeTree"
             if (
                 is_geometry_tree
                 and isinstance(other, int)
@@ -842,16 +860,16 @@ class NodeBuilder:
                 result = Math.subtract(1.0, result._default_output_socket)
             return result
 
-    def __lt__(self, other: Any) -> "Compare":
+    def __lt__(self, other: Any) -> "Compare | Math":
         return self._apply_compare_operation(other, "less_than")
 
-    def __gt__(self, other: Any) -> "Compare":
+    def __gt__(self, other: Any) -> "Compare | Math":
         return self._apply_compare_operation(other, "greater_than")
 
-    def __le__(self, other: Any) -> "Compare":
+    def __le__(self, other: Any) -> "Compare | Math":
         return self._apply_compare_operation(other, "less_equal")
 
-    def __ge__(self, other: Any) -> "Compare":
+    def __ge__(self, other: Any) -> "Compare | Math":
         return self._apply_compare_operation(other, "greater_equal")
 
     def _apply_boolean_operation(self, other: Any, operation: str) -> "BooleanMath":
@@ -898,15 +916,31 @@ class NodeBuilder:
         else:
             return value
 
-    def __matmul__(self, other: Any) -> "MultiplyMatrices":
-        from .nodes.geometry.converter import MultiplyMatrices
+    def __matmul__(self, other: Any) -> "MultiplyMatrices | TransformPoint":
+        from .nodes.geometry.converter import MultiplyMatrices, TransformPoint
 
-        return MultiplyMatrices(self, self._cast_to_matrix(other))
+        other = self._cast_to_matrix(other)
+        socket = self._default_output_socket
+        other_type = getattr(other, "type", None)
+
+        # matrix @ vector → TransformPoint (standard M @ v)
+        if socket.type == "MATRIX" and other_type == "VECTOR":
+            return TransformPoint(other, socket)
+
+        return MultiplyMatrices(self, other)
+
+    def __rmatmul__(self, other: Any) -> "MultiplyMatrices | TransformPoint":
+        from .nodes.geometry.converter import MultiplyMatrices, TransformPoint
+
+        other = self._cast_to_matrix(other)
+        socket = self._default_output_socket
+        other_type = getattr(other, "type", None)
 
-    def __rmatmul__(self, other: Any) -> "MultiplyMatrices":
-        from .nodes.geometry.converter import MultiplyMatrices
+        # matrix @ vector: other is matrix (non-NodeBuilder cast), self is vector
+        if socket.type == "VECTOR" and other_type == "MATRIX":
+            return TransformPoint(socket, other)
 
-        return MultiplyMatrices(self._cast_to_matrix(other), self)
+        return MultiplyMatrices(other, self)
 
 
 class DynamicInputsMixin:
@@ -934,7 +968,7 @@ class DynamicInputsMixin:
         self, source: NodeBuilder | NodeSocket, target: NodeBuilder | NodeSocket
     ) -> tuple[NodeSocket, NodeSocket]:
         try:
-            return super()._find_best_socket_pair(source, target)
+            return super()._find_best_socket_pair(source, target)  # type: ignore
         except SocketError:
             if target == self:
                 target_name, source_socket = list(target._add_inputs(source).items())[0]
@@ -1026,7 +1060,7 @@ class SocketBase(SocketLinker):
     def __init__(self, name: str, description: str = ""):
         self.description = description
 
-        self._socket_context: SocketContext = SocketContext._active_context
+        self._socket_context = SocketContext._active_context
         self.interface_socket = self._socket_context._create_socket(self, name)
         self._tree = self._socket_context.builder
         if self._socket_context._direction == "INPUT":
@@ -1056,7 +1090,7 @@ class SocketBase(SocketLinker):
             raise AttributeError(
                 f"'{self.__class__.__name__}' object has no attribute 'default_value'"
             )
-        return self.interface_socket.default_value
+        return getattr(self.interface_socket, "default_value")
 
     @default_value.setter
     def default_value(self, value):
@@ -1064,7 +1098,7 @@ class SocketBase(SocketLinker):
             raise AttributeError(
                 f"'{self.__class__.__name__}' object has no attribute 'default_value'"
             )
-        self.interface_socket.default_value = value
+        setattr(self.interface_socket, "default_value", value)
 
 
 class SocketFloat(SocketBase):

{nodebpy-0.7.0 → nodebpy-0.7.2}/src/nodebpy/types.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import typing
+from types import EllipsisType
 from typing import Literal
 
 from bpy.types import (
@@ -35,7 +36,7 @@ def _is_default_value(value: TYPE_INPUT_ALL):
 
 
 # Type aliases for node inputs using typing.Union for runtime compatibility
-LINKABLE = typing.Union["NodeBuilder", "SocketLinker", NodeSocket, None]
+LINKABLE = typing.Union["NodeBuilder", "SocketLinker", NodeSocket, None, EllipsisType]
 TYPE_INPUT_ROTATION = typing.Union[
     tuple[float, float, float], float, int, Euler, LINKABLE
 ]
@@ -316,7 +317,7 @@ SOCKET_COMPATIBILITY: dict[str, tuple[str]] = {
         "INT",
         "BOOLEAN",
     ),
-    "RGBA": ("RGBA", "VECTOR", "VALUE", "INT", "BOOLEAN", "SHADER"),
+    "RGBA": ("RGBA", "VECTOR", "VALUE", "INT", "BOOLEAN"),
     "ROTATION": (
         "ROTATION",
         "MATRIX",
@@ -335,7 +336,7 @@ SOCKET_COMPATIBILITY: dict[str, tuple[str]] = {
     "MATERIAL": ("MATERIAL",),
     "BUNDLE": ("BUNDLE",),
     "CLOSURE": ("CLOSURE",),
-    "SHADER": ("SHADER",),
+    "SHADER": ("SHADER", "RGBA"),
 }