- 新增基于 JWT 当前用户的登录恢复、角色权限、用户管理、审计日志和演示出厂重置后台接口与前端管理页。 - 重串 GT_label 导出和 GT Mask 导入逻辑:导出保留类别真实 maskid,导入仅接受灰度或 RGB 等通道 maskid 图,支持未知 maskid 策略、尺寸最近邻拉伸和导入预览。 - 统一分割结果导出体验:默认当前帧,按项目抽帧顺序和 XhXXmXXsXXXms 时间戳命名 ZIP 与图片,补齐 GT/Pro/Mix/分开 Mask 输出和映射 JSON。 - 调整工作区左侧工具栏:移除创建点/线段入口,新增画笔、橡皮擦及尺寸控制,并按绘制、布尔、导入/AI 工具分组分隔。 - 扩展 Canvas 编辑能力:画笔按语义分类绘制并可自动并入连通选中 mask,橡皮擦对选中区域扣除,优化布尔操作、选区、撤销重做和保存状态联动。 - 优化自动传播时间轴显示:同一蓝色系按传播新旧递进变暗,老传播记录达到阈值后统一旧记录色,并维护范围选择与清空后的历史显示。 - 将 AI 智能分割入口替换为更明确的 AI 元素图标,并同步侧栏、工作区和 AI 页面入口表现。 - 完善模板分类、maskid 工具函数、分类树联动、遮罩透明度、边缘平滑和传播链同步相关前端状态。 - 扩展后端项目、媒体、任务、Dashboard、模板和传播 runner 的用户隔离、任务控制、进度事件与兼容处理。 - 补充前后端测试,覆盖用户管理、GT_label 往返导入导出、GT Mask 校验和预览、画笔/橡皮擦、时间轴传播历史、导出范围、WebSocket 与 API 封装。 - 更新 AGENTS、README 和 doc 文档,记录当前接口契约、实现状态、测试计划、安装说明和 maskid/GT_label 规则。
232 lines
7.7 KiB
Python
232 lines
7.7 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, Query, 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, User
|
|
from progress_events import publish_task_progress_event
|
|
from routers.auth import require_editor
|
|
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),
|
|
current_user: User = Depends(require_editor),
|
|
) -> 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,
|
|
Project.owner_user_id == current_user.id,
|
|
).first()
|
|
if not project:
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
project.video_path = object_name
|
|
db.commit()
|
|
logger.info("Linked upload to project_id=%s", 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",
|
|
owner_user_id=current_user.id,
|
|
)
|
|
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),
|
|
current_user: User = Depends(require_editor),
|
|
) -> 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,
|
|
Project.owner_user_id == current_user.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",
|
|
owner_user_id=current_user.id,
|
|
)
|
|
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,
|
|
parse_fps: Optional[float] = Query(None, gt=0, le=120),
|
|
max_frames: Optional[int] = Query(None, gt=0),
|
|
target_width: int = Query(640, ge=64, le=4096),
|
|
db: Session = Depends(get_db),
|
|
current_user: User = Depends(require_editor),
|
|
) -> 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,
|
|
Project.owner_user_id == current_user.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"
|
|
effective_parse_fps = parse_fps or project.parse_fps or 30.0
|
|
task = ProcessingTask(
|
|
task_type=f"parse_{effective_source}",
|
|
status=TASK_STATUS_QUEUED,
|
|
progress=0,
|
|
message="解析任务已入队",
|
|
project_id=project_id,
|
|
payload={
|
|
"source_type": effective_source,
|
|
"parse_fps": effective_parse_fps,
|
|
"max_frames": max_frames,
|
|
"target_width": target_width,
|
|
},
|
|
)
|
|
project.parse_fps = effective_parse_fps
|
|
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
|