- 打通工作区真实标注闭环:支持手工多边形、矩形、圆形、点区域和线段生成 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 授权边界和后续实施顺序。
113 lines
4.1 KiB
Python
113 lines
4.1 KiB
Python
import json
|
|
from pathlib import Path
|
|
|
|
import numpy as np
|
|
|
|
from services.sam3_engine import SAM3Engine
|
|
|
|
|
|
class _Completed:
|
|
def __init__(self, returncode=0, stdout="", stderr=""):
|
|
self.returncode = returncode
|
|
self.stdout = stdout
|
|
self.stderr = stderr
|
|
|
|
|
|
def _external_settings(monkeypatch, python_path: Path):
|
|
python_path.write_text("#!/usr/bin/env python\n", encoding="utf-8")
|
|
python_path.chmod(0o755)
|
|
monkeypatch.setattr("services.sam3_engine.SAM3_PACKAGE_AVAILABLE", False)
|
|
monkeypatch.setattr("services.sam3_engine.TORCH_AVAILABLE", False)
|
|
monkeypatch.setattr("services.sam3_engine.settings.sam3_external_enabled", True)
|
|
monkeypatch.setattr("services.sam3_engine.settings.sam3_external_python", str(python_path))
|
|
monkeypatch.setattr("services.sam3_engine.settings.sam3_timeout_seconds", 10)
|
|
monkeypatch.setattr("services.sam3_engine.settings.sam3_status_cache_seconds", 30)
|
|
monkeypatch.setattr("services.sam3_engine.settings.sam3_confidence_threshold", 0.4)
|
|
|
|
|
|
def test_sam3_status_reports_external_runtime_ready(tmp_path, monkeypatch):
|
|
_external_settings(monkeypatch, tmp_path / "python")
|
|
|
|
def fake_run(args, **_kwargs):
|
|
assert "--status" in args
|
|
return _Completed(stdout=json.dumps({
|
|
"available": True,
|
|
"package_available": True,
|
|
"python_ok": True,
|
|
"torch_ok": True,
|
|
"cuda_available": True,
|
|
"device": "cuda",
|
|
"message": "ready",
|
|
}))
|
|
|
|
monkeypatch.setattr("services.sam3_engine.subprocess.run", fake_run)
|
|
|
|
status = SAM3Engine().status()
|
|
|
|
assert status["available"] is True
|
|
assert status["external_available"] is True
|
|
assert status["package_available"] is True
|
|
assert status["python_ok"] is True
|
|
assert status["message"] == "SAM 3 external runtime is ready; model will load in the helper process on inference."
|
|
|
|
|
|
def test_sam3_predict_semantic_uses_external_worker(tmp_path, monkeypatch):
|
|
_external_settings(monkeypatch, tmp_path / "python")
|
|
calls = []
|
|
|
|
def fake_run(args, **_kwargs):
|
|
calls.append(args)
|
|
if "--status" in args:
|
|
return _Completed(stdout=json.dumps({
|
|
"available": True,
|
|
"package_available": True,
|
|
"python_ok": True,
|
|
"torch_ok": True,
|
|
"cuda_available": True,
|
|
"device": "cuda",
|
|
"message": "ready",
|
|
}))
|
|
request_path = Path(args[-1])
|
|
request = json.loads(request_path.read_text(encoding="utf-8"))
|
|
assert request["text"] == "vessel"
|
|
assert request["confidence_threshold"] == 0.4
|
|
assert Path(request["image_path"]).exists()
|
|
return _Completed(stdout=json.dumps({
|
|
"polygons": [[[0.1, 0.1], [0.9, 0.1], [0.9, 0.9]]],
|
|
"scores": [0.91],
|
|
}))
|
|
|
|
monkeypatch.setattr("services.sam3_engine.subprocess.run", fake_run)
|
|
|
|
polygons, scores = SAM3Engine().predict_semantic(np.zeros((8, 8, 3), dtype=np.uint8), " vessel ")
|
|
|
|
assert polygons == [[[0.1, 0.1], [0.9, 0.1], [0.9, 0.9]]]
|
|
assert scores == [0.91]
|
|
assert any("--request" in args for args in calls)
|
|
|
|
|
|
def test_sam3_predict_semantic_reports_external_errors(tmp_path, monkeypatch):
|
|
_external_settings(monkeypatch, tmp_path / "python")
|
|
|
|
def fake_run(args, **_kwargs):
|
|
if "--status" in args:
|
|
return _Completed(stdout=json.dumps({
|
|
"available": True,
|
|
"package_available": True,
|
|
"python_ok": True,
|
|
"torch_ok": True,
|
|
"cuda_available": True,
|
|
"device": "cuda",
|
|
"message": "ready",
|
|
}))
|
|
return _Completed(returncode=1, stderr=json.dumps({"error": "HF access denied"}))
|
|
|
|
monkeypatch.setattr("services.sam3_engine.subprocess.run", fake_run)
|
|
|
|
try:
|
|
SAM3Engine().predict_semantic(np.zeros((8, 8, 3), dtype=np.uint8), "vessel")
|
|
except RuntimeError as exc:
|
|
assert "HF access denied" in str(exc)
|
|
else:
|
|
raise AssertionError("Expected SAM 3 external inference failure.")
|