重构回忆录为 story-first / markdown-first 架构并整合图片意图与前端 UI 修复
本次 squash merge 将 codex-story-first-image-intent 的整体改动合入 development，核心内容包括： 1. 后端数据与迁移：新增 stories、story_versions、story_image_intents、chapter_cover_intents、assets 等模型与 Alembic 迁移，建立 story-first、markdown-first、asset-first 的主数据链路。 2. 生成与任务链：引入 StoryBuilderOrchestrator、ChapterComposerOrchestrator、story_image_tasks、chapter_cover_tasks，图片生成从正文占位符改为结构化 intent -> asset -> markdown 回填。 3. 并发与一致性：为 story/chapter intent 增加 claim_token、claimed_at、attempt_count，采用数据库原子 claim 为主、Redis 锁为辅，避免重复生成、锁误删和 processing 卡死。 4. Memoir 读写路径：章节 canonical_markdown 成为正文真源，列表/详情接口补齐 markdown、cover_asset、word_count 等字段，PDF 与 asset 解析链路同步升级。 5. Memory / Retrieval：扩展 transcript ingest、chunking、evidence 检索与 story 聚合基础设施，为后续 story-first RAG 与多 agent 编排提供底座。 6. App 端体验：章节页继续走 MarkdownRenderer 阅读链，同时吸收 fix3-19 的跨平台 UI glitch 修复；更新对话页、首页、文案资源与章节列表映射逻辑。 7. 测试与文档：补充 asset resolver、story image task、章节封面派发、markdown 映射等回归测试，并加入图片占位符退役设计文档。
This commit is contained in:
Kevin
@@ -14,21 +14,31 @@ from app.core.db import Base, utc_now
|
||||
|
||||
|
||||
class Chapter(Base):
|
||||
"""章节：阅读与导出视图，canonical_markdown 为正文真源。"""
|
||||
|
||||
__tablename__ = "chapters"
|
||||
|
||||
id = Column(String, primary_key=True)
|
||||
user_id = Column(String, ForeignKey("users.id"), nullable=False)
|
||||
book_id = Column(String, ForeignKey("books.id", ondelete="SET NULL"), nullable=True)
|
||||
title = Column(String, nullable=False)
|
||||
order_index = Column(Integer, nullable=False)
|
||||
status = Column(String, default="draft")
|
||||
cover_image = Column(JSON, nullable=True)
|
||||
updated_at = Column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
|
||||
category = Column(String, nullable=True)
|
||||
order_index = Column(Integer, nullable=False)
|
||||
summary = Column(Text, nullable=True)
|
||||
canonical_markdown = Column(Text, nullable=True) # 当前生效正文（markdown-first）
|
||||
status = Column(String, default="draft") # active / draft / archived
|
||||
cover_image = Column(JSON, nullable=True) # 兼容旧数据，逐步迁移到 cover_asset_id
|
||||
cover_asset_id = Column(String, nullable=True)
|
||||
current_version_id = Column(String, nullable=True) # FK 在 migration 中分步添加
|
||||
created_at = Column(DateTime(timezone=True), default=utc_now)
|
||||
updated_at = Column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
|
||||
# 兼容旧运行时，迁移后废弃
|
||||
is_new = Column(Boolean, default=True)
|
||||
is_active = Column(Boolean, default=True)
|
||||
source_segments = Column(JSON, nullable=True)
|
||||
|
||||
user = relationship("User", back_populates="chapters")
|
||||
book = relationship("Book", back_populates="chapters")
|
||||
sections = relationship(
|
||||
"ChapterSection",
|
||||
back_populates="chapter",
|
||||
@@ -41,6 +51,27 @@ class Chapter(Base):
|
||||
foreign_keys="MemoirImage.chapter_id",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
versions = relationship(
|
||||
"ChapterVersion",
|
||||
back_populates="chapter",
|
||||
foreign_keys="ChapterVersion.chapter_id",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
current_version = relationship(
|
||||
"ChapterVersion",
|
||||
primaryjoin="Chapter.current_version_id == ChapterVersion.id",
|
||||
foreign_keys="ChapterVersion.id",
|
||||
)
|
||||
story_links = relationship(
|
||||
"ChapterStoryLink",
|
||||
back_populates="chapter",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
cover_intents = relationship(
|
||||
"ChapterCoverIntent",
|
||||
back_populates="chapter",
|
||||
cascade="all, delete-orphan",
|
||||
)
|
||||
|
||||
|
||||
class ChapterSection(Base):
|
||||
@@ -101,6 +132,95 @@ class MemoirImage(Base):
|
||||
)
|
||||
|
||||
|
||||
class ChapterVersion(Base):
|
||||
"""Chapter 版本快照，记录正文变更与来源。"""
|
||||
|
||||
__tablename__ = "chapter_versions"
|
||||
|
||||
id = Column(String, primary_key=True)
|
||||
chapter_id = Column(
|
||||
String,
|
||||
ForeignKey("chapters.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
)
|
||||
version_no = Column(Integer, nullable=False)
|
||||
markdown_snapshot = Column(Text, nullable=False)
|
||||
change_summary = Column(Text, nullable=True)
|
||||
actor_type = Column(String, nullable=True) # ai / user / editor / system
|
||||
source_type = Column(
|
||||
String, nullable=True
|
||||
) # generate / rewrite / merge / manual / migration
|
||||
parent_version_id = Column(
|
||||
String, ForeignKey("chapter_versions.id", ondelete="SET NULL"), nullable=True
|
||||
)
|
||||
prompt_meta = Column(JSON, nullable=True)
|
||||
created_at = Column(DateTime(timezone=True), default=utc_now)
|
||||
|
||||
chapter = relationship(
|
||||
"Chapter", back_populates="versions", foreign_keys=[chapter_id]
|
||||
)
|
||||
parent_version = relationship(
|
||||
"ChapterVersion",
|
||||
remote_side="ChapterVersion.id",
|
||||
foreign_keys=[parent_version_id],
|
||||
)
|
||||
|
||||
|
||||
class ChapterCoverIntent(Base):
|
||||
"""Chapter 封面意图（结构化）。"""
|
||||
|
||||
__tablename__ = "chapter_cover_intents"
|
||||
|
||||
id = Column(String, primary_key=True)
|
||||
chapter_id = Column(
|
||||
String,
|
||||
ForeignKey("chapters.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
)
|
||||
chapter_version_id = Column(
|
||||
String,
|
||||
ForeignKey("chapter_versions.id", ondelete="SET NULL"),
|
||||
nullable=True,
|
||||
)
|
||||
story_ids = Column(JSON, nullable=True)
|
||||
prompt_brief = Column(Text, nullable=True)
|
||||
status = Column(String, nullable=False)
|
||||
claim_token = Column(String, nullable=True)
|
||||
claimed_at = Column(DateTime(timezone=True), nullable=True)
|
||||
attempt_count = Column(Integer, nullable=False, default=0)
|
||||
asset_id = Column(String, nullable=True)
|
||||
error = Column(Text, nullable=True)
|
||||
created_at = Column(DateTime(timezone=True), default=utc_now)
|
||||
updated_at = Column(DateTime(timezone=True), default=utc_now, onupdate=utc_now)
|
||||
|
||||
chapter = relationship("Chapter", back_populates="cover_intents")
|
||||
|
||||
|
||||
class ChapterStoryLink(Base):
|
||||
"""Chapter 与 Story 的编排关联。"""
|
||||
|
||||
__tablename__ = "chapter_story_links"
|
||||
|
||||
id = Column(String, primary_key=True)
|
||||
chapter_id = Column(
|
||||
String,
|
||||
ForeignKey("chapters.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
index=True,
|
||||
)
|
||||
story_id = Column(
|
||||
String, ForeignKey("stories.id", ondelete="CASCADE"), nullable=False, index=True
|
||||
)
|
||||
order_index = Column(Integer, nullable=False)
|
||||
role = Column(String, nullable=True) # core / bridge / appendix
|
||||
created_at = Column(DateTime(timezone=True), default=utc_now)
|
||||
|
||||
chapter = relationship("Chapter", back_populates="story_links")
|
||||
story = relationship("Story", back_populates="chapter_links")
|
||||
|
||||
|
||||
class Book(Base):
|
||||
__tablename__ = "books"
|
||||
|
||||
@@ -115,6 +235,11 @@ class Book(Base):
|
||||
last_update_chapter_id = Column(String, nullable=True)
|
||||
|
||||
user = relationship("User", back_populates="books")
|
||||
chapters = relationship(
|
||||
"Chapter",
|
||||
back_populates="book",
|
||||
foreign_keys="Chapter.book_id",
|
||||
)
|
||||
|
||||
|
||||
class MemoirState(Base):
|
||||
|
||||
Reference in New Issue
Block a user