8e1cd41868
- beat_tasks.py: import app.models at module level so SQLAlchemy can
resolve relationship("Template") and relationship("User") when domain
models are imported in isolation inside task functions. Fixes all
beat tasks (batch_render_notifications, recover_stuck_cad_files) that
crashed every 60s with mapper initialization error.
- _blender_materials.py: build_mat_map_lower() now adds a slug-normalized
key variant (re.sub([^a-z0-9]+, _, kl)) for each mat_map entry. OCC
part names like 'F-802007_TR4-D1-H122AG' → slug 'f_802007_tr4_d1_h122ag'
now matches USD-imported Blender objects. Existing prefix fallback
(key.startswith(part_key)) catches AF-suffix variants.
- Orders.tsx: kanban drag-to-reject implemented. submitted/processing
cards are draggable (cursor-grab). Rejected column highlights with
red ring on drag-over. Drop opens reject reason modal via createPortal.
Confirm calls rejectOrder() mutation + invalidates orders cache.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
165 lines
6.3 KiB
Python
165 lines
6.3 KiB
Python
"""Material assignment helpers for Blender headless renders."""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import re as _re
|
|
|
|
FAILED_MATERIAL_NAME = "SCHAEFFLER_059999_FailedMaterial"
|
|
|
|
|
|
def assign_failed_material(part_obj) -> None:
|
|
"""Assign the standard fallback material (magenta) when no library material matches.
|
|
|
|
Reuses SCHAEFFLER_059999_FailedMaterial if already loaded; otherwise
|
|
creates a simple magenta Principled BSDF node tree.
|
|
"""
|
|
import bpy # type: ignore[import]
|
|
|
|
mat = bpy.data.materials.get(FAILED_MATERIAL_NAME)
|
|
if mat is None:
|
|
mat = bpy.data.materials.new(name=FAILED_MATERIAL_NAME)
|
|
mat.use_nodes = True
|
|
bsdf = mat.node_tree.nodes.get("Principled BSDF")
|
|
if bsdf:
|
|
bsdf.inputs["Base Color"].default_value = (1.0, 0.0, 1.0, 1.0) # magenta
|
|
bsdf.inputs["Roughness"].default_value = 0.6
|
|
part_obj.data.materials.clear()
|
|
part_obj.data.materials.append(mat)
|
|
|
|
|
|
def build_mat_map_lower(material_map: dict) -> dict:
|
|
"""Return a lowercased version of material_map with _AF\\d+ suffix variants added.
|
|
|
|
Both the original key and the AF-stripped key are inserted so that GLB
|
|
object names (which may lack _AF suffixes that OCC adds to mat_map keys)
|
|
can match in either direction.
|
|
"""
|
|
mat_map_lower: dict = {}
|
|
for k, v in material_map.items():
|
|
kl = k.lower().strip()
|
|
mat_map_lower[kl] = v
|
|
# USD path: part_key slugs replace ALL non-alphanumeric chars with '_'
|
|
# (same regex as generate_part_key in export_step_to_usd.py).
|
|
# E.g. "F-802007_TR4-D1" → "f_802007_tr4_d1". Add slug variant so
|
|
# hyphenated OCC names match USD-imported Blender objects.
|
|
slug_key = _re.sub(r'[^a-z0-9]+', '_', kl).strip('_')
|
|
if slug_key and slug_key != kl:
|
|
mat_map_lower.setdefault(slug_key, v)
|
|
# _AF\d+ stripping for GLB object names
|
|
stripped = kl
|
|
prev = None
|
|
while prev != stripped:
|
|
prev = stripped
|
|
stripped = _re.sub(r'_af\d+$', '', stripped)
|
|
if stripped != kl:
|
|
mat_map_lower.setdefault(stripped, v)
|
|
return mat_map_lower
|
|
|
|
|
|
def apply_material_library(
|
|
parts: list,
|
|
mat_lib_path: str,
|
|
mat_map: dict,
|
|
part_names_ordered: list | None = None,
|
|
) -> None:
|
|
"""Append materials from library .blend and assign to parts via material_map.
|
|
|
|
GLB-imported objects are named after STEP parts, so matching is by name
|
|
(stripping Blender .NNN suffix for duplicates). Falls back to
|
|
part_names_ordered index-based matching.
|
|
|
|
mat_map: {part_name_lower: material_name}
|
|
Parts without a match receive the FAILED_MATERIAL_NAME sentinel.
|
|
"""
|
|
if not mat_lib_path or not os.path.isfile(mat_lib_path):
|
|
print(f"[blender_render] material library not found: {mat_lib_path}")
|
|
return
|
|
|
|
import bpy # type: ignore[import]
|
|
|
|
if part_names_ordered is None:
|
|
part_names_ordered = []
|
|
|
|
# Collect unique material names needed
|
|
needed = set(mat_map.values())
|
|
if not needed:
|
|
return
|
|
|
|
# Append materials from library
|
|
appended: dict = {}
|
|
for mat_name in needed:
|
|
inner_path = f"{mat_lib_path}/Material/{mat_name}"
|
|
try:
|
|
bpy.ops.wm.append(
|
|
filepath=inner_path,
|
|
directory=f"{mat_lib_path}/Material/",
|
|
filename=mat_name,
|
|
link=False,
|
|
)
|
|
if mat_name in bpy.data.materials:
|
|
appended[mat_name] = bpy.data.materials[mat_name]
|
|
print(f"[blender_render] appended material: {mat_name}")
|
|
else:
|
|
print(f"[blender_render] WARNING: material '{mat_name}' not found after append")
|
|
except Exception as exc:
|
|
print(f"[blender_render] WARNING: failed to append material '{mat_name}': {exc}")
|
|
|
|
if not appended:
|
|
return
|
|
|
|
# Assign materials to parts — primary: name-based (GLB object names),
|
|
# secondary: index-based via part_names_ordered
|
|
assigned_count = 0
|
|
unmatched_names = []
|
|
for i, part in enumerate(parts):
|
|
# Try name-based matching first (strip Blender .NNN suffix)
|
|
base_name = _re.sub(r'\.\d{3}$', '', part.name)
|
|
# Strip OCC assembly-instance suffix (_AF0, _AF1, …) — GLB object
|
|
# names may or may not have them while mat_map keys might.
|
|
_prev = None
|
|
while _prev != base_name:
|
|
_prev = base_name
|
|
base_name = _re.sub(r'_AF\d+$', '', base_name, flags=_re.IGNORECASE)
|
|
part_key = base_name.lower().strip()
|
|
mat_name = mat_map.get(part_key)
|
|
|
|
# Prefix fallback: if a mat_map key starts with our base name or
|
|
# vice-versa, use the longest matching key (most-specific wins).
|
|
if not mat_name:
|
|
for key, val in sorted(mat_map.items(), key=lambda x: len(x[0]), reverse=True):
|
|
if len(key) >= 5 and len(part_key) >= 5 and (
|
|
part_key.startswith(key) or key.startswith(part_key)
|
|
):
|
|
mat_name = val
|
|
break
|
|
|
|
# Fall back to index-based matching via part_names_ordered
|
|
if not mat_name and part_names_ordered and i < len(part_names_ordered):
|
|
step_name = part_names_ordered[i]
|
|
step_key = step_name.lower().strip()
|
|
mat_name = mat_map.get(step_key)
|
|
# Also try stripping AF from part_names_ordered entry
|
|
if not mat_name:
|
|
_p2 = None
|
|
while _p2 != step_key:
|
|
_p2 = step_key
|
|
step_key = _re.sub(r'_af\d+$', '', step_key)
|
|
mat_name = mat_map.get(step_key)
|
|
|
|
if mat_name and mat_name in appended:
|
|
part.data.materials.clear()
|
|
part.data.materials.append(appended[mat_name])
|
|
assigned_count += 1
|
|
else:
|
|
unmatched_names.append(part.name)
|
|
|
|
print(f"[blender_render] material assignment: {assigned_count}/{len(parts)} parts matched", flush=True)
|
|
if unmatched_names:
|
|
print(f"[blender_render] unmatched parts → assigning {FAILED_MATERIAL_NAME}: {unmatched_names[:10]}", flush=True)
|
|
unmatched_set = set(unmatched_names)
|
|
for part in parts:
|
|
if part.name in unmatched_set:
|
|
if part.data.users > 1:
|
|
part.data = part.data.copy()
|
|
assign_failed_material(part)
|