fix: neutral placeholder, exam edge cases, stronger invariants (review)

Author: root

app/extended_curriculum.py

@@ -13,6 +13,7 @@
 from app.lessons_13_25 import LESSONS_13_25
 
 TERM_SYNONYMS = {
+    "sorted": ("сортировка",),
     "арифметический оператор": ("арифметика", "оператор"),
     "оператор %": ("%", "остаток"),
     "оператор and": ("and", "логическое и"),
@@ -1422,7 +1423,7 @@ def _make_questions(
             "kind": "input",
             "prompt": f"Какой ключевой инструмент или термин связывает урок «{title}»?",
             "answers": [keyword, *TERM_SYNONYMS.get(keyword, ())],
-            "placeholder": f"Например: {keyword}",
+            "placeholder": "Введите термин",
             "explanation": f"Ключевой ориентир урока — «{keyword}». {subtitle}.",
         },
         {"id": f"{lesson_id}-code", "kind": "code", **code_task},
@@ -1481,13 +1482,16 @@ def build_extended_course() -> tuple[
                     }
                 )
             else:
-                questions = next(lesson for lesson in LESSONS_13_25 if lesson["id"] == lesson_id)["questions"]
+                questions = next(lesson for lesson in LESSONS_13_25 if lesson["id"] == lesson_id)[
+                    "questions"
+                ]
             for question in questions:
                 question_ids_by_kind[question["kind"]].append(question["id"])
             order += 1
         question_ids = [
             random.Random(f"{module_id}:{kind}").choice(ids)
             for kind, ids in question_ids_by_kind.items()
+            if ids
         ]
         remaining_ids = [
             question_id
@@ -1496,7 +1500,8 @@ def build_extended_course() -> tuple[
             if question_id not in question_ids
         ]
         random.Random(f"{module_id}:exam").shuffle(remaining_ids)
-        question_ids.append(remaining_ids[0])
+        if remaining_ids:
+            question_ids.append(remaining_ids[0])
         random.Random(f"{module_id}:exam-order").shuffle(question_ids)
         exams[module_id] = {
             "title": f"Контрольная точка: {unit['title']}",

tests/test_curriculum.py

@@ -1,9 +1,10 @@
 import re
 from pathlib import Path
 
+from app import extended_curriculum
 from app.content import EXAMS, LESSONS, MODULES, QUESTION_BY_ID
-from app.evaluator import evaluate
-from app.extended_curriculum import EXTRA_LESSONS
+from app.evaluator import evaluate, normalize
+from app.extended_curriculum import EXTRA_LESSONS, build_extended_course
 from app.lessons_13_25 import LESSONS_13_25
 
 LESSONS_13_25_IDENTITY = [
@@ -114,13 +115,14 @@ def test_lessons_four_to_six_do_not_require_future_topics() -> None:
 
 def test_extended_questions_are_fair_and_exams_are_mixed() -> None:
     extended_lessons = [lesson for lesson in LESSONS if lesson["order"] >= 13]
-    choice_positions = {
+    choice_positions = [
         question["options"].index(question["answer"])
         for lesson in extended_lessons
         for question in lesson["questions"]
         if question["kind"] == "choice"
-    }
-    assert len(choice_positions) > 1
+    ]
+    assert len(set(choice_positions)) > 1
+    assert all(0 <= position < 3 for position in choice_positions)
     assert (
         sum(
             len(question["answers"]) > 1
@@ -132,6 +134,52 @@ def test_extended_questions_are_fair_and_exams_are_mixed() -> None:
     )
     extended_modules = {lesson["module_id"] for lesson in extended_lessons}
     for module_id in extended_modules:
-        assert {
-            QUESTION_BY_ID[question_id]["kind"] for question_id in EXAMS[module_id]["question_ids"]
-        } == {"choice", "input", "code"}
+        question_ids = EXAMS[module_id]["question_ids"]
+        assert len(question_ids) == len(set(question_ids)) == 4
+        assert {QUESTION_BY_ID[question_id]["kind"] for question_id in question_ids} == {
+            "choice",
+            "input",
+            "code",
+        }
+
+    term_question = next(
+        question
+        for lesson in extended_lessons
+        for question in lesson["questions"]
+        if question["kind"] == "input" and len(question["answers"]) > 1
+    )
+    assert all(
+        normalize(answer) not in normalize(term_question["placeholder"])
+        for answer in term_question["answers"]
+    )
+
+    keyword, synonyms = "sorted", ("сортировка",)
+    answers = next(
+        question["answers"]
+        for lesson in extended_lessons
+        for question in lesson["questions"]
+        if question["kind"] == "input" and keyword in question["answers"]
+    )
+    assert normalize(f"  {synonyms[0].upper()}  ") in {normalize(answer) for answer in answers}
+
+
+def test_extended_generation_is_deterministic_and_handles_short_modules(monkeypatch) -> None:
+    first = build_extended_course()
+    second = build_extended_course()
+    assert first == second
+
+    monkeypatch.setattr(
+        extended_curriculum,
+        "COURSE_UNITS",
+        [
+            {
+                **extended_curriculum.COURSE_UNITS[0],
+                "lessons": extended_curriculum.COURSE_UNITS[0]["lessons"][:1],
+            }
+        ],
+    )
+    monkeypatch.setattr(
+        extended_curriculum, "TASK_CYCLES", [extended_curriculum.TASK_CYCLES[0][:1]]
+    )
+    _, _, exams = build_extended_course()
+    assert len(next(iter(exams.values()))["question_ids"]) == 3