wsb1224
25c6f2a3b7
功能 文件 说明 幻灯片显隐 routes.py, PptResult.vue, ppt-api.ts 每页可点击隐藏/恢复，隐藏页在缩略图中半透明显示，页码标注隐藏数量 DeckContract 快照 renderer.py, celery_tasks.py, ppt_session.py 生成时保存完整 deck JSON 到文件系统，供版本化回溯 版本化生成 celery_tasks.py, task_service.py, routes.py POST /preview/:id/regenerate → 递增版本号 → 用 deck 重新渲染 → 追加到版本历史，不覆盖旧版 版本历史 UI PptResult.vue 右栏显示版本列表（版本号/页数/时间），当前版本高亮标记 数据库迁移 migrate_025.py 新增 deck_contract_path、versions_json 字段 阶段 4：UI 重构 功能 文件 说明 保险绿主题 PptPage.vue, PptGenerate.vue, PptResult.vue, PptSlideCanvas.vue 主色从 #2563eb 蓝改为 #3B7A57 保险绿，背景暖灰 #f0f7f3 生成决策展示 PptGenerate.vue 新增"系统决策"区域，展示检测场景、选用模板、计划书数量、险种类型、保司 骨架屏加载 PptResult.vue preview_status=none/generating 时显示骨架屏 + 加载动画，不再显示静态 fallback 新增后端接口（本轮） 方法 路径 功能 POST /ppt/preview/:id/regenerate 基于编辑内容生成新版本 PUT /ppt/preview/:id/slide/:index 增加 hidden 字段支持 新增 Celery 任务 任务名 说明 insurance.regenerate_ppt 读取 DeckContract → 应用编辑 → 重新渲染 → 保存新版本
243 lines
8.8 KiB
Python
243 lines
8.8 KiB
Python
"""统一任务服务：创建、查询、取消任务。"""
|
||
import json
|
||
import logging
|
||
import uuid
|
||
from datetime import datetime
|
||
|
||
logger = logging.getLogger(__name__)
|
||
|
||
|
||
def create_task(user_id: str, artifact_type: str, operation: str,
|
||
workspace_id: str, title: str = "",
|
||
input_snapshot: dict = None, idempotency_key: str = None) -> dict:
|
||
"""创建生成任务并提交到 Celery。
|
||
|
||
返回 {"code": 0, "data": task_dict} 或错误。
|
||
"""
|
||
from insurance.db.compat import db
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
# 幂等检查
|
||
if idempotency_key:
|
||
existing = GenerationTask.query.filter_by(
|
||
idempotency_key=idempotency_key,
|
||
).filter(GenerationTask.status.in_(["queued", "running", "done"])).first()
|
||
if existing:
|
||
return {"code": 0, "data": existing.to_dict(), "message": "任务已存在"}
|
||
|
||
# 检查同一工作区是否有运行中的任务
|
||
active = GenerationTask.query.filter_by(
|
||
workspace_id=workspace_id,
|
||
).filter(GenerationTask.status.in_(["queued", "running"])).first()
|
||
if active:
|
||
return {"code": 1001, "message": "该工作区有正在执行的任务，请等待完成", "data": None}
|
||
|
||
task = GenerationTask(
|
||
id=uuid.uuid4().hex,
|
||
user_id=user_id,
|
||
artifact_type=artifact_type,
|
||
operation=operation,
|
||
workspace_id=workspace_id,
|
||
title_snapshot=title,
|
||
input_snapshot_json=json.dumps(input_snapshot, ensure_ascii=False) if input_snapshot else None,
|
||
idempotency_key=idempotency_key,
|
||
)
|
||
db.session.add(task)
|
||
db.session.commit()
|
||
|
||
# 提交到 Celery。投递失败时必须结束数据库任务，不能留下永久 queued。
|
||
try:
|
||
_dispatch_to_celery(task)
|
||
except Exception as exc:
|
||
message = f"任务提交失败: {exc}"
|
||
logger.error("任务 %s 提交到 Celery 失败: %s", task.id, exc, exc_info=True)
|
||
task.status = "failed"
|
||
task.error_code = "dispatch_failed"
|
||
task.error_message = message[:1000]
|
||
task.finished_at = datetime.now()
|
||
db.session.commit()
|
||
_sync_failed_ppt_session(task, message)
|
||
return {"code": 9999, "message": message, "data": task.to_dict()}
|
||
|
||
return {"code": 0, "data": task.to_dict()}
|
||
|
||
|
||
def _dispatch_to_celery(task):
|
||
"""根据任务类型分发到对应的 Celery 任务。"""
|
||
from insurance.generation.celery_tasks import (
|
||
parse_ppt_task, generate_ppt_task, regenerate_ppt_task,
|
||
parse_poster_task, generate_poster_task,
|
||
)
|
||
|
||
task_map = {
|
||
("ppt", "parse"): parse_ppt_task,
|
||
("ppt", "generate"): generate_ppt_task,
|
||
("ppt", "regenerate"): regenerate_ppt_task,
|
||
("poster", "parse"): parse_poster_task,
|
||
("poster", "generate"): generate_poster_task,
|
||
}
|
||
|
||
celery_task_fn = task_map.get((task.artifact_type, task.operation))
|
||
if not celery_task_fn:
|
||
logger.error(f"未知任务类型: {task.artifact_type}/{task.operation}")
|
||
task.status = "failed"
|
||
task.error_code = "unknown_type"
|
||
task.error_message = f"未知任务类型: {task.artifact_type}/{task.operation}"
|
||
from insurance.db.compat import db
|
||
db.session.commit()
|
||
return
|
||
|
||
result = celery_task_fn.apply_async(args=[task.id], queue="insurance")
|
||
task.celery_task_id = result.id
|
||
from insurance.db.compat import db
|
||
db.session.commit()
|
||
logger.info(f"任务 {task.id} 已提交到 Celery: {result.id}")
|
||
|
||
|
||
def _sync_failed_ppt_session(task, message: str):
|
||
"""将 PPT 解析任务失败同步到工作区，避免页面永久停在 parsing。"""
|
||
if task.artifact_type != "ppt" or task.operation != "parse":
|
||
return
|
||
|
||
from insurance.db.compat import db
|
||
from insurance.models.ppt_session import PptSession
|
||
|
||
session = PptSession.query.get(task.workspace_id)
|
||
if not session or session.status != "parsing":
|
||
return
|
||
if session.latest_task_id and session.latest_task_id != task.id:
|
||
return
|
||
|
||
session.status = "error"
|
||
session.parse_progress = 100
|
||
session.parse_message = "处理失败"
|
||
session.parse_error = message[:1000]
|
||
session.parse_finished_at = datetime.now()
|
||
db.session.commit()
|
||
|
||
|
||
def list_active_tasks(user_id: str, artifact_type: str = None) -> list:
|
||
"""查询用户活跃任务（任务坞用）。"""
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
query = GenerationTask.query.filter_by(user_id=user_id)
|
||
query = query.filter(GenerationTask.dock_hidden_at.is_(None))
|
||
if artifact_type:
|
||
query = query.filter_by(artifact_type=artifact_type)
|
||
|
||
# 只返回活跃和最近完成的任务
|
||
query = query.filter(
|
||
GenerationTask.status.in_(["queued", "running", "done", "failed"])
|
||
)
|
||
query = query.order_by(GenerationTask.created_at.desc())
|
||
tasks = query.limit(20).all()
|
||
return [t.to_dict() for t in tasks]
|
||
|
||
|
||
def list_tasks(user_id: str, artifact_type: str = None,
|
||
status: str = None, page: int = 1, page_size: int = 20) -> dict:
|
||
"""查询任务列表（任务中心用）。"""
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
query = GenerationTask.query.filter_by(user_id=user_id)
|
||
if artifact_type:
|
||
query = query.filter_by(artifact_type=artifact_type)
|
||
if status:
|
||
query = query.filter_by(status=status)
|
||
query = query.order_by(GenerationTask.created_at.desc())
|
||
|
||
total = query.count()
|
||
items = query.offset((page - 1) * page_size).limit(page_size).all()
|
||
return {
|
||
"total": total,
|
||
"items": [t.to_dict() for t in items],
|
||
}
|
||
|
||
|
||
def get_task(task_id: str, user_id: str) -> dict:
|
||
"""获取任务详情。"""
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
task = GenerationTask.query.get(task_id)
|
||
if not task or task.user_id != user_id:
|
||
return {"code": 1002, "message": "任务不存在", "data": None}
|
||
return {"code": 0, "data": task.to_dict()}
|
||
|
||
|
||
def cancel_task(task_id: str, user_id: str) -> dict:
|
||
"""取消排队中的任务。"""
|
||
from insurance.db.compat import db
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
task = GenerationTask.query.get(task_id)
|
||
if not task or task.user_id != user_id:
|
||
return {"code": 1002, "message": "任务不存在", "data": None}
|
||
if task.status != "queued":
|
||
return {"code": 1001, "message": "只能取消排队中的任务", "data": None}
|
||
|
||
task.status = "cancelled"
|
||
task.finished_at = datetime.now()
|
||
db.session.commit()
|
||
|
||
return {"code": 0, "data": task.to_dict()}
|
||
|
||
|
||
def hide_task_from_dock(task_id: str, user_id: str) -> dict:
|
||
"""从任务坞隐藏任务。"""
|
||
from insurance.db.compat import db
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
task = GenerationTask.query.get(task_id)
|
||
if not task or task.user_id != user_id:
|
||
return {"code": 1002, "message": "任务不存在", "data": None}
|
||
|
||
task.dock_hidden_at = datetime.now()
|
||
db.session.commit()
|
||
return {"code": 0, "data": task.to_dict()}
|
||
|
||
|
||
# ─── 过期任务恢复 ──────────────────────────────────────────
|
||
|
||
STALE_TASK_TIMEOUT = 600 # 10 分钟无心跳视为过期
|
||
|
||
|
||
def recover_stale_tasks():
|
||
"""启动时恢复过期任务：将长时间无心跳的 running 任务标记为 failed。
|
||
|
||
应在应用启动时调用。
|
||
"""
|
||
from insurance.db.compat import db
|
||
from insurance.models.generation_task import GenerationTask
|
||
|
||
cutoff = datetime.now().timestamp() - STALE_TASK_TIMEOUT
|
||
|
||
# 恢复无心跳的 running 任务
|
||
stale_running = GenerationTask.query.filter(
|
||
GenerationTask.status == "running",
|
||
GenerationTask.heartbeat_at < datetime.fromtimestamp(cutoff),
|
||
).all()
|
||
for task in stale_running:
|
||
task.status = "failed"
|
||
task.error_code = "stale"
|
||
task.error_message = "任务因服务重启而中断，请重新提交"
|
||
task.finished_at = datetime.now()
|
||
_sync_failed_ppt_session(task, task.error_message)
|
||
logger.warning(f"恢复过期任务: {task.id} (workspace={task.workspace_id})")
|
||
|
||
# 恢复长时间 queued 的任务（可能 Celery 未消费）
|
||
stale_queued = GenerationTask.query.filter(
|
||
GenerationTask.status == "queued",
|
||
GenerationTask.created_at < datetime.fromtimestamp(cutoff),
|
||
).all()
|
||
for task in stale_queued:
|
||
task.status = "failed"
|
||
task.error_code = "queue_timeout"
|
||
task.error_message = "任务排队超时，请重新提交"
|
||
task.finished_at = datetime.now()
|
||
_sync_failed_ppt_session(task, task.error_message)
|
||
logger.warning(f"恢复排队超时任务: {task.id}")
|
||
|
||
if stale_running or stale_queued:
|
||
db.session.commit()
|
||
logger.info(f"已恢复 {len(stale_running)} 个运行过期任务, {len(stale_queued)} 个排队超时任务")
|