Hartmut/HartOMat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: per-position camera settings, material alias dialog, product delete, media browser links

Browse Source 
- Per-render-position focal_length_mm/sensor_width_mm (DB → pipeline → Blender)
- FOV-based camera distance with min clamp fix for wide-angle lenses
- Unmapped materials blocking dialog on "Dispatch Renders" with batch alias creation
- Material check endpoint (GET /orders/{id}/check-materials)
- Batch alias endpoint (POST /materials/batch-aliases)
- Quick-map "No alias" badges on Materials page
- Full product hard-delete with storage cleanup (MinIO + disk files + orphaned CadFile)
- Delete button on ProductDetail page with confirmation
- Clickable product names in Media Browser (links to product page)
- Single-line render dispatch/retry (POST /orders/{id}/lines/{id}/dispatch-render)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Hartmut Nörenberg
2026-03-14 12:16:37 +01:00
parent 0020376702
commit b583b0d7a2
48 changed files with 1827 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/domains/materials/service.py
+64
View File
@@ -9,6 +9,7 @@ Resolution chain:
3. Pass through unchanged → Blender will show FailedMaterial magenta
"""
import logging
from difflib import SequenceMatcher
from sqlalchemy import create_engine, select, func
from sqlalchemy.orm import Session, selectinload
@@ -138,3 +139,66 @@ async def seed_material_aliases_from_mappings(
await db.flush()
return {"created": created, "skipped": skipped}
async def find_unmapped_materials(
material_names: list[str], db: AsyncSession
) -> list[dict]:
"""Find material names that have no alias or library match.
Returns a list of {"raw_name": str, "suggestions": [...]} for each
unmapped name. Suggestions are the top 5 SCHAEFFLER library materials
by string similarity.
"""
if not material_names:
return []
# Load all aliases (case-insensitive lookup)
alias_rows = (await db.execute(select(MaterialAlias))).scalars().all()
alias_set: set[str] = {a.alias.lower() for a in alias_rows}
# Load all materials
mat_rows = (await db.execute(select(Material))).scalars().all()
# Library materials have a schaeffler_code
library_mats = [m for m in mat_rows if m.schaeffler_code is not None]
# All material names (case-insensitive) for exact-match check
name_lookup: dict[str, Material] = {m.name.lower(): m for m in mat_rows}
unmapped: list[dict] = []
seen: set[str] = set()
for raw_name in material_names:
raw_lower = raw_name.lower()
if raw_lower in seen:
continue
seen.add(raw_lower)
# 1. Alias match → mapped
if raw_lower in alias_set:
continue
# 2. Exact name match with a library material → mapped
matched_mat = name_lookup.get(raw_lower)
if matched_mat and matched_mat.schaeffler_code is not None:
continue
# Unmapped — compute suggestions from library materials
scored = []
for lib_mat in library_mats:
ratio = SequenceMatcher(None, raw_lower, lib_mat.name.lower()).ratio()
if ratio > 0.3:
scored.append((ratio, lib_mat))
scored.sort(key=lambda x: x[0], reverse=True)
suggestions = [
{
"id": str(m.id),
"name": m.name,
"schaeffler_code": str(m.schaeffler_code),
}
for _, m in scored[:5]
]
unmapped.append({"raw_name": raw_name, "suggestions": suggestions})
return unmapped
backend/app/domains/media/router.py
+18
View File
@@ -432,6 +432,24 @@ async def delete_asset_permanent(asset_id: uuid.UUID, db: AsyncSession = Depends
return {"ok": True}
@router.post("/batch-delete")
async def batch_delete_assets(
asset_ids: list[uuid.UUID],
_user: User = Depends(get_current_user),
db: AsyncSession = Depends(get_db),
):
"""Permanently delete multiple MediaAsset records."""
from app.utils.auth import require_global_admin
require_global_admin(_user)
deleted = 0
for aid in asset_ids:
ok = await service.delete_media_asset(db, aid)
if ok:
deleted += 1
return {"deleted": deleted, "requested": len(asset_ids)}
@router.post("/cleanup-orphaned")
async def cleanup_orphaned_assets(
_user: User = Depends(get_current_user),
backend/app/domains/pipeline/tasks/export_glb.py
+2 -2
View File
@@ -95,9 +95,9 @@ def generate_gltf_geometry_task(self, cad_file_id: str):
_cache_hit_asset_id = None
# Composite cache key includes deflection settings so changing them invalidates cache
# v2: tessellation now happens after mm→m scaling (fixes destroyed tessellation)
# v3: removed BRepBuilderAPI_Transform, writer handles mm→m from STEP unit metadata
effective_cache_key = (
f"v2:{_current_hash}:{linear_deflection}:{angular_deflection}:{tessellation_engine}"
f"v3:{_current_hash}:{linear_deflection}:{angular_deflection}:{tessellation_engine}"
if _current_hash else None
)
backend/app/domains/pipeline/tasks/render_order_line.py
+15 -2
View File
@@ -208,18 +208,26 @@ def render_order_line_task(self, order_line_id: str):
cad_name = cad_file.original_name if cad_file else "?"
# Load render_position for rotation values (per-product takes priority, falls back to global)
rotation_x = rotation_y = rotation_z = 0.0
focal_length_mm = None
sensor_width_mm = None
if line.render_position_id:
from app.models.render_position import ProductRenderPosition
rp = session.get(ProductRenderPosition, line.render_position_id)
if rp:
rotation_x, rotation_y, rotation_z = rp.rotation_x, rp.rotation_y, rp.rotation_z
emit(order_line_id, f"Render position: '{rp.name}' ({rotation_x}°, {rotation_y}°, {rotation_z}°)")
focal_length_mm = rp.focal_length_mm
sensor_width_mm = rp.sensor_width_mm
emit(order_line_id, f"Render position: '{rp.name}' ({rotation_x}°, {rotation_y}°, {rotation_z}°)" +
(f" focal_length={focal_length_mm}mm" if focal_length_mm else ""))
elif line.global_render_position_id:
from app.models import GlobalRenderPosition
grp = session.get(GlobalRenderPosition, line.global_render_position_id)
if grp:
rotation_x, rotation_y, rotation_z = grp.rotation_x, grp.rotation_y, grp.rotation_z
emit(order_line_id, f"Global render position: '{grp.name}' ({rotation_x}°, {rotation_y}°, {rotation_z}°)")
focal_length_mm = grp.focal_length_mm
sensor_width_mm = grp.sensor_width_mm
emit(order_line_id, f"Global render position: '{grp.name}' ({rotation_x}°, {rotation_y}°, {rotation_z}°)" +
(f" focal_length={focal_length_mm}mm" if focal_length_mm else ""))
emit(order_line_id, f"Starting render for {cad_name} ({len(part_colors)} coloured parts)")
@@ -334,7 +342,10 @@ def render_order_line_task(self, order_line_id: str):
rotation_x=rotation_x,
rotation_y=rotation_y,
rotation_z=rotation_z,
camera_orbit=bool(template.camera_orbit) if template else True,
usd_path=usd_render_path,
focal_length_mm=focal_length_mm,
sensor_width_mm=sensor_width_mm,
)
success = True
render_log = {
@@ -391,6 +402,8 @@ def render_order_line_task(self, order_line_id: str):
rotation_x=rotation_x,
rotation_y=rotation_y,
rotation_z=rotation_z,
focal_length_mm=focal_length_mm,
sensor_width_mm=sensor_width_mm,
job_id=order_line_id,
order_line_id=order_line_id,
noise_threshold=noise_threshold,
backend/app/domains/rendering/models.py
+4
View File
@@ -94,6 +94,8 @@ class ProductRenderPosition(Base):
rotation_z: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
is_default: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
focal_length_mm: Mapped[float | None] = mapped_column(Float, nullable=True, default=None)
sensor_width_mm: Mapped[float | None] = mapped_column(Float, nullable=True, default=None)
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
updated_at: Mapped[datetime] = mapped_column(
DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False
@@ -113,6 +115,8 @@ class GlobalRenderPosition(Base):
rotation_z: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
is_default: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
focal_length_mm: Mapped[float | None] = mapped_column(Float, nullable=True, default=None)
sensor_width_mm: Mapped[float | None] = mapped_column(Float, nullable=True, default=None)
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
updated_at: Mapped[datetime] = mapped_column(
DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False
backend/app/domains/rendering/schemas.py
+12
View File
@@ -68,6 +68,8 @@ class RenderPositionCreate(BaseModel):
rotation_z: float = 0.0
is_default: bool = False
sort_order: int = 0
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
class RenderPositionPatch(BaseModel):
@@ -77,6 +79,8 @@ class RenderPositionPatch(BaseModel):
rotation_z: float | None = None
is_default: bool | None = None
sort_order: int | None = None
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
class RenderPositionOut(BaseModel):
@@ -88,6 +92,8 @@ class RenderPositionOut(BaseModel):
rotation_z: float
is_default: bool
sort_order: int
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
created_at: datetime
updated_at: datetime
@@ -101,6 +107,8 @@ class GlobalRenderPositionCreate(BaseModel):
rotation_z: float = 0.0
is_default: bool = False
sort_order: int = 0
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
class GlobalRenderPositionPatch(BaseModel):
@@ -110,6 +118,8 @@ class GlobalRenderPositionPatch(BaseModel):
rotation_z: float | None = None
is_default: bool | None = None
sort_order: int | None = None
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
class GlobalRenderPositionOut(BaseModel):
@@ -120,6 +130,8 @@ class GlobalRenderPositionOut(BaseModel):
rotation_z: float
is_default: bool
sort_order: int
focal_length_mm: float | None = None
sensor_width_mm: float | None = None
created_at: datetime
updated_at: datetime