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:
@@ -54,12 +54,6 @@ export const memoirApi = {
|
||||
);
|
||||
},
|
||||
|
||||
regenerateChapter(chapterId: string) {
|
||||
return api.post<{ status: string; message: string }>(
|
||||
`/api/chapters/${chapterId}/regenerate`,
|
||||
);
|
||||
},
|
||||
|
||||
fetchMemoirState() {
|
||||
return api.get<MemoirState>('/api/memoir-state');
|
||||
},
|
||||
|
||||
37
app-expo/src/features/memoir/framework-chapter-keys.ts
Normal file
37
app-expo/src/features/memoir/framework-chapter-keys.ts
Normal file
@@ -0,0 +1,37 @@
|
||||
import type { ChapterViewModel } from './types';
|
||||
|
||||
/**
|
||||
* 与后端 `CHAPTER_ORDER` / `CHAPTER_CATEGORIES` 顺序一致;对应 i18n `memoir.frameworkChapters.*`。
|
||||
*/
|
||||
export const FRAMEWORK_CHAPTER_KEYS = [
|
||||
'chapter1',
|
||||
'chapter2',
|
||||
'chapter3',
|
||||
'chapter4',
|
||||
'chapter5',
|
||||
'chapter6',
|
||||
'chapter7',
|
||||
'chapter8',
|
||||
] as const;
|
||||
|
||||
export type FrameworkChapterKey = (typeof FRAMEWORK_CHAPTER_KEYS)[number];
|
||||
|
||||
export function buildFrameworkChapterPlaceholders(
|
||||
tr: (key: string) => string,
|
||||
): ChapterViewModel[] {
|
||||
return FRAMEWORK_CHAPTER_KEYS.map((key, orderIndex) => ({
|
||||
id: `framework:${key}`,
|
||||
title: tr(`frameworkChapters.${key}`),
|
||||
category: '',
|
||||
orderIndex,
|
||||
isEmpty: true,
|
||||
isNew: false,
|
||||
hasImages: false,
|
||||
allImagesReady: false,
|
||||
pendingImageCount: 0,
|
||||
failedImageCount: 0,
|
||||
coverImageUrl: null,
|
||||
updatedAt: null,
|
||||
wordCount: 0,
|
||||
}));
|
||||
}
|
||||
@@ -6,28 +6,24 @@ function countByStatus(images: ImageAsset[], status: string): number {
|
||||
|
||||
export function toChapterViewModel(chapter: Chapter): ChapterViewModel {
|
||||
const images = chapter.images ?? [];
|
||||
const cover = chapter.cover_image ?? chapter.cover_asset ?? null;
|
||||
const cover = chapter.cover_asset ?? null;
|
||||
const imagesForStatus = cover ? [cover, ...images] : images;
|
||||
const completedCount = countByStatus(imagesForStatus, 'completed');
|
||||
const hasContent =
|
||||
!!(chapter.canonical_markdown ?? '').trim() ||
|
||||
!!(chapter.content ?? '').trim() ||
|
||||
!!(chapter.summary ?? '').trim();
|
||||
const wordCountFromSections = (chapter.sections ?? []).reduce(
|
||||
(sum, s) => sum + (s.content?.length ?? 0),
|
||||
0,
|
||||
);
|
||||
const wordCountFromMarkdown = (chapter.canonical_markdown ?? '').length;
|
||||
const wordCount =
|
||||
typeof chapter.word_count === 'number' && chapter.word_count >= 0
|
||||
? chapter.word_count
|
||||
: wordCountFromSections;
|
||||
: wordCountFromMarkdown;
|
||||
|
||||
return {
|
||||
id: chapter.id,
|
||||
title: chapter.title,
|
||||
category: chapter.category,
|
||||
orderIndex: chapter.order_index,
|
||||
isEmpty: chapter.status === 'empty' || !hasContent,
|
||||
isEmpty: !hasContent,
|
||||
isNew: chapter.is_new,
|
||||
hasImages: imagesForStatus.length > 0,
|
||||
allImagesReady:
|
||||
@@ -36,7 +32,6 @@ export function toChapterViewModel(chapter: Chapter): ChapterViewModel {
|
||||
countByStatus(imagesForStatus, 'pending') +
|
||||
countByStatus(imagesForStatus, 'processing'),
|
||||
failedImageCount: countByStatus(imagesForStatus, 'failed'),
|
||||
sections: chapter.sections ?? [],
|
||||
coverImageUrl: cover?.url ?? null,
|
||||
updatedAt: chapter.updated_at,
|
||||
wordCount,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Markdown 渲染器:使用 react-native-markdown-display 渲染 canonical_markdown。
|
||||
* 线上正文以 asset:// 或已解析的 https 为准;遗留 {{IMAGE:...}} 仅从展示层剥离,不作为协议。
|
||||
* 线上正文以 asset:// 或已解析的 https 为准;{{IMAGE:...}} 仅从展示层剥离,不作为协议。
|
||||
*/
|
||||
|
||||
import { Image } from 'expo-image';
|
||||
@@ -25,13 +25,13 @@ function buildPlaceholderToAssetMap(
|
||||
return map;
|
||||
}
|
||||
|
||||
/** 移除遗留 IMAGE 占位符(不参与正文协议)。 */
|
||||
export function stripLegacyImagePlaceholders(markdown: string): string {
|
||||
/** 移除 IMAGE 占位符(不参与正文协议)。 */
|
||||
export function stripImagePlaceholders(markdown: string): string {
|
||||
return markdown.replace(PLACEHOLDER_RE, '').replace(/\n{3,}/g, '\n\n');
|
||||
}
|
||||
|
||||
/**
|
||||
* 预处理正文:先用 assets 替换可匹配的遗留占位符,再剥离剩余占位符。
|
||||
* 预处理正文:先用 assets 替换可匹配的占位符,再剥离剩余占位符。
|
||||
*/
|
||||
export function replaceImagePlaceholders(
|
||||
markdown: string,
|
||||
@@ -47,7 +47,7 @@ export function replaceImagePlaceholders(
|
||||
return ``;
|
||||
});
|
||||
}
|
||||
return stripLegacyImagePlaceholders(out);
|
||||
return stripImagePlaceholders(out);
|
||||
}
|
||||
|
||||
/** 顶层正文段落(body 直属,非列表/引用内)用于首行缩进 */
|
||||
|
||||
@@ -44,37 +44,26 @@ export interface ImageAsset {
|
||||
updated_at: string | null;
|
||||
}
|
||||
|
||||
export interface ChapterSection {
|
||||
content: string;
|
||||
image: ImageAsset | null;
|
||||
}
|
||||
|
||||
/** 章节详情:与 chapter_story_links 顺序一致,每段故事正文 + 主配图 */
|
||||
export interface ChapterReadingSegment {
|
||||
story_id: string;
|
||||
body_markdown: string;
|
||||
cover_image: ImageAsset | null;
|
||||
cover_asset: ImageAsset | null;
|
||||
}
|
||||
|
||||
export interface Chapter {
|
||||
id: string;
|
||||
title: string;
|
||||
content: string;
|
||||
order_index: number;
|
||||
status: string;
|
||||
category: string;
|
||||
images: ImageAsset[];
|
||||
cover_image: ImageAsset | null;
|
||||
/** 列表接口与 cover_image 同构(资产化封面) */
|
||||
cover_asset?: ImageAsset | null;
|
||||
sections: ChapterSection[];
|
||||
cover_asset: ImageAsset | null;
|
||||
summary?: string;
|
||||
/** 列表接口:与 canonical 一致的字符规模(后端 word_count) */
|
||||
word_count?: number;
|
||||
/** 正文真源,优先用于渲染 */
|
||||
canonical_markdown?: string | null;
|
||||
/** 图片等资源映射,与 canonical_markdown 配合使用 */
|
||||
rendered_assets?: ImageAsset[];
|
||||
/** 有 story 编排时的分段阅读(正文不含故事标题,配图按故事) */
|
||||
reading_segments?: ChapterReadingSegment[];
|
||||
updated_at: string | null;
|
||||
@@ -138,9 +127,8 @@ export interface ChapterViewModel {
|
||||
allImagesReady: boolean;
|
||||
pendingImageCount: number;
|
||||
failedImageCount: number;
|
||||
sections: ChapterSection[];
|
||||
coverImageUrl: string | null;
|
||||
updatedAt: string | null;
|
||||
/** 优先使用列表接口的 word_count,否则由 sections 推算 */
|
||||
/** 优先使用列表接口的 word_count,否则由 canonical_markdown 推算 */
|
||||
wordCount: number;
|
||||
}
|
||||
|
||||
@@ -107,10 +107,14 @@ export function usePurgeUserData() {
|
||||
|
||||
// ─── Legal ───
|
||||
|
||||
export function useLegalDoc(type: LegalDocType) {
|
||||
export function useLegalDoc(
|
||||
type: LegalDocType,
|
||||
options?: { enabled?: boolean },
|
||||
) {
|
||||
return useQuery({
|
||||
queryKey: profileKeys.legal(type),
|
||||
queryFn: () => profileApi.fetchLegalDoc(type),
|
||||
staleTime: Infinity,
|
||||
enabled: options?.enabled ?? true,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
/**
|
||||
* Player is now fully implemented in hooks/use-player.ts as a self-contained
|
||||
* React hook. expo-audio's hook-centric API (useAudioPlayer + useAudioPlayerStatus)
|
||||
* makes a class-level player impractical — completion detection, source replacement,
|
||||
* and lifecycle management all need React context.
|
||||
*
|
||||
* This file re-exports the hook for backward compatibility with any imports.
|
||||
*/
|
||||
export { usePlayer } from './hooks/use-player';
|
||||
@@ -18,21 +18,6 @@ const CREATE_TABLE_SQL = `
|
||||
|
||||
let initialized = false;
|
||||
|
||||
async function migrateLegacyVoiceMessageLocal(): Promise<void> {
|
||||
const rows = await querySql<{ name: string }>(
|
||||
`SELECT name FROM sqlite_master WHERE type='table' AND name='voice_message_local'`,
|
||||
);
|
||||
if (rows.length === 0) return;
|
||||
const now = Date.now();
|
||||
await executeSql(
|
||||
`INSERT OR IGNORE INTO segment_outbox (conversation_id, voice_session_id, segment_index, file_uri, duration_ms, status, retry_count, created_at)
|
||||
SELECT conversation_id, voice_session_id, 0, file_uri, duration_ms, 'sent', 0, ?
|
||||
FROM voice_message_local`,
|
||||
[now],
|
||||
);
|
||||
await executeSql(`DROP TABLE IF EXISTS voice_message_local`);
|
||||
}
|
||||
|
||||
async function ensureTable(): Promise<void> {
|
||||
if (initialized) return;
|
||||
await executeSql(CREATE_TABLE_SQL);
|
||||
@@ -40,7 +25,6 @@ async function ensureTable(): Promise<void> {
|
||||
`CREATE UNIQUE INDEX IF NOT EXISTS uq_segment_outbox_voice_session_segment
|
||||
ON segment_outbox(voice_session_id, segment_index)`,
|
||||
);
|
||||
await migrateLegacyVoiceMessageLocal();
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
@@ -192,6 +176,3 @@ export const voiceSegmentStore = {
|
||||
initialized = false;
|
||||
},
|
||||
} as const;
|
||||
|
||||
/** @deprecated 使用 voiceSegmentStore */
|
||||
export const segmentOutbox = voiceSegmentStore;
|
||||
|
||||
Reference in New Issue
Block a user