ca62319688
Sharp Edge Pipeline V02:
- export_step_to_gltf.py: replace BRep_Tool.Polygon3D_s (returns None in XCAF) with
GCPnts_UniformAbscissa curve sampling at 0.3mm step — extracts 17,129 segment pairs
- Inject sharp_edge_pairs + sharp_threshold_deg into GLB extras (scenes[0].extras)
via binary GLB JSON-chunk patching (no extra dependency)
- export_gltf.py: read schaeffler_sharp_edge_pairs from Blender scene custom props,
apply via KD-tree to mark edges sharp=True + seam=True (OCC mm Z-up → Blender transform)
- tools/restore_sharp_marks.py: dual-pass (dihedral angle + OCC pairs), updated coordinate
transform (X, -Z, Y) * 0.001
Tessellation:
- Admin UI: Draft / Standard / Fine preset buttons with active-state highlighting
- Default angular deflection: preview 0.5→0.1 rad, production 0.2→0.05 rad
- export_glb.py: read updated defaults from system_settings
Media / Cache:
- media/service.py: get_download_url appends ?v={file_size_bytes} cache-buster
- media/router.py: Cache-Control: no-cache for all download/thumbnail endpoints
Render pipeline:
- still_render.py / turntable_render.py: shared GPU activation + camera improvements
- render_order_line.py: global render position support
- render_thumbnail.py: updated defaults
Frontend:
- InlineCadViewer: file_size_bytes-aware URL update triggers re-fetch on regeneration
- ThreeDViewer: material panel, part selection, PBR mode improvements
- Admin.tsx: tessellation preset cards, GMSH setting dropdown
- MediaBrowser, ProductDetail, OrderDetail, Orders: various UI improvements
- New: MaterialPanel, GlobalRenderPositionsPanel, StepIndicator components
- New: renderPositions.ts API client
Plans / Docs:
- plan.md: GMSH Frontal-Delaunay tessellation plan (6 tasks)
- LEARNINGS.md: OCC Polygon3D_s None issue + GCPnts fix
- .gitignore: add backend/core (core dump from root process)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
135 lines
3.8 KiB
Python
135 lines
3.8 KiB
Python
import uuid
|
|
from datetime import datetime
|
|
from typing import Any
|
|
from pydantic import BaseModel
|
|
from app.domains.orders.models import OrderStatus, ItemStatus, AIValidationStatus
|
|
|
|
|
|
class ComponentData(BaseModel):
|
|
part_name: str | None = None
|
|
material: str | None = None
|
|
component_type: str | None = None
|
|
column_index: int | None = None
|
|
|
|
|
|
class OrderItemCreate(BaseModel):
|
|
row_index: int
|
|
ebene1: str | None = None
|
|
ebene2: str | None = None
|
|
baureihe: str | None = None
|
|
pim_id: str | None = None
|
|
produkt_baureihe: str | None = None
|
|
gewaehltes_produkt: str | None = None
|
|
name_cad_modell: str | None = None
|
|
gewuenschte_bildnummer: str | None = None
|
|
lagertyp: str | None = None
|
|
medias_rendering: bool | None = None
|
|
components: list[ComponentData] = []
|
|
|
|
|
|
class OrderItemOut(BaseModel):
|
|
id: uuid.UUID
|
|
order_id: uuid.UUID
|
|
row_index: int
|
|
ebene1: str | None
|
|
ebene2: str | None
|
|
baureihe: str | None
|
|
pim_id: str | None
|
|
produkt_baureihe: str | None
|
|
gewaehltes_produkt: str | None
|
|
name_cad_modell: str | None
|
|
gewuenschte_bildnummer: str | None
|
|
lagertyp: str | None
|
|
medias_rendering: bool | None
|
|
components: list[dict]
|
|
cad_file_id: uuid.UUID | None
|
|
thumbnail_path: str | None
|
|
cad_parsed_objects: list[str] | None = None
|
|
cad_part_materials: list[dict] = []
|
|
ai_validation_status: AIValidationStatus
|
|
ai_validation_result: dict | None
|
|
item_status: ItemStatus
|
|
notes: str | None
|
|
created_at: datetime
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class RejectOrderRequest(BaseModel):
|
|
reason: str = ""
|
|
notify_client: bool = True
|
|
|
|
|
|
class OrderLineCreate(BaseModel):
|
|
product_id: uuid.UUID
|
|
output_type_id: uuid.UUID | None = None
|
|
render_position_id: uuid.UUID | None = None
|
|
global_render_position_id: uuid.UUID | None = None
|
|
gewuenschte_bildnummer: str | None = None
|
|
notes: str | None = None
|
|
|
|
|
|
class OrderLineOut(BaseModel):
|
|
id: uuid.UUID
|
|
order_id: uuid.UUID
|
|
product_id: uuid.UUID
|
|
product: Any # ProductOut — forward ref to avoid circular imports
|
|
output_type_id: uuid.UUID | None
|
|
output_type: Any | None # OutputTypeOut
|
|
gewuenschte_bildnummer: str | None
|
|
item_status: str
|
|
render_status: str
|
|
result_path: str | None
|
|
thumbnail_url: str | None = None
|
|
ai_validation_status: str
|
|
ai_validation_result: dict | None
|
|
render_backend_used: str | None = None
|
|
flamenco_job_id: str | None = None
|
|
unit_price: float | None = None
|
|
render_position_id: uuid.UUID | None = None
|
|
render_position_name: str | None = None
|
|
render_log: dict | None = None
|
|
render_started_at: datetime | None = None
|
|
render_completed_at: datetime | None = None
|
|
notes: str | None
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class OrderCreate(BaseModel):
|
|
template_id: uuid.UUID | None = None
|
|
source_excel: str | None = None
|
|
notes: str | None = None
|
|
items: list[OrderItemCreate] = []
|
|
lines: list[OrderLineCreate] = []
|
|
|
|
|
|
class OrderOut(BaseModel):
|
|
id: uuid.UUID
|
|
order_number: str
|
|
template_id: uuid.UUID | None
|
|
status: OrderStatus
|
|
created_by: uuid.UUID
|
|
source_excel: str | None
|
|
notes: str | None
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
submitted_at: datetime | None = None
|
|
processing_started_at: datetime | None = None
|
|
completed_at: datetime | None = None
|
|
rejected_at: datetime | None = None
|
|
rejection_reason: str | None = None
|
|
estimated_price: float | None = None
|
|
item_count: int = 0
|
|
line_count: int = 0
|
|
render_progress: dict | None = None
|
|
|
|
model_config = {"from_attributes": True}
|
|
|
|
|
|
class OrderDetailOut(OrderOut):
|
|
items: list[OrderItemOut] = []
|
|
lines: list[OrderLineOut] = []
|