nodebpy 520.30.2__tar.gz → 520.32.0__tar.gz

{nodebpy-520.30.2 → nodebpy-520.32.0}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.3
 Name: nodebpy
-Version: 520.30.2
+Version: 520.32.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.2.* ; extra == 'bpy'
 Requires-Dist: ruff>=0.14.11 ; extra == 'format'
-Requires-Dist: networkx>=3.6.1 ; extra == 'networkx'
 Requires-Dist: matplotlib>=3.8 ; extra == 'plot'
 Requires-Python: >=3.13
 Provides-Extra: bpy
@@ -33,21 +32,19 @@ pip install nodebpy
 ```python
 from nodebpy import geometry as g
 
-with g.tree("AnotherTree", collapse=True) as tree:
-    rotation = (
+with g.tree("AnotherTree", collapse=True, is_modifier=True) as tree:
+    rot = (
         g.RandomValue.vector(min=-1, seed=2)
         >> g.AlignRotationToVector()
         >> g.RotateRotation(rotate_by=g.AxisAngleToRotation(angle=0.3))
     )
+    pos = g.Position() * 2.0 + (0, 0.2, 0.3)
 
-    _ = (
+    (
         tree.inputs.integer("Count", 10)
         >> g.Points(position=g.RandomValue.vector(min=-1))
-        >> g.InstanceOnPoints(instance=g.Cube(), rotation=rotation)
-        >> g.SetPosition(
-            position=g.Position() * 2.0 + (0, 0.2, 0.3),
-            offset=(0, 0, 0.1),
-        )
+        >> g.InstanceOnPoints(instance=g.Cube(), rotation=rot)
+        >> g.SetPosition(position=pos, offset=(0, 0, 0.1))
         >> g.RealizeInstances()
         >> g.InstanceOnPoints(g.Cube(), instance=...)
         >> tree.outputs.geometry("Instances")

{nodebpy-520.30.2 → nodebpy-520.32.0}/README.md

@@ -15,21 +15,19 @@ pip install nodebpy
 ```python
 from nodebpy import geometry as g
 
-with g.tree("AnotherTree", collapse=True) as tree:
-    rotation = (
+with g.tree("AnotherTree", collapse=True, is_modifier=True) as tree:
+    rot = (
         g.RandomValue.vector(min=-1, seed=2)
         >> g.AlignRotationToVector()
         >> g.RotateRotation(rotate_by=g.AxisAngleToRotation(angle=0.3))
     )
+    pos = g.Position() * 2.0 + (0, 0.2, 0.3)
 
-    _ = (
+    (
         tree.inputs.integer("Count", 10)
         >> g.Points(position=g.RandomValue.vector(min=-1))
-        >> g.InstanceOnPoints(instance=g.Cube(), rotation=rotation)
-        >> g.SetPosition(
-            position=g.Position() * 2.0 + (0, 0.2, 0.3),
-            offset=(0, 0, 0.1),
-        )
+        >> g.InstanceOnPoints(instance=g.Cube(), rotation=rot)
+        >> g.SetPosition(position=pos, offset=(0, 0, 0.1))
         >> g.RealizeInstances()
         >> g.InstanceOnPoints(g.Cube(), instance=...)
         >> tree.outputs.geometry("Instances")

{nodebpy-520.30.2 → nodebpy-520.32.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nodebpy"
-version = "520.30.2"
+version = "520.32.0"
 description = "Build nodes trees in Blender more elegantly with code"
 readme = "README.md"
 authors = [
@@ -9,10 +9,13 @@ authors = [
 requires-python = ">=3.13"
 license = { text = "GPL-3.0-or-later" }
 
+[project.scripts]
+nodebpy = "nodebpy.__main__:main"
+
 [project.optional-dependencies]
-networkx = [
-    "networkx>=3.6.1",
-]
+# Deprecated: the Sugiyama layout no longer needs networkx. Kept (empty) so
+# existing `nodebpy[networkx]` installs keep resolving.
+networkx = []
 plot = [
     "matplotlib>=3.8",
 ]
@@ -32,7 +35,6 @@ build-backend = "uv_build"
 dev = [
     "ipython>=8.0.0",
     "ipykernel>=6.0.0",
-    "networkx>=3.6.1",
     "fake-bpy-module>=20260501",
     "jsondiff>=2.2.1",
     "pytest>=9.0.2",
@@ -45,7 +47,6 @@ dev = [
     "pytest-xdist>=3.8.0",
     "griffe<2.0.0",
     "ty==0.0.74",
-    "types-networkx>=3.6.1.20260728",
     "matplotlib>=3.11.2",
 ]
 

{nodebpy-520.30.2 → nodebpy-520.32.0}/src/nodebpy/__init__.py

@@ -1,7 +1,7 @@
 from . import builder, export, live, nodes, types
 from .builder import (
+    SIMPLE_OPTIONS,
     ArrangeMethod,
-    SimpleOptions,
     SugiyamaOptions,
     TreeBuilder,
     arrange,
@@ -12,9 +12,9 @@ from .nodes import compositor, geometry, shader
 from .types import Default
 
 __all__ = [
+    "SIMPLE_OPTIONS",
     "ArrangeMethod",
     "Default",
-    "SimpleOptions",
     "SugiyamaOptions",
     "TreeBuilder",
     "arrange",

nodebpy-520.32.0/src/nodebpy/__main__.py

@@ -0,0 +1,41 @@
+"""The ``nodebpy`` command line.
+
+``nodebpy <subcommand>`` (or ``python -m nodebpy <subcommand>``) round-trips
+``.blend`` asset libraries through Python source — ``dump``, ``build``,
+``ensure``, ``check``, ``plot`` — and renders them as text for ``git diff``
+with ``textconv``; see :mod:`nodebpy.assets._library` and
+:mod:`nodebpy.assets._textconv`.
+
+Under a full Blender (no ``bpy`` module) run this file as a script, with the
+arguments after Blender's ``--`` separator::
+
+    blender -b --factory-startup -P <.../nodebpy/__main__.py> -- textconv <blend>
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+# ``blender ... -P .../nodebpy/__main__.py`` runs this file as a plain script
+# (no package context): put the package root on sys.path so the absolute
+# imports resolve — a no-op under ``python -m nodebpy``.
+if not __package__:  # pragma: no cover - only under blender -P
+    sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+
+
+def main(argv: list[str] | None = None) -> None:  # pragma: no cover - CLI wrapper
+    if argv is None:
+        # Blender passes script arguments after a ``--`` separator: strip
+        # everything up to and including it, so the subcommands work there.
+        argv = sys.argv[1:]
+        if "--" in sys.argv:
+            argv = sys.argv[sys.argv.index("--") + 1 :]
+
+    from nodebpy.assets._library import main as library_main
+
+    library_main(argv)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()

{nodebpy-520.30.2 → nodebpy-520.32.0}/src/nodebpy/assets/__init__.py

@@ -10,13 +10,15 @@ compositor}.assets`` and are re-exported alongside the built-in nodes.
 ``dump_library`` and ``build_library`` round-trip a ``.blend`` asset library
 through Python source: every asset is dumped to its own ``.py`` file (the
 version-controlled source of truth) and the ``.blend`` is rebuilt from them
-(``python -m nodebpy.assets dump/build``). The CLI adds ``ensure`` (rebuild
+(``nodebpy dump/build``). The CLI adds ``ensure`` (rebuild
 only when the ``.blend`` or its fingerprint stamp is stale) and ``check``
 (verify that build → dump reproduces the sources byte-for-byte), and reads
 its arguments from a ``[tool.nodebpy.assets]`` pyproject table — see
 :mod:`nodebpy.assets._pipeline`. ``plot_library`` renders node groups from a
 ``.blend`` to PNG images by name or wildcard
-(``python -m nodebpy.assets plot``), for review outside Blender.
+(``nodebpy plot``), for review outside Blender, and ``nodebpy textconv``
+prints a library's dumped source for ``git diff`` — see
+:mod:`nodebpy.assets._textconv`.
 """
 
 from ..builder import AssetLibrary, BundledLibrary, PackageLibrary

nodebpy-520.32.0/src/nodebpy/assets/__main__.py

@@ -0,0 +1,76 @@
+"""Deprecated ``python -m nodebpy.assets`` entry point; use ``nodebpy``.
+
+Forwards to the ``nodebpy`` command (:mod:`nodebpy.__main__`) with a
+``FutureWarning``, and will be removed in nodebpy 530. Subcommands pass
+through unchanged (``python -m nodebpy.assets dump …`` runs ``nodebpy dump
+…``), and the old flag-based codegen interface (``-b lib.blend -o DIR``)
+runs ``nodebpy dump --api-only lib.blend DIR``. The :mod:`nodebpy.assets`
+module itself stays.
+"""
+
+from __future__ import annotations
+
+import argparse
+import sys
+import warnings
+from pathlib import Path
+
+# ``blender ... -P .../nodebpy/assets/__main__.py`` runs this file as a plain
+# script (no package context): put the package root on sys.path so the
+# absolute imports resolve, a no-op under ``python -m nodebpy.assets``.
+if not __package__:  # pragma: no cover - only under blender -P
+    sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
+
+
+def _api_dump_argv(argv: list[str]) -> list[str]:
+    """The flag-based codegen command line as a ``dump --api-only`` one."""
+    parser = argparse.ArgumentParser(prog="python -m nodebpy.assets")
+    parser.add_argument("--blend-file", "-b", type=Path)
+    parser.add_argument("--output", "--output-dir", "-o", dest="output", type=Path)
+    parser.add_argument("--nodebpy-pkg")
+    parser.add_argument("--no-docstrings", dest="docstrings", action="store_false")
+    args = parser.parse_args(argv)
+    if args.blend_file is None:
+        raise SystemExit(
+            "python -m nodebpy.assets: nodebpy's own bundled-essentials classes "
+            "are regenerated by 'python -m gen' (make generate)."
+        )
+    if args.output is None or args.output.suffix == ".py":
+        raise SystemExit(
+            "python -m nodebpy.assets: 'nodebpy dump --api-only' writes one "
+            "module per asset, so -o must be a directory; for a single module "
+            "call nodebpy.assets.generate_asset_api."
+        )
+    forwarded = ["dump", "--api-only", str(args.blend_file), str(args.output)]
+    if args.nodebpy_pkg:
+        forwarded += ["--nodebpy-pkg", args.nodebpy_pkg]
+    if not args.docstrings:
+        forwarded.append("--no-docstrings")
+    return forwarded
+
+
+def main() -> None:
+    # Blender passes script arguments after a ``--`` separator: strip
+    # everything up to and including it.
+    argv = sys.argv[1:]
+    if "--" in sys.argv:
+        argv = sys.argv[sys.argv.index("--") + 1 :]
+
+    # The flag-based codegen interface took no positionals, so a leading
+    # positional is always a subcommand.
+    if not argv or argv[0].startswith("-"):
+        argv = _api_dump_argv(argv)
+    warnings.warn(
+        "'python -m nodebpy.assets' is deprecated and will be removed in "
+        f"nodebpy 530; use 'nodebpy {' '.join(argv[:2])}' instead.",
+        FutureWarning,
+        stacklevel=2,
+    )
+
+    from nodebpy.__main__ import main as nodebpy_main
+
+    nodebpy_main(argv)
+
+
+if __name__ == "__main__":  # pragma: no cover
+    main()