Hartmut
ee6eb34b4c
- GPU: fix Cycles device activation order — set compute_device_type BEFORE engine init, re-set AFTER open_mainfile wipes preferences - GPU: remove _mark_sharp_and_seams edit-mode loop (redundant with Blender 5.0 shade_smooth_by_angle), saves ~200s/render on 175 parts - Material: fix _AFN suffix mismatch — build AF-stripped mat_map keys and add prefix fallback in _apply_material_library (blender_render.py) - Material: production GLB now uses get_material_library_path() which checks active AssetLibrary instead of empty legacy system setting - Admin: RenderTemplateTable multi-select output types (M2M frontend) - Admin: MaterialLibraryPanel replaced with link to Asset Libraries - UX: move Toaster to top-left to avoid dispatch button overlap - SQLAlchemy: add .unique() to all RenderTemplate M2M collection queries - Logging: flush=True on all Blender progress prints, stdout reconfigure Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
163 lines
9.0 KiB
Python
163 lines
9.0 KiB
Python
import uuid
|
|
from datetime import datetime
|
|
from sqlalchemy import String, DateTime, Boolean, Text, Integer, Float, ForeignKey, Table, Column
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
from sqlalchemy.dialects.postgresql import UUID, JSONB
|
|
from app.database import Base
|
|
|
|
|
|
# M2M: render templates ↔ output types
|
|
render_template_output_types = Table(
|
|
"render_template_output_types",
|
|
Base.metadata,
|
|
Column("template_id", UUID(as_uuid=True), ForeignKey("render_templates.id", ondelete="CASCADE"), primary_key=True),
|
|
Column("output_type_id", UUID(as_uuid=True), ForeignKey("output_types.id", ondelete="CASCADE"), primary_key=True),
|
|
)
|
|
|
|
VALID_RENDER_BACKENDS = {"celery"}
|
|
|
|
|
|
class OutputType(Base):
|
|
__tablename__ = "output_types"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
name: Mapped[str] = mapped_column(String(200), unique=True, nullable=False)
|
|
description: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
renderer: Mapped[str] = mapped_column(String(50), nullable=False, default="threejs")
|
|
render_settings: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
|
|
output_format: Mapped[str] = mapped_column(String(20), nullable=False, default="png")
|
|
sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
|
|
compatible_categories: Mapped[list] = mapped_column(JSONB, default=list, server_default="[]")
|
|
render_backend: Mapped[str] = mapped_column(String(20), nullable=False, default="auto", server_default="auto")
|
|
is_animation: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="false")
|
|
transparent_bg: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="false")
|
|
cycles_device: Mapped[str | None] = mapped_column(String(10), nullable=True, default=None)
|
|
pricing_tier_id: Mapped[int | None] = mapped_column(
|
|
Integer, ForeignKey("pricing_tiers.id", ondelete="SET NULL"), nullable=True, index=True
|
|
)
|
|
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
tenant_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("tenants.id"), nullable=True, index=True
|
|
)
|
|
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
|
|
)
|
|
|
|
workflow_definition_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("workflow_definitions.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
|
|
order_lines: Mapped[list["OrderLine"]] = relationship("OrderLine", back_populates="output_type")
|
|
pricing_tier: Mapped["PricingTier | None"] = relationship("PricingTier", back_populates="output_types")
|
|
|
|
|
|
class RenderTemplate(Base):
|
|
__tablename__ = "render_templates"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
name: Mapped[str] = mapped_column(String(300), nullable=False)
|
|
category_key: Mapped[str | None] = mapped_column(String(100), nullable=True)
|
|
output_type_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("output_types.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
blend_file_path: Mapped[str] = mapped_column(Text, nullable=False)
|
|
original_filename: Mapped[str] = mapped_column(String(500), nullable=False)
|
|
target_collection: Mapped[str] = mapped_column(String(200), nullable=False, default="Product", server_default="Product")
|
|
material_replace_enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="false")
|
|
lighting_only: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="false")
|
|
shadow_catcher_enabled: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="false")
|
|
camera_orbit: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True, server_default="true")
|
|
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True, server_default="true")
|
|
tenant_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("tenants.id"), nullable=True, index=True
|
|
)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default="now()")
|
|
updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default="now()", onupdate=datetime.utcnow)
|
|
|
|
# Legacy single FK (kept for backward compat, prefer output_types M2M)
|
|
output_type = relationship("OutputType", lazy="joined")
|
|
# M2M: multiple output types per template
|
|
output_types = relationship("OutputType", secondary=render_template_output_types, lazy="joined")
|
|
|
|
|
|
class ProductRenderPosition(Base):
|
|
__tablename__ = "product_render_positions"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
product_id: Mapped[uuid.UUID] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("products.id", ondelete="CASCADE"), nullable=False, index=True
|
|
)
|
|
name: Mapped[str] = mapped_column(String(200), nullable=False)
|
|
rotation_x: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
|
|
rotation_y: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
|
|
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)
|
|
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
|
|
)
|
|
|
|
product: Mapped["Product"] = relationship("Product", back_populates="render_positions")
|
|
order_lines: Mapped[list["OrderLine"]] = relationship("OrderLine", back_populates="render_position")
|
|
|
|
|
|
class WorkflowDefinition(Base):
|
|
__tablename__ = "workflow_definitions"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
name: Mapped[str] = mapped_column(String(200), nullable=False)
|
|
output_type_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("output_types.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
config: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
|
|
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
|
|
|
runs: Mapped[list["WorkflowRun"]] = relationship(
|
|
"WorkflowRun", back_populates="workflow_def", lazy="noload", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class WorkflowRun(Base):
|
|
__tablename__ = "workflow_runs"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
workflow_def_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("workflow_definitions.id", ondelete="SET NULL"), nullable=True
|
|
)
|
|
order_line_id: Mapped[uuid.UUID | None] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("order_lines.id", ondelete="CASCADE"), nullable=True, index=True
|
|
)
|
|
celery_task_id: Mapped[str | None] = mapped_column(String(500), nullable=True)
|
|
status: Mapped[str] = mapped_column(String(50), nullable=False, default="pending")
|
|
started_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
|
completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
|
|
error_message: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
|
|
|
workflow_def: Mapped["WorkflowDefinition | None"] = relationship(
|
|
"WorkflowDefinition", back_populates="runs"
|
|
)
|
|
node_results: Mapped[list["WorkflowNodeResult"]] = relationship(
|
|
"WorkflowNodeResult", back_populates="run", cascade="all, delete-orphan"
|
|
)
|
|
|
|
|
|
class WorkflowNodeResult(Base):
|
|
__tablename__ = "workflow_node_results"
|
|
|
|
id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
|
|
run_id: Mapped[uuid.UUID] = mapped_column(
|
|
UUID(as_uuid=True), ForeignKey("workflow_runs.id", ondelete="CASCADE"), nullable=False, index=True
|
|
)
|
|
node_name: Mapped[str] = mapped_column(String(200), nullable=False)
|
|
status: Mapped[str] = mapped_column(String(50), nullable=False, default="pending")
|
|
output: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
|
|
log: Mapped[str | None] = mapped_column(Text, nullable=True)
|
|
duration_s: Mapped[float | None] = mapped_column(Float, nullable=True)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, default=datetime.utcnow, nullable=False)
|
|
|
|
run: Mapped["WorkflowRun"] = relationship("WorkflowRun", back_populates="node_results")
|