Put student-first detect learning ahead of the teacher call.
Identity-only senses no longer lock a new cue. Learning stages, journal-generate review, and additive docs follow the closed section 6. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
a65ea98b0c
commit
011cc9dd81
26 files changed
+1893
-89
No files matched your search
@@ -5,8 +5,17 @@ import re
|
||||
|
||||
from context_builder import assemble_text, build_internal_context
|
||||
from debug_store import persist_engine_error, persist_step
|
||||
from detect_learning import (
|
||||
apply_review_decisions,
|
||||
drop_pending,
|
||||
is_bypass_mode,
|
||||
load_pending,
|
||||
save_pending,
|
||||
)
|
||||
from detect_pipeline import KIND_CONFIRM_REMOTE, apply_remote_confirm, prepare_detect_pipeline
|
||||
from dialogue_store import StoreError, list_conversations_for_day, list_messages
|
||||
from engine import EngineError, execute_prompt, load_active_prompt, preview_prompt
|
||||
from entity_detect import DetectError
|
||||
from journal_policy import require_explicit_generate, source_conversation_ids
|
||||
from identity_store import is_maskable_label, list_mappings, mapping_spellings
|
||||
from journal_body import clean_title
|
||||
@@ -372,6 +381,7 @@ def generate_draft(
|
||||
explicit: bool = True,
|
||||
generation_selection: dict | None = None,
|
||||
remember_generation_selection: bool = False,
|
||||
precomputed_mappings: list[dict] | None = None,
|
||||
) -> dict:
|
||||
try:
|
||||
draft = _generate_draft(
|
||||
@@ -382,6 +392,7 @@ def generate_draft(
|
||||
explicit=explicit,
|
||||
generation_selection=generation_selection,
|
||||
remember_generation_selection=remember_generation_selection,
|
||||
precomputed_mappings=precomputed_mappings,
|
||||
)
|
||||
except EngineError as exc:
|
||||
persist_engine_error(
|
||||
@@ -394,6 +405,8 @@ def generate_draft(
|
||||
extra={"conversation_ids": conversation_ids or []},
|
||||
)
|
||||
raise
|
||||
if draft.get("pending_mask_review"):
|
||||
return draft
|
||||
persist_step(
|
||||
profile_id,
|
||||
purpose="journal_generate",
|
||||
@@ -423,6 +436,7 @@ def _generate_draft(
|
||||
explicit: bool = True,
|
||||
generation_selection: dict | None = None,
|
||||
remember_generation_selection: bool = False,
|
||||
precomputed_mappings: list[dict] | None = None,
|
||||
) -> dict:
|
||||
require_explicit_generate(explicit)
|
||||
day = get_day(profile_id, journal_day_id)
|
||||
@@ -564,6 +578,44 @@ def _generate_draft(
|
||||
)
|
||||
rendered_preview = preview_prompt(narrate_prompt, assembled)
|
||||
assert_template_resolved(rendered_preview.get("rendered") or "")
|
||||
detect_mappings = precomputed_mappings
|
||||
if detect_mappings is None and not is_bypass_mode():
|
||||
user_text = "\n".join(source_user)
|
||||
pipe = prepare_detect_pipeline(profile_id, user_text, "")
|
||||
if (pipe.need_review or pipe.candidates) and selected:
|
||||
review_id = save_pending(
|
||||
profile_id,
|
||||
selected[0],
|
||||
"",
|
||||
{
|
||||
"mappings": pipe.mappings,
|
||||
"candidates": pipe.candidates,
|
||||
"user_body": user_text,
|
||||
"kind": pipe.kind,
|
||||
"counters": pipe.counters,
|
||||
"purpose": "journal_generate",
|
||||
"generate": {
|
||||
"journal_day_id": journal_day_id,
|
||||
"conversation_ids": selected,
|
||||
"include_existing": include_existing,
|
||||
"generation_selection": generation_selection,
|
||||
"remember_generation_selection": remember_generation_selection,
|
||||
},
|
||||
},
|
||||
)
|
||||
return {
|
||||
"pending_mask_review": {
|
||||
"id": review_id,
|
||||
"candidates": pipe.candidates,
|
||||
"kind": pipe.kind,
|
||||
"purpose": "journal_generate",
|
||||
},
|
||||
"run_log": run_log,
|
||||
"trace": None,
|
||||
}
|
||||
detect_mappings = pipe.mappings
|
||||
assembled = dict(assembled)
|
||||
assembled["user_body"] = "\n".join(source_user)
|
||||
narrate_result = execute_prompt(
|
||||
narrate_prompt,
|
||||
profile_id,
|
||||
@@ -573,6 +625,7 @@ def _generate_draft(
|
||||
max_tokens=narrate_budget.reserved_output_tokens,
|
||||
disable_context_compression=True,
|
||||
budget=narrate_budget,
|
||||
precomputed_mappings=detect_mappings,
|
||||
)
|
||||
_stamp_log(run_log, "journal_generate", _log_items(narrate_result))
|
||||
title, body = _split_title(narrate_result.get("content") or "")
|
||||
@@ -745,3 +798,30 @@ def _generate_draft(
|
||||
draft["run_log"] = run_log
|
||||
draft["trace"] = bundle
|
||||
return draft
|
||||
|
||||
|
||||
def continue_journal_generate(profile_id: str, journal_day_id: str, review_id: str, decisions: list[dict]) -> dict:
|
||||
pending = load_pending(profile_id, review_id)
|
||||
if not pending or pending.get("purpose") != "journal_generate":
|
||||
raise EngineError("mask_review_missing", "Die Maskierungsprüfung ist nicht mehr gültig.", 404)
|
||||
generate = pending.get("generate") or {}
|
||||
if generate.get("journal_day_id") != journal_day_id:
|
||||
raise EngineError("mask_review_missing", "Die Maskierungsprüfung ist nicht mehr gültig.", 404)
|
||||
if pending.get("kind") == KIND_CONFIRM_REMOTE:
|
||||
try:
|
||||
mappings = apply_remote_confirm(profile_id, pending, decisions)
|
||||
except DetectError as exc:
|
||||
raise EngineError(exc.code, exc.message, getattr(exc, "status_code", 403)) from exc
|
||||
else:
|
||||
mappings = apply_review_decisions(profile_id, pending, decisions)
|
||||
drop_pending(profile_id, review_id)
|
||||
return generate_draft(
|
||||
profile_id,
|
||||
journal_day_id,
|
||||
conversation_ids=generate.get("conversation_ids"),
|
||||
include_existing=bool(generate.get("include_existing")),
|
||||
explicit=True,
|
||||
generation_selection=generate.get("generation_selection"),
|
||||
remember_generation_selection=bool(generate.get("remember_generation_selection")),
|
||||
precomputed_mappings=mappings,
|
||||
)
|
||||
Reference in new issue
Block a user