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>
222 lines
7.9 KiB
Python
222 lines
7.9 KiB
Python
# services/task_storage_service.py
|
||
"""任务与源文件生命周期存储——PostgreSQL(+ 源文件 RustFS 上传)。
|
||
|
||
批次 3 自 storage_integration_rustfs.py 按职责拆分(原 867 行混杂
|
||
写入/查询/历史三类职责):
|
||
- 本模块:STPFile 生命周期 + ProcessingTask 创建/状态/参数
|
||
- 分析结果数据:analysis_storage_service.AnalysisStorageService
|
||
- 历史查询视图:file_history_service.FileHistoryService
|
||
"""
|
||
from pathlib import Path
|
||
from typing import Optional, Dict, Any
|
||
from datetime import datetime
|
||
import uuid
|
||
|
||
from sqlalchemy import update, select
|
||
from sqlalchemy.ext.asyncio import AsyncSession
|
||
|
||
from moldinsight.models import STPFile, ProcessingTask
|
||
from moldinsight.storage.rustfs_storage import rustfs_manager
|
||
from shared.utils.logger import get_logger
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
class TaskStorageService:
|
||
"""STP 文件与处理任务的生命周期存储"""
|
||
|
||
async def save_stp_file(self, session: AsyncSession,
|
||
file_path: Path,
|
||
original_filename: str,
|
||
user_id: Optional[int] = None,
|
||
upload_batch: Optional[str] = None) -> STPFile:
|
||
"""保存STP文件到PostgreSQL元数据 + RustFS对象存储
|
||
|
||
支持同一文件多次上传,每次上传都会创建新记录
|
||
"""
|
||
|
||
# 1. 上传到RustFS
|
||
upload_result = await rustfs_manager.upload_file(
|
||
file_type='stp_files',
|
||
file_path=file_path,
|
||
original_filename=original_filename,
|
||
metadata={
|
||
'original_filename': original_filename,
|
||
'user_id': str(user_id) if user_id else 'anonymous',
|
||
'upload_batch': upload_batch or str(uuid.uuid4())
|
||
}
|
||
)
|
||
|
||
file_hash = upload_result['file_hash']
|
||
batch_id = upload_batch or str(uuid.uuid4())
|
||
|
||
# 2. 创建新PostgreSQL记录(每次上传都创建新记录)
|
||
stp_file = STPFile(
|
||
user_id=user_id,
|
||
object_key=upload_result['object_key'],
|
||
storage_bucket=upload_result['bucket'],
|
||
original_filename=original_filename,
|
||
file_size=upload_result['file_size'],
|
||
file_hash=file_hash,
|
||
upload_batch=batch_id,
|
||
status="uploaded",
|
||
file_path=str(file_path),
|
||
upload_time=datetime.now()
|
||
)
|
||
|
||
session.add(stp_file)
|
||
# D9:仅 flush,与 ProcessingTask 由路由层一并原子提交(避免孤儿文件记录)
|
||
await session.flush()
|
||
await session.refresh(stp_file)
|
||
|
||
logger.info(f"STP文件保存成功 RustFS: {stp_file.id}, 批次: {batch_id}")
|
||
return stp_file
|
||
|
||
async def create_processing_task(
|
||
self,
|
||
session: AsyncSession,
|
||
task_id: str,
|
||
stp_file_id: int,
|
||
task_type: str = "stp_parsing",
|
||
parameters: Optional[Dict[str, Any]] = None,
|
||
batch_id: Optional[str] = None,
|
||
) -> ProcessingTask:
|
||
"""创建处理任务记录(D9:仅 flush 不 commit,事务由调用方收口——
|
||
与 STPFile 记录同批提交,避免留下无任务的孤儿文件记录;batch_id 用于批量任务聚合查询)
|
||
"""
|
||
try:
|
||
task = ProcessingTask(
|
||
task_id=task_id,
|
||
stp_file_id=stp_file_id,
|
||
task_type=task_type,
|
||
status="pending",
|
||
started_time=datetime.now(),
|
||
parameters=parameters or {},
|
||
batch_id=batch_id,
|
||
)
|
||
|
||
session.add(task)
|
||
await session.flush()
|
||
|
||
logger.info(f"处理任务创建成功: {task_id}")
|
||
return task
|
||
|
||
except Exception as e:
|
||
await session.rollback()
|
||
logger.error(f"创建处理任务失败: {e}")
|
||
raise
|
||
|
||
async def update_task_status(
|
||
self,
|
||
session: AsyncSession,
|
||
task_id: str,
|
||
status: str,
|
||
progress: Optional[int] = None,
|
||
current_step: Optional[str] = None,
|
||
error_message: Optional[str] = None
|
||
):
|
||
"""更新任务状态(保留即时 commit:进度/状态需跨事务对外可见,
|
||
处理链路中的各阶段进度依赖它落库——D9 收口仅针对数据本体写方法)"""
|
||
try:
|
||
update_data = {
|
||
"status": status,
|
||
"completed_time": datetime.now() if status in ["completed", "failed"] else None,
|
||
"error_message": error_message
|
||
}
|
||
|
||
if progress is not None:
|
||
update_data["progress"] = progress
|
||
if current_step is not None:
|
||
update_data["current_step"] = current_step
|
||
|
||
await session.execute(
|
||
update(ProcessingTask)
|
||
.where(ProcessingTask.task_id == task_id)
|
||
.values(**update_data)
|
||
)
|
||
await session.commit()
|
||
|
||
logger.info(f"任务状态更新: {task_id} -> {status}")
|
||
|
||
except Exception as e:
|
||
await session.rollback()
|
||
logger.error(f"更新任务状态失败: {e}")
|
||
raise
|
||
|
||
async def update_task_parameters(
|
||
self,
|
||
session: AsyncSession,
|
||
task_id: str,
|
||
parameters: Dict[str, Any],
|
||
):
|
||
"""合并更新任务参数,便于保存阶段耗时等元数据。(D9:flush 不 commit,事务由调用方收口)"""
|
||
try:
|
||
task = await session.execute(
|
||
select(ProcessingTask).where(ProcessingTask.task_id == task_id)
|
||
)
|
||
task = task.scalar_one_or_none()
|
||
if task is None:
|
||
return
|
||
|
||
merged = dict(task.parameters or {})
|
||
merged.update(parameters or {})
|
||
task.parameters = merged
|
||
await session.flush()
|
||
except Exception as e:
|
||
await session.rollback()
|
||
logger.error(f"更新任务参数失败: {e}")
|
||
raise
|
||
|
||
async def update_stp_file_status(self, session: AsyncSession, stp_file_id: int, status: str):
|
||
"""更新STP文件状态(保留即时 commit,理由同 update_task_status)"""
|
||
try:
|
||
await session.execute(
|
||
update(STPFile)
|
||
.where(STPFile.id == stp_file_id)
|
||
.values(
|
||
status=status,
|
||
processed_time=datetime.now() if status in ["completed", "failed"] else None
|
||
)
|
||
)
|
||
await session.commit()
|
||
|
||
logger.info(f"STP文件状态更新: ID {stp_file_id} -> {status}")
|
||
|
||
except Exception as e:
|
||
await session.rollback()
|
||
logger.error(f"更新STP文件状态失败: {e}")
|
||
raise
|
||
|
||
async def update_stp_file_analysis_summary(
|
||
self,
|
||
session: AsyncSession,
|
||
stp_file_id: int,
|
||
volume: Optional[float] = None,
|
||
surface_area: Optional[float] = None,
|
||
product_weight: Optional[float] = None
|
||
):
|
||
"""更新STP文件的分析摘要字段(用于快速查询)"""
|
||
try:
|
||
update_data = {}
|
||
if volume is not None:
|
||
update_data['volume'] = volume
|
||
if surface_area is not None:
|
||
update_data['surface_area'] = surface_area
|
||
if product_weight is not None:
|
||
update_data['product_weight'] = product_weight
|
||
|
||
if update_data:
|
||
await session.execute(
|
||
update(STPFile)
|
||
.where(STPFile.id == stp_file_id)
|
||
.values(**update_data)
|
||
)
|
||
# D9:flush 不 commit,随结果包由编排层统一提交
|
||
await session.flush()
|
||
logger.info(f"STP文件分析摘要更新: ID {stp_file_id}")
|
||
|
||
except Exception as e:
|
||
await session.rollback()
|
||
logger.error(f"更新STP文件分析摘要失败: {e}")
|
||
raise
|