feat: 任务进度实时展示、接口测试、暗色主题重构及多项 bug 修复
后端 - 新增 app/task_progress.py 线程安全进度注册表 - 任务改为后台线程异步执行(_run_task_background),手动触发立即返回 task_key - 6 个任务函数(summarizer/tagger/scorer/deduplicator/brief/taxonomy)循环内上报进度 - scheduler 定时任务同步上报进度(trigger=scheduled) - 新增 GET /api/tasks/progress 与 POST /api/tasks/progress/reset 接口 - 新增 POST /api/test-connection 接口连通性测试(独立短超时客户端) - 修复 ai_client/rss_client 配置在 import 时固化的 bug(改为 property 运行时读取 settings), 导致实际任务用 .env 假 key 调 LLM 401 - 修复 ai_client 对 reasoning 模型(MiniMax-M3 等)输出 <think> 块的 JSON 解析失败 - 修复 taxonomy bootstrap:LLM 超时(改用 300s 专用 client)、MiniMax 输出审查 (精简样本仅标题 + 约束生成中性类目名)、失败误报 success(改抛异常如实标记) - 修复 models.py 双外键关系映射启动崩溃(显式 foreign_keys) - 修复 main.py SPA 路由 404、ArticleOut.published_at 序列化 500 - 移除 lifespan 同步 bootstrap 阻塞启动,改由 scheduler 后台异步执行 前端 - Deep Ink 高对比度暗色主题重构,修复 Element Plus 暗色模式对比度问题 - Tasks 页面任务进度实时展示(进度条/阶段/计数/状态/触发来源)+ 1.5s 轮询 - 接口测试面板(rssKeeper / LLM 连通性 + 延迟) - 修复 nextJobs jobId 映射 bug 部署与文档 - Dockerfile 优化(BuildKit 缓存挂载、预编译 wheel、去 gcc、阿里云镜像源) - 新增 API.md 接口文档 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
+24
-1
@@ -19,6 +19,7 @@ from app.deduplicator import deduplicate_articles
|
||||
from app.scorer import score_articles
|
||||
from app.brief import generate_daily_brief
|
||||
from app.settings_manager import get_setting_value
|
||||
from app import task_progress
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -27,6 +28,14 @@ _scheduler: BackgroundScheduler | None = None
|
||||
# 任务互斥锁:防止手动任务与定时任务并发执行
|
||||
_task_lock = threading.Lock()
|
||||
|
||||
# 定时任务函数名 → 进度 key 映射
|
||||
_JOB_TASK_KEYS = {
|
||||
"job_fetch_and_summarize": "summarize",
|
||||
"job_tag_score_deduplicate": "tag_score_dedup",
|
||||
"job_generate_daily_brief": "generate_daily_brief",
|
||||
"job_bootstrap_taxonomy": "bootstrap_taxonomy",
|
||||
}
|
||||
|
||||
|
||||
def get_scheduler() -> BackgroundScheduler:
|
||||
global _scheduler
|
||||
@@ -48,18 +57,32 @@ def get_task_lock():
|
||||
|
||||
|
||||
def _with_db(func):
|
||||
"""装饰器:为任务函数提供数据库会话,并记录运行日志"""
|
||||
"""装饰器:为任务函数提供数据库会话,并记录运行日志,同时上报进度"""
|
||||
@functools.wraps(func)
|
||||
def wrapper():
|
||||
acquired = _task_lock.acquire(blocking=False)
|
||||
if not acquired:
|
||||
logger.warning("定时任务 %s 跳过:已有其他任务正在执行", func.__name__)
|
||||
return
|
||||
task_key = _JOB_TASK_KEYS.get(func.__name__)
|
||||
db = SessionLocal()
|
||||
if task_key:
|
||||
task_progress.update_progress(
|
||||
task_key, status="running", trigger="scheduled",
|
||||
stage="初始化", current=0, total=0, message=None,
|
||||
)
|
||||
try:
|
||||
func(db)
|
||||
if task_key:
|
||||
task_progress.update_progress(
|
||||
task_key, status="success", stage="完成", message="定时任务执行成功"
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.error("定时任务 %s 执行失败: %s", func.__name__, exc, exc_info=True)
|
||||
if task_key:
|
||||
task_progress.update_progress(
|
||||
task_key, status="error", stage="失败", message=str(exc)[:500]
|
||||
)
|
||||
finally:
|
||||
db.close()
|
||||
_task_lock.release()
|
||||
|
||||
Reference in New Issue
Block a user