fix: 批量任务进度实时汇总,暂停/中断时前端不再显示 0/总数 0%
batch_jobs.done 此前只在任务整体完成时一次性汇总,处理中途(尤其被暂停) 恒为 0,导致前端显示 "0/431 完成 0%" 而实际已处理多个视频 (回归 batch_fee668175444:已处理 15 个仍显示 0/431)。 - db: 新增 sync_batch_job_progress(按明细实时重算 done=COMPLETED+SKIPPED、 failed=FAILED 并落库)与 refresh_batch_job(对齐后返回最新任务) - batch 引擎: 暂停返回、SKIPPED/COMPLETED continue、视频缺失、单视频异常后、 任务收尾等边界统一调用实时对齐,替代收尾一次性 sum - routers/batch: 列表/详情读取前实时对齐,即使引擎不在运行也返回真实进度 - tests: 新增 6 条 TDD 回归测试覆盖 db 助手、引擎暂停、SKIPPED、API 读取侧 同时按用户要求:移除 100% 行覆盖率强制门槛(pytest 不再 --cov-fail-under), 约定小改动只跑相关测试、保证功能可用即可(AGENTS.md 与 pyproject.toml)。
This commit is contained in:
@@ -9,10 +9,16 @@ from __future__ import annotations
|
||||
import json
|
||||
import sqlite3
|
||||
from contextlib import contextmanager
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Any, Iterator
|
||||
|
||||
|
||||
def _now_iso() -> str:
|
||||
"""返回当前 UTC 时间的 ISO 格式字符串(与批量引擎的时间戳一致)。"""
|
||||
return datetime.now(timezone.utc).isoformat()
|
||||
|
||||
|
||||
class Database:
|
||||
"""SQLite 数据库封装:负责建表以及工作流/任务/产物的 CRUD。"""
|
||||
|
||||
@@ -551,6 +557,46 @@ class Database:
|
||||
with self._connect() as conn:
|
||||
conn.execute(f"UPDATE batch_jobs SET {assignments} WHERE id = ?", values)
|
||||
|
||||
|
||||
def sync_batch_job_progress(self, job_id: str) -> None:
|
||||
"""按视频明细实时重算任务的 done/failed 汇总并落库。
|
||||
|
||||
明细里 COMPLETED 与 SKIPPED 都计入 done(它们都不再需要处理,是任务
|
||||
已完成的工作量);FAILED 计入 failed;PAUSED/PENDING 等状态不计。
|
||||
引擎在暂停、视频间检查、收尾等边界调用,router 在读取前也调用,保证
|
||||
前端看到的进度始终与明细一致——即使任务被暂停或进程被终止,汇总字段
|
||||
也不会停留在创建时的 0(回归 batch_fee668175444:处理了 15 个仍显示
|
||||
0/431)。任务不存在时静默返回。
|
||||
"""
|
||||
with self._connect() as conn:
|
||||
counts = conn.execute(
|
||||
"""
|
||||
SELECT
|
||||
SUM(CASE WHEN status IN ('COMPLETED', 'SKIPPED') THEN 1 ELSE 0 END) AS done,
|
||||
SUM(CASE WHEN status = 'FAILED' THEN 1 ELSE 0 END) AS failed
|
||||
FROM batch_videos WHERE job_id = ?
|
||||
""",
|
||||
(job_id,),
|
||||
).fetchone()
|
||||
if counts is None or counts["done"] is None:
|
||||
# 任务不存在或没有任何明细:无需更新。
|
||||
return
|
||||
conn.execute(
|
||||
"UPDATE batch_jobs SET done = ?, failed = ?, updated_at = ? WHERE id = ?",
|
||||
(int(counts["done"]), int(counts["failed"]), _now_iso(), job_id),
|
||||
)
|
||||
|
||||
def refresh_batch_job(self, job_id: str) -> dict[str, Any] | None:
|
||||
"""实时对齐任务汇总后返回最新记录(读取侧统一入口)。
|
||||
|
||||
先 sync_batch_job_progress 让 done/failed 与明细一致,再返回最新 job;
|
||||
任务不存在返回 None。批量引擎与 router 共用此入口,保证各处看到的
|
||||
进度数字一致。
|
||||
"""
|
||||
self.sync_batch_job_progress(job_id)
|
||||
return self.get_batch_job(job_id)
|
||||
|
||||
|
||||
def delete_batch_job(self, job_id: str) -> None:
|
||||
"""删除批量任务记录及其全部视频明细(不含 workflow_runs)。"""
|
||||
with self._connect() as conn:
|
||||
|
||||
Reference in New Issue
Block a user