nodebpy 520.6.0__tar.gz → 520.8.0__tar.gz

{nodebpy-520.6.0 → nodebpy-520.8.0}/PKG-INFO

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

{nodebpy-520.6.0 → nodebpy-520.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "520.6.0"
+version = "520.8.0"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [

nodebpy-520.8.0/src/nodebpy/assets/__init__.py

@@ -0,0 +1,20 @@
+"""Typed APIs for node-group assets.
+
+``generate_asset_api`` builds typed :class:`~nodebpy.builder.AssetNodeGroup`
+classes for the node groups in a ``.blend`` asset library into a single module;
+``generate_asset_modules`` splits them into one module per tree type
+(``geometry.py`` / ``shader.py`` / ``compositor.py``). The bundled-essentials
+APIs generated for nodebpy itself live in ``nodebpy.nodes.{geometry,shader,
+compositor}.assets`` and are re-exported alongside the built-in nodes.
+"""
+
+from ..builder import AssetLibrary, BundledLibrary, PackageLibrary
+from ._codegen import generate_asset_api, generate_asset_modules
+
+__all__ = [
+    "generate_asset_api",
+    "generate_asset_modules",
+    "AssetLibrary",
+    "BundledLibrary",
+    "PackageLibrary",
+]

{nodebpy-520.6.0 → nodebpy-520.8.0}/src/nodebpy/assets/__main__.py

@@ -14,7 +14,7 @@ import os
 from pathlib import Path
 
 from ..builder import BundledLibrary, PackageLibrary
-from ._codegen import generate_asset_api
+from ._codegen import generate_asset_api, generate_asset_modules
 
 # Bundled libraries shipped with Blender, grouped by output module. Each library
 # holds node groups of a single tree type.
@@ -70,7 +70,11 @@ def parse_args() -> argparse.Namespace:
         "-o",
         dest="output",
         type=Path,
-        help="Path of the assets.py module to write.",
+        help=(
+            "Where to write the generated module(s). A .py path writes a single "
+            "module; a directory writes one module per tree type "
+            "(geometry.py / shader.py / compositor.py)."
+        ),
     )
     parser.add_argument(
         "--nodebpy-pkg",
@@ -98,6 +102,16 @@ def main() -> None:  # pragma: no cover - CLI wrapper
         # directory (``__file__``), so express the .blend relative to the output
         # module — not the CWD the command happened to run from.
         blend = args.blend_file.resolve()
+        if output.suffix != ".py":
+            # Directory output: one module per tree type.
+            out_dir = output.resolve()
+            relative = Path(os.path.relpath(blend, out_dir)).as_posix()
+            generate_asset_modules(
+                [PackageLibrary(str(out_dir / "_anchor.py"), relative)],
+                output,
+                nodebpy_pkg=args.nodebpy_pkg,
+            )
+            return
         relative = Path(os.path.relpath(blend, output.resolve().parent)).as_posix()
         generate_asset_api(
             [PackageLibrary(str(output), relative)],

{nodebpy-520.6.0 → nodebpy-520.8.0}/src/nodebpy/assets/_codegen.py

@@ -50,6 +50,14 @@ _SOCKET_TYPES: dict[str, tuple[str, str]] = {
 }
 
 
+# Tree type → module name used when splitting generated output per tree type.
+_TREE_MODULES: dict[str, str] = {
+    "GeometryNodeTree": "geometry",
+    "ShaderNodeTree": "shader",
+    "CompositorNodeTree": "compositor",
+}
+
+
 def _socket_types(bl_socket_type: str) -> tuple[str, str]:
     for key, value in _SOCKET_TYPES.items():
         if key in bl_socket_type:
@@ -329,3 +337,47 @@ def generate_asset_api(
         _render_module(classes, nodebpy_pkg=nodebpy_pkg), encoding="utf-8"
     )
     return [c.class_name for c in classes]
+
+
+def generate_asset_modules(
+    libraries: AssetLibrary | Sequence[AssetLibrary],
+    output_dir: str | Path,
+    *,
+    names: set[str] | None = None,
+    nodebpy_pkg: str = "nodebpy",
+) -> dict[str, list[str]]:
+    """Generate typed asset classes for ``libraries``, split into one module per
+    tree type inside ``output_dir``.
+
+    Writes ``geometry.py``, ``shader.py`` and/or ``compositor.py`` — one module
+    for each tree type that has assets in the libraries (no file for the
+    others). Asset names repeat across editors (a geometry *and* a compositor
+    "Combine Spherical" both exist), so splitting keeps the generated class
+    names collision-free where a single :func:`generate_asset_api` module would
+    silently shadow one with the other.
+
+    Parameters are as for :func:`generate_asset_api`, except ``output_dir`` is
+    the directory to write the modules into (created if needed).
+
+    Returns a mapping of module name (``"geometry"`` / ``"shader"`` /
+    ``"compositor"``) to the class names written to it.
+    """
+    if isinstance(libraries, AssetLibrary):
+        libraries = [libraries]
+
+    classes: list[_AssetClass] = []
+    for library in libraries:
+        classes.extend(_introspect(library, names))
+
+    output_dir = Path(output_dir)
+    output_dir.mkdir(parents=True, exist_ok=True)
+    written: dict[str, list[str]] = {}
+    for tree_idname, module in _TREE_MODULES.items():
+        tree_classes = [c for c in classes if c.tree_idname == tree_idname]
+        if not tree_classes:
+            continue
+        (output_dir / f"{module}.py").write_text(
+            _render_module(tree_classes, nodebpy_pkg=nodebpy_pkg), encoding="utf-8"
+        )
+        written[module] = [c.class_name for c in tree_classes]
+    return written

{nodebpy-520.6.0 → nodebpy-520.8.0}/src/nodebpy/builder/node.py

@@ -387,6 +387,10 @@ class NodeGroupBuilder(BaseNode, ABC, Generic[_T]):
         self._establish_links(**kwargs)
         if named_links:
             self._establish_named_links(named_links)
+        # Name the node after its tree (Blender deduplicates with a
+        # ``.001``-style suffix), matching how group assets added from the
+        # Add menu are named, instead of Blender's default ``Group``.
+        self.node.name = self.node_tree.name
 
     @property
     @abstractmethod

nodebpy-520.6.0/src/nodebpy/assets/__init__.py

@@ -1,17 +0,0 @@
-"""Typed APIs for node-group assets.
-
-``generate_asset_api`` builds typed :class:`~nodebpy.builder.AssetNodeGroup`
-classes for the node groups in a ``.blend`` asset library. The bundled-essentials
-APIs generated for nodebpy itself live alongside this module as
-``nodebpy.assets.geometry`` / ``.shader`` / ``.compositor``.
-"""
-
-from ..builder import AssetLibrary, BundledLibrary, PackageLibrary
-from ._codegen import generate_asset_api
-
-__all__ = [
-    "generate_asset_api",
-    "AssetLibrary",
-    "BundledLibrary",
-    "PackageLibrary",
-]