feat: track + options_language + test generator + повторы уроков

This commit is contained in:
2026-10-04 16:13:59 +00:00
parent 80b7f6b419
commit a730ef87f5
4 changed files with 275 additions and 65 deletions
+70 -36
View File
@@ -6,6 +6,9 @@ Orchestrator — мозг чат-учителя.
3. Иначе → следующий урок по порядку
Никакого AI — только детерминированная логика.
🔧 ОБНОВЛЕНО (04.10.2026): track_filter —
учитель уважает аудиторию юзера (pl / ru_uk / en).
"""
import logging
from typing import Optional, Dict, Any
@@ -16,7 +19,7 @@ logger = logging.getLogger(__name__)
async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
"""
Выбирает следующий урок для пользователя.
Возвращает:
{
"type": "new" | "review" | "test",
@@ -24,13 +27,34 @@ async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
"reason": str,
"skill_tag": str | None
}
🔧 ОБНОВЛЕНО (04.10.2026): track_filter —
учитель уважает аудиторию юзера:
- pl → track='pl'
- ru/uk → track='ru_uk'
- en → track='en'
Все SQL-запросы фильтруют по track, чтобы не подсовывать
RU/UK-уроки польскому или английскому юзеру.
"""
# Получаем текущий уровень пользователя
current_level = await conn.fetchval("""
SELECT current_level FROM users WHERE telegram_id = $1
""", user_id) or "A1"
# 🔧 НОВОЕ (04.10.2026): track_filter —
# определяем track по app_language юзера.
user_lang = await conn.fetchval("""
SELECT app_language FROM users WHERE telegram_id = $1
""", user_id) or "ru"
if user_lang == "pl":
track = "pl"
elif user_lang == "en":
track = "en"
else:
track = "ru_uk"
# ============ ШАГ 1: Проверяем retention_status ============
# Если есть навыки, которые давно не повторяли — повторяем их
overdue_skill = await conn.fetchrow("""
@@ -42,26 +66,30 @@ async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
ORDER BY days_since_last_attempt DESC
LIMIT 1
""", user_id)
if overdue_skill:
# 🔧 НОВОЕ (04.10.2026): track_filter_lesson — ищем урок по skill_tag
# ТОЛЬКО в темах нужного track.
lesson = await conn.fetchrow("""
SELECT l.lesson_id, l.topic_id, l.skill_tag, l.title_pl, l.title_ru, l.title_uk, l.title_en
FROM learning_lessons l
JOIN learning_topics t ON l.topic_id = t.topic_id
WHERE l.skill_tag = $1
AND l.is_active = TRUE
AND t.track = $2
ORDER BY l.order_number
LIMIT 1
""", overdue_skill["skill_tag"])
""", overdue_skill["skill_tag"], track)
if lesson:
logger.info(f"Orchestrator: review (overdue) for user={user_id}, skill={overdue_skill['skill_tag']}")
logger.info(f"Orchestrator: review (overdue) for user={user_id}, skill={overdue_skill['skill_tag']}, track={track}")
return {
"type": "review",
"lesson": dict(lesson),
"reason": "overdue",
"skill_tag": overdue_skill["skill_tag"],
}
# ============ ШАГ 2: Проверяем mastery < 75 ============
weak_skill = await conn.fetchrow("""
SELECT skill_tag, mastery_score, repeated_error_count, trend
@@ -72,50 +100,55 @@ async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
ORDER BY mastery_score ASC
LIMIT 1
""", user_id)
if weak_skill:
# 🔧 НОВОЕ (04.10.2026): track_filter_lesson
lesson = await conn.fetchrow("""
SELECT l.lesson_id, l.topic_id, l.skill_tag, l.title_pl, l.title_ru, l.title_uk, l.title_en
FROM learning_lessons l
JOIN learning_topics t ON l.topic_id = t.topic_id
WHERE l.skill_tag = $1
AND l.is_active = TRUE
AND t.track = $2
ORDER BY l.order_number
LIMIT 1
""", weak_skill["skill_tag"])
""", weak_skill["skill_tag"], track)
if lesson:
logger.info(f"Orchestrator: review (weak) for user={user_id}, skill={weak_skill['skill_tag']}, mastery={weak_skill['mastery_score']}")
logger.info(f"Orchestrator: review (weak) for user={user_id}, skill={weak_skill['skill_tag']}, mastery={weak_skill['mastery_score']}, track={track}")
return {
"type": "review",
"lesson": dict(lesson),
"reason": "weak_mastery",
"skill_tag": weak_skill["skill_tag"],
}
# ============ ШАГ 3: Проверяем, нужно ли пройти тест темы ============
# Если пользователь завершил все уроки темы, но не прошёл тест
# 🔧 НОВОЕ (04.10.2026): track_filter_test — только темы нужного track.
topic_for_test = await conn.fetchrow("""
SELECT tp.topic_id, tp.lessons_total, tp.lessons_completed, tp.test_completed
FROM user_topic_progress tp
JOIN learning_topics t ON tp.topic_id = t.topic_id
WHERE tp.user_id = $1
AND tp.lessons_completed >= tp.lessons_total
AND tp.lessons_total > 0
AND tp.test_completed = FALSE
AND t.track = $2
ORDER BY tp.topic_id
LIMIT 1
""", user_id)
""", user_id, track)
if topic_for_test:
logger.info(f"Orchestrator: test for user={user_id}, topic={topic_for_test['topic_id']}")
logger.info(f"Orchestrator: test for user={user_id}, topic={topic_for_test['topic_id']}, track={track}")
return {
"type": "test",
"lesson": None,
"reason": "topic_completed_no_test",
"topic_id": topic_for_test["topic_id"],
}
# ============ ШАГ 4: Следующий урок по порядку ============
# Находим первый непройденный урок в текущем уровне
# 🔧 НОВОЕ (04.10.2026): track_filter_next — только уроки нужного track.
next_lesson = await conn.fetchrow("""
SELECT l.lesson_id, l.topic_id, l.skill_tag, l.title_pl, l.title_ru, l.title_uk, l.title_en,
t.topic_id as topic_id, t.order_number as topic_order
@@ -123,25 +156,26 @@ async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
JOIN learning_topics t ON l.topic_id = t.topic_id
WHERE t.level_code = $1
AND l.is_active = TRUE
AND t.track = $3
AND l.lesson_id NOT IN (
SELECT lesson_id FROM user_lesson_progress
WHERE user_id = $2 AND completed = TRUE
)
ORDER BY t.order_number, l.order_number
LIMIT 1
""", current_level, user_id)
""", current_level, user_id, track)
if next_lesson:
logger.info(f"Orchestrator: new lesson for user={user_id}, lesson={next_lesson['lesson_id']}")
logger.info(f"Orchestrator: new lesson for user={user_id}, lesson={next_lesson['lesson_id']}, track={track}")
return {
"type": "new",
"lesson": dict(next_lesson),
"reason": "next_in_order",
"skill_tag": next_lesson["skill_tag"],
}
# ============ ШАГ 5: Всё пройдено ============
logger.info(f"Orchestrator: all completed for user={user_id}")
logger.info(f"Orchestrator: all completed for user={user_id}, track={track}")
return {
"type": "completed",
"lesson": None,
@@ -152,18 +186,18 @@ async def get_next_lesson(conn, user_id: int) -> Dict[str, Any]:
async def get_lesson_by_id(conn, lesson_id: str) -> Optional[Dict[str, Any]]:
"""Получает урок по ID со всеми данными: объяснение, примеры, вопросы."""
lesson = await conn.fetchrow("""
SELECT * FROM learning_lessons WHERE lesson_id = $1 AND is_active = TRUE
""", lesson_id)
if not lesson:
return None
examples = await conn.fetch("""
SELECT * FROM lesson_examples WHERE lesson_id = $1 ORDER BY order_number
""", lesson_id)
questions = await conn.fetch("""
SELECT * FROM learning_questions
WHERE lesson_id = $1 AND is_test_question = FALSE
@@ -200,7 +234,7 @@ async def get_lesson_by_id(conn, lesson_id: str) -> Optional[Dict[str, Any]]:
async def get_lesson_questions(conn, lesson_id: str) -> list:
"""Получает только вопросы урока (без объяснения)."""
questions = await conn.fetch("""
SELECT * FROM learning_questions
WHERE lesson_id = $1 AND is_test_question = FALSE
@@ -231,7 +265,7 @@ async def get_lesson_questions(conn, lesson_id: str) -> list:
async def get_test_questions(conn, topic_id: str) -> list:
"""Получает вопросы финального теста по теме."""
questions = await conn.fetch("""
SELECT * FROM learning_questions
WHERE topic_id = $1 AND is_test_question = TRUE
@@ -262,7 +296,7 @@ async def get_test_questions(conn, topic_id: str) -> list:
async def get_random_reaction(conn, reaction_type: str, lang: str) -> str:
"""Получает случайную реакцию из банка по типу."""
row = await conn.fetchrow("""
SELECT text_pl, text_ru, text_uk, text_en
FROM teacher_reactions
@@ -270,7 +304,7 @@ async def get_random_reaction(conn, reaction_type: str, lang: str) -> str:
ORDER BY RANDOM()
LIMIT 1
""", reaction_type)
if not row:
# Запасные реакции, если таблица пуста
fallbacks = {
@@ -294,22 +328,22 @@ async def get_random_reaction(conn, reaction_type: str, lang: str) -> str:
},
}
return fallbacks.get(reaction_type, {}).get(lang, "OK")
field = f"text_{lang}"
return row.get(field) or row.get("text_en") or "OK"
async def get_wrong_because_explanation(conn, wrong_because: str, lang: str) -> str:
"""Получает объяснение ошибки по тегу wrong_because."""
row = await conn.fetchrow("""
SELECT explanation_pl, explanation_ru, explanation_uk, explanation_en
FROM wrong_because_explanations
WHERE wrong_because = $1
""", wrong_because)
if not row:
return ""
field = f"explanation_{lang}"
return row.get(field) or row.get("explanation_en") or ""