Hartmut
409fb92899
M1 — USD exporter:
- render-worker/scripts/export_step_to_usd.py (631 lines)
Full XCAF traversal, one UsdGeom.Mesh per leaf part,
schaeffler:partKey on every prim, index-space sharpEdgeVertexPairs
- render-worker/Dockerfile: usd-core>=24.11 installed (USD 0.26.3)
M2 — usd_master MediaAsset + pipeline auto-chain:
- migrations 060 (usd_master enum), 061 (3 JSONB columns),
062 (rename tessellation settings keys)
- generate_usd_master_task: runs export_step_to_usd.py, upserts
usd_master MediaAsset, writes resolved_material_assignments to CadFile
- Auto-chained from generate_gltf_geometry_task after every GLB export
- step_tasks.py shim re-exports generate_usd_master_task
M3 — scene-manifest API:
- part_key_service.py: build_scene_manifest(), generate_part_key(),
four-layer material priority resolution with provenance
- SceneManifest / PartEntry Pydantic models in products/schemas.py
- GET /api/cad/{id}/scene-manifest endpoint (graceful fallback to
parsed_objects when USD not yet generated)
- POST /api/cad/{id}/generate-usd-master endpoint
- frontend/src/api/sceneManifest.ts: fetchSceneManifest(),
triggerUsdMasterGeneration()
M4 — manual-material-overrides API:
- GET/PUT /api/cad/{id}/manual-material-overrides endpoints
- CadFile.manual_material_overrides JSONB column (migration 061)
- getManualOverrides() / saveManualOverrides() in cad.ts
M5 — ThreeDViewer partKey integration:
- export_step_to_gltf.py injects partKeyMap into GLB extras
- ThreeDViewer: partKeyMap extraction, resolvePartKey(), effectiveMaterials
merges legacy partMaterials + new manualOverrides (server-side persistence)
- MaterialPanel: dual-path save (partKey vs legacy), provenance badge,
reconciliation panel for unmatched/unassigned parts
Also:
- Admin.tsx: generate-missing-usd-masters + canonical scenes bulk actions
- ProductDetail.tsx: usd_master row in asset table
- vite-env.d.ts: fix ImportMeta.env TypeScript error
- GPUProbeResult: add timestamp/devices/render_time_s fields
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
88 lines
2.9 KiB
Docker
88 lines
2.9 KiB
Docker
FROM ubuntu:22.04
|
|
|
|
ARG BLENDER_VERSION=5.0.1
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
ENV PYTHONUNBUFFERED=1
|
|
ENV BLENDER_VERSION=${BLENDER_VERSION}
|
|
# Blender 5.x is mounted from the host at /opt/blender (see docker-compose.yml)
|
|
ENV BLENDER_BIN=/opt/blender/blender
|
|
# OSMesa for headless cadquery/VTK (no display needed)
|
|
ENV PYOPENGL_PLATFORM=osmesa
|
|
ENV VTK_DEFAULT_EGL=0
|
|
|
|
# Runtime libraries for cadquery/OCC + Blender 5.x headless
|
|
# Also installs Python 3.11 via deadsnakes PPA (Ubuntu 22.04 ships 3.10)
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
software-properties-common gnupg gpg-agent \
|
|
&& add-apt-repository ppa:deadsnakes/ppa -y \
|
|
&& apt-get update && apt-get install -y --no-install-recommends \
|
|
python3.11 \
|
|
python3.11-dev \
|
|
python3.11-distutils \
|
|
python3-pip \
|
|
python3-dev \
|
|
curl \
|
|
libpq-dev \
|
|
gcc \
|
|
libxrender1 \
|
|
libxi6 \
|
|
libxkbcommon-x11-0 \
|
|
libsm6 \
|
|
libglib2.0-0 \
|
|
libgl1-mesa-glx \
|
|
libosmesa6 \
|
|
libgomp1 \
|
|
libxfixes3 \
|
|
libxrandr2 \
|
|
libxcursor1 \
|
|
libxinerama1 \
|
|
libwayland-client0 \
|
|
libwayland-cursor0 \
|
|
libwayland-egl1 \
|
|
libvulkan1 \
|
|
mesa-vulkan-drivers \
|
|
libegl1 \
|
|
libegl-mesa0 \
|
|
libgbm1 \
|
|
ffmpeg \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
|
|
# Use Python 3.11 as the default pip target
|
|
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11 \
|
|
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 \
|
|
&& update-alternatives --install /usr/bin/pip3 pip3 /usr/local/bin/pip3.11 1
|
|
|
|
# Install backend Python dependencies (includes celery, sqlalchemy, fastapi, etc.)
|
|
COPY backend/pyproject.toml .
|
|
RUN pip3 install --no-cache-dir -e .
|
|
|
|
# Install cadquery (heavy — installed after backend deps for better layer caching)
|
|
RUN pip3 install --no-cache-dir "cadquery>=2.4.0"
|
|
|
|
# Install trimesh for STL→GLB geometry export (separate layer to avoid cache invalidation)
|
|
RUN pip3 install --no-cache-dir "trimesh>=4.2.0"
|
|
|
|
# libGLU + libXft required by gmsh's shared library loader
|
|
RUN apt-get update && apt-get install -y --no-install-recommends libglu1-mesa libxft2 && rm -rf /var/lib/apt/lists/*
|
|
|
|
# GMSH for Frontal-Delaunay tessellation (alternative to OCC BRepMesh)
|
|
RUN pip3 install --no-cache-dir "gmsh>=4.15.0"
|
|
|
|
# USD authoring library (no GPU/imaging dependency — pure Python + C++ bindings)
|
|
RUN pip3 install --no-cache-dir "usd-core>=24.11"
|
|
|
|
# Copy render scripts
|
|
COPY render-worker/scripts/ /render-scripts/
|
|
|
|
# Version check script — fails fast if Blender < 5.0.1
|
|
COPY render-worker/check_version.py /check_version.py
|
|
|
|
# Copy backend app code (overridden by volume mount in docker-compose)
|
|
COPY backend/ .
|
|
|
|
# Verify Blender version at build time if binary is available
|
|
# (skipped during build since /opt/blender is a host mount)
|
|
CMD ["bash", "-c", "python3 /check_version.py && celery -A app.tasks.celery_app worker --loglevel=info -Q thumbnail_rendering --concurrency=1"]
|