feat(P2): USD Foundation — canonical part identity + material overrides
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>
This commit is contained in:
@@ -38,7 +38,6 @@ class RenderConfig(BaseModel):
|
||||
blender_cycles_samples: int = 256
|
||||
blender_eevee_samples: int = 64
|
||||
thumbnail_format: str = "jpg"
|
||||
stl_quality: str = "low"
|
||||
blender_smooth_angle: int = 30
|
||||
cycles_device: str = "auto"
|
||||
render_backend: str = "celery"
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
"""Sync tenant context helpers for Celery tasks.
|
||||
|
||||
Celery tasks run in a sync context (no async event loop), so they cannot use
|
||||
the async ``set_tenant_context`` from ``app.database``. This module provides
|
||||
``set_tenant_context_sync`` which accepts a SQLAlchemy sync ``Session`` and
|
||||
a raw ``tenant_id`` UUID string (or None for global-admin bypass), as well as
|
||||
``resolve_tenant_id_for_cad`` / ``resolve_tenant_id_for_order_line`` helpers
|
||||
that look up the tenant_id from the database given only an entity ID.
|
||||
|
||||
Typical usage at the start of a Celery task::
|
||||
|
||||
from app.core.tenant_context import resolve_tenant_id_for_cad, set_tenant_context_sync
|
||||
|
||||
tenant_id = resolve_tenant_id_for_cad(cad_file_id)
|
||||
# tenant_id is already logged by resolve_tenant_id_for_cad
|
||||
|
||||
# Then in every Session block that does RLS-protected queries:
|
||||
with Session(engine) as session:
|
||||
set_tenant_context_sync(session, tenant_id)
|
||||
# ... queries here respect RLS ...
|
||||
"""
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy import create_engine, text
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def set_tenant_context_sync(db: Session, tenant_id: Optional[str]) -> None:
|
||||
"""Set the PostgreSQL RLS context variable for a sync SQLAlchemy session.
|
||||
|
||||
Executes ``SET LOCAL app.current_tenant_id = :tid`` so that all subsequent
|
||||
queries within the same transaction respect row-level security policies.
|
||||
|
||||
Args:
|
||||
db: An open sync SQLAlchemy ``Session``.
|
||||
tenant_id: UUID string of the tenant, or ``None`` / empty string to use
|
||||
the bypass sentinel (global-admin context — sees all rows).
|
||||
"""
|
||||
if tenant_id:
|
||||
db.execute(
|
||||
text("SET LOCAL app.current_tenant_id = :tid"),
|
||||
{"tid": str(tenant_id)},
|
||||
)
|
||||
else:
|
||||
# None means no tenant context is known (e.g. system tasks).
|
||||
# Use empty string — RLS policies treat '' as no-tenant, which allows
|
||||
# global admin queries to proceed without filtering.
|
||||
db.execute(text("SET LOCAL app.current_tenant_id = ''"))
|
||||
|
||||
|
||||
def resolve_tenant_id_for_cad(cad_file_id: str) -> Optional[str]:
|
||||
"""Look up the tenant_id for a CadFile by its primary key.
|
||||
|
||||
Opens a short-lived sync session, reads CadFile.tenant_id, and returns it
|
||||
as a string UUID or None. Also emits the ``[TENANT]`` log line.
|
||||
|
||||
Args:
|
||||
cad_file_id: The UUID string (or UUID) of the CadFile record.
|
||||
|
||||
Returns:
|
||||
tenant_id as ``str`` if the CadFile has one, ``None`` otherwise.
|
||||
"""
|
||||
try:
|
||||
from app.config import settings as _cfg
|
||||
from app.models.cad_file import CadFile # compat shim → domains.products.models
|
||||
|
||||
_sync_url = _cfg.database_url.replace("+asyncpg", "")
|
||||
_eng = create_engine(_sync_url)
|
||||
try:
|
||||
with Session(_eng) as _sess:
|
||||
_cad = _sess.get(CadFile, cad_file_id)
|
||||
tenant_id = str(_cad.tenant_id) if (_cad and _cad.tenant_id) else None
|
||||
finally:
|
||||
_eng.dispose()
|
||||
except Exception as exc:
|
||||
logger.warning("[TENANT] resolve_tenant_id_for_cad(%s) failed: %s", cad_file_id, exc)
|
||||
tenant_id = None
|
||||
|
||||
logger.info("[TENANT] context set: tenant_id=%s", tenant_id)
|
||||
return tenant_id
|
||||
|
||||
|
||||
def resolve_tenant_id_for_order_line(order_line_id: str) -> Optional[str]:
|
||||
"""Look up the tenant_id for an OrderLine by its primary key.
|
||||
|
||||
Opens a short-lived sync session, reads OrderLine.tenant_id, and returns it
|
||||
as a string UUID or None. Also emits the ``[TENANT]`` log line.
|
||||
|
||||
Args:
|
||||
order_line_id: The UUID string (or UUID) of the OrderLine record.
|
||||
|
||||
Returns:
|
||||
tenant_id as ``str`` if the OrderLine has one, ``None`` otherwise.
|
||||
"""
|
||||
try:
|
||||
from app.config import settings as _cfg
|
||||
from app.models.order_line import OrderLine # compat shim
|
||||
|
||||
_sync_url = _cfg.database_url.replace("+asyncpg", "")
|
||||
_eng = create_engine(_sync_url)
|
||||
try:
|
||||
with Session(_eng) as _sess:
|
||||
_line = _sess.get(OrderLine, order_line_id)
|
||||
tenant_id = str(_line.tenant_id) if (_line and _line.tenant_id) else None
|
||||
finally:
|
||||
_eng.dispose()
|
||||
except Exception as exc:
|
||||
logger.warning("[TENANT] resolve_tenant_id_for_order_line(%s) failed: %s", order_line_id, exc)
|
||||
tenant_id = None
|
||||
|
||||
logger.info("[TENANT] context set: tenant_id=%s", tenant_id)
|
||||
return tenant_id
|
||||
Reference in New Issue
Block a user