功能增加: - 新增后端 /api/ai/smooth-mask 接口,对当前 mask polygon 执行 Chaikin 边缘平滑,并返回 polygon、bbox、area 与拓扑锚点。 - 在右侧实例属性面板加入边缘平滑强度和应用边缘平滑操作,应用后将 mask 标记为 draft/dirty,并通过正常保存链路落库。 - 保存标注与传播 seed 时保留 geometry_smoothing 元数据,自动传播 forward/backward 结果保存前应用同一平滑参数。 - 自动传播 seed signature 纳入平滑参数,修改平滑强度后会触发旧同源传播结果清理并重新传播。 - 支持跨帧跟随同一传播链 mask,AI 推送回工作区时保留当前帧视角。 Bugfix: - 修复中间帧向前传播时旧 forward/backward 同物体结果未被清理导致双重 mask 的问题。 - 修复 propagation worker 写入目标帧前只按旧方向清理导致 backward 重传残留的问题。 - 修复多边形顶点拖拽和编辑后画布视口异常移动的问题,并补充拖拽状态回写。 - 修复实例属性标题跟随全局 active class 而不是当前 mask label 的问题,并移除后端模型置信度展示。 开发与部署: - 新增 restart_dev_services.sh,使用 setsid 独立后台重启 FastAPI、Celery 和前端,写入 pid/log 文件并做 3000/8000 健康检查。 - 明确后端或 Celery 相关改动完成后需要运行重启脚本,保证运行态加载最新代码。 测试与文档: - 补充后端 smooth-mask、传播平滑 metadata、seed signature、传播去重方向覆盖等测试。 - 补充前端 OntologyInspector、VideoWorkspace、CanvasArea 和 api 契约测试,覆盖边缘平滑、传播参数、跨帧选区跟随和画布编辑行为。 - 更新 README、AGENTS、安装文档、前端元素审计、需求冻结、设计冻结和测试计划,记录当前真实行为与重启要求。
320 lines
8.4 KiB
Python
320 lines
8.4 KiB
Python
"""Pydantic schemas for request/response validation."""
|
|
|
|
from datetime import datetime
|
|
from typing import Optional, Any
|
|
from pydantic import BaseModel, ConfigDict
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Project schemas
|
|
# ---------------------------------------------------------------------------
|
|
class ProjectBase(BaseModel):
|
|
name: str
|
|
description: Optional[str] = None
|
|
video_path: Optional[str] = None
|
|
thumbnail_url: Optional[str] = None
|
|
status: Optional[str] = "pending"
|
|
source_type: Optional[str] = "video"
|
|
original_fps: Optional[float] = None
|
|
parse_fps: Optional[float] = 30.0
|
|
|
|
|
|
class ProjectCreate(ProjectBase):
|
|
pass
|
|
|
|
|
|
class ProjectUpdate(BaseModel):
|
|
name: Optional[str] = None
|
|
description: Optional[str] = None
|
|
video_path: Optional[str] = None
|
|
thumbnail_url: Optional[str] = None
|
|
status: Optional[str] = None
|
|
source_type: Optional[str] = None
|
|
original_fps: Optional[float] = None
|
|
parse_fps: Optional[float] = None
|
|
|
|
|
|
class ProjectOut(ProjectBase):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
frame_count: int = 0
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Frame schemas
|
|
# ---------------------------------------------------------------------------
|
|
class FrameBase(BaseModel):
|
|
frame_index: int
|
|
image_url: str
|
|
width: Optional[int] = None
|
|
height: Optional[int] = None
|
|
timestamp_ms: Optional[float] = None
|
|
source_frame_number: Optional[int] = None
|
|
|
|
|
|
class FrameCreate(FrameBase):
|
|
project_id: int
|
|
|
|
|
|
class FrameOut(FrameBase):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
project_id: int
|
|
created_at: datetime
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Template schemas
|
|
# ---------------------------------------------------------------------------
|
|
class TemplateBase(BaseModel):
|
|
name: str
|
|
description: Optional[str] = None
|
|
color: str
|
|
z_index: int = 0
|
|
mapping_rules: Optional[dict[str, Any]] = None
|
|
classes: Optional[list[dict[str, Any]]] = None
|
|
rules: Optional[list[dict[str, Any]]] = None
|
|
|
|
|
|
class TemplateCreate(TemplateBase):
|
|
pass
|
|
|
|
|
|
class TemplateUpdate(BaseModel):
|
|
name: Optional[str] = None
|
|
description: Optional[str] = None
|
|
color: Optional[str] = None
|
|
z_index: Optional[int] = None
|
|
mapping_rules: Optional[dict[str, Any]] = None
|
|
classes: Optional[list[dict[str, Any]]] = None
|
|
rules: Optional[list[dict[str, Any]]] = None
|
|
|
|
|
|
class TemplateOut(TemplateBase):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
created_at: datetime
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Annotation schemas
|
|
# ---------------------------------------------------------------------------
|
|
class AnnotationBase(BaseModel):
|
|
project_id: int
|
|
frame_id: Optional[int] = None
|
|
template_id: Optional[int] = None
|
|
mask_data: Optional[dict[str, Any]] = None
|
|
points: Optional[list[list[float]]] = None
|
|
bbox: Optional[list[float]] = None
|
|
|
|
|
|
class AnnotationCreate(AnnotationBase):
|
|
pass
|
|
|
|
|
|
class AnnotationUpdate(BaseModel):
|
|
mask_data: Optional[dict[str, Any]] = None
|
|
points: Optional[list[list[float]]] = None
|
|
bbox: Optional[list[float]] = None
|
|
template_id: Optional[int] = None
|
|
|
|
|
|
class AnnotationOut(AnnotationBase):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Mask schemas
|
|
# ---------------------------------------------------------------------------
|
|
class MaskBase(BaseModel):
|
|
annotation_id: int
|
|
mask_url: str
|
|
format: str = "png"
|
|
|
|
|
|
class MaskCreate(MaskBase):
|
|
pass
|
|
|
|
|
|
class MaskOut(MaskBase):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
created_at: datetime
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Processing task schemas
|
|
# ---------------------------------------------------------------------------
|
|
class ProcessingTaskOut(BaseModel):
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
id: int
|
|
task_type: str
|
|
status: str
|
|
progress: int
|
|
message: Optional[str] = None
|
|
project_id: Optional[int] = None
|
|
celery_task_id: Optional[str] = None
|
|
payload: Optional[dict[str, Any]] = None
|
|
result: Optional[dict[str, Any]] = None
|
|
error: Optional[str] = None
|
|
created_at: datetime
|
|
started_at: Optional[datetime] = None
|
|
finished_at: Optional[datetime] = None
|
|
updated_at: datetime
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# AI schemas
|
|
# ---------------------------------------------------------------------------
|
|
class PredictRequest(BaseModel):
|
|
image_id: int
|
|
prompt_type: str # point / box / semantic
|
|
prompt_data: Any
|
|
model: Optional[str] = None
|
|
options: Optional[dict[str, Any]] = None
|
|
|
|
|
|
class PredictResponse(BaseModel):
|
|
polygons: list[list[list[float]]]
|
|
scores: Optional[list[float]] = None
|
|
|
|
|
|
class MaskAnalysisRequest(BaseModel):
|
|
frame_id: Optional[int] = None
|
|
mask_data: dict[str, Any]
|
|
points: Optional[list[list[float]]] = None
|
|
bbox: Optional[list[float]] = None
|
|
extract_skeleton: bool = False
|
|
|
|
|
|
class MaskAnalysisResponse(BaseModel):
|
|
confidence: Optional[float] = None
|
|
confidence_source: str
|
|
topology_anchor_count: int
|
|
topology_anchors: list[list[float]]
|
|
area: float
|
|
bbox: Optional[list[float]] = None
|
|
source: Optional[str] = None
|
|
message: str
|
|
|
|
|
|
class SmoothMaskRequest(BaseModel):
|
|
frame_id: Optional[int] = None
|
|
mask_data: dict[str, Any]
|
|
points: Optional[list[list[float]]] = None
|
|
bbox: Optional[list[float]] = None
|
|
strength: float = 0.0
|
|
method: str = "chaikin"
|
|
|
|
|
|
class SmoothMaskResponse(BaseModel):
|
|
polygons: list[list[list[float]]]
|
|
topology_anchor_count: int
|
|
topology_anchors: list[list[float]]
|
|
area: float
|
|
bbox: Optional[list[float]] = None
|
|
smoothing: dict[str, Any]
|
|
message: str
|
|
|
|
|
|
class PropagationSeed(BaseModel):
|
|
polygons: Optional[list[list[list[float]]]] = None
|
|
bbox: Optional[list[float]] = None
|
|
points: Optional[list[list[float]]] = None
|
|
labels: Optional[list[int]] = None
|
|
label: Optional[str] = None
|
|
color: Optional[str] = None
|
|
class_metadata: Optional[dict[str, Any]] = None
|
|
template_id: Optional[int] = None
|
|
source_mask_id: Optional[str] = None
|
|
source_annotation_id: Optional[int] = None
|
|
propagation_seed_signature: Optional[str] = None
|
|
smoothing: Optional[dict[str, Any]] = None
|
|
|
|
|
|
class PropagateRequest(BaseModel):
|
|
project_id: int
|
|
frame_id: int
|
|
model: Optional[str] = "sam2.1_hiera_tiny"
|
|
seed: PropagationSeed
|
|
direction: str = "forward"
|
|
max_frames: int = 30
|
|
include_source: bool = False
|
|
save_annotations: bool = True
|
|
|
|
|
|
class PropagateResponse(BaseModel):
|
|
model: str
|
|
direction: str
|
|
source_frame_id: int
|
|
processed_frame_count: int
|
|
created_annotation_count: int
|
|
annotations: list[AnnotationOut]
|
|
|
|
|
|
class PropagateTaskStep(BaseModel):
|
|
seed: PropagationSeed
|
|
direction: str = "forward"
|
|
max_frames: int = 30
|
|
|
|
|
|
class PropagateTaskRequest(BaseModel):
|
|
project_id: int
|
|
frame_id: int
|
|
model: Optional[str] = "sam2.1_hiera_tiny"
|
|
steps: list[PropagateTaskStep]
|
|
include_source: bool = False
|
|
save_annotations: bool = True
|
|
|
|
|
|
class AiModelStatus(BaseModel):
|
|
id: str
|
|
label: str
|
|
available: bool
|
|
loaded: bool = False
|
|
device: str
|
|
supports: list[str]
|
|
message: str
|
|
package_available: bool = False
|
|
checkpoint_exists: bool = False
|
|
checkpoint_path: Optional[str] = None
|
|
python_ok: bool = True
|
|
torch_ok: bool = True
|
|
cuda_required: bool = False
|
|
external_available: bool = False
|
|
external_python: Optional[str] = None
|
|
|
|
|
|
class GpuStatus(BaseModel):
|
|
available: bool
|
|
device: str
|
|
name: Optional[str] = None
|
|
torch_available: bool
|
|
torch_version: Optional[str] = None
|
|
cuda_version: Optional[str] = None
|
|
|
|
|
|
class AiRuntimeStatus(BaseModel):
|
|
selected_model: str
|
|
gpu: GpuStatus
|
|
models: list[AiModelStatus]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Export schemas
|
|
# ---------------------------------------------------------------------------
|
|
class ExportStatus(BaseModel):
|
|
url: str
|
|
format: str
|