nodebpy 0.1.0__tar.gz → 0.1.1__tar.gz

{nodebpy-0.1.0 → nodebpy-0.1.1}/PKG-INFO

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

{nodebpy-0.1.0 → nodebpy-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "0.1.0"
+version = "0.1.1"
 description = "Build nodes in Blender with code"
 readme = "README.md"
 authors = [

{nodebpy-0.1.0 → nodebpy-0.1.1}/src/nodebpy/builder.py

@@ -290,7 +290,14 @@ class NodeBuilder:
         # so instead we have to convert the identifier to an index and then lookup the socket
         # from the index instead
         input_ids = [input.identifier for input in self.node.inputs]
-        return input_ids.index(identifier)
+        if identifier in input_ids:
+            idx = input_ids.index(identifier)
+            return idx
+        input_names = [input.name for input in self.node.inputs]
+        if identifier in input_names:
+            return input_names.index(identifier)
+
+        raise RuntimeError()
 
     def _output_idx(self, identifier: str) -> int:
         output_ids = [output.identifier for output in self.node.outputs]
@@ -298,7 +305,8 @@ class NodeBuilder:
 
     def _input(self, identifier: str) -> SocketLinker:
         """Input socket: Vector"""
-        return SocketLinker(self.node.inputs[self._input_idx(identifier)])
+        input = self.node.inputs[self._input_idx(identifier)]
+        return SocketLinker(input)
 
     def _output(self, identifier: str) -> SocketLinker:
         """Output socket: Vector"""
@@ -336,7 +344,6 @@ class NodeBuilder:
             # we can also provide just a default value for the socket to take if we aren't
             # providing a socket to link with
             elif isinstance(value, (NodeBuilder, SocketNodeBuilder, NodeSocket, Node)):
-                # print("Linking from", value, "to", name)
                 self.link_from(value, name)
             else:
                 if name in input_ids:
@@ -346,7 +353,7 @@ class NodeBuilder:
                     input = self.node.inputs[name.replace("_", "").capitalize()]
                     input.default_value = value
 
-    def __rshift__(self, other: "NodeBuilder") -> "NodeBuilder":
+    def __rshift__(self, other: "NodeBuilder | SocketLinker") -> "NodeBuilder":
         """Chain nodes using >> operator. Links output to input.
 
         Usage:
@@ -362,19 +369,24 @@ class NodeBuilder:
         socket_out = self.node.outputs.get("Geometry") or self._default_output_socket
         other._from_socket = socket_out
 
-        # Get target socket
-        if other._link_target is not None:
-            # Use specific target if set by ellipsis
-            socket_in = self._get_input_socket_by_name(other, other._link_target)
+        if isinstance(other, SocketLinker):
+            socket_in = other.socket
         else:
-            # Default behavior - prefer Geometry, fall back to default
-            socket_in = other.node.inputs.get("Geometry") or other._default_input_socket
+            # Get target socket
+            if other._link_target is not None:
+                # Use specific target if set by ellipsis
+                socket_in = self._get_input_socket_by_name(other, other._link_target)
+            else:
+                # Default behavior - prefer Geometry, fall back to default
+                socket_in = (
+                    other.node.inputs.get("Geometry") or other._default_input_socket
+                )
 
-        # If target socket already has a link and isn't multi-input, try next available socket
-        if socket_in.links and not socket_in.is_multi_input:
-            socket_in = (
-                self._get_next_available_socket(socket_in, socket_out) or socket_in
-            )
+            # If target socket already has a link and isn't multi-input, try next available socket
+            if socket_in.links and not socket_in.is_multi_input:
+                socket_in = (
+                    self._get_next_available_socket(socket_in, socket_out) or socket_in
+                )
 
         self.tree.link(socket_out, socket_in)
         return other
@@ -508,6 +520,10 @@ class SocketLinker(NodeBuilder):
     def type(self) -> str:
         return self.socket.type
 
+    @property
+    def socket_name(self) -> str:
+        return self.socket.name
+
 
 class SocketNodeBuilder(NodeBuilder):
     """Special NodeBuilder for accessing specific sockets on input/output nodes."""

{nodebpy-0.1.0 → nodebpy-0.1.1}/src/nodebpy/nodes/input.py

@@ -173,32 +173,6 @@ class String(NodeBuilder):
         self.node.string = value
 
 
-class Vector(NodeBuilder):
-    """Provide a vector value that can be connected to other nodes in the tree"""
-
-    name = "FunctionNodeInputVector"
-    node: bpy.types.FunctionNodeInputVector
-
-    def __init__(self, vector: float = 0.0, **kwargs):
-        super().__init__()
-        key_args = kwargs
-        self.vector = vector
-        self._establish_links(**key_args)
-
-    @property
-    def o_vector(self) -> bpy.types.NodeSocketVector:
-        """Output socket: Vector"""
-        return self._output("Vector")
-
-    @property
-    def vector(self) -> list[float, float, float]:
-        return self.node.vector
-
-    @vector.setter
-    def vector(self, value: list[float, float, float]):
-        self.node.vector = value
-
-
 class ForEachGeometryElementInput(NodeBuilder):
     """For Each Geometry Element Input node"""
 

{nodebpy-0.1.0 → nodebpy-0.1.1}/src/nodebpy/nodes/manually_specified.py

@@ -20,6 +20,32 @@ from .types import LINKABLE, TYPE_INPUT_BOOLEAN, TYPE_INPUT_VECTOR, _AttributeDo
 _RANDOM_VALUE_DATA_TYPES = Literal["FLOAT", "INT", "BOOLEAN", "FLOAT_VECTOR"]
 
 
+class Vector(NodeBuilder):
+    """Provide a vector value that can be connected to other nodes in the tree"""
+
+    name = "FunctionNodeInputVector"
+    node: bpy.types.FunctionNodeInputVector
+
+    def __init__(self, vector: list[float, float, float] | None = (0, 0, 0), **kwargs):
+        super().__init__()
+        key_args = kwargs
+        self.vector = vector
+        self._establish_links(**key_args)
+
+    @property
+    def o_vector(self) -> bpy.types.NodeSocketVector:
+        """Output socket: Vector"""
+        return self._output("Vector")
+
+    @property
+    def vector(self) -> list[float, float, float]:
+        return self.node.vector
+
+    @vector.setter
+    def vector(self, value: list[float, float, float]):
+        self.node.vector = value
+
+
 class RandomValue(NodeBuilder):
     """Random Value node"""