- 对齐「多智能体收敛」与「回忆录 stories-first / markdown-first」方向:收紧运行时契约、 删除过渡兼容路径与双轨逻辑,并同步更新客户端与文档。 - Chat:以 ChatOrchestrator 为实时编排入口;删除独立 conversation_agent,精简 prompts。 - Memoir:删除 memory_agent;MemoirOrchestrator、classification / story_route 与 prompts 收敛到 prepare_batches + run_story_pipeline_for_category_batch 主链路。 - 将 agents 侧 processor 迁入 feature 层为 background_runner,并移除 features 下重复/过时 processor 封装。 - 新增 history_store,强化「conversation_messages 为 DB 真源、Redis 为缓存」模型。 - 调整 models、repo、service、session_history;精简 WS message_types,重构 pipeline 与 router。 - 移除章节占位、整章再生等旧路径;章节列表与封面逻辑要求 story 关联;收紧 cover 资格与 enqueue。 - helpers、repo、service、router、reading_segment_materialize、story_pipeline_sync、pdf_service 等按 canonical markdown / cover_asset_id 收缩;删除 memoir_images/provider 等冗余。 - tasks:memoir_tasks、chapter_cover_tasks 等大幅瘦身;story_image_tasks 等与当前图片任务对齐。 - core:config、logging、redis、task_tracker 小幅调整。 - auth / user / payment / quota:路由或服务侧删减过时接口或逻辑(如 payment router 行数减少)。 - pyproject.toml、development.sh、.env.example / .env.production、README 等同步说明或变量。 - Alembic 0001_initial_schema 微调(与当前 schema 叙事一致的小改动)。 - 回忆录:types / mappers / api、章节页与 memoir 页与后端契约对齐;markdown-renderer 调整。 - 语音:删除 voice/player,voice-segment-store 相应精简。 - api/tests:删除 conftest 及绝大部分既有测试文件(websocket_baseline、conversation、memoir 图片、PDF、SMS 等),属有意收缩/待按 backend-test-system 重建的信号。 - docs:新增多智能体收敛与移除兼容层计划摘要;更新 story-first 设计、backend-test-system、 multi-agent-refactor-plan、实施总结等。 BREAKING CHANGE: 后端对外契约、回忆录章节字段与若干路由/任务行为已变更;大量 API 测试被移除, CI 若依赖这些用例需按新策略补测或调整流水线。
118 lines
4.0 KiB
Python
118 lines
4.0 KiB
Python
"""
|
||
任务追踪服务:追踪 Celery 任务状态(从 services 迁入 core)
|
||
"""
|
||
|
||
import json
|
||
from app.core.logging import get_logger
|
||
from datetime import datetime, timezone
|
||
from typing import Any, Dict, List, Optional
|
||
|
||
from app.core.redis import redis_service
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
class TaskTracker:
|
||
"""任务追踪器,使用 Redis 存储任务状态"""
|
||
|
||
KEY_PREFIX = "task:user:"
|
||
TASK_TTL = 3600
|
||
|
||
async def add_task(
|
||
self, user_id: str, task_id: str, task_type: str = "memoir"
|
||
) -> bool:
|
||
try:
|
||
client = await redis_service.get_client()
|
||
key = f"{self.KEY_PREFIX}{user_id}:tasks"
|
||
task_info = {
|
||
"task_id": task_id,
|
||
"task_type": task_type,
|
||
"status": "pending",
|
||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||
}
|
||
await client.hset(key, task_id, json.dumps(task_info))
|
||
await client.expire(key, self.TASK_TTL)
|
||
logger.debug("任务已记录: user_id=%s, task_id=%s", user_id, task_id)
|
||
return True
|
||
except Exception as e:
|
||
logger.error("记录任务失败: %s", e)
|
||
return False
|
||
|
||
async def update_task_status(
|
||
self, user_id: str, task_id: str, status: str, result: Any = None
|
||
) -> bool:
|
||
try:
|
||
client = await redis_service.get_client()
|
||
key = f"{self.KEY_PREFIX}{user_id}:tasks"
|
||
data = await client.hget(key, task_id)
|
||
if data:
|
||
task_info = json.loads(data)
|
||
else:
|
||
task_info = {"task_id": task_id}
|
||
task_info["status"] = status
|
||
task_info["updated_at"] = datetime.now(timezone.utc).isoformat()
|
||
if result is not None:
|
||
task_info["result"] = result
|
||
await client.hset(key, task_id, json.dumps(task_info))
|
||
return True
|
||
except Exception as e:
|
||
logger.error("更新任务状态失败: %s", e)
|
||
return False
|
||
|
||
async def get_user_tasks(self, user_id: str) -> List[Dict]:
|
||
try:
|
||
client = await redis_service.get_client()
|
||
key = f"{self.KEY_PREFIX}{user_id}:tasks"
|
||
tasks_data = await client.hgetall(key)
|
||
return [json.loads(data) for data in tasks_data.values()]
|
||
except Exception as e:
|
||
logger.error("获取用户任务失败: %s", e)
|
||
return []
|
||
|
||
async def get_pending_tasks(self, user_id: str) -> List[Dict]:
|
||
tasks = await self.get_user_tasks(user_id)
|
||
return [t for t in tasks if t.get("status") in ("pending", "running")]
|
||
|
||
async def check_tasks_status(self, user_id: str) -> Dict:
|
||
tasks = await self.get_user_tasks(user_id)
|
||
status_counts: Dict[str, int] = {
|
||
"total": len(tasks),
|
||
"pending": 0,
|
||
"running": 0,
|
||
"success": 0,
|
||
"failure": 0,
|
||
}
|
||
for task in tasks:
|
||
status = task.get("status", "pending")
|
||
if status in status_counts:
|
||
status_counts[status] += 1
|
||
status_counts["all_completed"] = (
|
||
status_counts["total"] > 0
|
||
and status_counts["pending"] == 0
|
||
and status_counts["running"] == 0
|
||
)
|
||
return status_counts
|
||
|
||
async def clear_user_tasks(self, user_id: str) -> bool:
|
||
try:
|
||
client = await redis_service.get_client()
|
||
key = f"{self.KEY_PREFIX}{user_id}:tasks"
|
||
await client.delete(key)
|
||
return True
|
||
except Exception as e:
|
||
logger.error("清除用户任务失败: %s", e)
|
||
return False
|
||
|
||
async def remove_task(self, user_id: str, task_id: str) -> bool:
|
||
try:
|
||
client = await redis_service.get_client()
|
||
key = f"{self.KEY_PREFIX}{user_id}:tasks"
|
||
await client.hdel(key, task_id)
|
||
return True
|
||
except Exception as e:
|
||
logger.error("移除任务失败: %s", e)
|
||
return False
|
||
|
||
|
||
task_tracker = TaskTracker()
|