0e6b3b1811
按 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>
168 lines
5.4 KiB
Python
168 lines
5.4 KiB
Python
# api/machining_router.py
|
|
"""CAM / 加工仿真类接口(批次 3 自 advanced_router 拆分,D1)。
|
|
|
|
加工计算为纯 Python 重计算(非 OCC),统一经 asyncio.to_thread
|
|
投放线程池执行,不阻塞事件循环。
|
|
"""
|
|
import asyncio
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from pydantic import BaseModel, Field
|
|
|
|
from shared.services.auth_service import get_current_active_user
|
|
from shared.models.identity import User
|
|
from moldinsight.api.core_modules import get_core_module
|
|
from moldinsight.api.design_router import BBox3D
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
# ---- 请求模型 ----
|
|
|
|
class ToolSpec(BaseModel):
|
|
diameter: float = 10.0
|
|
flute_length: float = 30.0
|
|
shank_diameter: float = 10.0
|
|
|
|
|
|
def _cam_cavity_bbox() -> BBox3D:
|
|
return BBox3D(dimensions=[100.0, 100.0, 50.0], min=[-50.0, -50.0, -25.0], max=[50.0, 50.0, 25.0])
|
|
|
|
|
|
def _cam_stock_bbox() -> BBox3D:
|
|
return BBox3D(dimensions=[150.0, 150.0, 100.0], min=[-75.0, -75.0, -50.0], max=[75.0, 75.0, 50.0])
|
|
|
|
|
|
class CamDesignRequest(BaseModel):
|
|
cavity_bbox: BBox3D = Field(default_factory=_cam_cavity_bbox)
|
|
stock_bbox: BBox3D = Field(default_factory=_cam_stock_bbox)
|
|
mold_steel: str = "P20"
|
|
surface_quality: str = "standard"
|
|
controller: str = "fanuc"
|
|
|
|
|
|
class CollisionCheckRequest(BaseModel):
|
|
toolpath_points: List[List[float]] = Field(
|
|
default_factory=lambda: [[0, 0, 50], [10, 10, -5], [20, 20, -10]]
|
|
)
|
|
tool: ToolSpec = Field(default_factory=ToolSpec)
|
|
stock_bbox: BBox3D = Field(default_factory=_cam_cavity_bbox)
|
|
clamp_positions: Optional[List[List[float]]] = None
|
|
|
|
|
|
class ToolpathOptimizeRequest(BaseModel):
|
|
toolpath_points: List[List[float]] = Field(
|
|
default_factory=lambda: [[0, 0, 50], [10, 10, -5], [20, 20, -10]]
|
|
)
|
|
cutting_params: Dict[str, Any] = Field(default_factory=lambda: {"feed_rate_mm_min": 500})
|
|
stock_bbox: Optional[BBox3D] = None
|
|
|
|
|
|
class ElectrodeDesignRequest(BaseModel):
|
|
undercut_regions: List[Dict[str, Any]] = Field(
|
|
default_factory=lambda: [{"center": [0, 0, 0], "area": 100, "type": "undercut"}]
|
|
)
|
|
cavity_bbox: BBox3D = Field(default_factory=BBox3D)
|
|
material: str = "copper"
|
|
spark_gap: float = 0.05
|
|
overburn: float = 0.1
|
|
|
|
|
|
class MachiningSimulateRequest(BaseModel):
|
|
operations: List[Dict[str, Any]] = Field(
|
|
default_factory=lambda: [{"strategy": "z_level_roughing", "levels": [{"z": -5}]}]
|
|
)
|
|
stock_bbox: BBox3D = Field(default_factory=_cam_cavity_bbox)
|
|
resolution: float = 2.0
|
|
|
|
|
|
@router.post("/design-cam")
|
|
async def design_mold_cam(
|
|
body: CamDesignRequest,
|
|
current_user: User = Depends(get_current_active_user),
|
|
):
|
|
cam = get_core_module("mold_cam_designer")
|
|
if not cam:
|
|
raise HTTPException(503, "服务不可用:核心模块未加载")
|
|
result = await asyncio.to_thread(
|
|
cam.design_mold_cam,
|
|
cavity_bbox=body.cavity_bbox.model_dump(exclude_none=True),
|
|
stock_bbox=body.stock_bbox.model_dump(exclude_none=True),
|
|
mold_steel=body.mold_steel,
|
|
surface_quality=body.surface_quality,
|
|
controller=body.controller,
|
|
)
|
|
return {"status": "success", "data": result}
|
|
|
|
|
|
@router.post("/check-collision")
|
|
async def check_toolpath_collision(
|
|
body: CollisionCheckRequest,
|
|
current_user: User = Depends(get_current_active_user),
|
|
):
|
|
cd = get_core_module("collision_detector")
|
|
if not cd:
|
|
raise HTTPException(503, "服务不可用:核心模块未加载")
|
|
result = await asyncio.to_thread(
|
|
cd.check_toolpath_safety,
|
|
body.toolpath_points,
|
|
body.tool.model_dump(),
|
|
body.stock_bbox.model_dump(exclude_none=True),
|
|
body.clamp_positions,
|
|
)
|
|
return {"status": "success", "data": result}
|
|
|
|
|
|
@router.post("/optimize-toolpath")
|
|
async def optimize_toolpath(
|
|
body: ToolpathOptimizeRequest,
|
|
current_user: User = Depends(get_current_active_user),
|
|
):
|
|
to = get_core_module("toolpath_optimizer")
|
|
if not to:
|
|
raise HTTPException(503, "服务不可用:核心模块未加载")
|
|
result = await asyncio.to_thread(
|
|
to.optimize_toolpath,
|
|
body.toolpath_points,
|
|
body.cutting_params,
|
|
body.stock_bbox.model_dump(exclude_none=True) if body.stock_bbox else None,
|
|
)
|
|
return {"status": "success", "data": result}
|
|
|
|
|
|
@router.post("/design-electrodes")
|
|
async def design_edm_electrodes(
|
|
body: ElectrodeDesignRequest,
|
|
current_user: User = Depends(get_current_active_user),
|
|
):
|
|
ed = get_core_module("edm_designer")
|
|
if not ed:
|
|
raise HTTPException(503, "服务不可用:核心模块未加载")
|
|
result = await asyncio.to_thread(
|
|
ed.design_electrodes,
|
|
body.undercut_regions,
|
|
body.cavity_bbox.model_dump(exclude_none=True),
|
|
body.material,
|
|
body.spark_gap,
|
|
body.overburn,
|
|
)
|
|
return {"status": "success", "data": result}
|
|
|
|
|
|
@router.post("/simulate-machining")
|
|
async def simulate_machining(
|
|
body: MachiningSimulateRequest,
|
|
current_user: User = Depends(get_current_active_user),
|
|
):
|
|
ms = get_core_module("machining_simulator")
|
|
if not ms:
|
|
raise HTTPException(503, "服务不可用:核心模块未加载")
|
|
result = await asyncio.to_thread(
|
|
ms.simulate_machining,
|
|
body.operations,
|
|
body.stock_bbox.model_dump(exclude_none=True),
|
|
body.resolution,
|
|
)
|
|
return {"status": "success", "data": result}
|