Enhance Roadmap Slot Matching and Off-Topic Detection
Deploy Development / deploy (push) Successful in 44s
Test Suite / pytest-backend (push) Successful in 45s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 13s
Test Suite / k6 /health Baseline (push) Successful in 36s
Test Suite / playwright-tests (push) Successful in 1m23s
Deploy Development / deploy (push) Successful in 44s
Test Suite / pytest-backend (push) Successful in 45s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 13s
Test Suite / k6 /health Baseline (push) Successful in 36s
Test Suite / playwright-tests (push) Successful in 1m23s
- Introduced `auto_rematch_after_qa` parameter in `ProgressionPathSuggestRequest` to enable automatic rematching after quality assurance checks. - Refactored roadmap slot matching logic to improve clarity and functionality, renaming `_build_steps_roadmap_first` to `_match_roadmap_slot`. - Added `_with_roadmap_major_index` utility to streamline off-topic step detection by incorporating roadmap major step indices. - Enhanced off-topic detection logic to utilize the new utility for improved clarity in identifying mismatches and exclusions. - Incremented application version to reflect these updates.
This commit is contained in:
1 parent
a152218c45
commit
1d94c2ebf1
4 files changed
+635
-173
No files matched your search
@@ -14,6 +14,7 @@ from pydantic import BaseModel, Field
|
||||
from tenant_context import TenantContext, library_content_visibility_sql
|
||||
from planning_exercise_profiles import PlanningTargetProfile
|
||||
from planning_path_qa_pipeline import run_multistage_path_qa
|
||||
from planning_path_rematch import collect_rematch_slot_indices, rematch_roadmap_slots
|
||||
from planning_stage_context import build_contextualized_stage_goal, resolve_path_start_target
|
||||
from planning_exercise_path_qa import (
|
||||
apply_llm_path_reorder,
|
||||
@@ -97,6 +98,7 @@ class ProgressionPathSuggestRequest(BaseModel):
|
||||
max_steps: int = Field(default=5, ge=2, le=10)
|
||||
include_llm_intent: bool = True
|
||||
include_path_qa: bool = True
|
||||
auto_rematch_after_qa: bool = True
|
||||
include_llm_path_qa: bool = True
|
||||
include_path_reorder: bool = True
|
||||
include_ai_gap_fill: bool = True
|
||||
@@ -534,6 +536,174 @@ def _annotate_roadmap_step(
|
||||
return step
|
||||
|
||||
|
||||
def _match_roadmap_slot(
|
||||
cur,
|
||||
*,
|
||||
tenant: TenantContext,
|
||||
body: ProgressionPathSuggestRequest,
|
||||
goal_query: str,
|
||||
max_steps: int,
|
||||
semantic_brief: PlanningSemanticBrief,
|
||||
path_target_profile: PlanningTargetProfile,
|
||||
path_intent: str,
|
||||
roadmap_ctx: ProgressionRoadmapContext,
|
||||
stage_spec: StageSpecArtifact,
|
||||
step_index: int,
|
||||
stage_count: int,
|
||||
planned_ids: List[int],
|
||||
anchor_id: Optional[int],
|
||||
anchor_variant_id: Optional[int],
|
||||
used: Set[int],
|
||||
) -> Tuple[Optional[Dict[str, Any]], Optional[StageSpecArtifact]]:
|
||||
"""Einzelnen Roadmap-Slot matchen (Initial-Build und Auto-Rematch)."""
|
||||
major_by_index: Dict[int, MajorStep] = {}
|
||||
if roadmap_ctx.roadmap:
|
||||
major_by_index = {m.index: m for m in roadmap_ctx.roadmap.major_steps}
|
||||
major = major_by_index.get(stage_spec.major_step_index)
|
||||
|
||||
ga_dump = (
|
||||
roadmap_ctx.goal_analysis.model_dump() if roadmap_ctx.goal_analysis else None
|
||||
)
|
||||
rs_dump = (
|
||||
roadmap_ctx.resolved_structured.model_dump()
|
||||
if roadmap_ctx.resolved_structured
|
||||
else None
|
||||
)
|
||||
path_start, path_target = resolve_path_start_target(
|
||||
structured=roadmap_ctx.resolved_structured,
|
||||
goal_analysis=roadmap_ctx.goal_analysis,
|
||||
)
|
||||
brief_summary = (
|
||||
roadmap_ctx.semantic_brief
|
||||
if roadmap_ctx.semantic_brief
|
||||
else brief_to_summary_dict(semantic_brief)
|
||||
)
|
||||
|
||||
stage_spec_dict = stage_spec.model_dump()
|
||||
if major:
|
||||
stage_spec_dict["phase"] = major.phase
|
||||
stage_inp = expectation_input_from_progression_stage(
|
||||
goal_query=goal_query,
|
||||
goal_analysis=ga_dump,
|
||||
resolved_structured=rs_dump,
|
||||
stage_spec=stage_spec_dict,
|
||||
semantic_brief_summary=brief_summary,
|
||||
major_step=major.model_dump() if major else None,
|
||||
)
|
||||
stage_exp = build_planning_skill_expectations(cur, stage_inp, semantic_brief=semantic_brief)
|
||||
step_target = apply_expectations_to_target(path_target_profile, stage_exp)
|
||||
skill_exp_api = stage_exp.to_api_dict() if stage_exp.items else None
|
||||
|
||||
step_query = stage_spec_retrieval_query(
|
||||
semantic_brief=semantic_brief,
|
||||
goal_query=goal_query,
|
||||
stage_spec=stage_spec,
|
||||
major_step=major,
|
||||
)
|
||||
step_kind = resolve_step_exercise_kind_filter(stage_spec, body.exercise_kind_any)
|
||||
stage_goal = (stage_spec.learning_goal or "").strip()
|
||||
stage_start = (stage_spec.start_state or "").strip()
|
||||
stage_target = (stage_spec.target_state or "").strip()
|
||||
contextual_goal = build_contextualized_stage_goal(
|
||||
learning_goal=stage_goal,
|
||||
start_state=stage_start,
|
||||
target_state=stage_target,
|
||||
path_target_state=path_target,
|
||||
path_start_state=path_start,
|
||||
stage_index=step_index,
|
||||
stage_count=stage_count,
|
||||
)
|
||||
path_context_note = None
|
||||
if rs_dump:
|
||||
ctx_parts = [
|
||||
str(rs_dump.get("start_situation") or "").strip()[:120],
|
||||
str(rs_dump.get("target_state") or "").strip()[:120],
|
||||
str(rs_dump.get("roadmap_notes") or "").strip()[:120],
|
||||
]
|
||||
path_context_note = " ".join(p for p in ctx_parts if p)[:240] or None
|
||||
path_anti = resolve_path_anti_patterns(
|
||||
goal_query,
|
||||
semantic_brief=semantic_brief,
|
||||
extra_context=path_context_note,
|
||||
)
|
||||
stage_anti = list(dict.fromkeys([*(stage_spec.anti_patterns or []), *path_anti]))
|
||||
path_primary = (semantic_brief.primary_topic or "").strip()
|
||||
path_tech_excludes = list(semantic_brief.exclude_phrases or [])
|
||||
if semantic_brief.topic_type == "technique" and path_primary:
|
||||
from planning_exercise_semantics import technique_sibling_excludes
|
||||
|
||||
for item in technique_sibling_excludes(path_primary):
|
||||
if item not in path_tech_excludes:
|
||||
path_tech_excludes.append(item)
|
||||
stage_match_brief = build_stage_match_brief(
|
||||
learning_goal=stage_goal,
|
||||
anti_patterns=stage_anti,
|
||||
success_criteria=list(stage_spec.success_criteria or []),
|
||||
load_profile=list(stage_spec.load_profile or []),
|
||||
phase=major.phase if major else None,
|
||||
path_context_note=path_context_note,
|
||||
path_anti_patterns=path_anti,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
stage_start_state=stage_start or None,
|
||||
stage_target_state=stage_target or None,
|
||||
path_target_state=path_target or None,
|
||||
contextualized_learning_goal=contextual_goal or None,
|
||||
)
|
||||
|
||||
hits, _, _, _ = _run_path_step_retrieval(
|
||||
cur,
|
||||
tenant=tenant,
|
||||
goal_query=goal_query,
|
||||
step_index=step_index,
|
||||
max_steps=max_steps,
|
||||
planned_ids=planned_ids,
|
||||
anchor_id=anchor_id,
|
||||
anchor_variant_id=anchor_variant_id,
|
||||
progression_graph_id=body.progression_graph_id,
|
||||
include_llm_intent=body.include_llm_intent and step_index == 0,
|
||||
exercise_kind_any=step_kind,
|
||||
semantic_brief=stage_match_brief,
|
||||
path_target_profile=path_target_profile,
|
||||
path_intent=path_intent,
|
||||
step_query_override=step_query,
|
||||
step_phase_override=major.phase if major else None,
|
||||
step_target_profile_override=step_target,
|
||||
stage_learning_goal=stage_goal or None,
|
||||
stage_anti_patterns=stage_anti or None,
|
||||
stage_match_brief=stage_match_brief,
|
||||
stage_success_criteria=list(stage_spec.success_criteria or []),
|
||||
stage_load_profile=list(stage_spec.load_profile or []),
|
||||
path_context_note=path_context_note,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
)
|
||||
|
||||
hit = _pick_best_path_hit(
|
||||
hits,
|
||||
used,
|
||||
semantic_brief=stage_match_brief,
|
||||
stage_learning_goal=stage_goal or None,
|
||||
stage_anti_patterns=stage_anti or None,
|
||||
roadmap_stage_match=True,
|
||||
stage_match_brief=stage_match_brief,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
)
|
||||
|
||||
if not hit:
|
||||
return None, stage_spec
|
||||
|
||||
step = _annotate_roadmap_step(
|
||||
_hit_to_path_step(hit),
|
||||
stage_spec=stage_spec,
|
||||
major_step=major,
|
||||
skill_expectations=skill_exp_api,
|
||||
anti_patterns_override=stage_anti,
|
||||
)
|
||||
return step, None
|
||||
|
||||
|
||||
def _build_steps_roadmap_first(
|
||||
cur,
|
||||
*,
|
||||
@@ -557,161 +727,37 @@ def _build_steps_roadmap_first(
|
||||
for m in roadmap_ctx.roadmap.major_steps[:max_steps]
|
||||
]
|
||||
|
||||
major_by_index: Dict[int, MajorStep] = {}
|
||||
if roadmap_ctx.roadmap:
|
||||
major_by_index = {m.index: m for m in roadmap_ctx.roadmap.major_steps}
|
||||
|
||||
used: Set[int] = set()
|
||||
steps: List[Dict[str, Any]] = []
|
||||
planned_ids: List[int] = []
|
||||
anchor_id: Optional[int] = None
|
||||
anchor_variant_id: Optional[int] = None
|
||||
unfilled: List[Tuple[int, StageSpecArtifact]] = []
|
||||
|
||||
ga_dump = (
|
||||
roadmap_ctx.goal_analysis.model_dump() if roadmap_ctx.goal_analysis else None
|
||||
)
|
||||
rs_dump = (
|
||||
roadmap_ctx.resolved_structured.model_dump()
|
||||
if roadmap_ctx.resolved_structured
|
||||
else None
|
||||
)
|
||||
path_start, path_target = resolve_path_start_target(
|
||||
structured=roadmap_ctx.resolved_structured,
|
||||
goal_analysis=roadmap_ctx.goal_analysis,
|
||||
)
|
||||
stage_count = len(stage_specs)
|
||||
brief_summary = (
|
||||
roadmap_ctx.semantic_brief
|
||||
if roadmap_ctx.semantic_brief
|
||||
else brief_to_summary_dict(semantic_brief)
|
||||
)
|
||||
|
||||
for step_index, stage_spec in enumerate(stage_specs):
|
||||
major = major_by_index.get(stage_spec.major_step_index)
|
||||
stage_spec_dict = stage_spec.model_dump()
|
||||
if major:
|
||||
stage_spec_dict["phase"] = major.phase
|
||||
stage_inp = expectation_input_from_progression_stage(
|
||||
goal_query=goal_query,
|
||||
goal_analysis=ga_dump,
|
||||
resolved_structured=rs_dump,
|
||||
stage_spec=stage_spec_dict,
|
||||
semantic_brief_summary=brief_summary,
|
||||
major_step=major.model_dump() if major else None,
|
||||
)
|
||||
stage_exp = build_planning_skill_expectations(cur, stage_inp, semantic_brief=semantic_brief)
|
||||
step_target = apply_expectations_to_target(path_target_profile, stage_exp)
|
||||
skill_exp_api = stage_exp.to_api_dict() if stage_exp.items else None
|
||||
|
||||
step_query = stage_spec_retrieval_query(
|
||||
semantic_brief=semantic_brief,
|
||||
goal_query=goal_query,
|
||||
stage_spec=stage_spec,
|
||||
major_step=major,
|
||||
)
|
||||
step_kind = resolve_step_exercise_kind_filter(stage_spec, body.exercise_kind_any)
|
||||
stage_goal = (stage_spec.learning_goal or "").strip()
|
||||
stage_start = (stage_spec.start_state or "").strip()
|
||||
stage_target = (stage_spec.target_state or "").strip()
|
||||
contextual_goal = build_contextualized_stage_goal(
|
||||
learning_goal=stage_goal,
|
||||
start_state=stage_start,
|
||||
target_state=stage_target,
|
||||
path_target_state=path_target,
|
||||
path_start_state=path_start,
|
||||
stage_index=step_index,
|
||||
stage_count=stage_count,
|
||||
)
|
||||
path_context_note = None
|
||||
if rs_dump:
|
||||
ctx_parts = [
|
||||
str(rs_dump.get("start_situation") or "").strip()[:120],
|
||||
str(rs_dump.get("target_state") or "").strip()[:120],
|
||||
str(rs_dump.get("roadmap_notes") or "").strip()[:120],
|
||||
]
|
||||
path_context_note = " ".join(p for p in ctx_parts if p)[:240] or None
|
||||
path_anti = resolve_path_anti_patterns(
|
||||
goal_query,
|
||||
semantic_brief=semantic_brief,
|
||||
extra_context=path_context_note,
|
||||
)
|
||||
stage_anti = list(dict.fromkeys([*(stage_spec.anti_patterns or []), *path_anti]))
|
||||
path_primary = (semantic_brief.primary_topic or "").strip()
|
||||
path_tech_excludes = list(semantic_brief.exclude_phrases or [])
|
||||
if semantic_brief.topic_type == "technique" and path_primary:
|
||||
from planning_exercise_semantics import technique_sibling_excludes
|
||||
|
||||
for item in technique_sibling_excludes(path_primary):
|
||||
if item not in path_tech_excludes:
|
||||
path_tech_excludes.append(item)
|
||||
stage_match_brief = build_stage_match_brief(
|
||||
learning_goal=stage_goal,
|
||||
anti_patterns=stage_anti,
|
||||
success_criteria=list(stage_spec.success_criteria or []),
|
||||
load_profile=list(stage_spec.load_profile or []),
|
||||
phase=major.phase if major else None,
|
||||
path_context_note=path_context_note,
|
||||
path_anti_patterns=path_anti,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
stage_start_state=stage_start or None,
|
||||
stage_target_state=stage_target or None,
|
||||
path_target_state=path_target or None,
|
||||
contextualized_learning_goal=contextual_goal or None,
|
||||
)
|
||||
|
||||
hits, _, _, _ = _run_path_step_retrieval(
|
||||
step, unfilled_spec = _match_roadmap_slot(
|
||||
cur,
|
||||
tenant=tenant,
|
||||
body=body,
|
||||
goal_query=goal_query,
|
||||
step_index=step_index,
|
||||
max_steps=max_steps,
|
||||
semantic_brief=semantic_brief,
|
||||
path_target_profile=path_target_profile,
|
||||
path_intent=path_intent,
|
||||
roadmap_ctx=roadmap_ctx,
|
||||
stage_spec=stage_spec,
|
||||
step_index=step_index,
|
||||
stage_count=stage_count,
|
||||
planned_ids=planned_ids,
|
||||
anchor_id=anchor_id,
|
||||
anchor_variant_id=anchor_variant_id,
|
||||
progression_graph_id=body.progression_graph_id,
|
||||
include_llm_intent=body.include_llm_intent and step_index == 0,
|
||||
exercise_kind_any=step_kind,
|
||||
semantic_brief=stage_match_brief,
|
||||
path_target_profile=path_target_profile,
|
||||
path_intent=path_intent,
|
||||
step_query_override=step_query,
|
||||
step_phase_override=major.phase if major else None,
|
||||
step_target_profile_override=step_target,
|
||||
stage_learning_goal=stage_goal or None,
|
||||
stage_anti_patterns=stage_anti or None,
|
||||
stage_match_brief=stage_match_brief,
|
||||
stage_success_criteria=list(stage_spec.success_criteria or []),
|
||||
stage_load_profile=list(stage_spec.load_profile or []),
|
||||
path_context_note=path_context_note,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
used=used,
|
||||
)
|
||||
|
||||
hit = _pick_best_path_hit(
|
||||
hits,
|
||||
used,
|
||||
semantic_brief=stage_match_brief,
|
||||
stage_learning_goal=stage_goal or None,
|
||||
stage_anti_patterns=stage_anti or None,
|
||||
roadmap_stage_match=True,
|
||||
stage_match_brief=stage_match_brief,
|
||||
path_primary_topic=path_primary or None,
|
||||
path_technique_excludes=path_tech_excludes or None,
|
||||
)
|
||||
|
||||
if not hit:
|
||||
unfilled.append((step_index, stage_spec))
|
||||
if not step:
|
||||
unfilled.append((step_index, unfilled_spec or stage_spec))
|
||||
continue
|
||||
|
||||
step = _annotate_roadmap_step(
|
||||
_hit_to_path_step(hit),
|
||||
stage_spec=stage_spec,
|
||||
major_step=major,
|
||||
skill_expectations=skill_exp_api,
|
||||
anti_patterns_override=stage_anti,
|
||||
)
|
||||
steps.append(step)
|
||||
eid = int(step["exercise_id"])
|
||||
used.add(eid)
|
||||
@@ -1245,6 +1291,8 @@ def suggest_progression_path(
|
||||
gap_fill_offers: List[Dict[str, Any]] = []
|
||||
off_topic_steps: List[Dict[str, Any]] = []
|
||||
stripped_off_topic: List[Dict[str, Any]] = []
|
||||
rematch_log: List[Dict[str, Any]] = []
|
||||
rematch_rounds = 0
|
||||
llm_qa: Optional[Dict[str, Any]] = None
|
||||
llm_qa_applied = False
|
||||
reorder_applied = False
|
||||
@@ -1315,6 +1363,7 @@ def suggest_progression_path(
|
||||
brief=semantic_brief,
|
||||
goal_query=goal_query,
|
||||
)
|
||||
off_topic_before_strip = list(off_topic_steps)
|
||||
steps, stripped_off_topic = strip_off_topic_steps_from_path(steps, off_topic_steps)
|
||||
if stripped_off_topic:
|
||||
off_topic_steps = []
|
||||
@@ -1325,6 +1374,56 @@ def suggest_progression_path(
|
||||
roadmap_first=roadmap_first,
|
||||
)
|
||||
|
||||
if (
|
||||
roadmap_first
|
||||
and body.auto_rematch_after_qa
|
||||
and roadmap_ctx is not None
|
||||
and roadmap_ctx.stage_specs
|
||||
):
|
||||
slot_indices, rematch_reasons = collect_rematch_slot_indices(
|
||||
stripped_off_topic=stripped_off_topic,
|
||||
off_topic_steps=off_topic_before_strip if not stripped_off_topic else [],
|
||||
optimization_hints=[],
|
||||
stage_specs=roadmap_ctx.stage_specs,
|
||||
)
|
||||
if slot_indices:
|
||||
steps, rematch_log, rematch_new_unfilled = rematch_roadmap_slots(
|
||||
cur,
|
||||
tenant=tenant,
|
||||
body=body,
|
||||
goal_query=goal_query,
|
||||
max_steps=max_steps,
|
||||
semantic_brief=semantic_brief,
|
||||
path_target_profile=path_target_profile,
|
||||
path_intent=path_intent,
|
||||
roadmap_ctx=roadmap_ctx,
|
||||
steps=steps,
|
||||
slot_indices=slot_indices,
|
||||
rematch_reasons=rematch_reasons,
|
||||
match_slot_fn=_match_roadmap_slot,
|
||||
)
|
||||
rematch_rounds = 1
|
||||
if rematch_new_unfilled:
|
||||
remapped = {sp.major_step_index for _, sp in rematch_new_unfilled}
|
||||
roadmap_unfilled = [
|
||||
item
|
||||
for item in roadmap_unfilled
|
||||
if item[1].major_step_index not in remapped
|
||||
]
|
||||
roadmap_unfilled.extend(rematch_new_unfilled)
|
||||
off_topic_steps = detect_off_topic_steps(
|
||||
cur,
|
||||
steps,
|
||||
brief=semantic_brief,
|
||||
goal_query=goal_query,
|
||||
)
|
||||
gaps = detect_path_gaps(
|
||||
cur,
|
||||
steps,
|
||||
brief=semantic_brief,
|
||||
roadmap_first=roadmap_first,
|
||||
)
|
||||
|
||||
llm_gap_specs = parse_llm_suggested_new_exercises(
|
||||
llm_qa,
|
||||
brief=semantic_brief,
|
||||
@@ -1396,6 +1495,10 @@ def suggest_progression_path(
|
||||
roadmap_qa_mode=roadmap_qa_mode,
|
||||
multistage_qa=multistage_qa,
|
||||
)
|
||||
if rematch_log:
|
||||
path_qa["rematch_applied"] = True
|
||||
path_qa["rematch_log"] = rematch_log
|
||||
path_qa["rematch_rounds"] = rematch_rounds
|
||||
|
||||
target_profile_summary = path_target_profile.to_summary_dict(cur)
|
||||
retrieval_parts = ["profile_v1", "full_library", "path_builder", "semantics"]
|
||||
@@ -1419,6 +1522,8 @@ def suggest_progression_path(
|
||||
retrieval_parts.append("roadmap_edited")
|
||||
if roadmap_unfilled:
|
||||
retrieval_parts.append("roadmap_unfilled")
|
||||
if rematch_log:
|
||||
retrieval_parts.append("path_rematch")
|
||||
|
||||
return {
|
||||
"goal_query": goal_query,
|
||||
|
||||
Reference in new issue
Block a user