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>
121 lines
4.4 KiB
Python
121 lines
4.4 KiB
Python
import asyncio
|
||
from datetime import datetime
|
||
from typing import Optional
|
||
|
||
from fastapi import APIRouter, Depends, HTTPException
|
||
from pydantic import BaseModel
|
||
from sqlalchemy import select
|
||
from sqlalchemy.ext.asyncio import AsyncSession
|
||
|
||
from shared.database.database import get_db_session
|
||
from shared.models.identity import User
|
||
from moldinsight.models import ProcessingTask
|
||
from shared.services.auth_service import get_current_active_user
|
||
from moldinsight.services.cam_bundle_service import cam_bundle_service
|
||
from moldinsight.services.task_query_service import TaskQueryService
|
||
from shared.utils.logger import get_logger
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
router = APIRouter()
|
||
DEFAULT_CAM_PREFERENCES = {
|
||
"mold_steel": "P20",
|
||
"surface_quality": "standard",
|
||
"controller": "fanuc",
|
||
"include_gcode": True,
|
||
}
|
||
|
||
|
||
class CamPlanRequest(BaseModel):
|
||
"""未提供的偏好字段回落到任务持久化偏好,再回落到默认值。"""
|
||
task_id: str
|
||
scheme_id: Optional[str] = None
|
||
mold_steel: Optional[str] = None
|
||
surface_quality: Optional[str] = None
|
||
controller: Optional[str] = None
|
||
include_gcode: Optional[bool] = None
|
||
|
||
|
||
@router.post("/cam/plan")
|
||
async def generate_cam_plan(
|
||
body: CamPlanRequest,
|
||
db_session: AsyncSession = Depends(get_db_session),
|
||
current_user: User = Depends(get_current_active_user),
|
||
):
|
||
"""基于任务分模结果生成 CAM 准备包(MVP)。"""
|
||
_ = current_user
|
||
task_id = body.task_id
|
||
|
||
task_result = await db_session.execute(
|
||
select(ProcessingTask).where(ProcessingTask.task_id == task_id)
|
||
)
|
||
processing_task = task_result.scalar_one_or_none()
|
||
|
||
persisted_preferences = {}
|
||
if processing_task and isinstance(processing_task.parameters, dict):
|
||
persisted_preferences = (
|
||
processing_task.parameters.get("cam_preferences", {}) or {}
|
||
)
|
||
|
||
# 注意 include_gcode 显式判 None:False 是有效值,不能走 or 回落
|
||
mold_steel = (
|
||
body.mold_steel
|
||
if body.mold_steel is not None
|
||
else persisted_preferences.get("mold_steel", DEFAULT_CAM_PREFERENCES["mold_steel"])
|
||
)
|
||
surface_quality = (
|
||
body.surface_quality
|
||
if body.surface_quality is not None
|
||
else persisted_preferences.get("surface_quality", DEFAULT_CAM_PREFERENCES["surface_quality"])
|
||
)
|
||
controller = (
|
||
body.controller
|
||
if body.controller is not None
|
||
else persisted_preferences.get("controller", DEFAULT_CAM_PREFERENCES["controller"])
|
||
)
|
||
include_gcode = (
|
||
body.include_gcode
|
||
if body.include_gcode is not None
|
||
else persisted_preferences.get("include_gcode", DEFAULT_CAM_PREFERENCES["include_gcode"])
|
||
)
|
||
|
||
task_view = await TaskQueryService.get_task_view(db_session, task_id)
|
||
if not task_view:
|
||
raise HTTPException(status_code=404, detail="任务不存在")
|
||
if task_view.get("status") != "completed":
|
||
raise HTTPException(status_code=400, detail="任务尚未完成,无法生成CAM计划")
|
||
|
||
try:
|
||
# CAM 刀路计算为纯 Python 重计算,投放线程池避免阻塞事件循环
|
||
data = await asyncio.to_thread(
|
||
cam_bundle_service.build_bundle,
|
||
task_view=task_view,
|
||
scheme_id=body.scheme_id,
|
||
mold_steel=mold_steel,
|
||
surface_quality=surface_quality,
|
||
controller=controller,
|
||
include_gcode=include_gcode,
|
||
)
|
||
cam_preferences = {
|
||
"mold_steel": mold_steel,
|
||
"surface_quality": surface_quality,
|
||
"controller": controller,
|
||
"include_gcode": include_gcode,
|
||
}
|
||
if processing_task:
|
||
parameters = processing_task.parameters if isinstance(processing_task.parameters, dict) else {}
|
||
parameters["cam_preferences"] = cam_preferences
|
||
parameters["cam_last_plan"] = {
|
||
"scheme_id": data.get("scheme_id"),
|
||
"generated_at": datetime.now().isoformat(),
|
||
}
|
||
processing_task.parameters = parameters
|
||
await db_session.commit()
|
||
# parameters 已变更,任务视图缓存失效
|
||
TaskQueryService.invalidate_task_view(task_id)
|
||
|
||
return {"status": "success", "data": data, "cam_preferences": cam_preferences}
|
||
except Exception as exc:
|
||
logger.error(f"生成CAM准备包失败 task_id={task_id}: {exc}")
|
||
raise HTTPException(status_code=500, detail=f"生成CAM准备包失败: {exc}")
|