7f57f96c25
本次 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 映射等回归测试，并加入图片占位符退役设计文档。
212 lines
8.3 KiB
Python
212 lines
8.3 KiB
Python
from io import BytesIO
|
||
import unittest
|
||
from unittest.mock import AsyncMock, patch, MagicMock
|
||
|
||
from PIL import Image
|
||
|
||
from app.features.memoir.pdf_service import PDFService
|
||
import app.features.memoir.pdf_service as pdf_service_module
|
||
from app.features.memoir.memoir_images.storage import CosDownloadUrlError
|
||
|
||
|
||
class PDFServiceImagesTest(unittest.IsolatedAsyncioTestCase):
|
||
@patch("app.features.memoir.pdf_service.ReportLabImage")
|
||
@patch("app.features.memoir.pdf_service.httpx.AsyncClient")
|
||
@patch("app.features.memoir.pdf_service.TencentCosStorageService")
|
||
async def test_generate_pdf_preserves_image_aspect_ratio(
|
||
self,
|
||
storage_cls,
|
||
async_client_cls,
|
||
reportlab_image_cls,
|
||
):
|
||
image_buffer = BytesIO()
|
||
Image.new("RGB", (2, 1), color="white").save(image_buffer, format="PNG")
|
||
png_bytes = image_buffer.getvalue()
|
||
mock_response = MagicMock()
|
||
mock_response.content = png_bytes
|
||
mock_response.raise_for_status = MagicMock()
|
||
|
||
mock_client = AsyncMock()
|
||
mock_client.get.return_value = mock_response
|
||
async_client_cls.return_value.__aenter__ = AsyncMock(return_value=mock_client)
|
||
async_client_cls.return_value.__aexit__ = AsyncMock(return_value=False)
|
||
storage = MagicMock()
|
||
storage.get_download_url.return_value = (
|
||
"https://signed.example.com/0.png?sig=123"
|
||
)
|
||
storage_cls.from_env.return_value = storage
|
||
reportlab_image_cls.return_value = MagicMock()
|
||
|
||
service = PDFService()
|
||
book = type("BookStub", (), {"title": "我的回忆录"})()
|
||
chapter = type(
|
||
"ChapterStub",
|
||
(),
|
||
{
|
||
"title": "童年的夏天",
|
||
"content": "{{{{IMAGE:南方小镇的青石板路}}}}",
|
||
"images": [
|
||
{
|
||
"index": 0,
|
||
"placeholder": "{{{{IMAGE:南方小镇的青石板路}}}}",
|
||
"url": "https://life-echo-dev-1319381411.cos.ap-shanghai.myqcloud.com/memoirs/u1/c1/0.png",
|
||
"storage_key": "memoirs/u1/c1/0.png",
|
||
"status": "completed",
|
||
}
|
||
],
|
||
},
|
||
)()
|
||
|
||
await service.generate_pdf(book, [chapter])
|
||
|
||
_, kwargs = reportlab_image_cls.call_args
|
||
self.assertAlmostEqual(kwargs["width"], 5 * 72)
|
||
self.assertAlmostEqual(kwargs["height"], 2.5 * 72)
|
||
|
||
@patch("app.features.memoir.pdf_service.httpx.AsyncClient")
|
||
@patch("app.features.memoir.pdf_service.TencentCosStorageService")
|
||
async def test_generate_pdf_embeds_completed_images_and_removes_placeholders(
|
||
self,
|
||
storage_cls,
|
||
async_client_cls,
|
||
):
|
||
png_bytes = (
|
||
b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01"
|
||
b"\x08\x02\x00\x00\x00\x90wS\xde\x00\x00\x00\x0cIDATx\x9cc```\x00\x00"
|
||
b"\x00\x04\x00\x01\xf6\x178U\x00\x00\x00\x00IEND\xaeB`\x82"
|
||
)
|
||
mock_response = MagicMock()
|
||
mock_response.content = png_bytes
|
||
mock_response.raise_for_status = MagicMock()
|
||
|
||
mock_client = AsyncMock()
|
||
mock_client.get.return_value = mock_response
|
||
async_client_cls.return_value.__aenter__ = AsyncMock(return_value=mock_client)
|
||
async_client_cls.return_value.__aexit__ = AsyncMock(return_value=False)
|
||
storage = MagicMock()
|
||
storage.get_download_url.return_value = (
|
||
"https://signed.example.com/0.png?sig=123"
|
||
)
|
||
storage_cls.from_env.return_value = storage
|
||
|
||
service = PDFService()
|
||
book = type("BookStub", (), {"title": "我的回忆录"})()
|
||
chapter = type(
|
||
"ChapterStub",
|
||
(),
|
||
{
|
||
"title": "童年的夏天",
|
||
"content": "那条路我一直记得。\n\n{{{{IMAGE:南方小镇的青石板路}}}}\n\n奶奶常坐在那里。",
|
||
"images": [
|
||
{
|
||
"index": 0,
|
||
"placeholder": "{{{{IMAGE:南方小镇的青石板路}}}}",
|
||
"url": "https://life-echo-dev-1319381411.cos.ap-shanghai.myqcloud.com/memoirs/u1/c1/0.png",
|
||
"storage_key": "memoirs/u1/c1/0.png",
|
||
"status": "completed",
|
||
}
|
||
],
|
||
},
|
||
)()
|
||
|
||
pdf_bytes = await service.generate_pdf(book, [chapter])
|
||
|
||
self.assertGreater(len(pdf_bytes), 100)
|
||
self.assertNotIn(b"IMAGE:", pdf_bytes)
|
||
mock_client.get.assert_called_once_with(
|
||
"https://signed.example.com/0.png?sig=123"
|
||
)
|
||
|
||
@patch("app.features.memoir.pdf_service.httpx.AsyncClient")
|
||
@patch("app.features.memoir.pdf_service.TencentCosStorageService")
|
||
async def test_generate_pdf_skips_private_cos_url_when_signing_fails(
|
||
self,
|
||
storage_cls,
|
||
async_client_cls,
|
||
):
|
||
mock_client = AsyncMock()
|
||
async_client_cls.return_value.__aenter__ = AsyncMock(return_value=mock_client)
|
||
async_client_cls.return_value.__aexit__ = AsyncMock(return_value=False)
|
||
storage = MagicMock()
|
||
storage.get_download_url.side_effect = CosDownloadUrlError(
|
||
"cos unavailable", retryable=True, request_id="req-err"
|
||
)
|
||
storage_cls.from_env.return_value = storage
|
||
|
||
service = PDFService()
|
||
book = type("BookStub", (), {"title": "我的回忆录"})()
|
||
chapter = type(
|
||
"ChapterStub",
|
||
(),
|
||
{
|
||
"title": "童年的夏天",
|
||
"content": "那条路我一直记得。\n\n{{{{IMAGE:南方小镇的青石板路}}}}\n\n奶奶常坐在那里。",
|
||
"images": [
|
||
{
|
||
"index": 0,
|
||
"placeholder": "{{{{IMAGE:南方小镇的青石板路}}}}",
|
||
"url": "https://life-echo-dev-1319381411.cos.ap-shanghai.myqcloud.com/memoirs/u1/c1/0.png",
|
||
"storage_key": "memoirs/u1/c1/0.png",
|
||
"status": "completed",
|
||
}
|
||
],
|
||
},
|
||
)()
|
||
|
||
pdf_bytes = await service.generate_pdf(book, [chapter])
|
||
|
||
self.assertGreater(len(pdf_bytes), 100)
|
||
mock_client.get.assert_not_called()
|
||
|
||
@patch("app.features.memoir.pdf_service.httpx.AsyncClient")
|
||
@patch("app.features.memoir.pdf_service.TencentCosStorageService")
|
||
async def test_generate_pdf_uses_canonical_markdown_when_present(
|
||
self,
|
||
storage_cls,
|
||
async_client_cls,
|
||
):
|
||
"""PDF 正文真源为 canonical_markdown，与 API / 前端一致。"""
|
||
png_bytes = (
|
||
b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01"
|
||
b"\x08\x02\x00\x00\x00\x90wS\xde\x00\x00\x00\x0cIDATx\x9cc```\x00\x00"
|
||
b"\x00\x04\x00\x01\xf6\x178U\x00\x00\x00\x00IEND\xaeB`\x82"
|
||
)
|
||
mock_response = MagicMock()
|
||
mock_response.content = png_bytes
|
||
mock_response.raise_for_status = MagicMock()
|
||
mock_client = AsyncMock()
|
||
mock_client.get.return_value = mock_response
|
||
async_client_cls.return_value.__aenter__ = AsyncMock(return_value=mock_client)
|
||
async_client_cls.return_value.__aexit__ = AsyncMock(return_value=False)
|
||
storage = MagicMock()
|
||
storage.get_download_url.return_value = "https://signed.example.com/img.png"
|
||
storage_cls.from_env.return_value = storage
|
||
|
||
service = PDFService()
|
||
book = type("BookStub", (), {"title": "我的回忆录"})()
|
||
chapter = type(
|
||
"ChapterStub",
|
||
(),
|
||
{
|
||
"title": "童年",
|
||
"canonical_markdown": "开头。\n\n{{{{IMAGE:南方小镇}}}}\n\n结尾。",
|
||
"sections": [],
|
||
"content": "",
|
||
"images": [
|
||
{
|
||
"index": 0,
|
||
"placeholder": "{{{{IMAGE:南方小镇}}}}",
|
||
"url": None,
|
||
"storage_key": "memoirs/u1/c1/0.png",
|
||
"status": "completed",
|
||
}
|
||
],
|
||
},
|
||
)()
|
||
|
||
pdf_bytes = await service.generate_pdf(book, [chapter])
|
||
|
||
self.assertGreater(len(pdf_bytes), 100)
|
||
self.assertNotIn(b"IMAGE:", pdf_bytes)
|
||
mock_client.get.assert_called_once()
|