后端能力: - 新增 Celery app、worker task、ProcessingTask 模型、/api/tasks 查询接口和 media_task_runner,将 /api/media/parse 改为创建后台任务并由 worker 执行 FFmpeg/OpenCV/pydicom 拆帧。 - 新增 Redis 进度事件模块和 FastAPI Redis pub/sub 订阅,将 worker 任务进度广播到 /ws/progress;Dashboard 后端概览接口改为聚合 projects/frames/annotations/templates/processing_tasks。 - 统一项目状态为 pending/parsing/ready/error,新增共享 status 常量,并让前端兼容归一化旧状态值。 - 扩展 AI 后端:新增 SAM registry、SAM2 真实运行状态、SAM3 状态检测与文本语义推理适配入口,以及 /api/ai/models/status GPU/模型状态接口。 - 补齐标注保存/更新/删除、COCO/PNG mask 导出相关后端契约和模板 mapping_rules 打包/解包行为。 前端能力: - 新增运行时 API/WS 地址推导配置,前端 API 封装对齐 FastAPI 路由、字段映射、任务轮询、标注归档、导出下载和 AI 预测响应转换。 - Dashboard 改为读取 /api/dashboard/overview,并订阅 WebSocket progress/complete/error/status 更新解析队列和实时流转记录。 - 项目库导入视频/DICOM 后创建项目、上传媒体、触发异步解析并刷新真实项目列表。 - 工作区加载真实帧、无帧时触发解析任务、回显已保存标注、保存未归档 mask、更新 dirty mask、清空当前帧后端标注、导出 COCO JSON。 - Canvas 支持当前帧点/框提示调用后端 AI、渲染推理/已保存 mask、应用模板分类并维护保存状态计数;时间轴按项目 fps 播放。 - AI 页面新增 SAM2/SAM3 模型选择,预测请求携带 model;侧边栏和工作区新增真实 GPU/SAM 状态徽标。 - 模板库和本体面板接入真实模板 CRUD、分类编辑、拖拽排序、JSON 导入、默认腹腔镜分类和本地自定义分类选择。 测试与文档: - 新增 Vitest 配置、前端测试 setup、API/config/websocket/store/组件测试,覆盖登录、项目库、Dashboard、Canvas、工作区、模型状态、时间轴、本体和模板库。 - 新增 pytest 后端测试夹具和 auth/projects/templates/media/AI/export/dashboard/tasks/progress 测试,使用 SQLite、fake MinIO、fake SAM registry 和 Redis monkeypatch 隔离外部服务。 - 新增 doc/ 文档结构,冻结当前需求、设计、接口契约、测试计划、前端逐元素审计、实现地图和后续实施计划,并同步更新 README 与 AGENTS。 验证: - conda run -n seg_server pytest backend/tests:27 passed。 - npm run test:run:54 passed。 - npm run lint、npm run build、compileall、git diff --check 均通过;Vite 仅提示大 chunk 警告。
208 lines
6.8 KiB
Python
208 lines
6.8 KiB
Python
"""Media upload and parsing endpoints."""
|
|
|
|
import logging
|
|
from pathlib import Path
|
|
from typing import List, Optional
|
|
|
|
from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile, status
|
|
from sqlalchemy.orm import Session
|
|
|
|
from database import get_db
|
|
from minio_client import upload_file, get_presigned_url
|
|
from models import ProcessingTask, Project
|
|
from progress_events import publish_task_progress_event
|
|
from schemas import ProcessingTaskOut
|
|
from statuses import PROJECT_STATUS_PARSING, PROJECT_STATUS_PENDING, TASK_STATUS_QUEUED
|
|
from worker_tasks import parse_project_media
|
|
|
|
logger = logging.getLogger(__name__)
|
|
router = APIRouter(prefix="/api/media", tags=["Media"])
|
|
|
|
ALLOWED_EXTENSIONS = {".mp4", ".avi", ".mov", ".mkv", ".webm", ".png", ".jpg", ".jpeg", ".dcm"}
|
|
|
|
|
|
def _get_ext(filename: str) -> str:
|
|
return Path(filename).suffix.lower()
|
|
|
|
|
|
@router.post(
|
|
"/upload",
|
|
status_code=status.HTTP_201_CREATED,
|
|
summary="Upload a media file",
|
|
)
|
|
async def upload_media(
|
|
file: UploadFile = File(...),
|
|
project_id: Optional[int] = Form(None),
|
|
db: Session = Depends(get_db),
|
|
) -> dict:
|
|
"""Accept a video, image, or DICOM file and store it in MinIO.
|
|
|
|
If project_id is provided, the video_path of the project is updated.
|
|
Returns the presigned URL of the uploaded object.
|
|
"""
|
|
if not file.filename:
|
|
raise HTTPException(status_code=400, detail="Missing filename")
|
|
|
|
ext = _get_ext(file.filename)
|
|
if ext not in ALLOWED_EXTENSIONS:
|
|
raise HTTPException(
|
|
status_code=400,
|
|
detail=f"Unsupported file type: {ext}",
|
|
)
|
|
|
|
data = await file.read()
|
|
object_name = f"uploads/{project_id or 'general'}/{file.filename}"
|
|
|
|
try:
|
|
upload_file(object_name, data, content_type=file.content_type or "application/octet-stream", length=len(data))
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.error("Upload failed: %s", exc)
|
|
raise HTTPException(status_code=500, detail="Upload to storage failed") from exc
|
|
|
|
file_url = get_presigned_url(object_name, expires=3600)
|
|
|
|
if project_id:
|
|
project = db.query(Project).filter(Project.id == project_id).first()
|
|
if project:
|
|
project.video_path = object_name
|
|
db.commit()
|
|
logger.info("Linked upload to project_id=%s", project_id)
|
|
else:
|
|
logger.warning("Project id=%s not found for upload linkage", project_id)
|
|
else:
|
|
# Auto-create a project named after the file
|
|
project = Project(
|
|
name=file.filename,
|
|
description="Auto-created from upload",
|
|
status=PROJECT_STATUS_PENDING,
|
|
video_path=object_name,
|
|
source_type="video",
|
|
)
|
|
db.add(project)
|
|
db.commit()
|
|
db.refresh(project)
|
|
project_id = project.id
|
|
object_name = f"uploads/{project_id}/{file.filename}"
|
|
# Re-upload with corrected path
|
|
upload_file(object_name, data, content_type=file.content_type or "application/octet-stream", length=len(data))
|
|
project.video_path = object_name
|
|
db.commit()
|
|
logger.info("Auto-created project id=%s for upload %s", project_id, file.filename)
|
|
|
|
logger.info("Upload complete: %s (size=%d bytes). Async parsing queued.", object_name, len(data))
|
|
|
|
return {
|
|
"object_name": object_name,
|
|
"file_url": file_url,
|
|
"size": len(data),
|
|
"project_id": project_id,
|
|
"message": "Upload successful. Parsing job queued.",
|
|
}
|
|
|
|
|
|
@router.post(
|
|
"/upload/dicom",
|
|
status_code=status.HTTP_201_CREATED,
|
|
summary="Upload multiple DICOM files",
|
|
)
|
|
async def upload_dicom_batch(
|
|
files: List[UploadFile] = File(...),
|
|
project_id: Optional[int] = Form(None),
|
|
db: Session = Depends(get_db),
|
|
) -> dict:
|
|
"""Upload multiple .dcm files for a DICOM series.
|
|
|
|
If project_id is provided, files are added to the existing project.
|
|
Otherwise a new DICOM project is created.
|
|
"""
|
|
if not files:
|
|
raise HTTPException(status_code=400, detail="No files uploaded")
|
|
|
|
uploaded = []
|
|
|
|
if project_id:
|
|
project = db.query(Project).filter(Project.id == project_id).first()
|
|
if not project:
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
else:
|
|
# Create new DICOM project
|
|
first_name = files[0].filename or "DICOM_Series"
|
|
project = Project(
|
|
name=first_name,
|
|
description=f"DICOM series with {len(files)} files",
|
|
status=PROJECT_STATUS_PENDING,
|
|
source_type="dicom",
|
|
)
|
|
db.add(project)
|
|
db.commit()
|
|
db.refresh(project)
|
|
project_id = project.id
|
|
logger.info("Auto-created DICOM project id=%s", project_id)
|
|
|
|
for file in files:
|
|
if not file.filename or not file.filename.lower().endswith(".dcm"):
|
|
continue
|
|
data = await file.read()
|
|
object_name = f"uploads/{project_id}/dicom/{file.filename}"
|
|
try:
|
|
upload_file(object_name, data, content_type="application/dicom", length=len(data))
|
|
uploaded.append(object_name)
|
|
except Exception as exc: # noqa: BLE001
|
|
logger.error("Failed to upload DICOM %s: %s", file.filename, exc)
|
|
|
|
project.video_path = f"uploads/{project_id}/dicom"
|
|
db.commit()
|
|
|
|
return {
|
|
"project_id": project_id,
|
|
"uploaded_count": len(uploaded),
|
|
"message": f"Uploaded {len(uploaded)} DICOM files. Parsing job queued.",
|
|
}
|
|
|
|
|
|
@router.post(
|
|
"/parse",
|
|
status_code=status.HTTP_202_ACCEPTED,
|
|
response_model=ProcessingTaskOut,
|
|
summary="Trigger frame extraction",
|
|
)
|
|
def parse_media(
|
|
project_id: int,
|
|
source_type: Optional[str] = None,
|
|
db: Session = Depends(get_db),
|
|
) -> ProcessingTask:
|
|
"""Create a background task for media frame extraction.
|
|
|
|
The Celery worker performs the heavy FFmpeg/OpenCV/pydicom work and
|
|
updates the persisted task record as it progresses.
|
|
"""
|
|
project = db.query(Project).filter(Project.id == project_id).first()
|
|
if not project:
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
|
|
if not project.video_path:
|
|
raise HTTPException(status_code=400, detail="Project has no media uploaded")
|
|
|
|
effective_source = source_type or project.source_type or "video"
|
|
task = ProcessingTask(
|
|
task_type=f"parse_{effective_source}",
|
|
status=TASK_STATUS_QUEUED,
|
|
progress=0,
|
|
message="解析任务已入队",
|
|
project_id=project_id,
|
|
payload={"source_type": effective_source},
|
|
)
|
|
project.status = PROJECT_STATUS_PARSING
|
|
db.add(task)
|
|
db.commit()
|
|
db.refresh(task)
|
|
publish_task_progress_event(task)
|
|
|
|
async_result = parse_project_media.delay(task.id)
|
|
task.celery_task_id = async_result.id
|
|
db.commit()
|
|
db.refresh(task)
|
|
|
|
logger.info("Queued parse task id=%s project_id=%s celery_id=%s", task.id, project_id, async_result.id)
|
|
return task
|