nodebpy 520.13.0__tar.gz → 520.15.0__tar.gz

{nodebpy-520.13.0 → nodebpy-520.15.0}/PKG-INFO

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

{nodebpy-520.13.0 → nodebpy-520.15.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "520.13.0"
+version = "520.15.0"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [
@@ -44,5 +44,26 @@ dev = [
     "syrupy>=5.0.0",
     "pytest-xdist>=3.8.0",
     "griffe<2.0.0",
-    "ty==0.0.51",
+    "ty==0.0.74",
+    "types-networkx>=3.6.1.20260728",
 ]
+
+# The bpy stubs mark most collections/pointers as `| None` and cannot type
+# dynamic attributes (e.g. `socket.default_value`), which test code exercises
+# constantly under a real Blender runtime. Relax only those rules for tests;
+# src/ passes `ty check` with no per-directory relaxation.
+[[tool.ty.overrides]]
+include = ["tests/**"]
+
+[tool.ty.overrides.rules]
+unresolved-attribute = "ignore"
+not-subscriptable = "ignore"
+invalid-assignment = "ignore"
+invalid-argument-type = "ignore"
+
+[tool.ruff.lint]
+ignore = ["SIM117", "RUF059"]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/test_codegen.py" = ["S102"]
+"tests/test_assets.py" = ["S102"]

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/assets/_codegen.py

@@ -17,6 +17,7 @@ from collections import Counter
 from collections.abc import Sequence
 from dataclasses import dataclass
 from pathlib import Path
+from typing import cast
 
 import bpy
 
@@ -220,6 +221,7 @@ def _introspect_group(group, name: str, library_source: str) -> _AssetClass:
     ``node_groups.new`` too narrowly for the runtime attributes used here.
     """
     host = bpy.data.node_groups.new("_introspect_host", group.bl_idname)
+    assert host is not None
     try:
         node_type = {
             "GeometryNodeTree": "GeometryNodeGroup",
@@ -227,7 +229,12 @@ def _introspect_group(group, name: str, library_source: str) -> _AssetClass:
             "CompositorNodeTree": "CompositorNodeGroup",
         }[group.bl_idname]
         node = host.nodes.new(node_type)
-        node.node_tree = group  # ty: ignore[unresolved-attribute]
+        assert node is not None
+        node = cast(
+            "bpy.types.GeometryNodeGroup | bpy.types.ShaderNodeGroup | bpy.types.CompositorNodeGroup",
+            node,
+        )
+        node.node_tree = group
         # Tooltips live on the tree *interface* items, not on the node's
         # sockets — collect them by identifier so the generated docstrings
         # can use the asset author's own wording.
@@ -442,7 +449,10 @@ def generate_asset_api(
         editors show documentation alongside the type hints. Defaults to
         ``True``; pass ``False`` for a terser module.
 
-    Returns the list of generated class names.
+    Returns
+    -------
+    list[str]
+        The list of generated class names.
     """
     if isinstance(libraries, AssetLibrary):
         libraries = [libraries]

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/__init__.py

@@ -9,7 +9,7 @@ from .asset import (
     PackageLibrary,
     asset_group_base,
 )
-from .items import Item, ItemsMixin
+from .items import Item, ItemsMixin, MenuItem
 from .mixins import LinkingMixin, OperatorMixin
 from .node import (
     BaseNode,
@@ -75,82 +75,76 @@ from .tree import (
 )
 
 __all__ = [
-    # Core
-    "TreeBuilder",
-    "MaterialBuilder",
+    "AssetCompositorGroup",
+    "AssetGeometryGroup",
+    "AssetLibrary",
+    "AssetShaderGroup",
     "BaseNode",
-    "Socket",
-    "SocketAccessor",
-    # Mixins
-    "OperatorMixin",
-    "LinkingMixin",
-    "DynamicInputsMixin",
-    "Item",
-    "ItemsMixin",
-    # Node groups
-    "NodeGroupBuilder",
+    "BooleanSocket",
+    "BooleanSocketGrid",
+    "BooleanSocketList",
+    "BundleSocket",
+    "BundleSocketList",
+    "BundledLibrary",
+    "ClosureSocket",
+    "ClosureSocketList",
+    "CollectionSocket",
+    "CollectionSocketList",
+    "ColorSocket",
+    "ColorSocketList",
     "CustomCompositorGroup",
     "CustomGeometryGroup",
     "CustomShaderGroup",
-    # Asset-backed node groups
-    "AssetLibrary",
-    "BundledLibrary",
-    "PackageLibrary",
-    "AssetGeometryGroup",
-    "AssetShaderGroup",
-    "AssetCompositorGroup",
-    "asset_group_base",
-    # Runtime socket types
+    "DynamicInputsMixin",
     "FloatSocket",
     "FloatSocketGrid",
     "FloatSocketList",
-    "VectorSocket",
-    "VectorSocketGrid",
-    "VectorSocketList",
-    "ColorSocket",
-    "ColorSocketList",
+    "FontSocket",
+    "FontSocketList",
+    "GeometrySocket",
+    "GeometrySocketList",
+    "ImageSocket",
+    "ImageSocketList",
+    "InputInterfaceContext",
     "IntegerSocket",
-    "IntegerVectorSocket",
     "IntegerSocketGrid",
     "IntegerSocketList",
-    "BooleanSocket",
-    "BooleanSocketGrid",
-    "BooleanSocketList",
-    "RotationSocket",
-    "RotationSocketList",
+    "IntegerVectorSocket",
+    "Item",
+    "ItemsMixin",
+    "LinkingMixin",
+    "MaterialBuilder",
+    "MaterialSocket",
+    "MaterialSocketList",
     "MatrixSocket",
     "MatrixSocketList",
-    "StringSocket",
-    "StringSocketList",
+    "MenuItem",
     "MenuSocket",
     "MenuSocketList",
-    "GeometrySocket",
-    "GeometrySocketList",
+    "NodeGroupBuilder",
     "ObjectSocket",
     "ObjectSocketList",
-    "FontSocket",
-    "FontSocketList",
-    "MaterialSocket",
-    "MaterialSocketList",
-    "ImageSocket",
-    "ImageSocketList",
-    "CollectionSocket",
-    "CollectionSocketList",
-    "BundleSocket",
-    "BundleSocketList",
-    "ClosureSocket",
-    "ClosureSocketList",
+    "OperatorMixin",
+    "OutputInterfaceContext",
+    "PackageLibrary",
+    "PanelContext",
+    "RotationSocket",
+    "RotationSocketList",
     "ShaderSocket",
     "ShaderSocketList",
-    "SoundSocket",
-    "SoundSocketList",
-    # Tree context
+    "Socket",
+    "SocketAccessor",
     "SocketContext",
-    "PanelContext",
-    "InputInterfaceContext",
-    "OutputInterfaceContext",
-    # Utilities
     "SocketError",
-    "normalize_name",
+    "SoundSocket",
+    "SoundSocketList",
+    "StringSocket",
+    "StringSocketList",
+    "TreeBuilder",
+    "VectorSocket",
+    "VectorSocketGrid",
+    "VectorSocketList",
+    "asset_group_base",
     "denormalize_name",
+    "normalize_name",
 ]

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/_registry.py

@@ -7,12 +7,12 @@ 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]"] = {}
+_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":
+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")

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/_utils.py

@@ -77,7 +77,7 @@ def _allow_innactive_sockets(node: bpy.types.Node) -> bool:
 
 def _resolve_promotion(
     self_socket: NodeSocket, other: Any, reverse: bool
-) -> "tuple[NodeSocket, Any, bool]":
+) -> tuple[NodeSocket, Any, bool]:
     """Determine the dominant socket for operator dispatch.
 
     When both operands have a socket type, the higher-precedence type wins.
@@ -114,7 +114,7 @@ class _SocketLike(Protocol):
     socket: NodeSocket
 
 
-def _output_socket_type(value: Any) -> "SOCKET_TYPES | None":
+def _output_socket_type(value: Any) -> SOCKET_TYPES | None:
     """The Blender socket ``type`` of *value*'s default output socket.
 
     Resolves a raw ``NodeSocket`` or any socket/node wrapper to the type string

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/accessor.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterator, Literal, overload
+from collections.abc import Iterator
+from typing import TYPE_CHECKING, Literal, cast, overload
 
 import bpy
 from bpy.types import NodeSocket
@@ -84,10 +85,10 @@ class SocketAccessor:
         )
 
     @overload
-    def _get(self, key: slice) -> "list[Socket]": ...
+    def _get(self, key: slice) -> list[Socket]: ...
     @overload
-    def _get(self, key: str | int) -> "Socket": ...
-    def _get(self, key: str | int | slice) -> "Socket | list[Socket]":
+    def _get(self, key: str | int) -> Socket: ...
+    def _get(self, key: str | int | slice) -> Socket | list[Socket]:
         """Get a Socket for a socket by identifier, name, or index."""
         if isinstance(key, slice):
             sockets = [
@@ -104,10 +105,10 @@ class SocketAccessor:
         return socket
 
     @overload
-    def __getitem__(self, key: slice) -> "list[Socket]": ...
+    def __getitem__(self, key: slice) -> list[Socket]: ...
     @overload
-    def __getitem__(self, key: str | int) -> "Socket": ...
-    def __getitem__(self, key: str | int | slice) -> "Socket | list[Socket]":
+    def __getitem__(self, key: str | int) -> Socket: ...
+    def __getitem__(self, key: str | int | slice) -> Socket | list[Socket]:
         """Access by identifier, name, or integer index."""
         return self._get(key)
 
@@ -122,7 +123,9 @@ class SocketAccessor:
         for s in self._collection:
             assert s.node is not None
             return s.node
-        return self._collection.data  # empty collection fallback
+        return cast(
+            "bpy.types.Node", self._collection.data
+        )  # empty collection fallback
 
     @property
     def _ignore_visibility(self) -> bool:
@@ -191,7 +194,7 @@ class SocketAccessor:
             f"{socket_type} on {self._node.name}"
         )
 
-    def _values(self) -> "list[Socket]":
+    def _values(self) -> list[Socket]:
         """All visible sockets as Sockets.
 
         Uses node-level visibility rules regardless of ``ignore_visibility`` —
@@ -199,7 +202,7 @@ class SocketAccessor:
         """
         return [_wrap_socket(s) for s in self._visible_sockets()]
 
-    def _items(self) -> "list[tuple[str, Socket]]":
+    def _items(self) -> list[tuple[str, Socket]]:
         """All visible sockets as (name, Socket) pairs.
 
         Uses node-level visibility rules regardless of ``ignore_visibility`` —
@@ -214,10 +217,10 @@ class SocketAccessor:
     def __len__(self) -> int:
         return len(self._items())
 
-    def __iter__(self) -> Iterator["Socket"]:
+    def __iter__(self) -> Iterator[Socket]:
         return iter(self._values())
 
-    def __getattr__(self, name: str) -> "Socket":
+    def __getattr__(self, name: str) -> Socket:
         """Dynamic socket access by normalised attribute name.
 
         Converts ``node.o.base_color`` to ``self._get("Base Color")``.

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/arrange.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from collections import Counter, deque
+from typing import Any, cast
 
 import bpy
 
@@ -114,10 +115,12 @@ def calculate_node_dimensions(
     enabled_outputs = sum(1 for s in node.outputs if s.enabled)
 
     # count properties specific to this node type (not inherited)
+    # ``bl_rna`` exists on bpy classes via their metaclass, invisible to type
+    # checkers looking at plain ``type``.
     inherited_ids = {
         prop.identifier
         for base in type(node).__bases__
-        for prop in getattr(base, "bl_rna").properties
+        for prop in cast(Any, base).bl_rna.properties
     }
     node_property_count = sum(
         1 for prop in node.bl_rna.properties if prop.identifier not in inherited_ids
@@ -275,8 +278,7 @@ def position_nodes_in_columns(
 
             width, height = calculate_node_dimensions(node, connection_counts, 1.0)
 
-            if width > col_width:
-                col_width = width
+            col_width = max(col_width, width)
 
             node.location = (x, y)
 

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/asset.py

@@ -12,6 +12,7 @@ from __future__ import annotations
 import os
 from abc import ABC, abstractmethod
 from pathlib import Path
+from typing import Any
 
 import bpy
 
@@ -122,19 +123,19 @@ _ASSET_GROUP_BASE = {
 }
 
 
-def asset_group_base(tree_idname: str) -> type:
+def asset_group_base(tree_idname: str) -> type[Any]:
     """The ``Asset*Group`` base class for a tree-type bl_idname."""
     return _ASSET_GROUP_BASE[tree_idname]
 
 
 __all__ = [
+    "AssetCompositorGroup",
+    "AssetGeometryGroup",
     "AssetLibrary",
-    "BundledLibrary",
-    "PackageLibrary",
     "AssetNodeGroup",
-    "AssetGeometryGroup",
     "AssetShaderGroup",
-    "AssetCompositorGroup",
+    "BundledLibrary",
+    "PackageLibrary",
     "asset_group_base",
 ]
 

{nodebpy-520.13.0 → nodebpy-520.15.0}/src/nodebpy/builder/items.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Generic, Mapping, TypeVar, cast
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, cast
 
 from bpy.types import ID, Node, NodeSocket
 from mathutils import Euler
@@ -9,7 +10,7 @@ from ..types import _is_default_value
 from ._registry import _wrap_socket
 from ._utils import _SocketLike
 from .node import DynamicInputsMixin
-from .socket import Socket
+from .socket import BaseSocket, Socket
 
 if TYPE_CHECKING:
     from ..types import (
@@ -95,7 +96,7 @@ def _infer_value_type(value: Any) -> str | None:
             return None
 
 
-_SocketT = TypeVar("_SocketT", bound=Socket, default=Socket)
+_SocketT = TypeVar("_SocketT", bound=BaseSocket, default=Socket)
 
 
 class Item(Generic[_SocketT]):
@@ -151,6 +152,29 @@ class Item(Generic[_SocketT]):
         )
 
 
+class MenuItem(Item[_SocketT]):
+    """Handle for one Menu Switch enum item.
+
+    ``input`` is the item's input socket (typed to the switch's data
+    type), ``is_selected`` the item's boolean output socket, and
+    ``description`` the tooltip Blender shows for the item in the menu.
+    """
+
+    @property
+    def is_selected(self) -> BooleanSocket:
+        """Boolean output socket — True when this item is selected."""
+        return cast("BooleanSocket", self.output)
+
+    @property
+    def description(self) -> str:
+        """Tooltip shown for this item in the drop-down menu."""
+        return self._item.description
+
+    @description.setter
+    def description(self, value: str) -> None:
+        self._item.description = value
+
+
 class ItemsMixin(DynamicInputsMixin):
     """Socket machinery for nodes whose sockets are driven by a bpy item
     collection (``capture_items``, ``bake_items``, ``format_items``, ...).