nodebpy 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

nodebpy/nodes/zone.py

@@ -2,11 +2,10 @@ from abc import ABC, abstractmethod
 from typing import Literal
 
 import bpy
-from bpy.types import NodeSocket
 
-from nodebpy.builder import NodeBuilder, SocketLinker
+from nodebpy.builder import DynamicInputsMixin, NodeBuilder, SocketLinker
 
-from .types import (
+from ..types import (
     LINKABLE,
     TYPE_INPUT_BOOLEAN,
     TYPE_INPUT_GEOMETRY,
@@ -16,7 +15,7 @@ from .types import (
 )
 
 
-class BaseZone(NodeBuilder, ABC):
+class BaseZone(DynamicInputsMixin, NodeBuilder, ABC):
     _items_attribute: Literal["state_items", "repeat_items"]
 
     @property
@@ -81,30 +80,6 @@ class BaseZoneInput(BaseZone, NodeBuilder, ABC):
         item = self.items.new(type, name)
         return self.inputs[item.name]
 
-    def __rshift__(self, other):
-        """Custom zone input linking that creates sockets as needed"""
-        # Check if target is a zone output without inputs
-        if (
-            hasattr(other, "_default_input_socket")
-            and other._default_input_socket is None
-        ):
-            # Target zone needs a socket - create one based on our output
-            from ..builder import SOCKET_COMPATIBILITY
-
-            source_socket = self._default_output_socket
-            source_type = source_socket.type
-
-            compatible_types = SOCKET_COMPATIBILITY.get(source_type, [source_type])
-            best_type = compatible_types[0] if compatible_types else source_type
-
-            # Create socket on target zone
-            target_socket = other._add_socket(name=best_type.title(), type=best_type)
-            self.tree.link(source_socket, target_socket)
-            return other
-        else:
-            # Use the general smart linking approach
-            return self._smart_link_to(other)
-
 
 class BaseZoneOutput(BaseZone, NodeBuilder, ABC):
     """Base class for zone output nodes"""
@@ -122,69 +97,22 @@ class BaseZoneOutput(BaseZone, NodeBuilder, ABC):
         item = self.items.new(type, name)
         return self.node.inputs[item.name]
 
-    def __rshift__(self, other):
-        """Custom zone output linking that creates sockets as needed"""
-        from ..builder import SOCKET_COMPATIBILITY
-
-        # Get the source socket type
-        source_socket = self._default_output_socket
-        source_type = source_socket.type
-
-        # Check if target has compatible inputs
-        if hasattr(other, "_default_input_socket") and other._default_input_socket:
-            # Normal linking
-            return super().__rshift__(other)
-        elif hasattr(other, "_add_socket"):
-            # Target is also a zone - create compatible socket
-            compatible_types = SOCKET_COMPATIBILITY.get(source_type, [source_type])
-            best_type = compatible_types[0] if compatible_types else source_type
-
-            # Create socket on target zone
-            target_socket = other._add_socket(name=best_type.title(), type=best_type)
-            self.tree.link(source_socket, target_socket)
-            return other
-        else:
-            # Normal NodeBuilder
-            return super().__rshift__(other)
-
-    @property
-    def _default_input_socket(self) -> NodeSocket:
-        """Get default input socket, avoiding skip-type sockets"""
-        inputs = list(self.inputs.values())
-        if inputs:
-            return inputs[0].socket
-        else:
-            # No socket exists - this should be handled by zone-specific __rshift__ logic
-            # Return None to signal that a socket needs to be created
-            return None
-
-
-class SimulationZone:
-    def __init__(self, *args: LINKABLE, **kwargs: LINKABLE):
-        self.input = SimulationInput()
-        self.output = SimulationOutput()
-        self.input.node.pair_with_output(self.output.node)
-
-        self.output.node.state_items.clear()
-        socket_lookup = self.output._add_inputs(*args, **kwargs)
-        for name, source in socket_lookup.items():
-            self.input._link_from(source, name)
-
-    def delta_time(self) -> SocketLinker:
-        return self.input.o_delta_time
-
-    def __getitem__(self, index: int):
-        match index:
-            case 0:
-                return self.input
-            case 1:
-                return self.output
-            case _:
-                raise IndexError("SimulationZone has only two items")
-
 
 class BaseSimulationZone(BaseZone):
     _items_attribute = "state_items"
+    _socket_data_types = (
+        "VALUE",
+        "INT",
+        "BOOLEAN",
+        "VECTOR",
+        "RGBA",
+        "ROTATION",
+        "MATRIX",
+        "STRING",
+        "GEOMETRY",
+        "BUNDLE",
+    )
+    _type_map = {"VALUE": "FLOAT"}
 
     @property
     def items(self) -> bpy.types.NodeGeometrySimulationOutputItems:
@@ -194,7 +122,7 @@ class BaseSimulationZone(BaseZone):
 class SimulationInput(BaseSimulationZone, BaseZoneInput):
     """Simulation Input node"""
 
-    name = "GeometryNodeSimulationInput"
+    _bl_idname = "GeometryNodeSimulationInput"
     node: bpy.types.GeometryNodeSimulationInput
 
     @property
@@ -206,7 +134,7 @@ class SimulationInput(BaseSimulationZone, BaseZoneInput):
 class SimulationOutput(BaseSimulationZone, BaseZoneOutput):
     """Simulation Output node"""
 
-    name = "GeometryNodeSimulationOutput"
+    _bl_idname = "GeometryNodeSimulationOutput"
     node: bpy.types.GeometryNodeSimulationOutput
 
     @property
@@ -215,39 +143,49 @@ class SimulationOutput(BaseSimulationZone, BaseZoneOutput):
         return self._input("Skip")
 
 
-class RepeatZone:
-    """Wrapper that supports both direct unpacking and iteration"""
-
-    def __init__(
-        self, iterations: TYPE_INPUT_INT = 1, *args: LINKABLE, **kwargs: LINKABLE
-    ):
-        self.input = RepeatInput(iterations)
-        self.output = RepeatOutput()
+class SimulationZone:
+    def __init__(self, *args: LINKABLE, **kwargs: LINKABLE):
+        self.input = SimulationInput()
+        self.output = SimulationOutput()
         self.input.node.pair_with_output(self.output.node)
 
-        self.output.node.repeat_items.clear()
-        self.input._establish_links(**self.input._add_inputs(*args, **kwargs))
-
-    @property
-    def i(self) -> SocketLinker:
-        """Input socket: Skip simluation frame"""
-        return self.input.o_iteration
+        self.output.node.state_items.clear()
+        socket_lookup = self.output._add_inputs(*args, **kwargs)
+        for name, source in socket_lookup.items():
+            self.input._link_from(source, name)
 
-    def __iter__(self):
-        """Support for loop: for i, input, output in RepeatZone(...)"""
-        self._index = 0
-        return self
+    def delta_time(self) -> SocketLinker:
+        return self.input.o_delta_time
 
-    def __next__(self):
-        """Support for iteration: next(RepeatZone)"""
-        if self._index > 0:
-            raise StopIteration
-        self._index += 1
-        return self.i, self.input, self.output
+    def __getitem__(self, index: int):
+        match index:
+            case 0:
+                return self.input
+            case 1:
+                return self.output
+            case _:
+                raise IndexError("SimulationZone has only two items")
 
 
 class BaseRepeatZone(BaseZone):
     _items_attribute = "repeat_items"
+    _socket_data_types = (
+        "FLOAT",
+        "INT",
+        "BOOLEAN",
+        "VECTOR",
+        "RGBA",
+        "ROTATION",
+        "MATRIX",
+        "STRING",
+        "OBJECT",
+        "IMAGE",
+        "GEOMETRY",
+        "COLLECTION",
+        "MATERIAL",
+        "BUNDLE",
+        "CLOSURE",
+    )
 
     @property
     def items(self) -> bpy.types.NodeGeometryRepeatOutputItems:
@@ -257,7 +195,7 @@ class BaseRepeatZone(BaseZone):
 class RepeatInput(BaseRepeatZone, BaseZoneInput):
     """Repeat Input node"""
 
-    name = "GeometryNodeRepeatInput"
+    _bl_idname = "GeometryNodeRepeatInput"
     node: bpy.types.GeometryNodeRepeatInput
 
     def __init__(self, iterations: TYPE_INPUT_INT = 1):
@@ -280,14 +218,45 @@ class RepeatInput(BaseRepeatZone, BaseZoneInput):
 class RepeatOutput(BaseRepeatZone, BaseZoneOutput):
     """Repeat Output node"""
 
-    name = "GeometryNodeRepeatOutput"
+    _bl_idname = "GeometryNodeRepeatOutput"
     node: bpy.types.GeometryNodeRepeatOutput
 
 
+class RepeatZone:
+    """Wrapper that supports both direct unpacking and iteration"""
+
+    def __init__(
+        self, iterations: TYPE_INPUT_INT = 1, *args: LINKABLE, **kwargs: LINKABLE
+    ):
+        self.input = RepeatInput(iterations)
+        self.output = RepeatOutput()
+        self.input.node.pair_with_output(self.output.node)
+
+        self.output.node.repeat_items.clear()
+        self.input._establish_links(**self.input._add_inputs(*args, **kwargs))
+
+    @property
+    def i(self) -> SocketLinker:
+        """Input socket: Skip simluation frame"""
+        return self.input.o_iteration
+
+    def __iter__(self):
+        """Support for loop: for i, input, output in RepeatZone(...)"""
+        self._index = 0
+        return self
+
+    def __next__(self):
+        """Support for iteration: next(RepeatZone)"""
+        if self._index > 0:
+            raise StopIteration
+        self._index += 1
+        return self.i, self.input, self.output
+
+
 class ForEachGeometryElementInput(NodeBuilder):
     """For Each Geometry Element Input node"""
 
-    name = "GeometryNodeForeachGeometryElementInput"
+    _bl_idname = "GeometryNodeForeachGeometryElementInput"
     node: bpy.types.GeometryNodeForeachGeometryElementInput
 
     def __init__(
@@ -332,7 +301,7 @@ class ForEachGeometryElementInput(NodeBuilder):
 class ForEachGeometryElementOutput(NodeBuilder):
     """For Each Geometry Element Output node"""
 
-    name = "GeometryNodeForeachGeometryElementOutput"
+    _bl_idname = "GeometryNodeForeachGeometryElementOutput"
     node: bpy.types.GeometryNodeForeachGeometryElementOutput
 
     def __init__(

nodebpy/{nodes/types.py → types.py}

@@ -6,6 +6,8 @@ from typing import Literal
 from bpy.types import (
     NodeSocket,
     NodeSocketBool,
+    NodeSocketBundle,
+    NodeSocketClosure,
     NodeSocketCollection,
     NodeSocketColor,
     NodeSocketFloat,
@@ -22,7 +24,7 @@ from bpy.types import (
 from mathutils import Euler
 
 if typing.TYPE_CHECKING:
-    from ..builder import NodeBuilder, SocketLinker
+    from .builder import NodeBuilder, SocketLinker
 
 
 def _is_default_value(value: TYPE_INPUT_ALL):
@@ -67,6 +69,17 @@ TYPE_INPUT_GRID = typing.Union[
     TYPE_INPUT_VALUE, TYPE_INPUT_VECTOR, TYPE_INPUT_BOOLEAN, TYPE_INPUT_INT
 ]
 TYPE_INPUT_MENU = typing.Union[LINKABLE, NodeSocketMenu]
+TYPE_INPUT_BUNDLE = typing.Union[LINKABLE, NodeSocketBundle]
+TYPE_INPUT_CLOSURE = typing.Union[LINKABLE, NodeSocketClosure]
+
+TYPE_INPUT_DATA = typing.Union[
+    TYPE_INPUT_VALUE,
+    TYPE_INPUT_INT,
+    TYPE_INPUT_BOOLEAN,
+    TYPE_INPUT_VECTOR,
+    TYPE_INPUT_ROTATION,
+    TYPE_INPUT_MATRIX,
+]
 
 TYPE_INPUT_ALL = typing.Union[
     TYPE_INPUT_VALUE,
@@ -267,7 +280,7 @@ SOCKET_TYPES = Literal[
     "CLOSURE",
 ]
 
-SOCKET_COMPATIBILITY = {
+SOCKET_COMPATIBILITY: dict[str, tuple[str]] = {
     "VALUE": (
         "VALUE",
         "VECTOR",

{nodebpy-0.2.0.dist-info → nodebpy-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 0.2.0
+Version: 0.3.0
 Summary: Build nodes in Blender with code
 Author: Brady Johnston
 Author-email: Brady Johnston <brady.johnston@me.com>
@@ -76,7 +76,7 @@ with TreeBuilder("AnotherTree") as tree:
 
     _ = (
         count
-        >> n.Points(position=n.RandomValue.vector(min=(-1, -1, -1)))
+        >> n.Points(position=n.RandomValue.vector(min=-1))
         >> n.InstanceOnPoints(instance=n.Cube(), rotation=rotation)
         >> n.SetPosition(
             position=n.Position() * 2.0 + (0, 0.2, 0.3),
@@ -94,8 +94,8 @@ tree
 graph LR
     N0("NodeGroupInput"):::default-node
     N1("RandomValue<br/><small>(-1,-1,-1) seed:2</small>"):::converter-node
-    N2("RandomValue<br/><small>(-1,-1,-1) seed:1</small>"):::converter-node
-    N3("AlignRotationToVector<br/><small>(0,0,1)</small>"):::converter-node
+    N2("RandomValue<br/><small>(-1,-1,-1)</small>"):::converter-node
+    N3("AlignRotationToVector"):::converter-node
     N4("AxisAngleToRotation<br/><small>(0,0,1)</small>"):::converter-node
     N5("InputPosition"):::input-node
     N6("Points"):::geometry-node
@@ -109,7 +109,7 @@ graph LR
     N14("RealizeInstances"):::geometry-node
     N15("InstanceOnPoints"):::geometry-node
     N16("NodeGroupOutput"):::default-node
-    N1 -->|"Value>>Rotation"| N3
+    N1 -->|"Value>>Vector"| N3
     N4 -->|"Rotation>>Rotate By"| N8
     N3 -->|"Rotation>>Rotation"| N8
     N2 -->|"Value>>Position"| N6

nodebpy-0.3.0.dist-info/RECORD

@@ -0,0 +1,26 @@
+nodebpy/__init__.py,sha256=AcXaVEPnvX1BlraPSSQ-0NR-Ip6cI0WNRqz84xvrTok,285
+nodebpy/arrange.py,sha256=xBHf-lYlvr-BCdI0gHhEn1ETWjEQyYmzgmhIZ1RYal8,11020
+nodebpy/builder.py,sha256=FI-cwNb2XN41L5TiajL4wuaenow4pK8iN6YM9LA6lE8,40838
+nodebpy/nodes/__init__.py,sha256=OKVeUcCUjhmqsEsGKhgkCVe0iq2dWEqJCgcogx9RShM,12528
+nodebpy/nodes/attribute.py,sha256=hme17msRejaqGHKDwvauHdCKMq7OLZhhi1Ax9Oxb7Wo,15043
+nodebpy/nodes/color.py,sha256=ye1LkcJuebjMlJ8OUlKepSOe8-dhImgoL1uXFG1NamE,1652
+nodebpy/nodes/converter.py,sha256=rzp3LmQ8uiDW1sDZg9x-LWkphBFzUn9dCgzETPI5Cdc,99014
+nodebpy/nodes/experimental.py,sha256=Gxd2lKD5Hr4ClSmFojeZpZQr5AapQebDgTeO9R6EqxE,9561
+nodebpy/nodes/geometry.py,sha256=C1H9JIGtzmzbJY7rsEf8c9PkX6Ja0JUKRcAI6uLS-l4,177510
+nodebpy/nodes/grid.py,sha256=Px92tPr9w-_IWdAzaMMaIbVeRAHWFTQF3QJ1FYPMqGc,50345
+nodebpy/nodes/group.py,sha256=PzQ20PrzgtqgQ2XRU7K1pqA9mW5wyt54bUIaqHjdqD0,289
+nodebpy/nodes/input.py,sha256=i4CmSe4mBxlIru-BnzwUH1C_95Op5JpIMd-QiZY-FWE,60082
+nodebpy/nodes/interface.py,sha256=jobDdF_DpioS25-RfnyPLiKcA40ZfwNhOjdLATBHdDk,14947
+nodebpy/nodes/manual.py,sha256=5mICg44VjyJzvBpWnbB83gOGo-7pUC2wZopztEHE4Rw,60499
+nodebpy/nodes/output.py,sha256=py1SgNLQfwTG31KQCHFZn6lC5qg8NixMAoJ1KhnT7XQ,2138
+nodebpy/nodes/texture.py,sha256=JyjsE8WrVJ4wpx3xO6uaJ5A8ll7N6FtWBQs0comAD7s,25526
+nodebpy/nodes/vector.py,sha256=ULEOGx71OCD1Rz2egzkz5RhaKc5huC-LUjghovrnPbQ,15283
+nodebpy/nodes/zone.py,sha256=koY2AnFsbcoReNEa2DdkUnUy2licxgKbUVE5fc0YnJI,11591
+nodebpy/screenshot.py,sha256=gXAwGfeK05YL9XIpghv5nQ5cXVgtR35wnLnTVDAh08g,18885
+nodebpy/screenshot_subprocess.py,sha256=bmuyjedROCasEDI-JdjXWVsYoEX5I-asE3KxMVR30qM,15364
+nodebpy/sockets.py,sha256=eU3p0IdCkYQeVRp8XkkDuOR38JTIzniTXKhsXQgx29Q,1011
+nodebpy/types.py,sha256=DtvTONY-gyTSRnrLCH5b5FuwaQa1Gy9wmMIvY3Oj8DU,10871
+nodebpy-0.3.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+nodebpy-0.3.0.dist-info/entry_points.txt,sha256=XvODbWiwSnneYWIYjxFJZmXdntQnapg59Ye2LtCKEN4,42
+nodebpy-0.3.0.dist-info/METADATA,sha256=V_RKbjLiA6eO3BUG7tjC2ZzoVzzqttGtCYNkRcaHlN0,6253
+nodebpy-0.3.0.dist-info/RECORD,,

nodebpy/nodes/mesh.py

@@ -1,17 +0,0 @@
-"""
-Auto-generated Blender Geometry Node classes.
-
-DO NOT EDIT THIS FILE MANUALLY.
-This file is generated by molecularnodes/nodes/generator.py
-
-To regenerate: Run generator.py from within Blender
-
-KNOWN LIMITATIONS:
-- Dynamic multi-input/output sockets are not yet supported
-  (these are the unnamed sockets that appear in the UI for nodes like
-  "Evaluate Closure", "Join Geometry", etc. that allow dragging in
-  multiple connections)
-- TODO: Add support for dynamic socket creation
-"""
-
-from __future__ import annotations

nodebpy-0.2.0.dist-info/RECORD

@@ -1,25 +0,0 @@
-nodebpy/__init__.py,sha256=AcXaVEPnvX1BlraPSSQ-0NR-Ip6cI0WNRqz84xvrTok,285
-nodebpy/arrange.py,sha256=xBHf-lYlvr-BCdI0gHhEn1ETWjEQyYmzgmhIZ1RYal8,11020
-nodebpy/builder.py,sha256=Wfi4qvrOmdNbKNnOuYVhLMzf6rspvBQnY8eAk4QH3sU,52351
-nodebpy/nodes/__init__.py,sha256=vRXLnYtOJK-nAsrNJDT5MGjWnLMawvGDn7HmjQx_YU0,12145
-nodebpy/nodes/attribute.py,sha256=ACgOqgZ6PX14NmQVL3Tx67-T4fJUJLVQz9xxGcdSB2Q,13027
-nodebpy/nodes/color.py,sha256=xZIbLvYquroHk3N9lTrVNaz8xv8MhE65s4zKTl10qXU,1842
-nodebpy/nodes/converter.py,sha256=UEpcVe1APLnXu64CSUZzz2OXvpxgtnUEjov623DkFHU,132396
-nodebpy/nodes/experimental.py,sha256=FWyVI6P-NP_vo8JUMBm-pS57naaE4kMqEQUzoOwAkM8,6739
-nodebpy/nodes/geometry.py,sha256=81vXjoZdG2vq4cjrxv21nglJ3UUrLAxfN006Bk7uAp4,160537
-nodebpy/nodes/grid.py,sha256=mgyEAutS7yfEv2K6zE48hUk7Yg1eBrUW4nGdqrhItfA,34164
-nodebpy/nodes/group.py,sha256=HzSTRBZbtRUGKI3vTbRndsxhXVKYIsX0tQfVQ5690G4,512
-nodebpy/nodes/input.py,sha256=kofvhhz2bH3cjnHPBjN3w2t-sMUqfmkKPzhXJZFv7vQ,57283
-nodebpy/nodes/interface.py,sha256=xSIo8qb8vN58rs71b2sAKIK6jKujWPIaM_eXNgLnIPc,11117
-nodebpy/nodes/mesh.py,sha256=B_cX264fFMax0M9xjGQiQcAuHoORj1cAjMmOQilapBw,524
-nodebpy/nodes/texture.py,sha256=8Plz7nzZtKGcPyrRlIpyOl_LNwtz5jezdbA8h7IVBHk,2059
-nodebpy/nodes/types.py,sha256=Y768eltOU5mMQt4tNT6sjnK2o9VEK0FXn7eeu3G6lb4,10508
-nodebpy/nodes/vector.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nodebpy/nodes/zone.py,sha256=P-xNY0v-8AwU9KgULE1EBvhI27ayFj7qqLWwb4TD8Ik,13506
-nodebpy/screenshot.py,sha256=gXAwGfeK05YL9XIpghv5nQ5cXVgtR35wnLnTVDAh08g,18885
-nodebpy/screenshot_subprocess.py,sha256=bmuyjedROCasEDI-JdjXWVsYoEX5I-asE3KxMVR30qM,15364
-nodebpy/sockets.py,sha256=eU3p0IdCkYQeVRp8XkkDuOR38JTIzniTXKhsXQgx29Q,1011
-nodebpy-0.2.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-nodebpy-0.2.0.dist-info/entry_points.txt,sha256=XvODbWiwSnneYWIYjxFJZmXdntQnapg59Ye2LtCKEN4,42
-nodebpy-0.2.0.dist-info/METADATA,sha256=PS4WASNyB2eY3_iU9lkm72NqWeuBEBcO1eK2Yl5Iv14,6299
-nodebpy-0.2.0.dist-info/RECORD,,