- 对齐「多智能体收敛」与「回忆录 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 若依赖这些用例需按新策略补测或调整流水线。
183 lines
6.7 KiB
Python
183 lines
6.7 KiB
Python
"""回忆录序列化与图片归一化辅助(供 MemoirService 使用)。"""
|
||
|
||
from app.core.config import settings
|
||
from app.core.logging import get_logger
|
||
from app.features.memoir.asset_resolver import resolve_asset_refs_in_markdown
|
||
from app.features.memoir.cover_eligibility import (
|
||
chapter_eligible_for_cover_by_inline_body_image_count,
|
||
primary_chapter_memoir_image,
|
||
)
|
||
from app.features.memoir.memoir_images.schema import (
|
||
IMAGE_STATUS_COMPLETED,
|
||
IMAGE_STATUS_FAILED,
|
||
completed_image_assets,
|
||
normalize_image_assets,
|
||
)
|
||
from app.features.memoir.memoir_images.serializers import memoir_image_to_dict
|
||
from app.features.memoir.memoir_images.settings import MemoirImageSettings
|
||
from app.features.memoir.memoir_images.storage import (
|
||
CosDownloadUrlError,
|
||
TencentCosStorageService,
|
||
mark_image_delivery_unavailable,
|
||
normalize_cos_url,
|
||
resolve_image_storage_key,
|
||
)
|
||
from app.features.memoir.models import Chapter
|
||
from app.features.memoir.reading_segment_materialize import (
|
||
resolve_reading_segments_for_chapter_detail,
|
||
)
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
def first_normalized_image_for_api(img: dict | None) -> dict | None:
|
||
"""单条图片经 schema 归一化后仍可能为空(例如非法状态且无可用字段),勿直接 [0]。"""
|
||
if not img:
|
||
return None
|
||
out = normalize_image_assets_for_api([img])
|
||
return out[0] if out else None
|
||
|
||
|
||
def normalize_image_assets_for_api(images: list[dict] | None) -> list[dict]:
|
||
bucket = settings.tencent_cos_bucket or ""
|
||
region = settings.tencent_cos_region or ""
|
||
base_url = settings.tencent_cos_base_url or ""
|
||
storage = TencentCosStorageService.from_settings(settings)
|
||
img_settings = MemoirImageSettings.from_settings(settings)
|
||
source_assets = normalize_image_assets(images)
|
||
if not img_settings.enabled:
|
||
source_assets = completed_image_assets(source_assets)
|
||
normalized_assets: list[dict] = []
|
||
for item in source_assets:
|
||
asset = dict(item)
|
||
normalized_url = normalize_cos_url(
|
||
asset.get("url"), bucket=bucket, region=region, base_url=base_url
|
||
)
|
||
storage_key = resolve_image_storage_key(asset)
|
||
if asset.get("status") == IMAGE_STATUS_COMPLETED and storage_key:
|
||
try:
|
||
asset["url"] = storage.get_download_url(storage_key)
|
||
except CosDownloadUrlError as exc:
|
||
logger.warning(
|
||
"章节图片签名失败: key=%s, retryable=%s, error=%s",
|
||
storage_key,
|
||
exc.retryable,
|
||
exc,
|
||
)
|
||
asset = mark_image_delivery_unavailable(asset)
|
||
except Exception as exc:
|
||
logger.warning("章节图片签名失败: key=%s, error=%s", storage_key, exc)
|
||
asset = mark_image_delivery_unavailable(asset)
|
||
else:
|
||
asset["url"] = normalized_url
|
||
asset.pop("storage_key", None)
|
||
normalized_assets.append(asset)
|
||
return normalized_assets
|
||
|
||
|
||
def is_image_permanently_unavailable(rec) -> bool:
|
||
if not rec:
|
||
return False
|
||
status = getattr(rec, "status", None) or ""
|
||
retryable = getattr(rec, "retryable", None)
|
||
url = getattr(rec, "url", None)
|
||
storage_key = getattr(rec, "storage_key", None)
|
||
if status == IMAGE_STATUS_FAILED and retryable is False:
|
||
return True
|
||
if status == IMAGE_STATUS_COMPLETED and not url and not storage_key:
|
||
return True
|
||
return False
|
||
|
||
|
||
def chapter_cover_to_dict(
|
||
ch: Chapter, asset_url_map: dict[str, str] | None = None
|
||
) -> dict | None:
|
||
if not chapter_eligible_for_cover_by_inline_body_image_count(ch):
|
||
return None
|
||
m = primary_chapter_memoir_image(ch)
|
||
if m:
|
||
return memoir_image_to_dict(m)
|
||
asset_url_map = asset_url_map or {}
|
||
aid = getattr(ch, "cover_asset_id", None)
|
||
if aid and asset_url_map.get(str(aid)):
|
||
url = asset_url_map[str(aid)]
|
||
return {
|
||
"placeholder": "",
|
||
"description": "章节封面",
|
||
"index": 0,
|
||
"status": IMAGE_STATUS_COMPLETED,
|
||
"prompt": None,
|
||
"url": url,
|
||
"storage_key": None,
|
||
"provider": None,
|
||
"style": None,
|
||
"size": None,
|
||
"error": None,
|
||
"retryable": None,
|
||
"created_at": None,
|
||
"updated_at": None,
|
||
}
|
||
return None
|
||
|
||
|
||
def _chapter_markdown(ch: Chapter) -> str:
|
||
"""正文真源:canonical_markdown。"""
|
||
md = getattr(ch, "canonical_markdown", None)
|
||
if md and str(md).strip():
|
||
return str(md).strip()
|
||
return ""
|
||
|
||
|
||
def chapter_to_list_dict(
|
||
ch: Chapter, asset_url_map: dict[str, str] | None = None
|
||
) -> dict:
|
||
"""列表视图:与详情字段对齐的最小子集。"""
|
||
cover = chapter_cover_to_dict(ch, asset_url_map=asset_url_map)
|
||
cover_normalized = first_normalized_image_for_api(cover)
|
||
canonical_raw = _chapter_markdown(ch)
|
||
wcount = len(canonical_raw.strip()) if canonical_raw else 0
|
||
return {
|
||
"id": ch.id,
|
||
"title": ch.title,
|
||
"category": ch.category,
|
||
"order_index": ch.order_index,
|
||
"status": getattr(ch, "status", None) or "draft",
|
||
"summary": getattr(ch, "summary", None) or "",
|
||
"canonical_markdown": canonical_raw,
|
||
"cover_asset": cover_normalized,
|
||
"images": [],
|
||
"word_count": wcount,
|
||
"updated_at": ch.updated_at.isoformat() if ch.updated_at else None,
|
||
"is_new": getattr(ch, "is_new", False),
|
||
"source_segments": getattr(ch, "source_segments", None) or [],
|
||
}
|
||
|
||
|
||
def chapter_to_dict(ch: Chapter, asset_url_map: dict[str, str] | None = None) -> dict:
|
||
"""详情视图:stories-first 契约。asset_url_map 用于解析 asset:// 与 cover_asset_id。"""
|
||
asset_url_map = asset_url_map or {}
|
||
resolve = lambda aid: asset_url_map.get(aid) # noqa: E731
|
||
|
||
cover = chapter_cover_to_dict(ch, asset_url_map=asset_url_map)
|
||
cover_normalized = first_normalized_image_for_api(cover)
|
||
# 正文真源:优先 canonical_markdown
|
||
canonical_md = _chapter_markdown(ch)
|
||
canonical_md = resolve_asset_refs_in_markdown(canonical_md, resolve)
|
||
reading_segments = resolve_reading_segments_for_chapter_detail(
|
||
ch, asset_url_map=asset_url_map
|
||
)
|
||
return {
|
||
"id": ch.id,
|
||
"title": ch.title,
|
||
"canonical_markdown": canonical_md,
|
||
"order_index": ch.order_index,
|
||
"status": ch.status,
|
||
"category": ch.category,
|
||
"images": [],
|
||
"cover_asset": cover_normalized,
|
||
"reading_segments": reading_segments,
|
||
"updated_at": ch.updated_at.isoformat() if ch.updated_at else None,
|
||
"is_new": ch.is_new,
|
||
"source_segments": ch.source_segments or [],
|
||
}
|