nodebpy 0.3.1__tar.gz → 0.4.0__tar.gz

{nodebpy-0.3.1 → nodebpy-0.4.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 0.3.1
+Version: 0.4.0
 Summary: Build nodes in Blender with code
 Author: Brady Johnston
 Author-email: Brady Johnston <brady.johnston@me.com>
-Requires-Dist: arrangebpy>=0.1.0
+Requires-Dist: networkx>=3.6.1
 Requires-Dist: bpy>=5.0.0 ; extra == 'bpy'
 Requires-Dist: fake-bpy-module>=20260113 ; extra == 'dev'
 Requires-Dist: jsondiff>=2.2.1 ; extra == 'dev'
@@ -60,18 +60,16 @@ be linked to the previous node via the inferred or specified socket.
 ``` python
 from nodebpy import TreeBuilder, nodes as n, sockets as s
 
-with TreeBuilder("AnotherTree") as tree:
+with TreeBuilder("AnotherTree", collapse=True) as tree:
     with tree.inputs:
         count = s.SocketInt("Count", 10)
     with tree.outputs:
         instances = s.SocketGeometry("Instances")
 
     rotation = (
-        n.RandomValue.vector(min=(-1, -1, -1), seed=2)
+        n.RandomValue.vector(min=-1, seed=2)
         >> n.AlignRotationToVector()
-        >> n.RotateRotation(
-            rotate_by=n.AxisAngleToRotation(angle=0.3), rotation_space="LOCAL"
-        )
+        >> n.RotateRotation(rotate_by=n.AxisAngleToRotation(angle=0.3))
     )
 
     _ = (
@@ -86,57 +84,9 @@ with TreeBuilder("AnotherTree") as tree:
         >> n.InstanceOnPoints(n.Cube(), instance=...)
         >> instances
     )
-
-tree
-```
-
-``` mermaid
-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)</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
-    N7("MeshCube"):::geometry-node
-    N8("RotateRotation"):::converter-node
-    N9("VectorMath<br/><small>×2</small>"):::vector-node
-    N10("InstanceOnPoints"):::geometry-node
-    N11("VectorMath<br/><small>(0,0.2,0.3)</small>"):::vector-node
-    N12("SetPosition<br/><small>+(0,0,0.1)</small>"):::geometry-node
-    N13("MeshCube"):::geometry-node
-    N14("RealizeInstances"):::geometry-node
-    N15("InstanceOnPoints"):::geometry-node
-    N16("NodeGroupOutput"):::default-node
-    N1 -->|"Value>>Vector"| N3
-    N4 -->|"Rotation>>Rotate By"| N8
-    N3 -->|"Rotation>>Rotation"| N8
-    N2 -->|"Value>>Position"| N6
-    N0 -->|"Count>>Count"| N6
-    N7 -->|"Mesh>>Instance"| N10
-    N8 -->|"Rotation>>Rotation"| N10
-    N6 -->|"Points>>Points"| N10
-    N5 -->|"Position>>Vector"| N9
-    N9 -->|"Vector>>Vector"| N11
-    N11 -->|"Vector>>Position"| N12
-    N10 -->|"Instances>>Geometry"| N12
-    N12 -->|"Geometry>>Geometry"| N14
-    N13 -->|"Mesh>>Points"| N15
-    N14 -->|"Geometry>>Instance"| N15
-    N15 -->|"Instances>>Instances"| N16
-
-    classDef geometry-node fill:#e8f5f1,stroke:#3a7c49,stroke-width:2px
-    classDef converter-node fill:#e6f1f7,stroke:#246283,stroke-width:2px
-    classDef vector-node fill:#e9e9f5,stroke:#3C3C83,stroke-width:2px
-    classDef texture-node fill:#fef3e6,stroke:#E66800,stroke-width:2px
-    classDef shader-node fill:#fef0eb,stroke:#e67c52,stroke-width:2px
-    classDef input-node fill:#f1f8ed,stroke:#7fb069,stroke-width:2px
-    classDef output-node fill:#faf0ed,stroke:#c97659,stroke-width:2px
-    classDef default-node fill:#f0f0f0,stroke:#5a5a5a,stroke-width:2px
 ```
 
-![](docs/images/paste-2.png)
+![](docs/images/paste-1.png)
 
 # Design Considerations
 

{nodebpy-0.3.1 → nodebpy-0.4.0}/README.md

@@ -36,18 +36,16 @@ be linked to the previous node via the inferred or specified socket.
 ``` python
 from nodebpy import TreeBuilder, nodes as n, sockets as s
 
-with TreeBuilder("AnotherTree") as tree:
+with TreeBuilder("AnotherTree", collapse=True) as tree:
     with tree.inputs:
         count = s.SocketInt("Count", 10)
     with tree.outputs:
         instances = s.SocketGeometry("Instances")
 
     rotation = (
-        n.RandomValue.vector(min=(-1, -1, -1), seed=2)
+        n.RandomValue.vector(min=-1, seed=2)
         >> n.AlignRotationToVector()
-        >> n.RotateRotation(
-            rotate_by=n.AxisAngleToRotation(angle=0.3), rotation_space="LOCAL"
-        )
+        >> n.RotateRotation(rotate_by=n.AxisAngleToRotation(angle=0.3))
     )
 
     _ = (
@@ -62,57 +60,9 @@ with TreeBuilder("AnotherTree") as tree:
         >> n.InstanceOnPoints(n.Cube(), instance=...)
         >> instances
     )
-
-tree
-```
-
-``` mermaid
-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)</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
-    N7("MeshCube"):::geometry-node
-    N8("RotateRotation"):::converter-node
-    N9("VectorMath<br/><small>×2</small>"):::vector-node
-    N10("InstanceOnPoints"):::geometry-node
-    N11("VectorMath<br/><small>(0,0.2,0.3)</small>"):::vector-node
-    N12("SetPosition<br/><small>+(0,0,0.1)</small>"):::geometry-node
-    N13("MeshCube"):::geometry-node
-    N14("RealizeInstances"):::geometry-node
-    N15("InstanceOnPoints"):::geometry-node
-    N16("NodeGroupOutput"):::default-node
-    N1 -->|"Value>>Vector"| N3
-    N4 -->|"Rotation>>Rotate By"| N8
-    N3 -->|"Rotation>>Rotation"| N8
-    N2 -->|"Value>>Position"| N6
-    N0 -->|"Count>>Count"| N6
-    N7 -->|"Mesh>>Instance"| N10
-    N8 -->|"Rotation>>Rotation"| N10
-    N6 -->|"Points>>Points"| N10
-    N5 -->|"Position>>Vector"| N9
-    N9 -->|"Vector>>Vector"| N11
-    N11 -->|"Vector>>Position"| N12
-    N10 -->|"Instances>>Geometry"| N12
-    N12 -->|"Geometry>>Geometry"| N14
-    N13 -->|"Mesh>>Points"| N15
-    N14 -->|"Geometry>>Instance"| N15
-    N15 -->|"Instances>>Instances"| N16
-
-    classDef geometry-node fill:#e8f5f1,stroke:#3a7c49,stroke-width:2px
-    classDef converter-node fill:#e6f1f7,stroke:#246283,stroke-width:2px
-    classDef vector-node fill:#e9e9f5,stroke:#3C3C83,stroke-width:2px
-    classDef texture-node fill:#fef3e6,stroke:#E66800,stroke-width:2px
-    classDef shader-node fill:#fef0eb,stroke:#e67c52,stroke-width:2px
-    classDef input-node fill:#f1f8ed,stroke:#7fb069,stroke-width:2px
-    classDef output-node fill:#faf0ed,stroke:#c97659,stroke-width:2px
-    classDef default-node fill:#f0f0f0,stroke:#5a5a5a,stroke-width:2px
 ```
 
-![](docs/images/paste-2.png)
+![](docs/images/paste-1.png)
 
 # Design Considerations
 

{nodebpy-0.3.1 → nodebpy-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "0.3.1"
+version = "0.4.0"
 description = "Build nodes in Blender with code"
 readme = "README.md"
 authors = [
@@ -8,7 +8,7 @@ authors = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "arrangebpy>=0.1.0",
+    "networkx>=3.6.1",
 ]
 
 [project.scripts]

{nodebpy-0.3.1 → nodebpy-0.4.0}/src/nodebpy/builder.py

@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING, Any, ClassVar, Iterable, Literal
 if TYPE_CHECKING:
     from .nodes import Math, VectorMath
 
-import arrangebpy
 import bpy
 from bpy.types import (
     GeometryNodeTree,
@@ -14,6 +13,7 @@ from bpy.types import (
     NodeSocket,
 )
 
+from .lib.nodearrange import arrange
 from .types import (
     LINKABLE,
     SOCKET_COMPATIBILITY,
@@ -117,12 +117,15 @@ class TreeBuilder:
     """Builder for creating Blender geometry node trees with a clean Python API."""
 
     _tree_contexts: ClassVar["list[TreeBuilder]"] = []
-    # _active_tree: ClassVar["TreeBuilder | None"] = None
-    # _previous_tree: ClassVar["list[TreeBuilder]"] = list()
     just_added: "Node | None" = None
+    collapse: bool = False
 
     def __init__(
-        self, tree: GeometryNodeTree | str = "Geometry Nodes", arrange: bool = True
+        self,
+        tree: GeometryNodeTree | str = "Geometry Nodes",
+        *,
+        collapse: bool = False,
+        arrange: bool = True,
     ):
         if isinstance(tree, str):
             self.tree = bpy.data.node_groups.new(tree, "GeometryNodeTree")
@@ -134,6 +137,11 @@ class TreeBuilder:
         self.inputs = InputInterfaceContext(self)
         self.outputs = OutputInterfaceContext(self)
         self._arrange = arrange
+        self.collapse = collapse
+
+    @property
+    def nodes(self) -> Nodes:
+        return self.tree.nodes
 
     def activate_tree(self) -> None:
         """Make this tree the active tree for all new node creation."""
@@ -152,18 +160,12 @@ class TreeBuilder:
             self.arrange()
         self.deactivate_tree()
 
-    @property
-    def nodes(self) -> Nodes:
-        return self.tree.nodes
-
     def __len__(self) -> int:
         return len(self.nodes)
 
     def arrange(self):
-        settings = arrangebpy.LayoutSettings(
-            horizontal_spacing=200, vertical_spacing=200, align_top_layer=True
-        )
-        arrangebpy.sugiyama_layout(self.tree, settings)
+        arrange.sugiyama.sugiyama_layout(self.tree)
+        arrange.sugiyama.config.reset()
 
     def _repr_markdown_(self) -> str | None:
         """
@@ -230,7 +232,9 @@ class TreeBuilder:
         return link
 
     def add(self, name: str) -> Node:
-        return self.tree.nodes.new(name)
+        node = self.tree.nodes.new(name)
+        node.hide = self.collapse
+        return node
 
 
 class NodeBuilder:

nodebpy-0.4.0/src/nodebpy/lib/nodearrange/__init__.py

@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+from .arrange import sugiyama