后端设计治理:批次 0-4 全部完成(安全/部署/一致性/结构/架构)
按 ROADMAP §3.1 治理批次推进的后端设计审查整改:
- 批次 0(安全):/api/status/{task_id} 补 JWT 鉴权与任务归属校验;
pythonocc_available 真实探测;bcrypt 超 72 字节显式拒绝;
SECRET_KEY/RUSTFS_* 惰性校验,代码侧弱默认移除
- 批次 1(部署正确性):主处理链路改走 RustFS(分派入参 stp_file_id 化,
worker 按 object_key 下载);AUTO_MIGRATE 开关 + 迁移目录 alembic/→migrations/
修复包遮蔽(自动迁移此前从未真正生效);OCC 镜像改 conda 原生执行 +
基础镜像 tag 锁定;compose 关键项改 ${VAR:?} 强制显式配置
- 批次 2(任务一致性):删除 Redis 进程内存回退,PG 为任务状态单一事实源;
批量元数据入库(processing_tasks.batch_id,迁移 a3f8c2d91e47);
型腔失败任务标 failed 不再静默 completed;事务边界收口
(数据本体写 flush-only、失败先回滚再置 failed、进度更新保留即时 commit)
- 批次 3(API 与代码结构):592 行 advanced_router 拆为 design/cost/machining/
export 四子路由,请求体全量 Pydantic 化;ROUTE_MODULES + route_registry
(/api/health 呈现 degraded,DEBUG fail fast);纯计算端点统一 to_thread;
StorageIntegrationService 按职责三拆;MAX_FILE_SIZE 接线生效、
celery 复用 Settings.redis_url;管理员重置密码改 JSON body(端到端断裂修复);
openapi.json 重导出(76 paths)+ 前端 gen:api
- 批次 4(架构演进):共享 ORM 按模块拆分(shared/models/base.py + identity.py、
moldinsight/models/、inventory/models/,删除三条无使用方的跨模块
relationship,跨模块桥接收敛为裸 FK 硬规则,无兼容 facade);
OCC executor 重建补 cancel_futures=True(消除旧队列被慢恢复线程
并行消化的数据竞争);OCC 吞吐方案设计先行
(docs/topics/performance/OCC_THROUGHPUT.md);顺手清偿 D15
(vite.config.ts 未用参数致 npm run build 失败)
测试基线:125 passed, 2 skipped(pytest + sqlite+aiosqlite;归属边界、
路由契约、配置治理、鉴权回归等随批新增)
文档同步:STATUS / TECH_DEBT / ROADMAP / ARCHITECTURE / API_CONTRACT /
OPERATIONS / AGENTS
Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,181 @@
|
||||
# api/design_router.py
|
||||
"""模具结构设计类接口(批次 3 自 advanced_router 拆分,D1)。
|
||||
|
||||
- 请求体一律 Pydantic 模型(原 request.json() 手动解析退役,校验失败统一 422)
|
||||
- 纯 Python 设计计算统一经 asyncio.to_thread 投放线程池,不阻塞事件循环;
|
||||
OCC 相关的倒扣检测仍走 processing_service.run_occ 的单线程 executor
|
||||
(PythonOCC 非线程安全)
|
||||
"""
|
||||
import asyncio
|
||||
from typing import List, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException
|
||||
from pydantic import BaseModel, Field
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from shared.services.auth_service import get_current_active_user
|
||||
from shared.database.database import get_db_session
|
||||
from shared.models.identity import User
|
||||
from moldinsight.services.processing_service import processing_service
|
||||
from moldinsight.services.task_query_service import TaskQueryService
|
||||
from moldinsight.api.core_modules import get_core_module
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# ---- 请求模型 ----
|
||||
|
||||
class BBox3D(BaseModel):
|
||||
dimensions: List[float] = Field(default_factory=lambda: [100.0, 100.0, 50.0])
|
||||
min: Optional[List[float]] = None
|
||||
max: Optional[List[float]] = None
|
||||
|
||||
|
||||
class MoldSize(BaseModel):
|
||||
length: float = 300.0
|
||||
width: float = 300.0
|
||||
height: float = 200.0
|
||||
|
||||
|
||||
class OptimizeLayoutRequest(BaseModel):
|
||||
product_bbox: BBox3D = Field(default_factory=BBox3D)
|
||||
cavity_count: int = Field(default=1, ge=1, le=64)
|
||||
mold_base_size: Optional[BBox3D] = None
|
||||
layout_type: str = "auto"
|
||||
|
||||
|
||||
class CoolingDesignRequest(BaseModel):
|
||||
mold_size: MoldSize = Field(default_factory=MoldSize)
|
||||
product_bbox: BBox3D = Field(default_factory=BBox3D)
|
||||
material: str = "ABS"
|
||||
cavity_count: int = Field(default=1, ge=1, le=64)
|
||||
cycle_time_target: Optional[float] = None
|
||||
|
||||
|
||||
class GatingDesignRequest(BaseModel):
|
||||
product_bbox: BBox3D = Field(default_factory=BBox3D)
|
||||
material: str = "ABS"
|
||||
cavity_count: int = Field(default=1, ge=1, le=64)
|
||||
gate_type: str = "auto"
|
||||
layout_positions: Optional[List[List[float]]] = None
|
||||
|
||||
|
||||
class MoldSystemDesignRequest(BaseModel):
|
||||
mold_size: MoldSize = Field(default_factory=MoldSize)
|
||||
product_bbox: BBox3D = Field(default_factory=BBox3D)
|
||||
material: str = "ABS"
|
||||
cavity_count: int = Field(default=1, ge=1, le=64)
|
||||
gate_type: str = "auto"
|
||||
cycle_time_target: Optional[float] = None
|
||||
layout_positions: Optional[List[List[float]]] = None
|
||||
|
||||
|
||||
class UndercutDetectRequest(BaseModel):
|
||||
task_id: str
|
||||
parting_direction: List[float] = Field(default_factory=lambda: [0.0, 0.0, 1.0])
|
||||
mold_size: MoldSize = Field(default_factory=MoldSize)
|
||||
|
||||
|
||||
@router.post("/optimize-layout")
|
||||
async def optimize_cavity_layout(
|
||||
body: OptimizeLayoutRequest,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
optimizer = get_core_module("cavity_layout_optimizer")
|
||||
if not optimizer:
|
||||
raise HTTPException(503, "服务不可用:核心模块未加载")
|
||||
# 纯 Python 布局优化,投放线程池避免阻塞事件循环
|
||||
result = await asyncio.to_thread(
|
||||
optimizer.optimize_layout,
|
||||
product_bbox=body.product_bbox.model_dump(exclude_none=True),
|
||||
cavity_count=body.cavity_count,
|
||||
mold_base_size=body.mold_base_size.model_dump(exclude_none=True) if body.mold_base_size else None,
|
||||
layout_type=body.layout_type,
|
||||
)
|
||||
return {"status": "success", "data": result}
|
||||
|
||||
|
||||
@router.post("/design-cooling")
|
||||
async def design_cooling_system(
|
||||
body: CoolingDesignRequest,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
from moldinsight.core.mold_system_designer import CoolingSystemDesigner
|
||||
designer = CoolingSystemDesigner()
|
||||
result = await asyncio.to_thread(
|
||||
designer.design_cooling_system,
|
||||
mold_size=body.mold_size.model_dump(),
|
||||
product_bbox=body.product_bbox.model_dump(exclude_none=True),
|
||||
material=body.material,
|
||||
cavity_count=body.cavity_count,
|
||||
cycle_time_target=body.cycle_time_target,
|
||||
)
|
||||
return {"status": "success", "data": result}
|
||||
|
||||
|
||||
@router.post("/design-gating")
|
||||
async def design_gating_system(
|
||||
body: GatingDesignRequest,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
from moldinsight.core.mold_system_designer import GatingSystemDesigner
|
||||
designer = GatingSystemDesigner()
|
||||
result = await asyncio.to_thread(
|
||||
designer.design_gating_system,
|
||||
product_bbox=body.product_bbox.model_dump(exclude_none=True),
|
||||
material=body.material,
|
||||
cavity_count=body.cavity_count,
|
||||
gate_type=body.gate_type,
|
||||
layout_positions=body.layout_positions,
|
||||
)
|
||||
return {"status": "success", "data": result}
|
||||
|
||||
|
||||
@router.post("/design-mold-system")
|
||||
async def design_complete_mold_system(
|
||||
body: MoldSystemDesignRequest,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
):
|
||||
ds = get_core_module("mold_system_designer")
|
||||
if not ds:
|
||||
raise HTTPException(503, "服务不可用:核心模块未加载")
|
||||
result = await asyncio.to_thread(
|
||||
ds.design_complete_system,
|
||||
mold_size=body.mold_size.model_dump(),
|
||||
product_bbox=body.product_bbox.model_dump(exclude_none=True),
|
||||
material=body.material,
|
||||
cavity_count=body.cavity_count,
|
||||
gate_type=body.gate_type,
|
||||
cycle_time_target=body.cycle_time_target,
|
||||
layout_positions=body.layout_positions,
|
||||
)
|
||||
return {"status": "success", "data": result}
|
||||
|
||||
|
||||
@router.post("/detect-undercuts")
|
||||
async def detect_undercuts(
|
||||
body: UndercutDetectRequest,
|
||||
current_user: User = Depends(get_current_active_user),
|
||||
db_session: AsyncSession = Depends(get_db_session),
|
||||
):
|
||||
# 归属校验统一走 TaskQueryService(与 /api/status 共用,含 404/403 语义)
|
||||
await TaskQueryService.ensure_task_access(db_session, body.task_id, current_user.id)
|
||||
|
||||
sd = get_core_module("side_action_designer")
|
||||
if not sd:
|
||||
raise HTTPException(503, "服务不可用:核心模块未加载")
|
||||
|
||||
# 从持久化 STP 原件重建几何(此前传 shape=None 会被兜底吞掉,永远返回"无倒扣")
|
||||
from moldinsight.services.shape_loader import get_shape_loader
|
||||
shape = await get_shape_loader().load_shape_for_task(db_session, body.task_id)
|
||||
if shape is None:
|
||||
raise HTTPException(410, "任务几何不可用:无法从存储重建 STP 形状,请重新上传分析")
|
||||
|
||||
# OCC 操作必须走单线程 executor(PythonOCC 非线程安全)
|
||||
result = await processing_service.run_occ(
|
||||
sd.analyze_and_design,
|
||||
shape,
|
||||
body.parting_direction,
|
||||
body.mold_size.model_dump(),
|
||||
)
|
||||
return {"status": "success", "data": result}
|
||||
Reference in New Issue
Block a user