- 打通工作区真实标注闭环:支持手工多边形、矩形、圆形、点区域和线段生成 mask,并可保存、回显、更新和删除后端 annotation。 - 增强 polygon 编辑器:支持顶点拖动、顶点删除、边中点插入、多 polygon 子区域选择编辑,以及区域合并和区域去除。 - 接入 GT mask 导入:后端支持二值/多类别 mask 拆分、contour 转 polygon、distance transform seed point,前端支持导入、回显和 seed point 拖动编辑。 - 完善导出能力:COCO JSON 导出对齐前端,PNG mask ZIP 同时包含单标注 mask、按 zIndex 融合的 semantic_frame 和 semantic_classes.json。 - 打通异步任务管理:新增任务取消、重试、失败详情接口与 Dashboard 控件,worker 支持取消状态检查并通过 Redis/WebSocket 推送 cancelled 事件。 - 对接 Dashboard 后端数据:概览统计、解析队列和实时流转记录从 FastAPI 聚合接口与 WebSocket 更新。 - 增强 AI 推理参数:前端发送 crop_to_prompt、auto_filter_background 和 min_score,后端支持点/框 prompt 局部裁剪推理、结果回映射和负向点/低分过滤。 - 接入 SAM3 基础设施:新增独立 Python 3.12 sam3 环境安装脚本、外部 worker helper、后端桥接和真实 Python/CUDA/包/HF checkpoint access 状态检测。 - 保留 SAM3 授权边界:当前官方 facebook/sam3 gated 权重未授权时状态接口会返回不可用,不伪装成可推理。 - 增强前端状态管理:新增 mask undo/redo 历史栈、AI 模型选择状态、保存状态 dirty/draft/saved 流转和项目状态归一化。 - 更新前端 API 封装:补充 annotation CRUD、GT mask import、mask ZIP export、task cancel/retry/detail、AI runtime status 和 prediction options。 - 更新 UI 控件:ToolsPalette、AISegmentation、VideoWorkspace 和 CanvasArea 接入真实操作、导入导出、撤销重做、任务控制和模型状态。 - 新增 polygon-clipping 依赖,用于前端区域 union/difference 几何运算。 - 完善后端 schemas/status/progress:补充 AI 模型外部状态字段、任务 cancelled 状态和进度事件 payload。 - 补充测试覆盖:新增后端任务控制、SAM3 桥接、GT mask、导出融合、AI options 测试;补充前端 Canvas、Dashboard、VideoWorkspace、ToolsPalette、API 和 store 测试。 - 更新 README、AGENTS 和 doc 文档:冻结当前需求/设计/测试计划,标注真实功能、剩余 Mock、SAM3 授权边界和后续实施顺序。
141 lines
4.6 KiB
Python
141 lines
4.6 KiB
Python
"""Dashboard overview endpoints."""
|
|
|
|
import os
|
|
from datetime import datetime, timezone
|
|
from typing import Any
|
|
|
|
from fastapi import APIRouter, Depends
|
|
from sqlalchemy import func
|
|
from sqlalchemy.orm import Session
|
|
|
|
from database import get_db
|
|
from models import Annotation, Frame, ProcessingTask, Project, Template
|
|
|
|
router = APIRouter(prefix="/api/dashboard", tags=["Dashboard"])
|
|
|
|
ACTIVE_TASK_STATUSES = {"queued", "running"}
|
|
MONITORED_TASK_STATUSES = {"queued", "running", "failed", "cancelled"}
|
|
|
|
|
|
def _system_load_percent() -> int:
|
|
"""Return a real host load estimate without adding a psutil dependency."""
|
|
try:
|
|
load_1m = os.getloadavg()[0]
|
|
cpu_count = os.cpu_count() or 1
|
|
return min(100, max(0, round((load_1m / cpu_count) * 100)))
|
|
except (AttributeError, OSError):
|
|
return 0
|
|
|
|
|
|
def _iso_or_none(value: datetime | None) -> str | None:
|
|
if value is None:
|
|
return None
|
|
if value.tzinfo is None:
|
|
value = value.replace(tzinfo=timezone.utc)
|
|
return value.isoformat()
|
|
|
|
|
|
def _task_payload(task: ProcessingTask) -> dict[str, Any]:
|
|
return {
|
|
"id": f"task-{task.id}",
|
|
"task_id": task.id,
|
|
"project_id": task.project_id or 0,
|
|
"name": task.project.name if task.project else f"任务 {task.id}",
|
|
"progress": task.progress,
|
|
"status": task.message or task.status,
|
|
"raw_status": task.status,
|
|
"frame_count": (task.result or {}).get("frames_extracted", 0),
|
|
"error": task.error,
|
|
"updated_at": _iso_or_none(task.updated_at),
|
|
}
|
|
|
|
|
|
@router.get("/overview", summary="Get dashboard overview")
|
|
def get_dashboard_overview(db: Session = Depends(get_db)) -> dict[str, Any]:
|
|
"""Return live dashboard data derived from persisted backend records."""
|
|
project_count = db.query(func.count(Project.id)).scalar() or 0
|
|
frame_count = db.query(func.count(Frame.id)).scalar() or 0
|
|
annotation_count = db.query(func.count(Annotation.id)).scalar() or 0
|
|
template_count = db.query(func.count(Template.id)).scalar() or 0
|
|
active_task_count = (
|
|
db.query(func.count(ProcessingTask.id))
|
|
.filter(ProcessingTask.status.in_(ACTIVE_TASK_STATUSES))
|
|
.scalar()
|
|
or 0
|
|
)
|
|
|
|
projects = db.query(Project).order_by(Project.updated_at.desc()).all()
|
|
recent_tasks = (
|
|
db.query(ProcessingTask)
|
|
.order_by(ProcessingTask.created_at.desc())
|
|
.limit(50)
|
|
.all()
|
|
)
|
|
tasks = [_task_payload(task) for task in recent_tasks if task.status in MONITORED_TASK_STATUSES]
|
|
|
|
activities: list[dict[str, Any]] = []
|
|
for task in recent_tasks[:10]:
|
|
project_name = task.project.name if task.project else f"项目 {task.project_id}"
|
|
activities.append({
|
|
"id": f"task-{task.id}",
|
|
"kind": "task",
|
|
"time": _iso_or_none(task.updated_at),
|
|
"message": task.message or f"任务状态: {task.status}",
|
|
"project": project_name,
|
|
})
|
|
|
|
for project in projects[:10]:
|
|
activities.append({
|
|
"id": f"project-{project.id}",
|
|
"kind": "project",
|
|
"time": _iso_or_none(project.updated_at),
|
|
"message": f"项目状态: {project.status}",
|
|
"project": project.name,
|
|
})
|
|
|
|
recent_annotations = (
|
|
db.query(Annotation)
|
|
.order_by(Annotation.updated_at.desc())
|
|
.limit(10)
|
|
.all()
|
|
)
|
|
for annotation in recent_annotations:
|
|
project_name = annotation.project.name if annotation.project else f"项目 {annotation.project_id}"
|
|
activities.append({
|
|
"id": f"annotation-{annotation.id}",
|
|
"kind": "annotation",
|
|
"time": _iso_or_none(annotation.updated_at),
|
|
"message": f"标注已更新 #{annotation.id}",
|
|
"project": project_name,
|
|
})
|
|
|
|
recent_templates = (
|
|
db.query(Template)
|
|
.order_by(Template.created_at.desc())
|
|
.limit(10)
|
|
.all()
|
|
)
|
|
for template in recent_templates:
|
|
activities.append({
|
|
"id": f"template-{template.id}",
|
|
"kind": "template",
|
|
"time": _iso_or_none(template.created_at),
|
|
"message": f"模板可用: {template.name}",
|
|
"project": "系统",
|
|
})
|
|
|
|
activities.sort(key=lambda item: item["time"] or "", reverse=True)
|
|
|
|
return {
|
|
"summary": {
|
|
"project_count": project_count,
|
|
"parsing_task_count": active_task_count,
|
|
"annotation_count": annotation_count,
|
|
"frame_count": frame_count,
|
|
"template_count": template_count,
|
|
"system_load_percent": _system_load_percent(),
|
|
},
|
|
"tasks": tasks,
|
|
"activity": activities[:10],
|
|
}
|