feat(blender): pinned extension set in a read-only System repo, for the GUI and blender-run --extensions
Blender is now a mandatory stage in draupnir's pipeline (Prime, 2026-09-28), and draupnir asked for eight add-ons from extensions.blender.org: SurfacePsycho 0.10.4, CAD Sketcher 0.32.1, 3D-Print Toolbox 1.4.1, STEP Importer 1.2.1, Bool Tool 2.1.0, LoopTools 4.7.7, MeasureIt 1.8.4, 3MF Import/Export 2.7.7. - stacks/blender/extensions.lock pins each by version and archive sha256. - scripts/blender-extensions sync builds fv-ml1:/tank/blender-extensions/5.2/system with Blender's own install-file, pre-warms and byte-compiles it, checks a read-only enable, then swaps it in. It refuses while the GUI or a blender-run job holds the old directory. - conf/scripts/startup/fleet_extensions.py enables every package in the System repo: in a timer in the GUI (after the prefs load), and as --python ahead of the caller's args in blender-run --extensions (a failed enable exits 1 before the caller's script). - It also patches SurfacePsycho's sp_overwrite_segment_selection from eval() to literal_eval(): the eval walked past MCP safe mode (control: unpatched ran code, patched refuses). - blender-run: --extensions (bind mounts via --mount so a missing source fails instead of being created); USER/LOGNAME set, which CAD Sketcher's getpass needs. - compose.yaml mounts the repo read-only and the hook into the GUI container. NOT yet deployed. - scripts/blender-probes/extensions_acceptance.py: one operator run per add-on, safe-mode compliant. Headless 8/9 online and with --network none; CAD Sketcher sketching is GUI-only. A Python audit hook saw no network/process events (positive control fired).
This commit is contained in:
Executable
+110
@@ -0,0 +1,110 @@
|
||||
#!/usr/bin/env bash
|
||||
# blender-extensions — fv-ml1's pinned Blender extension set (stacks/blender, README "Extensions").
|
||||
#
|
||||
# scripts/blender-extensions sync rebuild fv-ml1:/tank/blender-extensions/5.2/system from
|
||||
# stacks/blender/extensions.lock
|
||||
# scripts/blender-extensions status what is installed, against the lock
|
||||
#
|
||||
# The set lives in Blender's System extension repository, which is a plain directory. The GUI
|
||||
# container and `blender-run --extensions` both mount it READ-ONLY at /blender/5.2/extensions/system,
|
||||
# and conf/scripts/startup/fleet_extensions.py enables everything in it. Agents never install
|
||||
# anything: MCP safe mode blocks it, and the mount is read-only.
|
||||
#
|
||||
# sync:
|
||||
# 1. downloads each pinned archive into /tank/blender-extensions/zips/ (kept as a cache) and checks
|
||||
# its sha256 against the lock. A mismatch stops everything.
|
||||
# 2. installs each with Blender's own `--command extension install-file`, which validates the
|
||||
# manifest against this Blender and platform, into a staging directory.
|
||||
# 3. pre-warms the staging copy: enables everything once while it is still WRITABLE, then
|
||||
# byte-compiles it. 3D-Print Toolbox writes a translation cache into its own package dir on
|
||||
# first import, and that fails on the read-only mount (found 2026-09-28).
|
||||
# 4. checks that the staging copy enables READ-ONLY, then swaps it in and records the lock it was
|
||||
# built from as /tank/blender-extensions/5.2/installed.lock.
|
||||
# ⚠ It refuses while the GUI container or any blender-run job is running. They hold the old
|
||||
# directory through a bind mount, and the swap would pull it out from under them.
|
||||
set -euo pipefail
|
||||
|
||||
HOST=${BLENDER_SSH_HOST:-infra-ops@10.251.50.54}
|
||||
HERE=$(cd "$(dirname "$0")" && pwd)
|
||||
LOCK=$HERE/../stacks/blender/extensions.lock
|
||||
HOOK=$HERE/../stacks/blender/conf/scripts/startup/fleet_extensions.py
|
||||
|
||||
case "${1:-}" in
|
||||
sync)
|
||||
rows=$(grep -vE '^\s*(#|$)' "$LOCK")
|
||||
echo "$rows" | awk 'NF != 4 || $3 !~ /^[0-9a-f]{64}$/ || $1 !~ /^[A-Za-z0-9_]+$/ { bad=1; print "bad lock row: " $0 > "/dev/stderr" } END { exit bad }'
|
||||
ssh -n -o BatchMode=yes "$HOST" "mkdir -p /tank/blender-extensions/zips /tank/blender-extensions/5.2"
|
||||
scp -q "$LOCK" "$HOST:/tank/blender-extensions/5.2/staging.lock"
|
||||
scp -q "$HOOK" "$HOST:/tank/blender-extensions/5.2/staging-hook.py"
|
||||
ssh -o BatchMode=yes "$HOST" bash -s <<'REMOTE'
|
||||
set -euo pipefail
|
||||
cd /tank/blender-extensions
|
||||
if [ -n "$(docker ps -q --filter name='^blender$' --filter name='^blender-run-')" ]; then
|
||||
echo "blender-extensions: the GUI container or a blender-run job is running; stop it first (scripts/blender-mcp down)" >&2
|
||||
exit 3
|
||||
fi
|
||||
IMG=$(grep '^IMAGE=' /opt/docker/compose/blender/.env | cut -d= -f2)
|
||||
# Fixed, literal staging path: it is emptied before every build.
|
||||
rm -rf /tank/blender-extensions/5.2/staging
|
||||
mkdir -p 5.2/staging/system
|
||||
LOG=5.2/staging/sync.log
|
||||
blender() { # a throwaway Blender with the staging repo at $1 (rw|ro) and HOME in the container
|
||||
local mode=$1; shift
|
||||
docker run --rm --user 1002:1003 -e HOME=/tmp -e USER=infra-ops \
|
||||
-v /tank/blender-extensions/5.2/staging/system:/blender/5.2/extensions/system:"$mode" \
|
||||
-v /tank/blender-extensions/zips:/zips:ro \
|
||||
-v /tank/blender-extensions/5.2/staging-hook.py:/fleet/fleet_extensions.py:ro \
|
||||
--entrypoint /blender/blender "$IMG" "$@"
|
||||
}
|
||||
grep -vE '^\s*(#|$)' 5.2/staging.lock | while read -r id ver sha url; do
|
||||
zip=zips/$id-$ver.zip
|
||||
if ! echo "$sha $zip" | sha256sum -c --status 2>/dev/null; then
|
||||
curl -fsSL --retry 3 -o "$zip.part" "$url"
|
||||
mv "$zip.part" "$zip"
|
||||
fi
|
||||
echo "$sha $zip" | sha256sum -c --status || { echo "blender-extensions: sha256 MISMATCH for $id $ver; nothing installed" >&2; exit 4; }
|
||||
# install-file only targets user repos, so the staging dir is mounted as user_default for this step.
|
||||
docker run --rm --user 1002:1003 -e HOME=/tmp -e USER=infra-ops \
|
||||
-v /tank/blender-extensions/5.2/staging/system:/tmp/.config/blender/5.2/extensions/user_default \
|
||||
-v /tank/blender-extensions/zips:/zips:ro \
|
||||
--entrypoint /blender/blender "$IMG" --factory-startup \
|
||||
-c extension install-file -r user_default --no-prefs "/zips/$id-$ver.zip" >>"$LOG" 2>&1
|
||||
[ -f "5.2/staging/system/$id/blender_manifest.toml" ] || { echo "blender-extensions: install of $id failed; see $PWD/$LOG" >&2; exit 5; }
|
||||
echo "installed $id $ver"
|
||||
done
|
||||
# Pre-warm (writable), then byte-compile with Blender's own Python.
|
||||
blender rw -b --factory-startup --python-exit-code 1 --python /fleet/fleet_extensions.py >>"$LOG" 2>&1 \
|
||||
|| { echo "blender-extensions: pre-warm failed; see $PWD/$LOG" >&2; exit 6; }
|
||||
docker run --rm --user 1002:1003 -v /tank/blender-extensions/5.2/staging/system:/s --entrypoint /blender/5.2/python/bin/python3.13 "$IMG" \
|
||||
-m compileall -q /s >>"$LOG" 2>&1 || true
|
||||
# Must enable from the read-only mount before it goes live.
|
||||
blender ro -b --factory-startup --python-exit-code 1 --python /fleet/fleet_extensions.py >>"$LOG" 2>&1 \
|
||||
|| { echo "blender-extensions: read-only enable failed; see $PWD/$LOG" >&2; exit 7; }
|
||||
grep 'fleet_extensions: enabled' "$LOG" | tail -1
|
||||
# Swap in. Literal paths only.
|
||||
rm -rf /tank/blender-extensions/5.2/system.prev
|
||||
if [ -d /tank/blender-extensions/5.2/system ]; then mv /tank/blender-extensions/5.2/system /tank/blender-extensions/5.2/system.prev; fi
|
||||
mv /tank/blender-extensions/5.2/staging/system /tank/blender-extensions/5.2/system
|
||||
mv /tank/blender-extensions/5.2/staging.lock /tank/blender-extensions/5.2/installed.lock
|
||||
mv /tank/blender-extensions/5.2/staging/sync.log /tank/blender-extensions/5.2/sync.log
|
||||
rm -rf /tank/blender-extensions/5.2/system.prev /tank/blender-extensions/5.2/staging /tank/blender-extensions/5.2/staging-hook.py
|
||||
echo "live: /tank/blender-extensions/5.2/system ($(du -sh /tank/blender-extensions/5.2/system | cut -f1))"
|
||||
REMOTE
|
||||
"$HERE/ops-log" record --host fv-ml1 --action extensions-sync --target blender \
|
||||
--detail "rebuilt /tank/blender-extensions/5.2/system from extensions.lock ($(echo "$rows" | awk '{printf "%s %s, ", $1, $2}' | sed 's/, $//'))" ;;
|
||||
status)
|
||||
echo "lock (repo):"
|
||||
grep -vE '^\s*(#|$)' "$LOCK" | awk '{printf " %-16s %s\n", $1, $2}'
|
||||
echo "installed on fv-ml1:"
|
||||
ssh -n -o BatchMode=yes "$HOST" 'for m in /tank/blender-extensions/5.2/system/*/blender_manifest.toml; do
|
||||
[ -f "$m" ] || { echo " (nothing installed)"; break; }
|
||||
printf " %-16s %s\n" "$(sed -n "s/^id = \"\(.*\)\"/\1/p" "$m")" "$(sed -n "s/^version = \"\(.*\)\"/\1/p" "$m")"
|
||||
done'
|
||||
if ssh -n -o BatchMode=yes "$HOST" cat /tank/blender-extensions/5.2/installed.lock 2>/dev/null | cmp -s - "$LOCK"; then
|
||||
echo "installed.lock matches the repo lock"
|
||||
else
|
||||
echo "installed.lock DIFFERS from the repo lock (or is missing): run '$0 sync'"
|
||||
fi ;;
|
||||
*)
|
||||
sed -n 2,6p "$0" >&2; exit 2 ;;
|
||||
esac
|
||||
@@ -0,0 +1,239 @@
|
||||
# Acceptance probe for the fleet Blender extensions (stacks/blender, README "Extensions").
|
||||
# One real operator run per add-on. The same code runs on both paths:
|
||||
# headless: scripts/blender-run --extensions -- --python extensions_acceptance.py -- headless
|
||||
# MCP: the body pasted into execute_blender_code, with TAG = "mcp"
|
||||
# so it is written to pass MCP safe mode: bpy, bmesh and mathutils only, no os/open/imports.
|
||||
# Files land in /work/acceptance/extensions/ (= fv-ml1:/tank/blender/acceptance/extensions/),
|
||||
# which must exist first. Every result prints as PASS/FAIL; any FAIL raises at the end, so
|
||||
# blender-run exits 1.
|
||||
import bpy
|
||||
import bmesh
|
||||
import sys
|
||||
from mathutils import Vector
|
||||
|
||||
TAG = sys.argv[sys.argv.index("--") + 1] if "--" in sys.argv else "mcp"
|
||||
OUT = "/work/acceptance/extensions/"
|
||||
results = []
|
||||
|
||||
|
||||
def report(name, ok, detail):
|
||||
results.append((name, ok, detail))
|
||||
print(("PASS " if ok else "FAIL ") + name + " - " + detail)
|
||||
|
||||
|
||||
def clear():
|
||||
if bpy.context.object is not None and bpy.context.object.mode != "OBJECT":
|
||||
bpy.ops.object.mode_set(mode="OBJECT")
|
||||
for o in list(bpy.data.objects):
|
||||
bpy.data.objects.remove(o, do_unlink=True)
|
||||
|
||||
|
||||
def select_only(*objs):
|
||||
for o in bpy.context.view_layer.objects:
|
||||
o.select_set(False)
|
||||
for o in objs:
|
||||
o.select_set(True)
|
||||
bpy.context.view_layer.objects.active = objs[0]
|
||||
|
||||
|
||||
def view3d_override():
|
||||
"""Context for operators that insist on a 3D View area: the GUI window's, or (headless,
|
||||
where there is no window) a VIEW_3D area of a screen datablock."""
|
||||
for w in bpy.context.window_manager.windows:
|
||||
for a in w.screen.areas:
|
||||
if a.type == "VIEW_3D":
|
||||
region = [r for r in a.regions if r.type == "WINDOW"][0]
|
||||
return {"window": w, "screen": w.screen, "area": a, "region": region}
|
||||
for s in bpy.data.screens:
|
||||
for a in s.areas:
|
||||
if a.type == "VIEW_3D":
|
||||
return {"area": a}
|
||||
return {}
|
||||
|
||||
|
||||
def non_manifold_edges(o):
|
||||
bm = bmesh.new()
|
||||
bm.from_mesh(o.data)
|
||||
n = len([e for e in bm.edges if not e.is_manifold])
|
||||
bm.free()
|
||||
return n
|
||||
|
||||
|
||||
def world_extent(o):
|
||||
"""World-space bounding-box size. Object.dimensions is in LOCAL axes and ignores
|
||||
rotation, so it cannot show which way an import is facing."""
|
||||
pts = [o.matrix_world @ Vector(c) for c in o.bound_box]
|
||||
return [max(p[i] for p in pts) - min(p[i] for p in pts) for i in range(3)]
|
||||
|
||||
|
||||
def dims(o):
|
||||
return "x".join(str(round(d * 1000, 3)) for d in world_extent(o)) + " mm (world)"
|
||||
|
||||
|
||||
def run(name, fn):
|
||||
try:
|
||||
fn(name)
|
||||
except Exception as ex:
|
||||
report(name, False, "raised " + type(ex).__name__ + ": " + str(ex))
|
||||
|
||||
|
||||
# 1. 3D-Print Toolbox: clean non-manifold on a cube with one face deleted.
|
||||
def t_print3d(name):
|
||||
clear()
|
||||
bpy.ops.mesh.primitive_cube_add(size=0.02)
|
||||
cube = bpy.context.active_object
|
||||
bm = bmesh.new()
|
||||
bm.from_mesh(cube.data)
|
||||
bm.faces.ensure_lookup_table()
|
||||
bmesh.ops.delete(bm, geom=[bm.faces[0]], context="FACES_ONLY")
|
||||
bm.to_mesh(cube.data)
|
||||
bm.free()
|
||||
before = non_manifold_edges(cube)
|
||||
r = bpy.ops.mesh.print3d_clean_non_manifold()
|
||||
after = non_manifold_edges(cube)
|
||||
report(name, r == {"FINISHED"} and before > 0 and after == 0,
|
||||
"non-manifold edges " + str(before) + " -> " + str(after))
|
||||
|
||||
|
||||
# 2. Bool Tool: auto difference, a 4 mm hole through a 20 mm cube.
|
||||
def t_booltool(name):
|
||||
clear()
|
||||
bpy.ops.mesh.primitive_cube_add(size=0.02)
|
||||
canvas = bpy.context.active_object
|
||||
bpy.ops.mesh.primitive_cylinder_add(radius=0.002, depth=0.05)
|
||||
cutter = bpy.context.active_object
|
||||
cutter_name = cutter.name
|
||||
select_only(canvas, cutter)
|
||||
v0 = len(canvas.data.vertices)
|
||||
r = bpy.ops.object.boolean_auto_difference()
|
||||
v1 = len(canvas.data.vertices)
|
||||
gone = cutter_name not in bpy.data.objects
|
||||
report(name, r == {"FINISHED"} and gone and v1 > v0 and non_manifold_edges(canvas) == 0,
|
||||
"canvas verts " + str(v0) + " -> " + str(v1) + ", cutter consumed " + str(gone)
|
||||
+ ", non-manifold " + str(non_manifold_edges(canvas)))
|
||||
|
||||
|
||||
# 3. LoopTools: circle the boundary loop of a 5x5 grid (a square: corners sit further out).
|
||||
def t_looptools(name):
|
||||
clear()
|
||||
bpy.ops.mesh.primitive_grid_add(x_subdivisions=4, y_subdivisions=4, size=0.02)
|
||||
g = bpy.context.active_object
|
||||
edge = max(abs(v.co.x) for v in g.data.vertices)
|
||||
for v in g.data.vertices:
|
||||
v.select = abs(abs(v.co.x) - edge) < 1e-6 or abs(abs(v.co.y) - edge) < 1e-6
|
||||
ring = [v.index for v in g.data.vertices if v.select]
|
||||
|
||||
def spread():
|
||||
radii = [g.data.vertices[i].co.to_2d().length for i in ring]
|
||||
return max(radii) - min(radii)
|
||||
|
||||
before = spread()
|
||||
bpy.ops.object.mode_set(mode="EDIT")
|
||||
bpy.ops.mesh.select_mode(type="VERT")
|
||||
with bpy.context.temp_override(**view3d_override()):
|
||||
r = bpy.ops.mesh.looptools_circle()
|
||||
bpy.ops.object.mode_set(mode="OBJECT")
|
||||
after = spread()
|
||||
report(name, r == {"FINISHED"} and before > 1e-4 and after < 1e-6,
|
||||
str(len(ring)) + " boundary verts, radius spread " + str(round(before * 1000, 4))
|
||||
+ " -> " + str(round(after * 1000, 6)) + " mm")
|
||||
|
||||
|
||||
# 4. MeasureIt: a dimension segment between two vertices.
|
||||
def t_measureit(name):
|
||||
clear()
|
||||
bpy.ops.mesh.primitive_cube_add(size=0.02)
|
||||
c = bpy.context.active_object
|
||||
for elems in (c.data.polygons, c.data.edges, c.data.vertices):
|
||||
for e in elems:
|
||||
e.select = False
|
||||
for v in c.data.vertices:
|
||||
v.select = v.index in (0, 1)
|
||||
bpy.ops.object.mode_set(mode="EDIT")
|
||||
with bpy.context.temp_override(**view3d_override()):
|
||||
r = bpy.ops.measureit.addsegment()
|
||||
bpy.ops.object.mode_set(mode="OBJECT")
|
||||
n = c.MeasureGenerator[0].measureit_num if len(c.MeasureGenerator) else 0
|
||||
report(name, r == {"FINISHED"} and n == 1, "segments " + str(n))
|
||||
|
||||
|
||||
# 5. SurfacePsycho: one Bezier patch scaled to 20 x 20 mm, exported to STEP through its bundled OCP.
|
||||
def t_surfacepsycho(name):
|
||||
clear()
|
||||
r1 = bpy.ops.object.sp_add_bezier_patch()
|
||||
patch = bpy.context.active_object
|
||||
patch.scale = (0.01, 0.01, 0.01) # the default patch is 2 x 2 m
|
||||
bpy.context.view_layer.update()
|
||||
select_only(patch)
|
||||
path = OUT + "sp-patch-" + TAG + ".step"
|
||||
r2 = bpy.ops.wm.sp_step_export(filepath=path, use_selection=True)
|
||||
report(name, r1 == {"FINISHED"} and r2 == {"FINISHED"},
|
||||
"patch " + dims(patch) + " -> " + path + " (read back by the STEP import below)")
|
||||
|
||||
|
||||
# 6. STEP Importer (Clonephaze, OCCT via cascadio): read the SurfacePsycho STEP back, and check it
|
||||
# lands the same way up (world space) and the same size.
|
||||
def t_step_import(name):
|
||||
clear()
|
||||
path = OUT + "sp-patch-" + TAG + ".step"
|
||||
r = bpy.ops.import_scene.step(filepath=path)
|
||||
meshes = [o for o in bpy.data.objects if o.type == "MESH"]
|
||||
faces = sum(len(o.data.polygons) for o in meshes)
|
||||
d = world_extent(meshes[0]) if meshes else (0, 0, 0)
|
||||
same = abs(d[0] - 0.02) < 1e-5 and abs(d[1] - 0.02) < 1e-5 and d[2] < 1e-6
|
||||
report(name, r == {"FINISHED"} and len(meshes) == 1 and faces > 0 and same,
|
||||
str(len(meshes)) + " mesh object(s), " + str(faces) + " faces"
|
||||
+ ("; " + dims(meshes[0]) if meshes else "") + ", expect 20x20x0")
|
||||
# Control for the orientation check itself: a deliberately wrong source axis must stand
|
||||
# the patch on its edge, and the same check must say so.
|
||||
clear()
|
||||
bpy.ops.import_scene.step(filepath=path, up_axis="Z")
|
||||
wrong = [o for o in bpy.data.objects if o.type == "MESH"]
|
||||
w = world_extent(wrong[0]) if wrong else (0, 0, 0)
|
||||
caught = not (abs(w[0] - 0.02) < 1e-5 and abs(w[1] - 0.02) < 1e-5 and w[2] < 1e-6)
|
||||
report(name + " (control: wrong up-axis is caught)", caught,
|
||||
"up_axis=Z gives " + (dims(wrong[0]) if wrong else "nothing"))
|
||||
|
||||
|
||||
# 7. 3MF Import/Export: a 20 mm cube out and back; the size must survive (3MF carries units).
|
||||
def t_threemf(name):
|
||||
clear()
|
||||
bpy.ops.mesh.primitive_cube_add(size=0.02)
|
||||
select_only(bpy.context.active_object)
|
||||
path = OUT + "cube-" + TAG + ".3mf"
|
||||
r1 = bpy.ops.export_mesh.threemf(filepath=path, use_selection=True)
|
||||
clear()
|
||||
r2 = bpy.ops.import_mesh.threemf(filepath=path)
|
||||
meshes = [o for o in bpy.data.objects if o.type == "MESH"]
|
||||
ok_size = len(meshes) == 1 and all(abs(d - 0.02) < 1e-6 for d in world_extent(meshes[0]))
|
||||
report(name, r1 == {"FINISHED"} and r2 == {"FINISHED"} and ok_size,
|
||||
path + ", re-imported " + (dims(meshes[0]) if meshes else "nothing"))
|
||||
|
||||
|
||||
# 8. CAD Sketcher: a sketch on the XY origin plane, then a full solve through slvs.
|
||||
def t_cad_sketcher(name):
|
||||
clear()
|
||||
with bpy.context.temp_override(**view3d_override()):
|
||||
r1 = bpy.ops.view3d.slvs_add_sketch_on_plane(plane="XY")
|
||||
r2 = bpy.ops.view3d.slvs_solve(all=True)
|
||||
sketches = [o for o in bpy.data.objects if o.type == "CURVES"]
|
||||
report(name, r1 == {"FINISHED"} and r2 == {"FINISHED"} and len(sketches) == 1,
|
||||
"sketch objects " + str(len(sketches)))
|
||||
|
||||
|
||||
for n, f in (
|
||||
("print3d_toolbox clean_non_manifold", t_print3d),
|
||||
("bool_tool boolean_auto_difference", t_booltool),
|
||||
("looptools circle", t_looptools),
|
||||
("measureit addsegment", t_measureit),
|
||||
("surfacepsycho bezier patch + STEP export", t_surfacepsycho),
|
||||
("step_importer import_scene.step", t_step_import),
|
||||
("ThreeMF_io export + import", t_threemf),
|
||||
("CAD_Sketcher sketch + solve", t_cad_sketcher),
|
||||
):
|
||||
run(n, f)
|
||||
|
||||
failed = [r[0] for r in results if not r[1]]
|
||||
print("SUMMARY " + TAG + ": " + str(len(results) - len(failed)) + "/" + str(len(results)) + " passed")
|
||||
if failed:
|
||||
raise RuntimeError("failed: " + ", ".join(failed))
|
||||
+21
-6
@@ -2,9 +2,9 @@
|
||||
# blender-run — one-shot HEADLESS Blender on fv-ml1 GPU 3, for scripted/CLI callers (draupnir etc.).
|
||||
# The agent-driven, interactive path is scripts/blender-mcp; this is the batch path.
|
||||
#
|
||||
# scripts/blender-run [--job DIR] -- <blender args after -b>
|
||||
# scripts/blender-run [--job DIR] [--extensions] -- <blender args after -b>
|
||||
# scripts/blender-run --job /mnt/smithy/draupnir/j42 -- --python render.py -- --out out.png
|
||||
# scripts/blender-run -- --python-expr 'import bpy; print(bpy.app.version_string)'
|
||||
# scripts/blender-run --extensions -- --python-expr 'import bpy; print(bpy.app.version_string)'
|
||||
#
|
||||
# Each call is its own `docker run --rm` of the stacks/blender image (Blender 5.2.2 LTS, Python
|
||||
# 3.13): no desktop, no MCP socket, gone when Blender exits. So it never collides with the on-demand
|
||||
@@ -16,6 +16,12 @@
|
||||
# output path against the working directory: "cannot save 'out.png'". Python file I/O and
|
||||
# importers do use the cwd.
|
||||
#
|
||||
# --extensions: also enable the pinned add-on set (stacks/blender/extensions.lock: SurfacePsycho,
|
||||
# CAD Sketcher, 3D-Print Toolbox, STEP Importer, Bool Tool, LoopTools, MeasureIt, 3MF). It mounts
|
||||
# /tank/blender-extensions/5.2/system read-only as Blender's System repository and runs
|
||||
# fleet_extensions.py ahead of your arguments. If any add-on fails to enable, the run exits 1
|
||||
# before your script starts. Off by default, so a plain render stays factory-clean.
|
||||
#
|
||||
# Files: fv-ml1 does NOT mount /mnt/smithy. With --job DIR, DIR is mirrored to
|
||||
# fv-ml1:/tank/blender/jobs/<basename>-<hash of DIR's absolute path>/, Blender runs WITH THAT AS ITS
|
||||
# WORKING DIRECTORY, and new or changed files are copied back into DIR afterwards (nothing is ever
|
||||
@@ -32,11 +38,18 @@ set -euo pipefail
|
||||
HOST=${BLENDER_SSH_HOST:-infra-ops@10.251.50.54}
|
||||
ENV_FILE=/opt/docker/compose/blender/.env
|
||||
JOB=""
|
||||
EXT=""
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
--job) JOB=${2:?--job needs a directory}; shift 2 ;;
|
||||
--extensions)
|
||||
# --mount, not -v: a missing source is an error, where -v would silently create it as an
|
||||
# empty root-owned DIRECTORY on fv-ml1 (and a directory where the hook file belongs).
|
||||
EXT="--mount type=bind,src=/tank/blender-extensions/5.2/system,dst=/blender/5.2/extensions/system,readonly \
|
||||
--mount type=bind,src=/opt/docker/conf/blender/scripts/startup/fleet_extensions.py,dst=/fleet/fleet_extensions.py,readonly"
|
||||
shift ;;
|
||||
--) shift; break ;;
|
||||
-h|--help) sed -n 2,23p "$0"; exit 0 ;;
|
||||
-h|--help) sed -n 2,35p "$0"; exit 0 ;;
|
||||
*) echo "blender-run: unknown option $1 (blender args go after --)" >&2; exit 2 ;;
|
||||
esac
|
||||
done
|
||||
@@ -59,13 +72,15 @@ fi
|
||||
|
||||
# Arguments travel as one shell-quoted string: ssh flattens argv into a remote command line.
|
||||
ARGS=$(printf '%q ' "$@")
|
||||
PRE=""
|
||||
[ -n "$EXT" ] && PRE="--python /fleet/fleet_extensions.py"
|
||||
set +e
|
||||
ssh -n -o BatchMode=yes "$HOST" "IMG=\$(grep '^IMAGE=' $ENV_FILE | cut -d= -f2) && \
|
||||
exec docker run --rm --name blender-run-\$\$ --runtime nvidia \
|
||||
-e NVIDIA_VISIBLE_DEVICES=3 -e NVIDIA_DRIVER_CAPABILITIES=all \
|
||||
--user 1002:1003 -e HOME=/tmp --memory 64g --cpus 48 \
|
||||
-v /tank/blender:/work -w $WORKDIR --entrypoint /blender/blender \"\$IMG\" \
|
||||
-b --factory-startup --python-exit-code 1 $ARGS"
|
||||
--user 1002:1003 -e HOME=/tmp -e USER=infra-ops -e LOGNAME=infra-ops --memory 64g --cpus 48 \
|
||||
-v /tank/blender:/work $EXT -w $WORKDIR --entrypoint /blender/blender \"\$IMG\" \
|
||||
-b --factory-startup --python-exit-code 1 $PRE $ARGS"
|
||||
RC=$?
|
||||
set -e
|
||||
if [ -n "$JOB" ]; then
|
||||
|
||||
Reference in New Issue
Block a user