feat(eval): memoir A/B chapter judging and eval-web parity with dialogue
- Judge baseline excerpt and library chapter separately; build_memoir_compare_summary for gate, nine-dim and leaf deltas. - Memoir SSE chapter payload: baseline_judge, compare_summary, baseline_judge_error. - MemoirJudgeOutput: loose score coercion and post-validate clamp; memoir judge prompt caps from settings. - app-eval-web: two-column MemoirScoreCard layout, MemoirCompareSummary, chapter blocks and CSS. - Add memoir_compare_summary, log_events, celery_log_context, memoir_pipeline_progress; tests and migration 0014. - Misc: memory/evidence and enrichment paths, task/orchestrator updates, internal-eval docs, env examples.
This commit is contained in:
@@ -1,45 +1,145 @@
|
||||
"""
|
||||
Memory enrichment Celery task — runs asynchronously after ingest to generate
|
||||
summaries, facts, and timeline events without blocking the memoir hot path.
|
||||
summaries, facts, and timeline events without blocking ingest or memoir pipeline.
|
||||
|
||||
Tasks are routed to ``settings.celery_memory_enrichment_queue`` (default ``memory_idle``);
|
||||
run workers with ``-Q celery,memory_idle`` or a dedicated low-priority worker for that queue.
|
||||
"""
|
||||
|
||||
import time
|
||||
|
||||
from celery import shared_task
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
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_progress import merge_fanout_item
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@shared_task(bind=True, max_retries=2, default_retry_delay=30)
|
||||
def enrich_memory_source(self, user_id: str, source_id: str):
|
||||
def schedule_memory_enrichment(
|
||||
user_id: str,
|
||||
source_id: str,
|
||||
*,
|
||||
memoir_correlation_id: str | None = None,
|
||||
) -> str | None:
|
||||
"""
|
||||
Post-ingest enrichment: session summary, rolling summary, facts, timeline.
|
||||
Enqueue post-ingest LLM enrichment on the memory idle queue.
|
||||
|
||||
When ``memoir_correlation_id`` is set, records ``fanout.memory_enrichment`` as enqueued
|
||||
for eval / pipeline progress (same as the former Phase1 loop).
|
||||
"""
|
||||
if not settings.memory_enrichment_enabled:
|
||||
return None
|
||||
uid = (user_id or "").strip()
|
||||
sid = (source_id or "").strip()
|
||||
if not uid or not sid:
|
||||
return None
|
||||
q = (settings.celery_memory_enrichment_queue or "").strip() or "memory_idle"
|
||||
try:
|
||||
ar = enrich_memory_source.apply_async(
|
||||
args=[uid, sid],
|
||||
kwargs={"memoir_correlation_id": memoir_correlation_id},
|
||||
queue=q,
|
||||
)
|
||||
enr_id = getattr(ar, "id", None)
|
||||
if not enr_id:
|
||||
return None
|
||||
cid = (memoir_correlation_id or "").strip()
|
||||
if cid:
|
||||
merge_fanout_item(
|
||||
cid,
|
||||
list_name="memory_enrichment",
|
||||
id_field="source_id",
|
||||
item_id=sid,
|
||||
task_id=str(enr_id),
|
||||
status="enqueued",
|
||||
)
|
||||
return str(enr_id)
|
||||
except Exception as e:
|
||||
logger.warning(
|
||||
"event=memory_enrichment_schedule_failed user_id={} source_id={} exc={} exc_type={}",
|
||||
uid,
|
||||
sid,
|
||||
e,
|
||||
type(e).__name__,
|
||||
)
|
||||
return None
|
||||
|
||||
|
||||
@shared_task(bind=True, max_retries=2, default_retry_delay=30)
|
||||
def enrich_memory_source(
|
||||
self,
|
||||
user_id: str,
|
||||
source_id: str,
|
||||
memoir_correlation_id: str | None = None,
|
||||
):
|
||||
"""
|
||||
Post-ingest enrichment: one LLM call → session summary + structured facts.
|
||||
Runs outside the memoir Phase1 hot path so narrative generation isn't blocked.
|
||||
"""
|
||||
if not settings.memory_enrichment_enabled:
|
||||
return {"status": "disabled"}
|
||||
|
||||
tid = str(self.request.id)
|
||||
t0 = time.perf_counter()
|
||||
logger.info(
|
||||
"event=memory_enrichment_start user_id={} source_id={} task_id={} "
|
||||
"msg=开始记忆富化(会话摘要+事实)",
|
||||
user_id,
|
||||
source_id,
|
||||
tid,
|
||||
)
|
||||
merge_fanout_item(
|
||||
memoir_correlation_id,
|
||||
list_name="memory_enrichment",
|
||||
id_field="source_id",
|
||||
item_id=source_id,
|
||||
task_id=tid,
|
||||
status="running",
|
||||
)
|
||||
try:
|
||||
with get_sync_db() as db:
|
||||
from app.features.memory.enrichment import enrich_memory_after_ingest_sync
|
||||
|
||||
enrich_memory_after_ingest_sync(db, user_id, source_id, llm=None)
|
||||
db.commit()
|
||||
ms = (time.perf_counter() - t0) * 1000
|
||||
logger.info(
|
||||
"event=memory_enrichment_done user_id={} source_id={}",
|
||||
"event=memory_enrichment_done user_id={} source_id={} duration_ms={:.1f} "
|
||||
"msg=记忆富化完成",
|
||||
user_id,
|
||||
source_id,
|
||||
ms,
|
||||
)
|
||||
merge_fanout_item(
|
||||
memoir_correlation_id,
|
||||
list_name="memory_enrichment",
|
||||
id_field="source_id",
|
||||
item_id=source_id,
|
||||
task_id=tid,
|
||||
status="success",
|
||||
)
|
||||
return {"status": "success", "source_id": source_id}
|
||||
except Exception as e:
|
||||
ms = (time.perf_counter() - t0) * 1000
|
||||
logger.warning(
|
||||
"event=memory_enrichment_failed user_id={} source_id={} exc={} exc_type={}",
|
||||
"event=memory_enrichment_failed user_id={} source_id={} duration_ms={:.1f} "
|
||||
"exc={} exc_type={} msg=记忆富化失败",
|
||||
user_id,
|
||||
source_id,
|
||||
ms,
|
||||
e,
|
||||
type(e).__name__,
|
||||
)
|
||||
merge_fanout_item(
|
||||
memoir_correlation_id,
|
||||
list_name="memory_enrichment",
|
||||
id_field="source_id",
|
||||
item_id=source_id,
|
||||
task_id=tid,
|
||||
status="failure",
|
||||
extra={"error": str(e)},
|
||||
)
|
||||
raise self.retry(exc=e) from e
|
||||
|
||||
Reference in New Issue
Block a user