07c6478742
- 新增 utterance_substance：短时/应答/元话语可跳过记忆检索、阶段 LLM 与资料抽取 LLM；可配置 - 输入归一化：LLM 模式默认仅语音/ASR；配置项写入 .env.example - Memoir Phase1：可选 batch LLM 一次性抽取+分类（失败回退逐段）；Extraction 空槽位时阶段与 current_stage 对齐，prompt 约束收紧 - 叙事与忠实度：narrative_safety、证据重叠/场合锚点、标题 slots 与履历短语 grounded；fidelity 解析失败 fail-open 可配置 - 章节管线：锁 TTL 上调、锁竞争 Celery 重试、Phase2 immediate singleflight 等；story_pipeline_sync / chapter_compose / memoir_tasks 联动 - Memory：compaction / repo / summarizer / evidence 小修；事实 FTS 未命中是否回退最近事实可配置 - 新增 memoir_pipeline_trace；补充 memoir_reliability 文档与多项回归/门控测试
90 lines
3.4 KiB
Python
90 lines
3.4 KiB
Python
"""Celery：story 变更后重组关联章节的 canonical_markdown（物化视图）。"""
|
||
|
||
from datetime import datetime, timezone
|
||
|
||
from celery import shared_task
|
||
|
||
from app.core.chapter_pipeline_lock import (
|
||
acquire_chapter_pipeline_lock,
|
||
release_chapter_pipeline_lock,
|
||
)
|
||
from app.core.config import settings
|
||
from app.core.db import get_sync_db
|
||
from app.core.logging import get_logger
|
||
from app.core.memoir_pipeline_trace import new_memoir_correlation_id
|
||
from app.core.memory_compaction_schedule import schedule_memory_compaction_run
|
||
from app.features.memoir import repo as memoir_repo
|
||
from app.features.memoir.models import Chapter
|
||
|
||
logger = get_logger(__name__)
|
||
|
||
|
||
@shared_task(bind=True, max_retries=8, default_retry_delay=30)
|
||
def recompose_chapter(self, chapter_id: str) -> dict:
|
||
"""
|
||
按章节物化 canonical_markdown：仅当 markdown_compose_dirty 为 True 时执行；
|
||
与 pipeline 共用章节级 Redis 锁，拿不到锁则跳过（依赖后续触发重试）。
|
||
"""
|
||
lock_ttl = int(settings.chapter_pipeline_lock_ttl_seconds)
|
||
user_id: str | None = None
|
||
composed = False
|
||
with get_sync_db() as session:
|
||
chapter = session.get(Chapter, chapter_id)
|
||
if not chapter:
|
||
logger.info("recompose_chapter: chapter_id={} status=not_found", chapter_id)
|
||
return {"status": "not_found"}
|
||
if chapter.markdown_compose_dirty is not True:
|
||
logger.info(
|
||
"recompose_chapter: chapter_id={} status=skip_not_dirty",
|
||
chapter_id,
|
||
)
|
||
return {"status": "skip_not_dirty"}
|
||
uid = str(chapter.user_id)
|
||
stage = str(chapter.category)
|
||
lock_handle = acquire_chapter_pipeline_lock(uid, stage, ttl_seconds=lock_ttl)
|
||
if lock_handle is None:
|
||
logger.info(
|
||
"event=recompose_chapter status=lock_busy_retry "
|
||
"chapter_id={} user_id={} stage={} retry_on_lock={}",
|
||
chapter_id,
|
||
uid,
|
||
stage,
|
||
settings.memoir_recompose_retry_on_lock_contention,
|
||
)
|
||
if settings.memoir_recompose_retry_on_lock_contention:
|
||
countdown = max(15, min(120, lock_ttl // 4))
|
||
raise self.retry(countdown=countdown)
|
||
return {"status": "skip_lock_contention"}
|
||
try:
|
||
composed = memoir_repo.compose_chapter_from_story_links_sync(
|
||
session, chapter_id
|
||
)
|
||
session.commit()
|
||
user_id = uid
|
||
except Exception as exc:
|
||
session.rollback()
|
||
logger.warning(
|
||
"recompose_chapter failed chapter_id={} err={}", chapter_id, exc
|
||
)
|
||
raise self.retry(exc=exc) from exc
|
||
finally:
|
||
release_chapter_pipeline_lock(lock_handle)
|
||
|
||
if user_id:
|
||
schedule_memory_compaction_run(
|
||
user_id,
|
||
{
|
||
"trigger_source": "chapter_recompose",
|
||
"trigger_time": datetime.now(timezone.utc).isoformat(),
|
||
"pipeline_run_id": str(self.request.id),
|
||
"memoir_correlation_id": new_memoir_correlation_id(),
|
||
"recomposed_chapter_ids": [chapter_id],
|
||
},
|
||
)
|
||
logger.info(
|
||
"recompose_chapter: chapter_id={} status={}",
|
||
chapter_id,
|
||
"composed" if composed else "empty",
|
||
)
|
||
return {"status": "composed" if composed else "empty", "chapter_id": chapter_id}
|