nodebpy 0.17.0__tar.gz → 520.0.0__tar.gz

{nodebpy-0.17.0 → nodebpy-520.0.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 0.17.0
+Version: 520.0.0
 Summary: Build nodes trees in Blender more elegantly with code
 Author: Brady Johnston
 Author-email: Brady Johnston <brady.johnston@me.com>
 License: GPL-3.0-or-later
-Requires-Dist: bpy>=5.1.0 ; extra == 'bpy'
+Requires-Dist: bpy==5.2.* ; extra == 'bpy'
 Requires-Dist: networkx>=3.6.1 ; extra == 'networkx'
 Requires-Python: >=3.13
 Provides-Extra: bpy
@@ -130,7 +130,7 @@ Some nodes are manually specified in the `src/nodebpy/nodes/geometry/manual.py`
 Run the build & format script as such:
 
 ```bash
-uv run generate.py && uvx ruff format && uvx ruff check --fix
+uv run generate.py && uvx ruff format && uvx ruff check --fix && uvx ty check --fix src
 ```
 
 ## Other Projects

{nodebpy-0.17.0 → nodebpy-520.0.0}/README.md

@@ -116,7 +116,7 @@ Some nodes are manually specified in the `src/nodebpy/nodes/geometry/manual.py`
 Run the build & format script as such:
 
 ```bash
-uv run generate.py && uvx ruff format && uvx ruff check --fix
+uv run generate.py && uvx ruff format && uvx ruff check --fix && uvx ty check --fix src
 ```
 
 ## Other Projects

{nodebpy-0.17.0 → nodebpy-520.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "0.17.0"
+version = "520.0.0"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [
@@ -17,7 +17,7 @@ networkx = [
     "networkx>=3.6.1",
 ]
 bpy = [
-    "bpy>=5.1.0",
+    "bpy==5.2.*",
 ]
 
 [build-system]
@@ -28,7 +28,7 @@ build-backend = "uv_build"
 dev = [
     "ipython>=8.0.0",
     "networkx>=3.6.1",
-    "fake-bpy-module>=20260113",
+    "fake-bpy-module>=20260501",
     "jsondiff>=2.2.1",
     "pytest>=9.0.2",
     "pytest-cov>=7.0.0",
@@ -36,7 +36,7 @@ dev = [
     "quartodoc>=0.11.1",
     "ruff>=0.14.11",
     "syrupy>=5.0.0",
-    "tree-clipper>=0.1.1",
     "pytest-xdist>=3.8.0",
-    "griffe<2.0.0"
+    "griffe<2.0.0",
+    "ty>=0.0.35",
 ]

{nodebpy-0.17.0 → nodebpy-520.0.0}/src/nodebpy/arrange.py

@@ -117,7 +117,7 @@ def calculate_node_dimensions(
     inherited_ids = {
         prop.identifier
         for base in type(node).__bases__
-        for prop in base.bl_rna.properties
+        for prop in getattr(base, "bl_rna").properties
     }
     node_property_count = sum(
         1 for prop in node.bl_rna.properties if prop.identifier not in inherited_ids
@@ -143,6 +143,7 @@ def calculate_node_dimensions(
 
 def _socket_index(socket: bpy.types.NodeSocket) -> int:
     """Return the index of a socket among its node's enabled sockets."""
+    assert socket.node is not None
     collection = socket.node.inputs if not socket.is_output else socket.node.outputs
     idx = 0
     for s in collection:
@@ -208,6 +209,7 @@ def _reduce_crossings(
         # on the target node (input side).
         out_count = max(1, sum(1 for s in src.outputs if s.enabled))
         in_count = max(1, sum(1 for s in dst.inputs if s.enabled))
+        assert link.from_socket is not None and link.to_socket is not None
         src_frac = _socket_index(link.from_socket) / out_count
         dst_frac = _socket_index(link.to_socket) / in_count
 
@@ -299,8 +301,10 @@ def position_reroutes(tree: bpy.types.NodeTree) -> None:
         targets: list[bpy.types.Node] = []
         for link in tree.links:
             if link.to_node == node:
+                assert link.from_node is not None
                 sources.append(link.from_node)
             if link.from_node == node:
+                assert link.to_node is not None
                 targets.append(link.to_node)
 
         neighbours = sources + targets

{nodebpy-0.17.0 → nodebpy-520.0.0}/src/nodebpy/builder/__init__.py

@@ -11,24 +11,49 @@ from .node import (
 )
 from .socket import (
     BooleanSocket,
+    BooleanSocketGrid,
+    BooleanSocketList,
     BundleSocket,
+    BundleSocketList,
     ClosureSocket,
+    ClosureSocketList,
     CollectionSocket,
+    CollectionSocketList,
     ColorSocket,
+    ColorSocketList,
     FloatSocket,
+    FloatSocketGrid,
+    FloatSocketList,
     FontSocket,
+    FontSocketList,
     GeometrySocket,
+    GeometrySocketList,
     ImageSocket,
+    ImageSocketList,
     IntegerSocket,
+    IntegerSocketGrid,
+    IntegerSocketList,
+    IntegerVectorSocket,
     MaterialSocket,
+    MaterialSocketList,
     MatrixSocket,
+    MatrixSocketList,
     MenuSocket,
+    MenuSocketList,
     ObjectSocket,
+    ObjectSocketList,
     RotationSocket,
+    RotationSocketList,
     ShaderSocket,
+    ShaderSocketList,
     Socket,
+    SoundSocket,
+    SoundSocketList,
     StringSocket,
+    StringSocketList,
     VectorSocket,
+    VectorSocketGrid,
+    VectorSocketList,
 )
 from .tree import (
     InputInterfaceContext,
@@ -55,25 +80,51 @@ __all__ = [
     "CustomCompositorGroup",
     "CustomGeometryGroup",
     "CustomShaderGroup",
+    "CustomShaderGroup",
     # Runtime socket types
     "FloatSocket",
+    "FloatSocketGrid",
+    "FloatSocketList",
     "VectorSocket",
+    "VectorSocketGrid",
+    "VectorSocketList",
     "ColorSocket",
+    "ColorSocketList",
     "IntegerSocket",
+    "IntegerVectorSocket",
+    "IntegerSocketGrid",
+    "IntegerSocketList",
     "BooleanSocket",
+    "BooleanSocketGrid",
+    "BooleanSocketList",
     "RotationSocket",
+    "RotationSocketList",
     "MatrixSocket",
+    "MatrixSocketList",
     "StringSocket",
+    "StringSocketList",
     "MenuSocket",
+    "MenuSocketList",
     "GeometrySocket",
+    "GeometrySocketList",
     "ObjectSocket",
+    "ObjectSocketList",
     "FontSocket",
+    "FontSocketList",
     "MaterialSocket",
+    "MaterialSocketList",
     "ImageSocket",
+    "ImageSocketList",
     "CollectionSocket",
+    "CollectionSocketList",
     "BundleSocket",
+    "BundleSocketList",
     "ClosureSocket",
+    "ClosureSocketList",
     "ShaderSocket",
+    "ShaderSocketList",
+    "SoundSocket",
+    "SoundSocketList",
     # Tree context
     "SocketContext",
     "PanelContext",

nodebpy-520.0.0/src/nodebpy/builder/_registry.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from bpy.types import NodeSocket
+
+if TYPE_CHECKING:
+    from .socket import Socket
+
+_SOCKET_REGISTRY: dict[str, "type[Socket]"] = {}
+_SOCKET_LIST_REGISTRY: dict[str, "type[Socket]"] = {}
+_SOCKET_GRID_REGISTRY: dict[str, "type[Socket]"] = {}
+
+
+def _wrap_socket(socket: NodeSocket) -> "Socket":
+    for key, cls in _SOCKET_REGISTRY.items():
+        if key in socket.bl_idname:
+            structure = getattr(socket, "inferred_structure_type", "SINGLE")
+            if structure == "LIST":
+                return _SOCKET_LIST_REGISTRY.get(key, cls)(socket)
+            elif structure == "GRID":
+                return _SOCKET_GRID_REGISTRY.get(key, cls)(socket)
+            return cls(socket)
+    from .socket import Socket
+
+    return Socket(socket)

{nodebpy-0.17.0 → nodebpy-520.0.0}/src/nodebpy/builder/_utils.py

@@ -47,6 +47,7 @@ def _allow_innactive_sockets(node: bpy.types.Node) -> bool:
         "GeometryNodeIndexSwitch",
         "GeometryNodeMenuSwitch",
         "ShaderNodeMixShader",
+        # "ShaderNodeMix",
         "GeometryNodeSwitch",
     )
 
@@ -63,7 +64,7 @@ def _resolve_promotion(
     """
     other_type = getattr(other, "type", None)
     self_prec = _TYPE_PRECEDENCE.get(self_socket.type, 1)
-    other_prec = _TYPE_PRECEDENCE.get(other_type, -1)  # type: ignore[arg-type]
+    other_prec = _TYPE_PRECEDENCE.get(other_type, -1) if other_type is not None else -1
 
     if other_prec > self_prec:
         # Other side is dominant — swap so the linker wraps the vector/higher socket

{nodebpy-0.17.0 → nodebpy-520.0.0}/src/nodebpy/builder/accessor.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Iterator, Literal, overload
 import bpy
 from bpy.types import NodeSocket
 
-from ._registry import _get_socket_linker
+from ._registry import _wrap_socket
 from ._utils import (
     SocketError,
     _allow_innactive_sockets,
@@ -79,14 +79,14 @@ class SocketAccessor:
         """Get a Socket for a socket by identifier, name, or index."""
         if isinstance(key, slice):
             sockets = [
-                _get_socket_linker(self._collection[i])
+                _wrap_socket(self._collection[i])
                 for i in range(*key.indices(len(self._collection)))
             ]
             if self._builder is not None:
                 for s in sockets:
                     s._builder_node = self._builder
             return sockets
-        socket = _get_socket_linker(self._collection[self._index(key)])
+        socket = _wrap_socket(self._collection[self._index(key)])
         if self._builder is not None:
             socket._builder_node = self._builder
         return socket
@@ -103,10 +103,12 @@ class SocketAccessor:
     def _node(self) -> bpy.types.Node:
         """The node this accessor is associated with."""
         if isinstance(self._collection, list):
+            assert self._collection[0].node is not None
             return self._collection[0].node
         # bpy NodeInputs/NodeOutputs.id_data returns the NodeTree (top-level ID),
         # not the Node. Retrieve the node via the first socket instead.
         for s in self._collection:
+            assert s.node is not None
             return s.node
         return self._collection.data  # empty collection fallback
 
@@ -183,7 +185,7 @@ class SocketAccessor:
         Uses node-level visibility rules regardless of ``ignore_visibility`` —
         see ``_visible_sockets`` for rationale.
         """
-        return [_get_socket_linker(s) for s in self._visible_sockets()]
+        return [_wrap_socket(s) for s in self._visible_sockets()]
 
     def _items(self) -> "list[tuple[str, Socket]]":
         """All visible sockets as (name, Socket) pairs.
@@ -191,7 +193,7 @@ class SocketAccessor:
         Uses node-level visibility rules regardless of ``ignore_visibility`` —
         see ``_visible_sockets`` for rationale.
         """
-        return [(s.name, _get_socket_linker(s)) for s in self._visible_sockets()]
+        return [(s.name, _wrap_socket(s)) for s in self._visible_sockets()]
 
     def _keys(self) -> list[str]:
         """All visible socket names."""