refactor(api,expo): 多智能体与会话收敛、回忆录兼容层移除、后端测试集大幅删减
- 对齐「多智能体收敛」与「回忆录 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 若依赖这些用例需按新策略补测或调整流水线。
This commit is contained in:
Kevin
@@ -8,18 +8,13 @@ from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import joinedload
|
||||
|
||||
from app.agents.memoir.prompts import (
|
||||
CHAPTER_CATEGORIES,
|
||||
CHAPTER_ORDER,
|
||||
STAGE_TO_ORDER,
|
||||
)
|
||||
from app.core.logging import get_logger
|
||||
from app.core.storage_purge import delete_object_storage_keys_best_effort
|
||||
from app.features.memoir import repo
|
||||
from app.features.memoir.asset_resolver import (
|
||||
collect_asset_ids_for_chapter,
|
||||
collect_asset_ids_for_chapters,
|
||||
strip_legacy_image_placeholders,
|
||||
strip_image_placeholders,
|
||||
)
|
||||
from app.features.memoir.asset_urls import signed_urls_for_asset_ids
|
||||
from app.features.memoir.chapter_markdown_compose import (
|
||||
@@ -78,6 +73,18 @@ class MemoirService:
|
||||
await self._db.commit()
|
||||
await self._db.refresh(ch)
|
||||
|
||||
async def _ensure_chapter_materialized(self, chapter: Chapter) -> Chapter:
|
||||
has_story_links = bool(getattr(chapter, "story_links", None))
|
||||
has_snapshot = chapter.reading_segments_json is not None
|
||||
if not has_story_links or (has_snapshot and not chapter.markdown_compose_dirty):
|
||||
return chapter
|
||||
|
||||
markdown = materialize_chapter_markdown_from_loaded_chapter(chapter)
|
||||
await repo.append_chapter_compose_version_async(self._db, chapter, markdown)
|
||||
await self._db.commit()
|
||||
refreshed = await repo.get_chapter_by_id(chapter.id, self._db)
|
||||
return refreshed or chapter
|
||||
|
||||
async def get_current_book(self, user_id: str) -> dict:
|
||||
book = await repo.get_current_book(user_id, self._db)
|
||||
if not book:
|
||||
@@ -151,47 +158,18 @@ class MemoirService:
|
||||
async def get_chapters(
|
||||
self, user_id: str, is_new: bool | None = None
|
||||
) -> List[dict]:
|
||||
chapters = await repo.get_chapters_with_sections(
|
||||
chapters = await repo.get_chapters_for_memoir_list(
|
||||
user_id, self._db, is_new_only=is_new
|
||||
)
|
||||
if not chapters:
|
||||
return []
|
||||
|
||||
asset_ids: set[str] = set()
|
||||
for ch in chapters:
|
||||
asset_ids |= collect_asset_ids_for_chapter(ch)
|
||||
asset_map = await signed_urls_for_asset_ids(self._db, asset_ids)
|
||||
chapter_by_category: dict[str, Chapter] = {}
|
||||
for ch in chapters:
|
||||
if ch.category and ch.category not in chapter_by_category:
|
||||
chapter_by_category[ch.category] = ch
|
||||
all_chapters: List[dict] = []
|
||||
for category in CHAPTER_ORDER:
|
||||
ch = chapter_by_category.pop(category, None)
|
||||
if ch:
|
||||
await self._cleanup_unavailable_images(ch)
|
||||
all_chapters.append(chapter_to_list_dict(ch, asset_url_map=asset_map))
|
||||
else:
|
||||
if is_new is True:
|
||||
continue
|
||||
all_chapters.append(
|
||||
{
|
||||
"id": f"placeholder_{category}",
|
||||
"title": CHAPTER_CATEGORIES[category],
|
||||
"category": category,
|
||||
"order_index": STAGE_TO_ORDER.get(category, 999),
|
||||
"status": "empty",
|
||||
"summary": "",
|
||||
"canonical_markdown": "",
|
||||
"content": "",
|
||||
"cover_asset": None,
|
||||
"cover_image": None,
|
||||
"images": [],
|
||||
"sections": [],
|
||||
"word_count": 0,
|
||||
"updated_at": None,
|
||||
"is_new": False,
|
||||
"source_segments": [],
|
||||
}
|
||||
)
|
||||
for ch in chapter_by_category.values():
|
||||
for ch in chapters:
|
||||
await self._cleanup_unavailable_images(ch)
|
||||
all_chapters.append(chapter_to_list_dict(ch, asset_url_map=asset_map))
|
||||
return all_chapters
|
||||
@@ -204,6 +182,7 @@ class MemoirService:
|
||||
raise HTTPException(status_code=403, detail="无权访问此章节")
|
||||
if not chapter.is_active:
|
||||
raise HTTPException(status_code=404, detail="Chapter not found")
|
||||
chapter = await self._ensure_chapter_materialized(chapter)
|
||||
await self._cleanup_unavailable_images(chapter)
|
||||
asset_map = await signed_urls_for_asset_ids(
|
||||
self._db, collect_asset_ids_for_chapter(chapter)
|
||||
@@ -226,21 +205,6 @@ class MemoirService:
|
||||
)
|
||||
return {"status": "ok", "message": "章节已清除"}
|
||||
|
||||
async def regenerate_chapter(self, chapter_id: str, user_id: str) -> dict:
|
||||
chapter = await self._db.get(Chapter, chapter_id)
|
||||
if not chapter:
|
||||
raise HTTPException(status_code=404, detail="Chapter not found")
|
||||
if chapter.user_id != user_id:
|
||||
raise HTTPException(status_code=403, detail="无权操作此章节")
|
||||
n = await repo.count_chapter_story_links(self._db, chapter_id)
|
||||
if n > 0:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="该章节由故事编排驱动，请更新故事正文或调整故事顺序，不支持在此处整章再生。",
|
||||
)
|
||||
# TODO: 非 story-backed 章节的 LLM 重新整理
|
||||
return {"status": "ok", "message": "Chapter regeneration triggered"}
|
||||
|
||||
async def set_chapter_story_order(
|
||||
self, chapter_id: str, user_id: str, story_ids: list[str]
|
||||
) -> dict:
|
||||
@@ -290,7 +254,7 @@ class MemoirService:
|
||||
|
||||
async def check_and_trigger_cover_generation(self, user_id: str) -> dict:
|
||||
"""
|
||||
有正文、尚无 cover_asset、且 legacy 封面 MemoirImage 未 completed 时，
|
||||
有正文、尚无 cover_asset、且封面 MemoirImage 未 completed 时，
|
||||
派发 generate_chapter_cover（由 intent/asset 闭环完成）。
|
||||
"""
|
||||
from app.tasks.chapter_cover_enqueue import try_enqueue_generate_chapter_cover
|
||||
@@ -299,17 +263,17 @@ class MemoirService:
|
||||
if not img_settings.enabled:
|
||||
return {"triggered": []}
|
||||
|
||||
chapters = await repo.get_chapters_with_sections(
|
||||
chapters = await repo.get_chapters_for_memoir_list(
|
||||
user_id, self._db, active_only=True, is_new_only=None
|
||||
)
|
||||
triggered: List[str] = []
|
||||
for ch in chapters:
|
||||
if not ch.category or ch.status == "empty":
|
||||
if not ch.category or not getattr(ch, "story_links", None):
|
||||
continue
|
||||
if getattr(ch, "cover_asset_id", None):
|
||||
continue
|
||||
md = (ch.canonical_markdown or "").strip()
|
||||
body = strip_legacy_image_placeholders(md).strip() if md else ""
|
||||
body = strip_image_placeholders(md).strip() if md else ""
|
||||
if not body:
|
||||
continue
|
||||
cover_rec = primary_chapter_memoir_image(ch)
|
||||
|
||||
Reference in New Issue
Block a user