- 对齐「多智能体收敛」与「回忆录 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 若依赖这些用例需按新策略补测或调整流水线。
138 lines
4.2 KiB
Python
138 lines
4.2 KiB
Python
"""
|
||
章节封面 Celery 任务入队闸门:DB 二次校验 + Redis 短时去重,避免重复 delay 同一 chapter。
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
from typing import Literal
|
||
|
||
import redis
|
||
from sqlalchemy import select
|
||
from sqlalchemy.orm import joinedload
|
||
|
||
from app.core.config import settings
|
||
from app.core.db import get_sync_db
|
||
from app.core.logging import get_logger
|
||
from app.features.memoir.asset_resolver import strip_image_placeholders
|
||
from app.features.memoir.cover_eligibility import (
|
||
chapter_eligible_for_cover_by_inline_body_image_count,
|
||
chapter_has_story_links,
|
||
chapter_needs_cover_enqueue,
|
||
primary_chapter_memoir_image,
|
||
)
|
||
from app.features.memoir.models import Chapter, ChapterStoryLink
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
CHAPTER_COVER_ENQUEUE_DEDUP_TTL_SECONDS = 450
|
||
_ENQUEUE_KEY_PREFIX = "enqueue:chapter-cover:"
|
||
|
||
|
||
def _enqueue_dedup_key(chapter_id: str) -> str:
|
||
return f"{_ENQUEUE_KEY_PREFIX}{chapter_id}"
|
||
|
||
|
||
def _chapter_eligible_for_http_enqueue(chapter: Chapter | None) -> bool:
|
||
"""与 MemoirService.check_and_trigger_cover_generation 循环条件一致。"""
|
||
if not chapter:
|
||
return False
|
||
if not chapter.category:
|
||
return False
|
||
if not chapter_has_story_links(chapter):
|
||
return False
|
||
if getattr(chapter, "cover_asset_id", None):
|
||
return False
|
||
md = (chapter.canonical_markdown or "").strip()
|
||
body = md or ""
|
||
if not body.strip():
|
||
return False
|
||
body = strip_image_placeholders(body).strip()
|
||
if not body:
|
||
return False
|
||
if not chapter_eligible_for_cover_by_inline_body_image_count(chapter):
|
||
return False
|
||
cover_rec = primary_chapter_memoir_image(chapter)
|
||
if cover_rec and (cover_rec.status or "").strip() == "completed":
|
||
return False
|
||
return True
|
||
|
||
|
||
def _chapter_eligible_for_pipeline_enqueue(chapter: Chapter | None) -> bool:
|
||
"""尚无 cover_asset、正文插图数 > 3(与 HTTP 闸门共用 chapter_needs_cover_enqueue 核心)。"""
|
||
return bool(chapter_needs_cover_enqueue(chapter))
|
||
|
||
|
||
def _load_chapter_for_enqueue_sync(chapter_id: str) -> Chapter | None:
|
||
with get_sync_db() as db:
|
||
stmt = (
|
||
select(Chapter)
|
||
.where(Chapter.id == chapter_id)
|
||
.options(
|
||
joinedload(Chapter.images),
|
||
joinedload(Chapter.story_links).joinedload(ChapterStoryLink.story),
|
||
)
|
||
)
|
||
return db.execute(stmt).unique().scalar_one_or_none()
|
||
|
||
|
||
def try_enqueue_generate_chapter_cover(
|
||
chapter_id: str,
|
||
source: Literal["http", "pipeline"] = "pipeline",
|
||
) -> bool:
|
||
"""
|
||
若章节仍需要生成封面,则 SET NX 去重后派发 generate_chapter_cover。
|
||
|
||
Returns:
|
||
True 当且仅当成功调用 delay(通过闸门)。
|
||
"""
|
||
chapter = _load_chapter_for_enqueue_sync(chapter_id)
|
||
if source == "http":
|
||
eligible = _chapter_eligible_for_http_enqueue(chapter)
|
||
else:
|
||
eligible = _chapter_eligible_for_pipeline_enqueue(chapter)
|
||
if not eligible:
|
||
return False
|
||
|
||
key = _enqueue_dedup_key(chapter_id)
|
||
try:
|
||
client = redis.from_url(settings.redis_url, decode_responses=True)
|
||
if not client.set(
|
||
key, "1", nx=True, ex=CHAPTER_COVER_ENQUEUE_DEDUP_TTL_SECONDS
|
||
):
|
||
logger.debug(
|
||
"chapter_cover enqueue skipped (dedup): chapter=%s source=%s",
|
||
chapter_id,
|
||
source,
|
||
)
|
||
return False
|
||
except Exception as exc:
|
||
logger.warning(
|
||
"chapter_cover enqueue dedup redis failed, allowing enqueue: chapter=%s error=%s",
|
||
chapter_id,
|
||
exc,
|
||
)
|
||
|
||
from app.tasks.chapter_cover_tasks import generate_chapter_cover
|
||
|
||
try:
|
||
generate_chapter_cover.delay(chapter_id)
|
||
except Exception as exc:
|
||
logger.warning(
|
||
"chapter_cover delay failed: chapter=%s error=%s",
|
||
chapter_id,
|
||
exc,
|
||
)
|
||
try:
|
||
client = redis.from_url(settings.redis_url, decode_responses=True)
|
||
client.delete(key)
|
||
except Exception:
|
||
pass
|
||
return False
|
||
|
||
logger.info(
|
||
"chapter_cover enqueued: chapter=%s source=%s",
|
||
chapter_id,
|
||
source,
|
||
)
|
||
return True
|