Author SHA1 Message Date
Drobysh 90488bf575 Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#62) from eva/chat-5b1483-backend into main
Reviewed-on: #62
2026-11-04 14:36:00 +00:00
Drobysh 618ff196d4 [Eva] Добавлена таблица teacher_materials для AI-учителя 2026-11-04 14:33:26 +00:00
Drobysh 18f8dfd285 Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#61) from eva/chat-5b1483-backend into main
Reviewed-on: #61
2026-11-04 14:19:53 +00:00
Drobysh c57bf3133e [Eva] Марек отвечает только про Польшу и польский язык 2026-11-04 14:18:08 +00:00
Drobysh 6196639d89 [Eva] Марек: контекст Pleily + нюансы по родному языку ученика 2026-11-04 14:15:14 +00:00
Drobysh b94e53562c Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#60) from eva/chat-5b1483-backend into main
Reviewed-on: #60
2026-11-03 18:20:31 +00:00
Drobysh 32e250ddae [Eva] Отключён лимит AI-запросов учителя (тестирование) 2026-11-03 18:17:40 +00:00
Drobysh 9f92995522 [Eva] Фикс счётчика AI-запросов: command_count вместо COUNT(*) 2026-11-03 18:17:19 +00:00
Drobysh fe6019ecbc [Eva] Убираем длинные тире в ответах AI учителя 2026-11-03 18:09:35 +00:00
Drobysh 0bb061c31f [Eva] Учитель AI: эндпоинт GET /teacher/ai-usage 2026-11-03 18:06:59 +00:00
Drobysh 0c6111d789 [Eva] Учитель AI: usage/limit при исчерпании лимита 2026-11-03 18:06:47 +00:00
Drobysh 5f72bfee6a [Eva] Учитель AI: usage/limit в ответе free-message 2026-11-03 18:06:38 +00:00
Drobysh f4f02f7078 [Eva] Учитель AI: запрет длинных тире в ответах 2026-11-03 18:06:24 +00:00
Drobysh af87fddeb4 Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#59) from eva/chat-5b1483-backend into main
Reviewed-on: #59
2026-11-03 10:45:02 +00:00
Drobysh 2e06012d23 [Eva] Скрипт генерации фразы дня для cron (5:00 утра) 2026-11-03 10:42:30 +00:00
Drobysh 750c03a57a Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#58) from eva/chat-5b1483-backend into main
Reviewed-on: #58
2026-11-02 09:48:32 +00:00
Drobysh 790eabbbef [Eva] Hard в филворде: 110 → 150 очков 2026-11-02 09:47:56 +00:00
Drobysh 4ba1d90f07 [Eva] complete-level проверяет, что все слова найдены 2026-11-02 09:47:49 +00:00
Drobysh eb26ba9a25 [Eva] Повторный свайп найденного слова больше не накручивает серию 2026-11-02 09:47:39 +00:00
Drobysh 3dcc61c92f [Eva] Добавлена колонка found_words в user_progress 2026-11-02 09:47:30 +00:00
Drobysh 707837b109 Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#57) from eva/chat-5b1483-backend into main
Reviewed-on: #57
2026-11-02 09:41:55 +00:00
Drobysh 4e444499d4 [Eva] Убрать мусорный суффикс из частей слова 2026-11-02 09:41:25 +00:00
Drobysh 06cb1ecbb0 [Eva] Убрать неиспользуемый импорт hashlib 2026-11-02 09:41:14 +00:00
Drobysh 4786a73c22 Merge pull request '[Eva] ты помнишь проблему с агентом Ева?)' (#56) from eva/chat-5b1483-backend into main
Reviewed-on: #56
2026-11-02 09:35:04 +00:00
Drobysh 1a8d85a51d [Eva] Hard в пузырях: очки 110 → 150 2026-11-02 09:34:04 +00:00
Drobysh bbca26826d Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#55) from eva/chat-14ba33-backend into main
Reviewed-on: #55
2026-10-26 17:57:43 +00:00
Drobysh a679ca4e77 [Eva] schema: sentence_hints_used помечена устаревшей 2026-10-26 17:55:16 +00:00
Drobysh 871d7167e2 [Eva] reset: убрана sentence_hints_used из сброса 2026-10-26 17:55:07 +00:00
Drobysh 8fce00f1e1 [Eva] sentences: удалён эндпоинт /{id}/hint 2026-10-26 17:55:00 +00:00
Drobysh 17f7ed7370 [Eva] test_smoke: hint → show-answer (medium/hard/easy) 2026-10-26 17:54:56 +00:00
Drobysh 5fd4988985 Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#54) from eva/chat-14ba33-backend into main
Reviewed-on: #54
2026-10-20 13:10:42 +00:00
Drobysh 361e2d9b61 [Eva] Убрать bubble_perfect_streak, добавить bubble_speed_10 2026-10-20 13:06:26 +00:00
Drobysh 73c88678dc [Eva] Убрать триггер bubble_no_mistakes 2026-10-20 13:06:16 +00:00
Drobysh e8a8d9f11e [Eva] Убрать триггер bubble_perfect 2026-10-20 13:06:06 +00:00
Drobysh 7d52b0232b [Eva] Заменить bubble_perfect_10 на bubble_speed_10 2026-10-20 13:05:55 +00:00
Drobysh 95058b2d3c [Eva] Заменить bubble_no_mistakes на bubble_words_1000 2026-10-20 13:05:38 +00:00
Drobysh 8a78368458 [Eva] Заменить bubble_perfect на bubble_streak_25 2026-10-20 13:05:28 +00:00
Drobysh 4598289f06 Merge pull request '[Eva] **Цель:** превратить `support_screen.dar' (#53) from eva/chat-14ba33-backend into main
Reviewed-on: #53
2026-10-19 11:09:08 +00:00
Drobysh 20674f0823 [Eva] Скрипт сброса прогресса и достижений пользователя 2026-10-19 11:06:55 +00:00
Drobysh 3d379c8357 Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#52) from eva/chat-ec3e05-backend into main
Reviewed-on: #52
2026-10-16 11:59:54 +00:00
Drobysh ba9a43dcfa [Eva] B5.4: /stats — убрать фильтр по уровню и поле level 2026-10-16 11:59:03 +00:00
Drobysh 3c9548540c [Eva] B5.3: database.py — UNIQUE(sentence_number) + перенумерация 2026-10-16 11:58:59 +00:00
Drobysh 5810eccde1 [Eva] B5.2: init_sentences — единый пул, сквозная нумерация 1..400 2026-10-16 11:58:53 +00:00
Drobysh 1df1119d11 [Eva] B5.1: /next — убрать фильтр по уровню (единый пул) 2026-10-16 11:58:50 +00:00
Drobysh bcf4db0ddb Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#51) from eva/chat-ec3e05-backend into main
Reviewed-on: #51
2026-10-16 11:08:49 +00:00
Drobysh 965d5d2503 [Eva] B4: добавляем user_difficulty в ответ /sentences/next 2026-10-16 11:08:03 +00:00
Drobysh a313c08b95 [Eva] B4: читаем difficulty юзера в /sentences/next 2026-10-16 11:08:00 +00:00
Drobysh ce9f68ae51 Merge pull request '[Eva] Ева, привет! Новая задача: игра «Составь' (#50) from eva/chat-ec3e05-backend into main
Reviewed-on: #50
2026-10-16 10:59:05 +00:00
Drobysh 400cf375be [Eva] Добавляю идеальные серии и XP-достижения 2026-10-16 10:58:06 +00:00
Drobysh 11ef94a9bf [Eva] Добавляю sentence_speed_3 и серии без ошибок 2026-10-16 10:57:53 +00:00
Drobysh ed60a54e0c [Eva] Добавляю sentence_500 и sentence_1000 2026-10-16 10:57:42 +00:00
Drobysh 2d687904b0 [Eva] Удаляю 3 мёртвых достижения предложений 2026-10-16 10:57:12 +00:00
Drobysh c7ca0c97c2 [Eva] Sentence Builder: заголовок 10 → 20 2026-10-16 10:57:09 +00:00
Drobysh 3dfe34f18a [Eva] Добавляем 3 новых типа достижений в /check 2026-10-16 10:56:48 +00:00
Drobysh 61fbbe55e8 [Eva] Читаем sentence_stats для достижений 2026-10-16 10:56:45 +00:00
Drobysh 7cbde183ff [Eva] B2.3: убрать stars из ответа (KeyError) 2026-10-16 10:49:07 +00:00
Drobysh da3f1567a8 [Eva] B2.3: формула очков по сложности + серии в sentence_stats 2026-10-16 10:49:00 +00:00
Drobysh 82eb9208d8 [Eva] B2.3: already_completed по completed_at IS NOT NULL 2026-10-16 10:48:50 +00:00
Drobysh 5b2dbc0d42 [Eva] B2.2: новый эндпоинт POST /sentences/show-answer 2026-10-16 10:48:37 +00:00
Drobysh 3548654d6a [Eva] B2.1: /next создаёт строку прогресса (in-progress) 2026-10-16 10:48:26 +00:00
Drobysh 4e78c32c18 [Eva] B2.1: /next исключает только завершённые предложения 2026-10-16 10:48:17 +00:00
Drobysh 5be242aafd [Eva] Добавлена таблица sentence_stats + идемпотентные миграции 2026-10-16 10:46:30 +00:00
Drobysh 10242f89b3 [Eva] B1: миграции sentence_progress (list_opened, no_mistakes_streak, perfect_streak, completion_time) 2026-10-16 10:37:29 +00:00
Drobysh 299c4e2fd5 Merge pull request '[Eva] Ева, критичный фикс в wordquiz.py — 500' (#49) from eva/chat-55df46-backend into main
Reviewed-on: #49
2026-10-15 17:46:02 +00:00
Drobysh 38e0c2fe80 [Eva] Fix 500 on /wordquiz/next: LIMIT (wrong_count + 1) → LIMIT 5 (fallback) 2026-10-15 17:45:27 +00:00
Drobysh d669b37397 [Eva] Fix 500 on /wordquiz/next: LIMIT (wrong_count + 1) → LIMIT 5 2026-10-15 17:45:24 +00:00
Drobysh d334bc958d Merge pull request '[Eva] Ева, начинаем новую игру ChooseWord («Уг' (#47) from eva/chat-d4b957-backend into main
Reviewed-on: #47
2026-10-15 17:11:32 +00:00
Drobysh ccd733ba36 [Eva] /check: новые триггеры достижений 2026-10-15 17:10:37 +00:00
Drobysh b7c6bd9ebe [Eva] /check: накопление no_mistakes_streak + запись 2026-10-15 17:10:33 +00:00
Drobysh b25f27fcfe [Eva] /check: читаем no_mistakes_streak 2026-10-15 17:10:28 +00:00
Drobysh 69224b546b [Eva] 6 новых достижений Word Quiz (часть 2) 2026-10-15 17:09:58 +00:00
Drobysh d375a1e1ac [Eva] 6 новых достижений Word Quiz (часть 1) 2026-10-15 17:09:42 +00:00
Drobysh 739cda7eb8 [Eva] quiz_speed_2: тип → quiz_speed_2 2026-10-15 17:09:14 +00:00
Drobysh 8f96c61f29 [Eva] quiz_speed: тип → quiz_speed_3 2026-10-15 17:09:11 +00:00
Drobysh 96abab9883 [Eva] quiz_streak_20: тип → quiz_correct_streak 2026-10-15 17:09:08 +00:00
Drobysh 689a2258c0 [Eva] quiz_perfect_10: тип → quiz_correct_streak 2026-10-15 17:09:05 +00:00
Drobysh cc8e0e01f0 [Eva] Заголовок секции Word Quiz 8 → 20 2026-10-15 17:08:51 +00:00
Drobysh 7d5e3a7d8f [Eva] Миграция: no_mistakes_streak в word_quiz_progress 2026-10-15 17:08:48 +00:00
Drobysh 934e81a55a [Eva] ChooseWord /check: убираю поле stars из ответа 2026-10-15 17:02:13 +00:00
Drobysh 7e8c0e132e [Eva] ChooseWord /check: очки по сложности вместо звёзд 2026-10-15 17:02:06 +00:00
Drobysh af3c634bfd [Eva] ChooseWord /check: проверка языка + difficulty 2026-10-15 17:01:58 +00:00
Drobysh 7ddfc2e451 [Eva] ChooseWord /next: time_limit + новый return 2026-10-15 17:01:55 +00:00
Drobysh 34bae9bb6a [Eva] ChooseWord /next: обрезка вариантов по wrong_count 2026-10-15 17:01:52 +00:00
Drobysh 175691136e [Eva] ChooseWord /next: проверка минимума по wrong_count 2026-10-15 17:01:47 +00:00
Drobysh 7f5fc8311c [Eva] ChooseWord /next: LIMIT fallback по wrong_count 2026-10-15 17:01:44 +00:00
Drobysh edf29cb806 [Eva] ChooseWord /next: LIMIT по wrong_count 2026-10-15 17:01:41 +00:00
Drobysh 279fc5f313 [Eva] ChooseWord /next: проверка языка + wrong_count по сложности 2026-10-15 17:01:39 +00:00
Drobysh 07eebf6fed [Eva] ChooseWord /next: читаем difficulty из users 2026-10-15 17:01:35 +00:00
Drobysh c60f9a39c2 Merge pull request '[Eva] Ева, привет! Задача — собрать анамнез по' (#46) from eva/chat-42ebdc-backend into main
Reviewed-on: #46
2026-10-15 08:13:21 +00:00
Drobysh ced4cd1c8e [Eva] Триггеры новых достижений bubble_words/no_mistakes/streak/xp/speed_15/perfect_streak 2026-10-15 08:12:53 +00:00
Drobysh 25b1437e0b [Eva] Накопление счётчиков words_collected/no_hints_streak/perfect_streak в /complete 2026-10-15 08:12:49 +00:00
Drobysh d77d9bdaef [Eva] achievements: +4 достижения Bubble Words (часть 3) 2026-10-15 08:10:23 +00:00
Drobysh 85a168e8d7 [Eva] achievements: +4 достижения Bubble Words (часть 2) 2026-10-15 08:10:12 +00:00
Drobysh 7204111ad6 [Eva] achievements: +4 достижения Bubble Words (часть 1) 2026-10-15 08:09:54 +00:00
Drobysh 214567383e [Eva] achievements: Bubble Words 8 → 20 (заголовок секции) 2026-10-15 08:07:30 +00:00
Drobysh 3257b5da3b [Eva] Миграция: 3 колонки в bubble_words_progress (words_collected, no_hints_streak, perfect_streak) 2026-10-15 08:05:27 +00:00
Drobysh 92780b247d [Eva] bubble_speed_30: тип bubble_speed → bubble_speed_30 2026-10-15 08:01:19 +00:00
Drobysh eeb5a382c9 [Eva] bubble_speed: тип bubble_speed → bubble_speed_45 2026-10-15 08:01:16 +00:00
Drobysh ab45d026dd [Eva] bubblewords: передаём тип bubble_speed_45 2026-10-15 08:01:06 +00:00
Drobysh b6a8783ad0 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#45) from eva/chat-b7c183-backend into main
Reviewed-on: #45
2026-10-14 16:52:17 +00:00
Drobysh abc3a8ae7d Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#44) from eva/chat-b7c183-backend into main
Reviewed-on: #44
2026-10-14 11:59:16 +00:00
Drobysh 3f7e7ef8d6 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#43) from eva/chat-b7c183-backend into main
Reviewed-on: #43
2026-10-14 11:06:40 +00:00
Drobysh 4bbaa0030f Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#42) from eva/chat-b7c183-backend into main
Reviewed-on: #42
2026-10-14 09:37:45 +00:00
Drobysh 3c60cfed31 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#41) from eva/chat-b7c183-backend into main
Reviewed-on: #41
2026-10-14 09:25:07 +00:00
Drobysh 118345f701 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#40) from eva/chat-b7c183-backend into main
Reviewed-on: #40
2026-10-14 09:03:24 +00:00
11 changed files with 1135 additions and 198 deletions
+246 -5
View File
@@ -244,6 +244,21 @@ async def init_db():
""") """)
logger.info("Added wave column to user_progress") logger.info("Added wave column to user_progress")
# ============ Авто-миграция: добавляем found_words в user_progress ============
# 🔧 НОВОЕ (02.11.2026): found_words — список уже найденных слов уровня.
# Нужен, чтобы (1) повторный свайп найденного слова не накручивал
# серию и (2) complete-level мог проверить, что все слова найдены.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'user_progress' AND column_name = 'found_words'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE user_progress
ADD COLUMN found_words TEXT[] DEFAULT '{}'
""")
logger.info("Added found_words column to user_progress")
# ============ sentences ============ # ============ sentences ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS sentences ( CREATE TABLE IF NOT EXISTS sentences (
@@ -258,20 +273,31 @@ async def init_db():
) )
""") """)
# ============ Убираем старый UNIQUE constraint с sentences.sentence_number ============ # ============ Убираем составной UNIQUE (level, sentence_number) ============
await conn.execute(""" await conn.execute("""
ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_key ALTER TABLE sentences DROP CONSTRAINT IF EXISTS sentences_sentence_number_unique
""") """)
# ============ Добавляем составной UNIQUE (level, sentence_number) ============ # ============ Пересчёт номеров: единый пул 1..N ============
await conn.execute("""
UPDATE sentences s
SET sentence_number = sub.rn
FROM (
SELECT id, ROW_NUMBER() OVER (ORDER BY id) AS rn
FROM sentences
) sub
WHERE s.id = sub.id
""")
# ============ Добавляем UNIQUE (sentence_number) ============
await conn.execute(""" await conn.execute("""
DO $$ DO $$
BEGIN BEGIN
IF NOT EXISTS ( IF NOT EXISTS (
SELECT 1 FROM pg_constraint SELECT 1 FROM pg_constraint
WHERE conname = 'sentences_sentence_number_unique' WHERE conname = 'sentences_sentence_number_key'
) THEN ) THEN
ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_unique UNIQUE (level, sentence_number); ALTER TABLE sentences ADD CONSTRAINT sentences_sentence_number_key UNIQUE (sentence_number);
END IF; END IF;
END $$; END $$;
""") """)
@@ -300,6 +326,60 @@ async def init_db():
""") """)
logger.info("Added level column to sentence_progress") logger.info("Added level column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): list_opened — счётчик «показать предложение»
# для текущего предложения. Medium — лимит 2, Easy — ∞, Hard — 0.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'list_opened'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN list_opened INTEGER DEFAULT 0
""")
logger.info("Added list_opened column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): no_mistakes_streak — серия предложений без ошибок.
# +1 если предложение собрано без ошибок, иначе сброс в 0.
# Нужен для достижения sentence_no_mistakes.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): perfect_streak — серия идеальных предложений
# (без ошибок + без показов). +1 если всё чисто, иначе сброс в 0.
# Нужен для достижения sentence_perfect_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
logger.info("Added perfect_streak column to sentence_progress")
# 🔧 НОВОЕ (16.10.2026): completion_time — время прохождения последнего
# предложения (сек). Для статистики и бонуса Hard (≤15 сек).
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_progress' AND column_name = 'completion_time'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_progress
ADD COLUMN completion_time INTEGER DEFAULT 0
""")
logger.info("Added completion_time column to sentence_progress")
# ============ typing_progress ============ # ============ typing_progress ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS typing_progress ( CREATE TABLE IF NOT EXISTS typing_progress (
@@ -863,6 +943,20 @@ async def init_db():
""") """)
logger.info("Added current_mistakes column to word_quiz_progress") logger.info("Added current_mistakes column to word_quiz_progress")
# 🔧 НОВОЕ (15.10.2026): no_mistakes_streak — серия раундов без ошибок
# в «Выбери слово». +1 если раунд пройден без ошибок, иначе сброс в 0.
# Нужен для достижения quiz_no_mistakes_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'word_quiz_progress' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE word_quiz_progress
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to word_quiz_progress")
# ============ bubble_words_progress ============ # ============ bubble_words_progress ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS bubble_words_progress ( CREATE TABLE IF NOT EXISTS bubble_words_progress (
@@ -938,6 +1032,111 @@ async def init_db():
""") """)
logger.info("Added hinted_words column to bubble_words_progress") logger.info("Added hinted_words column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): words_collected — суммарно собранных слов
# в пузырях. Нужен для достижения bubble_words (собрать N слов).
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'words_collected'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN words_collected INTEGER DEFAULT 0
""")
logger.info("Added words_collected column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): no_hints_streak — серия уровней БЕЗ подсказок
# и без «показать слова». +1 если hints_used == 0 и not list_opened,
# иначе сброс в 0. Нужен для достижения bubble_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'no_hints_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN no_hints_streak INTEGER DEFAULT 0
""")
logger.info("Added no_hints_streak column to bubble_words_progress")
# 🔧 НОВОЕ (15.10.2026): perfect_streak — серия идеальных уровней
# (без подсказок + без списка + без ошибок). +1 если всё чисто,
# иначе сброс в 0. Нужен для достижения bubble_perfect_streak.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'bubble_words_progress' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE bubble_words_progress
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
logger.info("Added perfect_streak column to bubble_words_progress")
# ============ sentence_stats ============
# 🔧 НОВОЕ (16.10.2026): глобальная статистика игры «Составь предложение».
# PK = user_id (одна строка на юзера), по образцу word_quiz_progress.
# total_score — суммарные очки; no_mistakes_streak / perfect_streak —
# серии для достижений sentence_no_mistakes / sentence_perfect_streak.
await conn.execute("""
CREATE TABLE IF NOT EXISTS sentence_stats (
user_id BIGINT PRIMARY KEY
REFERENCES users(telegram_id) ON DELETE CASCADE,
total_score INTEGER DEFAULT 0,
no_mistakes_streak INTEGER DEFAULT 0,
perfect_streak INTEGER DEFAULT 0,
updated_at TIMESTAMP DEFAULT NOW()
)
""")
# ============ Авто-миграция: total_score ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'total_score'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN total_score INTEGER DEFAULT 0
""")
logger.info("Added total_score column to sentence_stats")
# ============ Авто-миграция: no_mistakes_streak ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'no_mistakes_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
""")
logger.info("Added no_mistakes_streak column to sentence_stats")
# ============ Авто-миграция: perfect_streak ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'perfect_streak'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN perfect_streak INTEGER DEFAULT 0
""")
logger.info("Added perfect_streak column to sentence_stats")
# ============ Авто-миграция: updated_at ============
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'sentence_stats' AND column_name = 'updated_at'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE sentence_stats
ADD COLUMN updated_at TIMESTAMP DEFAULT NOW()
""")
logger.info("Added updated_at column to sentence_stats")
# ============ wrong_because_explanations ============ # ============ wrong_because_explanations ============
await conn.execute(""" await conn.execute("""
CREATE TABLE IF NOT EXISTS wrong_because_explanations ( CREATE TABLE IF NOT EXISTS wrong_because_explanations (
@@ -986,6 +1185,48 @@ async def init_db():
) )
""") """)
# ============ teacher_materials — материалы для AI-учителя ============
# 🔧 НОВОЕ (04.11.2026): единое хранилище материалов, на основе которых
# Марек (AI-учитель) отвечает. Вместо десятка таблиц — одна гибкая:
# category — тип материала (rule/cheatsheet/false_friend/word/text/
# alphabet/lesson/lecture/test/example/task), tags — теги для поиска
# (grammar/cases/verbs/...), level — A1..C2. Контент на 4 языках.
# Марек ищет материалы по тегам и отвечает на их основе (защита от
# галлюцинаций). Пополняется через Еву (Oleg пишет текст → Ева INSERT).
await conn.execute("""
CREATE TABLE IF NOT EXISTS teacher_materials (
id BIGSERIAL PRIMARY KEY,
category VARCHAR(50) NOT NULL,
title_pl TEXT,
title_ru TEXT,
title_uk TEXT,
title_en TEXT,
content_pl TEXT,
content_ru TEXT,
content_uk TEXT,
content_en TEXT,
tags TEXT[] DEFAULT '{}',
level VARCHAR(10) DEFAULT 'A1',
is_active BOOLEAN DEFAULT TRUE,
created_at TIMESTAMP DEFAULT NOW(),
updated_at TIMESTAMP DEFAULT NOW()
)
""")
# Индекс по категории (быстрый выбор по типу материала)
await conn.execute("""
CREATE INDEX IF NOT EXISTS idx_teacher_materials_category
ON teacher_materials(category, is_active)
""")
# GIN-индекс по тегам (поиск по массиву тегов)
await conn.execute("""
CREATE INDEX IF NOT EXISTS idx_teacher_materials_tags
ON teacher_materials USING GIN (tags)
""")
logger.info("Table teacher_materials initialized")
# ============ lectures — лекции (архивы) ============ # ============ lectures — лекции (архивы) ============
# 🔧 ОБНОВЛЕНО (27.09.2026): добавлены lecture_language и display_language. # 🔧 ОБНОВЛЕНО (27.09.2026): добавлены lecture_language и display_language.
# title_pl и title_ru/uk/en теперь nullable — фронт забирает заголовок # title_pl и title_ru/uk/en теперь nullable — фронт забирает заголовок
+1 -1
View File
@@ -283,7 +283,7 @@
| wrong_because | character varying | YES | | | wrong_because | character varying | YES | |
| edited_at | timestamp without time zone | YES | | | edited_at | timestamp without time zone | YES | |
## sentence_hints_used ## sentence_hints_used ⚠️ устаревшая (не используется)
| Колонка | Тип | NULL | Default | | Колонка | Тип | NULL | Default |
|---------|-----|------|---------| |---------|-----|------|---------|
+196 -25
View File
@@ -112,7 +112,7 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches", "desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches",
"type": "wordsearch_xp", "value": 10000}, "type": "wordsearch_xp", "value": 10000},
# ===== Sentence Builder (10) ===== # ===== Sentence Builder (20) =====
{"code": "first_sentence", "category": "sentence", "icon": "📝", {"code": "first_sentence", "category": "sentence", "icon": "📝",
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant", "name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
"desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence", "desc_pl": "Ułóż 1 zdanie", "desc_ru": "Составить 1 предложение", "desc_uk": "Скласти 1 речення", "desc_en": "Build 1 sentence",
@@ -138,20 +138,16 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences", "desc_pl": "Ułóż 200 zdań", "desc_ru": "Составить 200 предложений", "desc_uk": "Скласти 200 речень", "desc_en": "Build 200 sentences",
"type": "sentences_completed", "value": 200}, "type": "sentences_completed", "value": 200},
{"code": "perfect_sentence_5", "category": "sentence", "icon": "✨", {"code": "sentence_500", "category": "sentence", "icon": "🌟",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist", "name_pl": "Legenda zdań", "name_ru": "Легенда предложений", "name_uk": "Легенда речень", "name_en": "Sentence Legend",
"desc_pl": "Ułóż 5 zdań bez błędu", "desc_ru": "Составить 5 предложений без единой ошибки", "desc_uk": "Скласти 5 речень без жодної помилки", "desc_en": "Build 5 sentences without mistakes", "desc_pl": "Ułóż 500 zdań", "desc_ru": "Составить 500 предложений", "desc_uk": "Скласти 500 речень", "desc_en": "Build 500 sentences",
"type": "perfect_sentences", "value": 5}, "type": "sentences_completed", "value": 500},
{"code": "sentence_perfect_10", "category": "sentence", "icon": "💎", {"code": "sentence_1000", "category": "sentence", "icon": "👑",
"name_pl": "Mistrz zdań", "name_ru": "Мастер предложений", "name_uk": "Майстер речень", "name_en": "Sentence Master", "name_pl": "Guru zdań", "name_ru": "Гуру предложений", "name_uk": "Гуру речень", "name_en": "Sentence Guru",
"desc_pl": "Ułóż 10 zdań bez błędu", "desc_ru": "Составить 10 предложений без ошибок", "desc_uk": "Скласти 10 речень без помилок", "desc_en": "Build 10 sentences without mistakes", "desc_pl": "Ułóż 1000 zdań", "desc_ru": "Составить 1000 предложений", "desc_uk": "Скласти 1000 речень", "desc_en": "Build 1000 sentences",
"type": "perfect_sentences", "value": 10}, "type": "sentences_completed", "value": 1000},
{"code": "sentence_streak_10", "category": "sentence", "icon": "💪",
"name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Ułóż 10 zdań z rzędu bez błędu", "desc_ru": "Составить 10 предложений подряд без ошибок", "desc_uk": "Скласти 10 речень поспіль без помилок", "desc_en": "Build 10 sentences in a row without mistakes",
"type": "sentence_streak", "value": 10},
{"code": "speed_10", "category": "sentence", "icon": "🚀", {"code": "speed_10", "category": "sentence", "icon": "🚀",
"name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo", "name_pl": "Turbo", "name_ru": "Турбо", "name_uk": "Турбо", "name_en": "Turbo",
@@ -162,8 +158,63 @@ ACHIEVEMENTS_DATA = [
"name_pl": "Ekspres", "name_ru": "Экспресс", "name_uk": "Експрес", "name_en": "Express", "name_pl": "Ekspres", "name_ru": "Экспресс", "name_uk": "Експрес", "name_en": "Express",
"desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds", "desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds",
"type": "speed_sentence", "value": 5}, "type": "speed_sentence", "value": 5},
{"code": "sentence_speed_3", "category": "sentence", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Ułóż zdanie w mniej niż 3 sekundy", "desc_ru": "Составить предложение быстрее 3 секунд", "desc_uk": "Скласти речення швидше 3 секунд", "desc_en": "Build a sentence in under 3 seconds",
"type": "speed_sentence", "value": 3},
{"code": "sentence_no_mistakes_5", "category": "sentence", "icon": "✨",
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Ułóż 5 zdań bez błędu z rzędu", "desc_ru": "Составить 5 предложений без ошибок подряд", "desc_uk": "Скласти 5 речень без помилок поспіль", "desc_en": "Build 5 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 5},
{"code": "sentence_no_mistakes_10", "category": "sentence", "icon": "💎",
"name_pl": "Nieomylny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Infallible",
"desc_pl": "Ułóż 10 zdań bez błędu z rzędu", "desc_ru": "Составить 10 предложений без ошибок подряд", "desc_uk": "Скласти 10 речень без помилок поспіль", "desc_en": "Build 10 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 10},
{"code": "sentence_no_mistakes_25", "category": "sentence", "icon": "🏆",
"name_pl": "Mistrz czystości", "name_ru": "Мастер чистоты", "name_uk": "Майстер чистоти", "name_en": "Pure Master",
"desc_pl": "Ułóż 25 zdań bez błędu z rzędu", "desc_ru": "Составить 25 предложений без ошибок подряд", "desc_uk": "Скласти 25 речень без помилок поспіль", "desc_en": "Build 25 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 25},
{"code": "sentence_no_mistakes_50", "category": "sentence", "icon": "👑",
"name_pl": "Król czystości", "name_ru": "Король чистоты", "name_uk": "Король чистоти", "name_en": "Pure King",
"desc_pl": "Ułóż 50 zdań bez błędu z rzędu", "desc_ru": "Составить 50 предложений без ошибок подряд", "desc_uk": "Скласти 50 речень без помилок поспіль", "desc_en": "Build 50 sentences without mistakes in a row",
"type": "sentence_no_mistakes", "value": 50},
{"code": "sentence_perfect_streak_5", "category": "sentence", "icon": "✨",
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak",
"desc_pl": "Ułóż 5 idealnych zdań z rzędu", "desc_ru": "Составить 5 идеальных предложений подряд", "desc_uk": "Скласти 5 ідеальних речень поспіль", "desc_en": "Build 5 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 5},
{"code": "sentence_perfect_streak_10", "category": "sentence", "icon": "💎",
"name_pl": "Mistrz perfekcji", "name_ru": "Мастер идеала", "name_uk": "Майстер ідеалу", "name_en": "Perfection Master",
"desc_pl": "Ułóż 10 idealnych zdań z rzędu", "desc_ru": "Составить 10 идеальных предложений подряд", "desc_uk": "Скласти 10 ідеальних речень поспіль", "desc_en": "Build 10 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 10},
{"code": "sentence_perfect_streak_25", "category": "sentence", "icon": "🏆",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist",
"desc_pl": "Ułóż 25 idealnych zdań z rzędu", "desc_ru": "Составить 25 идеальных предложений подряд", "desc_uk": "Скласти 25 ідеальних речень поспіль", "desc_en": "Build 25 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 25},
{"code": "sentence_perfect_streak_50", "category": "sentence", "icon": "👑",
"name_pl": "Idealny król", "name_ru": "Идеальный король", "name_uk": "Ідеальний король", "name_en": "Perfect King",
"desc_pl": "Ułóż 50 idealnych zdań z rzędu", "desc_ru": "Составить 50 идеальных предложений подряд", "desc_uk": "Скласти 50 ідеальних речень поспіль", "desc_en": "Build 50 perfect sentences in a row",
"type": "sentence_perfect_streak", "value": 50},
{"code": "sentence_xp_1000", "category": "sentence", "icon": "💎",
"name_pl": "Zdaniowy XP", "name_ru": "XP предложений", "name_uk": "XP речень", "name_en": "Sentence XP",
"desc_pl": "Zdobądź 1000 punktów w zdaniach", "desc_ru": "Набрать 1000 очков в предложениях", "desc_uk": "Набрати 1000 балів у реченнях", "desc_en": "Earn 1000 points in sentences",
"type": "sentence_xp", "value": 1000},
{"code": "sentence_xp_5000", "category": "sentence", "icon": "👑",
"name_pl": "Zdaniowy diament", "name_ru": "Бриллиант предложений", "name_uk": "Діамант речень", "name_en": "Sentence Diamond",
"desc_pl": "Zdobądź 5000 punktów w zdaniach", "desc_ru": "Набрать 5000 очков в предложениях", "desc_uk": "Набрати 5000 балів у реченнях", "desc_en": "Earn 5000 points in sentences",
"type": "sentence_xp", "value": 5000},
# ===== Word Quiz (8) ===== # ===== Word Quiz (20) =====
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠", {"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
"name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker", "name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker",
"desc_pl": "Odgadnij 10 słów w Quiz słownym", "desc_ru": "Угадать 10 слов в Квизе слов", "desc_uk": "Відгадати 10 слів у Квізі слів", "desc_en": "Guess 10 words in Word Quiz", "desc_pl": "Odgadnij 10 słów w Quiz słownym", "desc_ru": "Угадать 10 слов в Квизе слов", "desc_uk": "Відгадати 10 слів у Квізі слів", "desc_en": "Guess 10 words in Word Quiz",
@@ -182,29 +233,89 @@ ACHIEVEMENTS_DATA = [
{"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎", {"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎",
"name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score", "name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score",
"desc_pl": "Odgadnij 10 słów bez pomyłki", "desc_ru": "Угадать 10 слов без ошибок", "desc_uk": "Відгадати 10 слів без помилок", "desc_en": "Guess 10 words without mistakes", "desc_pl": "Odgadnij 10 słów bez pomyłki", "desc_ru": "Угадать 10 слов без ошибок", "desc_uk": "Відгадати 10 слів без помилок", "desc_en": "Guess 10 words without mistakes",
"type": "quiz_perfect_streak", "value": 10}, "type": "quiz_correct_streak", "value": 10},
{"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥", {"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥",
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable", "name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
"desc_pl": "Odgadnij 20 słów z rzędu", "desc_ru": "Угадать 20 слов подряд", "desc_uk": "Відгадати 20 слів поспіль", "desc_en": "Guess 20 words in a row", "desc_pl": "Odgadnij 20 słów z rzędu", "desc_ru": "Угадать 20 слов подряд", "desc_uk": "Відгадати 20 слів поспіль", "desc_en": "Guess 20 words in a row",
"type": "quiz_perfect_streak", "value": 20}, "type": "quiz_correct_streak", "value": 20},
{"code": "quiz_speed", "category": "wordquiz", "icon": "⚡", {"code": "quiz_speed", "category": "wordquiz", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning", "name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Odgadnij słowo w mniej niż 3 sekundy", "desc_ru": "Угадать слово быстрее 3 секунд", "desc_uk": "Відгадати слово швидше 3 секунд", "desc_en": "Guess a word in under 3 seconds", "desc_pl": "Odgadnij słowo w mniej niż 3 sekundy", "desc_ru": "Угадать слово быстрее 3 секунд", "desc_uk": "Відгадати слово швидше 3 секунд", "desc_en": "Guess a word in under 3 seconds",
"type": "quiz_speed", "value": 3}, "type": "quiz_speed_3", "value": 3},
{"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀", {"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀",
"name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast", "name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast",
"desc_pl": "Odgadnij słowo w mniej niż 2 sekundy", "desc_ru": "Угадать слово быстрее 2 секунд", "desc_uk": "Відгадати слово швидше 2 секунд", "desc_en": "Guess a word in under 2 seconds", "desc_pl": "Odgadnij słowo w mniej niż 2 sekundy", "desc_ru": "Угадать слово быстрее 2 секунд", "desc_uk": "Відгадати слово швидше 2 секунд", "desc_en": "Guess a word in under 2 seconds",
"type": "quiz_speed", "value": 2}, "type": "quiz_speed_2", "value": 2},
{"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆", {"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆",
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless", "name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
"desc_pl": "Odgadnij słowo bez żadnej pomyłki", "desc_ru": "Угадать слово без единой ошибки", "desc_uk": "Відгадати слово без жодної помилки", "desc_en": "Guess a word without any mistakes", "desc_pl": "Odgadnij słowo bez żadnej pomyłki", "desc_ru": "Угадать слово без единой ошибки", "desc_uk": "Відгадати слово без жодної помилки", "desc_en": "Guess a word without any mistakes",
"type": "quiz_no_mistakes", "value": 1}, "type": "quiz_no_mistakes", "value": 1},
# ===== Bubble Words (8) ===== {"code": "quiz_1", "category": "wordquiz", "icon": "🎯",
"name_pl": "Pierwszy krok", "name_ru": "Первый шаг", "name_uk": "Перший крок", "name_en": "First Step",
"desc_pl": "Odgadnij 1 słowo", "desc_ru": "Угадать 1 слово", "desc_uk": "Вгадати 1 слово", "desc_en": "Guess 1 word",
"type": "quiz_guessed", "value": 1},
{"code": "quiz_25", "category": "wordquiz", "icon": "🎓",
"name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student",
"desc_pl": "Odgadnij 25 słów", "desc_ru": "Угадать 25 слов", "desc_uk": "Вгадати 25 слів", "desc_en": "Guess 25 words",
"type": "quiz_guessed", "value": 25},
{"code": "quiz_200", "category": "wordquiz", "icon": "📚",
"name_pl": "Erudyta", "name_ru": "Эрудит", "name_uk": "Ерудит", "name_en": "Erudite",
"desc_pl": "Odgadnij 200 słów", "desc_ru": "Угадать 200 слов", "desc_uk": "Вгадати 200 слів", "desc_en": "Guess 200 words",
"type": "quiz_guessed", "value": 200},
{"code": "quiz_500", "category": "wordquiz", "icon": "🌟",
"name_pl": "Legenda", "name_ru": "Легенда", "name_uk": "Легенда", "name_en": "Legend",
"desc_pl": "Odgadnij 500 słów", "desc_ru": "Угадать 500 слов", "desc_uk": "Вгадати 500 слів", "desc_en": "Guess 500 words",
"type": "quiz_guessed", "value": 500},
{"code": "quiz_1000", "category": "wordquiz", "icon": "👑",
"name_pl": "Guru", "name_ru": "Гуру", "name_uk": "Гуру", "name_en": "Guru",
"desc_pl": "Odgadnij 1000 słów", "desc_ru": "Угадать 1000 слов", "desc_uk": "Вгадати 1000 слів", "desc_en": "Guess 1000 words",
"type": "quiz_guessed", "value": 1000},
{"code": "quiz_correct_streak_5", "category": "wordquiz", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
"desc_pl": "5 poprawnych z rzędu", "desc_ru": "5 правильных подряд", "desc_uk": "5 правильних поспіль", "desc_en": "5 correct in a row",
"type": "quiz_correct_streak", "value": 5},
{"code": "quiz_streak_30", "category": "wordquiz", "icon": "💪",
"name_pl": "Na fali", "name_ru": "На волне", "name_uk": "На хвилі", "name_en": "On Fire",
"desc_pl": "30 poprawnych z rzędu", "desc_ru": "30 правильных подряд", "desc_uk": "30 правильних поспіль", "desc_en": "30 correct in a row",
"type": "quiz_correct_streak", "value": 30},
{"code": "quiz_streak_50", "category": "wordquiz", "icon": "🏆",
"name_pl": "Niezwyciężony", "name_ru": "Непобедимый", "name_uk": "Непереможний", "name_en": "Invincible",
"desc_pl": "50 poprawnych z rzędu", "desc_ru": "50 правильных подряд", "desc_uk": "50 правильних поспіль", "desc_en": "50 correct in a row",
"type": "quiz_correct_streak", "value": 50},
{"code": "quiz_no_mistakes_3", "category": "wordquiz", "icon": "✨",
"name_pl": "Czysta trójka", "name_ru": "Чистая тройка", "name_uk": "Чиста трійка", "name_en": "Clean Three",
"desc_pl": "3 rundy bez błędu z rzędu", "desc_ru": "3 раунда без ошибок подряд", "desc_uk": "3 раунди без помилок поспіль", "desc_en": "3 rounds without mistakes in a row",
"type": "quiz_no_mistakes_streak", "value": 3},
{"code": "quiz_perfect_25", "category": "wordquiz", "icon": "💎",
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist",
"desc_pl": "25 rund bez błędu z rzędu", "desc_ru": "25 раундов без ошибок подряд", "desc_uk": "25 раундів без помилок поспіль", "desc_en": "25 rounds without mistakes in a row",
"type": "quiz_no_mistakes_streak", "value": 25},
{"code": "quiz_speed_5", "category": "wordquiz", "icon": "⚡",
"name_pl": "Szybki", "name_ru": "Быстрый", "name_uk": "Швидкий", "name_en": "Fast",
"desc_pl": "Odgadnij słowo w mniej niż 5 sekund", "desc_ru": "Угадать слово быстрее 5 секунд", "desc_uk": "Вгадати слово швидше 5 секунд", "desc_en": "Guess a word in under 5 seconds",
"type": "quiz_speed_5", "value": 5},
{"code": "quiz_speed_1", "category": "wordquiz", "icon": "🚀",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Odgadnij słowo w mniej niż 1 sekundę", "desc_ru": "Угадать слово быстрее 1 секунды", "desc_uk": "Вгадати слово швидше 1 секунди", "desc_en": "Guess a word in under 1 second",
"type": "quiz_speed_1", "value": 1},
# ===== Bubble Words (20) =====
{"code": "bubble_5", "category": "bubblewords", "icon": "🫧", {"code": "bubble_5", "category": "bubblewords", "icon": "🫧",
"name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner", "name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner",
"desc_pl": "Ukończ 5 poziomów w Bąbelkach słów", "desc_ru": "Пройти 5 уровней в Пузырях слов", "desc_uk": "Пройти 5 рівнів у Бульбашках слів", "desc_en": "Complete 5 levels in Bubble Words", "desc_pl": "Ukończ 5 poziomów w Bąbelkach słów", "desc_ru": "Пройти 5 уровней в Пузырях слов", "desc_uk": "Пройти 5 рівнів у Бульбашках слів", "desc_en": "Complete 5 levels in Bubble Words",
@@ -230,20 +341,80 @@ ACHIEVEMENTS_DATA = [
"desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints", "desc_pl": "Ukończ poziom bez podpowiedzi", "desc_ru": "Пройти уровень без подсказок", "desc_uk": "Пройти рівень без підказок", "desc_en": "Complete a level without hints",
"type": "bubble_no_hints", "value": 1}, "type": "bubble_no_hints", "value": 1},
{"code": "bubble_perfect", "category": "bubblewords", "icon": "✨", {"code": "bubble_streak_25", "category": "bubblewords", "icon": "🔥",
"name_pl": "Perfekcyjny", "name_ru": "Идеальный", "name_uk": "Ідеальний", "name_en": "Perfect", "name_pl": "Dwadzieścia pięć z rzędu", "name_ru": "Двадцать пять подряд", "name_uk": "Двадцять п'ять поспіль", "name_en": "Twenty-Five in a Row",
"desc_pl": "Ukończ poziom z maksymalną punktacją (100)", "desc_ru": "Пройти уровень с максимальным счётом (100)", "desc_uk": "Пройти рівень з максимальним рахунком (100)", "desc_en": "Complete a level with maximum score (100)", "desc_pl": "Ukończ 25 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 25 уровней подряд без подсказок", "desc_uk": "Пройти 25 рівнів поспіль без підказок", "desc_en": "Complete 25 levels in a row without hints",
"type": "bubble_perfect", "value": 1}, "type": "bubble_streak", "value": 25},
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀", {"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles", "name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
"desc_pl": "Ukończ poziom w mniej niż 45 sekund", "desc_ru": "Пройти уровень быстрее 45 секунд", "desc_uk": "Пройти рівень швидше 45 секунд", "desc_en": "Complete a level in under 45 seconds", "desc_pl": "Ukończ poziom w mniej niż 45 sekund", "desc_ru": "Пройти уровень быстрее 45 секунд", "desc_uk": "Пройти рівень швидше 45 секунд", "desc_en": "Complete a level in under 45 seconds",
"type": "bubble_speed", "value": 45}, "type": "bubble_speed_45", "value": 45},
{"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡", {"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡",
"name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning", "name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning",
"desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds", "desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds",
"type": "bubble_speed", "value": 30}, "type": "bubble_speed_30", "value": 30},
{"code": "bubble_1", "category": "bubblewords", "icon": "🫧",
"name_pl": "Pierwszy bąbelek", "name_ru": "Первый пузырь", "name_uk": "Перша бульбашка", "name_en": "First Bubble",
"desc_pl": "Ukończ 1 poziom w Bąbelkach słów", "desc_ru": "Пройти 1 уровень в Пузырях слов", "desc_uk": "Пройти 1 рівень у Бульбашках слів", "desc_en": "Complete 1 level in Bubble Words",
"type": "bubble_levels", "value": 1},
{"code": "bubble_10", "category": "bubblewords", "icon": "🫧",
"name_pl": "Dziesięć bąbelków", "name_ru": "Десять пузырей", "name_uk": "Десять бульбашок", "name_en": "Ten Bubbles",
"desc_pl": "Ukończ 10 poziomów w Bąbelkach słów", "desc_ru": "Пройти 10 уровней в Пузырях слов", "desc_uk": "Пройти 10 рівнів у Бульбашках слів", "desc_en": "Complete 10 levels in Bubble Words",
"type": "bubble_levels", "value": 10},
{"code": "bubble_words_25", "category": "bubblewords", "icon": "📚",
"name_pl": "Kolekcjoner", "name_ru": "Собиратель", "name_uk": "Колекціонер", "name_en": "Collector",
"desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words",
"type": "bubble_words", "value": 25},
{"code": "bubble_words_1000", "category": "bubblewords", "icon": "📚",
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
"desc_pl": "Zbierz 1000 słów", "desc_ru": "Собрать 1000 слов", "desc_uk": "Зібрати 1000 слів", "desc_en": "Collect 1000 words",
"type": "bubble_words", "value": 1000},
{"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥",
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
"desc_pl": "Ukończ 3 poziomy z rzędu bez podpowiedzi", "desc_ru": "Пройти 3 уровня подряд без подсказок", "desc_uk": "Пройти 3 рівні поспіль без підказок", "desc_en": "Complete 3 levels in a row without hints",
"type": "bubble_streak", "value": 3},
{"code": "bubble_streak_10", "category": "bubblewords", "icon": "💪",
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
"desc_pl": "Ukończ 10 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 10 уровней подряд без подсказок", "desc_uk": "Пройти 10 рівнів поспіль без підказок", "desc_en": "Complete 10 levels in a row without hints",
"type": "bubble_streak", "value": 10},
{"code": "bubble_words_100", "category": "bubblewords", "icon": "📖",
"name_pl": "Sto słów", "name_ru": "Сто слов", "name_uk": "Сто слів", "name_en": "Hundred Words",
"desc_pl": "Zbierz 100 słów", "desc_ru": "Собрать 100 слов", "desc_uk": "Зібрати 100 слів", "desc_en": "Collect 100 words",
"type": "bubble_words", "value": 100},
{"code": "bubble_xp_1000", "category": "bubblewords", "icon": "💎",
"name_pl": "Bąbelkowy XP", "name_ru": "Пузырьковый XP", "name_uk": "Бульбашковий XP", "name_en": "Bubble XP",
"desc_pl": "Zdobądź 1000 XP w Bąbelkach", "desc_ru": "Набрать 1000 XP в пузырях", "desc_uk": "Набрати 1000 XP у бульбашках", "desc_en": "Earn 1000 XP in Bubbles",
"type": "bubble_xp", "value": 1000},
{"code": "bubble_200", "category": "bubblewords", "icon": "👑",
"name_pl": "Dwustu poziomów", "name_ru": "Двести уровней", "name_uk": "Двісті рівнів", "name_en": "Two Hundred Levels",
"desc_pl": "Ukończ 200 poziomów w Bąbelkach słów", "desc_ru": "Пройти 200 уровней в Пузырях слов", "desc_uk": "Пройти 200 рівнів у Бульбашках слів", "desc_en": "Complete 200 levels in Bubble Words",
"type": "bubble_levels", "value": 200},
{"code": "bubble_speed_15", "category": "bubblewords", "icon": "⚡",
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
"desc_pl": "Ukończ poziom w mniej niż 15 sekund", "desc_ru": "Пройти уровень быстрее 15 секунд", "desc_uk": "Пройти рівень швидше 15 секунд", "desc_en": "Complete a level in under 15 seconds",
"type": "bubble_speed_15", "value": 15},
{"code": "bubble_speed_10", "category": "bubblewords", "icon": "⚡",
"name_pl": "Mgnienie", "name_ru": "Мгновение", "name_uk": "Миттєвість", "name_en": "Blink",
"desc_pl": "Ukończ poziom w mniej niż 10 sekund", "desc_ru": "Пройти уровень быстрее 10 секунд", "desc_uk": "Пройти рівень швидше 10 секунд", "desc_en": "Complete a level in under 10 seconds",
"type": "bubble_speed_10", "value": 10},
{"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆",
"name_pl": "Pięćset słów", "name_ru": "Пятьсот слов", "name_uk": "П'ятсот слів", "name_en": "Five Hundred Words",
"desc_pl": "Zbierz 500 słów", "desc_ru": "Собрать 500 слов", "desc_uk": "Зібрати 500 слів", "desc_en": "Collect 500 words",
"type": "bubble_words", "value": 500},
# ===== General (9) ===== # ===== General (9) =====
{"code": "score_1000", "category": "general", "icon": "🌟", {"code": "score_1000", "category": "general", "icon": "🌟",
+49 -19
View File
@@ -1,5 +1,4 @@
import random import random
import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования
import json import json
from fastapi import APIRouter, Request, HTTPException from fastapi import APIRouter, Request, HTTPException
from auth import require_auth from auth import require_auth
@@ -82,15 +81,9 @@ def split_word_into_parts(word: str, forbidden_parts: set = None) -> list:
attempts += 1 attempts += 1
# Если за 50 попыток не нашли уникальное разбиение — # Если за 50 попыток не нашли уникальное разбиение —
# разбиваем слово ПО БУКВАМ и добавляем суффикс с хешем слова # разбиваем слово ПО БУКВАМ (каждая буква — отдельный пузырь).
# Такой суффикс гарантированно уникален для каждого слова # Без суффиксов: части остаются чистыми, игрок видит обычные буквы.
# 🔧 ИСПРАВЛЕНО: заменён hash() на hashlib.md5 для стабильности между запусками return [letter for letter in word]
word_hash = hashlib.md5(word.encode('utf-8')).hexdigest()[:4] # Берём первые 4 символа MD5
unique_parts = []
for idx, letter in enumerate(word):
unique_parts.append(f"{letter}.{word_hash}.{idx}")
return unique_parts
@router.get("/next") @router.get("/next")
@@ -370,14 +363,14 @@ async def complete_bubble_level(request: Request):
list_opened = (progress["current_list_opened"] if progress else 0) or 0 list_opened = (progress["current_list_opened"] if progress else 0) or 0
# 🔧 НОВОЕ (14.10.2026): очки по формуле филворда. # 🔧 НОВОЕ (14.10.2026): очки по формуле филворда.
# Hard — фикс 110. Easy/Medium — 100 − 20×hints − 20×list + bonus. # Hard — фикс 150. Easy/Medium — 100 − 20×hints − 20×list + bonus.
if difficulty == "hard": if difficulty == "hard":
if hints_used > 0 or list_opened: if hints_used > 0 or list_opened:
raise HTTPException( raise HTTPException(
status_code=400, status_code=400,
detail="Hints and word list are disabled on Hard difficulty" detail="Hints and word list are disabled on Hard difficulty"
) )
points = 110 points = 150
else: else:
bonus = 10 if hints_used == 0 else 0 bonus = 10 if hints_used == 0 else 0
penalty_hints = 20 * hints_used penalty_hints = 20 * hints_used
@@ -389,11 +382,16 @@ async def complete_bubble_level(request: Request):
xp_result = await award_xp(conn, telegram_id, "bubbles", points) xp_result = await award_xp(conn, telegram_id, "bubbles", points)
score = xp_result["points"] score = xp_result["points"]
# 🔧 НОВОЕ (15.10.2026): флаги для накопления серий.
no_hints_clean = 1 if (hints_used == 0 and not list_opened) else 0
perfect_clean = 1 if (hints_used == 0 and not list_opened and wrong_words == 0) else 0
await conn.execute(""" await conn.execute("""
INSERT INTO bubble_words_progress INSERT INTO bubble_words_progress
(user_id, levels_completed, total_score, level, (user_id, levels_completed, total_score, level,
current_hints_used, current_list_opened, current_level_words, hinted_words) current_hints_used, current_list_opened, current_level_words, hinted_words,
VALUES ($1, 1, $2, $3, 0, 0, '[]'::jsonb, '{}') words_collected, no_hints_streak, perfect_streak)
VALUES ($1, 1, $2, $3, 0, 0, '[]'::jsonb, '{}', $4, $5, $6)
ON CONFLICT (user_id) DO UPDATE ON CONFLICT (user_id) DO UPDATE
SET levels_completed = bubble_words_progress.levels_completed + 1, SET levels_completed = bubble_words_progress.levels_completed + 1,
total_score = bubble_words_progress.total_score + $2, total_score = bubble_words_progress.total_score + $2,
@@ -401,8 +399,23 @@ async def complete_bubble_level(request: Request):
current_hints_used = 0, current_hints_used = 0,
current_list_opened = 0, current_list_opened = 0,
current_level_words = '[]'::jsonb, current_level_words = '[]'::jsonb,
hinted_words = '{}' hinted_words = '{}',
""", telegram_id, score, current_level) words_collected = COALESCE(bubble_words_progress.words_collected, 0) + $4,
no_hints_streak = CASE WHEN $5 = 1
THEN COALESCE(bubble_words_progress.no_hints_streak, 0) + 1 ELSE 0 END,
perfect_streak = CASE WHEN $6 = 1
THEN COALESCE(bubble_words_progress.perfect_streak, 0) + 1 ELSE 0 END
""", telegram_id, score, current_level, words_count, no_hints_clean, perfect_clean)
# 🔧 НОВОЕ (15.10.2026): читаем актуальные счётчики для проверки достижений.
stats = await conn.fetchrow("""
SELECT words_collected, no_hints_streak, perfect_streak, total_score
FROM bubble_words_progress WHERE user_id = $1
""", telegram_id)
words_collected = stats["words_collected"] or 0
no_hints_streak = stats["no_hints_streak"] or 0
perfect_streak = stats["perfect_streak"] or 0
bubble_total_score = stats["total_score"] or 0
# Данные для достижений # Данные для достижений
total_levels = await conn.fetchval( total_levels = await conn.fetchval(
@@ -416,13 +429,30 @@ async def complete_bubble_level(request: Request):
] ]
if hints_used == 0: if hints_used == 0:
achievements_to_check.append(("bubble_no_hints", 1)) achievements_to_check.append(("bubble_no_hints", 1))
if hints_used == 0 and not list_opened and wrong_words == 0:
achievements_to_check.append(("bubble_perfect", 1))
if completion_time is not None and 0 < completion_time <= 45: if completion_time is not None and 0 < completion_time <= 45:
achievements_to_check.append(("bubble_speed", 45)) achievements_to_check.append(("bubble_speed_45", 45))
if completion_time is not None and 0 < completion_time <= 30: if completion_time is not None and 0 < completion_time <= 30:
achievements_to_check.append(("bubble_speed_30", 30)) achievements_to_check.append(("bubble_speed_30", 30))
# 🔧 НОВОЕ (15.10.2026): триггеры новых достижений.
# bubble_words — всего слов собрано
achievements_to_check.append(("bubble_words", words_collected))
# bubble_streak — серия без подсказок (если > 0)
if no_hints_streak > 0:
achievements_to_check.append(("bubble_streak", no_hints_streak))
# bubble_xp — XP в пузырях (total_score — очки именно пузырей)
achievements_to_check.append(("bubble_xp", bubble_total_score))
# bubble_speed_15 — быстрее 15 сек
if completion_time is not None and 0 < completion_time <= 15:
achievements_to_check.append(("bubble_speed_15", 15))
# bubble_speed_10 — быстрее 10 сек
if completion_time is not None and 0 < completion_time <= 10:
achievements_to_check.append(("bubble_speed_10", 10))
# Достижения — вне транзакции # Достижения — вне транзакции
from routers.achievements import check_and_award_achievements from routers.achievements import check_and_award_achievements
new_achievements = [] new_achievements = []
+38 -6
View File
@@ -275,14 +275,33 @@ async def check_word(request: Request):
) )
current_streak = current_streak_row or 0 current_streak = current_streak_row or 0
# 🔧 НОВОЕ (02.11.2026): found_words — какие слова уже найдены.
# Повторный свайп уже найденного слова не должен накручивать серию.
found_words_row = await conn.fetchval(
"SELECT found_words FROM user_progress WHERE user_id = $1 AND level_id = $2",
telegram_id, level_id
)
found_words = list(found_words_row or [])
if found_word: if found_word:
if found_word in found_words:
# Слово уже найдено — не накручиваем серию.
return {
"status": "ok",
"found": True,
"word": found_word,
"server_streak": current_streak,
"already_found": True,
"new_achievements": []
}
server_streak = current_streak + 1 server_streak = current_streak + 1
found_words.append(found_word)
await conn.execute(""" await conn.execute("""
INSERT INTO user_progress (user_id, level_id, current_streak, level) INSERT INTO user_progress (user_id, level_id, current_streak, level, found_words)
VALUES ($1, $2, $3, $4) VALUES ($1, $2, $3, $4, $5)
ON CONFLICT (user_id, level_id) DO UPDATE ON CONFLICT (user_id, level_id) DO UPDATE
SET current_streak = $3 SET current_streak = $3, found_words = $5
""", telegram_id, level_id, server_streak, level_name) """, telegram_id, level_id, server_streak, level_name, found_words)
else: else:
if current_streak > 0: if current_streak > 0:
await conn.execute(""" await conn.execute("""
@@ -425,6 +444,19 @@ async def complete_level(request: Request):
) or 0 ) or 0
hints_used = min(max(0, hints_used), 3) hints_used = min(max(0, hints_used), 3)
# 🔧 НОВОЕ (02.11.2026): проверяем, что все слова найдены.
# Раньше можно было вызвать complete-level напрямую, не найдя
# ни одного слова, и получить очки.
found_words = await conn.fetchval(
"SELECT found_words FROM user_progress WHERE user_id = $1 AND level_id = $2",
telegram_id, level_id
) or []
total_words = await conn.fetchval(
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
) or 0
if len(found_words) < total_words:
raise HTTPException(400, "Not all words found")
# 🆕 Штрафы (филворд): # 🆕 Штрафы (филворд):
# -20 за открытие списка слов (один раз за уровень) # -20 за открытие списка слов (один раз за уровень)
# -20 за каждую подсказку # -20 за каждую подсказку
@@ -439,8 +471,8 @@ async def complete_level(request: Request):
# Очки в зависимости от сложности # Очки в зависимости от сложности
if difficulty == "hard": if difficulty == "hard":
# Hard: фикс 110 (без подсказок и списка) # Hard: фикс 150 (без подсказок и списка)
points = 110 points = 150
else: else:
# Easy / Medium # Easy / Medium
bonus = 10 if hints_used == 0 else 0 bonus = 10 if hints_used == 0 else 0
+130 -76
View File
@@ -7,39 +7,6 @@ from database import get_pool
router = APIRouter(prefix="/sentences", tags=["sentences"]) router = APIRouter(prefix="/sentences", tags=["sentences"])
@router.get("/{sentence_id}/hint")
async def get_sentence_hint(sentence_id: int, request: Request):
"""Получить правильное предложение в качестве подсказки (одноразово)"""
telegram_id, _ = await require_auth(request)
pool = await get_pool()
async with pool.acquire() as conn:
row = await conn.fetchrow(
"SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id
)
if not row:
raise HTTPException(404, "Sentence not found")
# 🔧 ФИКС (24.09.2026): sentence_hint_no_limit — лимит 1 раз на предложение.
already_used = await conn.fetchval(
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
telegram_id, sentence_id
)
if already_used:
raise HTTPException(403, "Hint already used for this sentence")
# Записываем использование
await conn.execute("""
INSERT INTO sentence_hints_used (user_id, sentence_id)
VALUES ($1, $2)
ON CONFLICT (user_id, sentence_id) DO NOTHING
""", telegram_id, sentence_id)
return {
"sentence_pl": row["sentence_pl"],
}
def load_sentences_from_csv(filename): def load_sentences_from_csv(filename):
"""Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian).""" """Загружает предложения из CSV файла (формат: polish,english,russian,ukrainian)."""
sentences = [] sentences = []
@@ -65,6 +32,7 @@ async def init_sentences():
("B1", "sentences_b1.csv"), ("B1", "sentences_b1.csv"),
] ]
offset = 0
for level, filename in level_files: for level, filename in level_files:
sentences = load_sentences_from_csv(filename) sentences = load_sentences_from_csv(filename)
for i, s in enumerate(sentences): for i, s in enumerate(sentences):
@@ -74,11 +42,12 @@ async def init_sentences():
await conn.execute( await conn.execute(
"""INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level) """INSERT INTO sentences (sentence_number, sentence_pl, translation_ru, translation_uk, translation_en, difficulty, level)
VALUES ($1, $2, $3, $4, $5, $6, $7) VALUES ($1, $2, $3, $4, $5, $6, $7)
ON CONFLICT (level, sentence_number) DO NOTHING""", ON CONFLICT (sentence_number) DO NOTHING""",
i + 1, s["sentence_pl"], offset + i + 1, s["sentence_pl"],
s["translation_ru"], s["translation_uk"], s["translation_en"], s["translation_ru"], s["translation_uk"], s["translation_en"],
difficulty, level difficulty, level
) )
offset += len(sentences)
def normalize_word_for_display(word: str) -> str: def normalize_word_for_display(word: str) -> str:
@@ -100,28 +69,34 @@ async def get_next_sentence(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id "SELECT app_language, difficulty FROM users WHERE telegram_id = $1", telegram_id
) )
if not user: if not user:
raise HTTPException(401, "User not registered") raise HTTPException(401, "User not registered")
lang = user["app_language"] or "pl" lang = user["app_language"] or "pl"
current_level = user["current_level"] or "A1" difficulty = user["difficulty"] or "medium"
# Находим случайное непройденное предложение нужного уровня # Находим случайное непройденное предложение (единый пул)
row = await conn.fetchrow(""" row = await conn.fetchrow("""
SELECT s.* FROM sentences s SELECT s.* FROM sentences s
WHERE s.level = $1 WHERE s.id NOT IN (
AND s.id NOT IN ( SELECT sentence_id FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL
SELECT sentence_id FROM sentence_progress WHERE user_id = $2
) )
ORDER BY RANDOM() ORDER BY RANDOM()
LIMIT 1 LIMIT 1
""", current_level, telegram_id) """, telegram_id)
if not row: if not row:
return {"completed": True, "message": "All sentences completed!"} return {"completed": True, "message": "All sentences completed!"}
# 🔧 НОВОЕ (16.10.2026): строка прогресса (in-progress) для счётчика list_opened.
await conn.execute("""
INSERT INTO sentence_progress (user_id, sentence_id, list_opened, completion_time)
VALUES ($1, $2, 0, 0)
ON CONFLICT (user_id, sentence_id) DO NOTHING
""", telegram_id, row["id"])
# Оригинальные слова (для проверки) # Оригинальные слова (для проверки)
correct_words = row["sentence_pl"].split() correct_words = row["sentence_pl"].split()
@@ -140,10 +115,64 @@ async def get_next_sentence(request: Request):
"correct_words": display_words, "correct_words": display_words,
"translation": translation, "translation": translation,
"difficulty": row["difficulty"], "difficulty": row["difficulty"],
"user_difficulty": difficulty,
"level": row["level"], "level": row["level"],
} }
@router.post("/show-answer")
async def show_answer(request: Request):
"""Подсказка «показать предложение». Easy — ∞ бесплатно, Medium — 2 раза × −20, Hard — 403."""
telegram_id, _ = await require_auth(request)
body = await request.json()
sentence_id = body.get("sentence_id")
if not sentence_id:
raise HTTPException(400, "sentence_id required")
pool = await get_pool()
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
)
if not user:
raise HTTPException(401, "User not registered")
difficulty = user["difficulty"] or "medium"
row = await conn.fetchrow(
"SELECT sentence_pl FROM sentences WHERE id = $1", sentence_id
)
if not row:
raise HTTPException(404, "Sentence not found")
if difficulty == "hard":
raise HTTPException(403, "Hints are disabled on Hard difficulty")
progress = await conn.fetchrow(
"SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
telegram_id, sentence_id
)
list_opened = (progress["list_opened"] if progress else 0) or 0
if difficulty == "medium":
if list_opened >= 2:
raise HTTPException(403, "Show answer limit reached on Medium difficulty")
await conn.execute("""
INSERT INTO sentence_progress (user_id, sentence_id, list_opened)
VALUES ($1, $2, 1)
ON CONFLICT (user_id, sentence_id) DO UPDATE
SET list_opened = sentence_progress.list_opened + 1
""", telegram_id, sentence_id)
new_list_opened = list_opened + 1
else:
new_list_opened = list_opened # Easy — не инкрементим
return {
"sentence_pl": row["sentence_pl"],
"list_opened": new_list_opened,
"max_list_opened": None if difficulty == "easy" else 2,
}
@router.post("/check") @router.post("/check")
async def check_sentence(request: Request): async def check_sentence(request: Request):
"""Проверка предложения с защитой от повторного прохождения и выдачей достижений""" """Проверка предложения с защитой от повторного прохождения и выдачей достижений"""
@@ -176,7 +205,7 @@ async def check_sentence(request: Request):
raise HTTPException(404, "Sentence not found") raise HTTPException(404, "Sentence not found")
existing_progress = await conn.fetchrow( existing_progress = await conn.fetchrow(
"SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2", "SELECT score, completed_at FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2 AND completed_at IS NOT NULL",
telegram_id, sentence_id telegram_id, sentence_id
) )
@@ -208,36 +237,67 @@ async def check_sentence(request: Request):
is_correct = user_words_normalized == correct_words_normalized is_correct = user_words_normalized == correct_words_normalized
if is_correct: if is_correct:
word_count = len(correct_words_original) # 🔧 НОВОЕ (16.10.2026): очки по формуле сложностей.
# Easy — фикс 20. Medium — 60 − 20×list_opened (мин 20).
# 🆕 Расчёт звёзд для "Составь предложение" # Hard — 100, +50 бонус если completion_time <= 15 сек.
# Старт 5. Штрафы:
# -1 за каждую неверную проверку (клиент шлёт wrong_checks)
# -1 если time > лимита (по длине: 3-4 → 30с, 5-6 → 45с, 7-8 → 60с)
wrong_checks = int(body.get("wrong_checks", 0) or 0) wrong_checks = int(body.get("wrong_checks", 0) or 0)
if word_count <= 4: user_row = await conn.fetchrow(
time_limit = 30 "SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
elif word_count <= 6: )
time_limit = 45 difficulty = (user_row["difficulty"] if user_row else None) or "medium"
else:
time_limit = 60
time_penalty = 1 if (completion_time and completion_time > time_limit) else 0 progress_row = await conn.fetchrow(
wrong_penalty = min(max(0, wrong_checks), 3) "SELECT list_opened FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
stars = max(1, 5 - wrong_penalty - time_penalty) telegram_id, sentence_id
)
list_opened = (progress_row["list_opened"] if progress_row else 0) or 0
if difficulty == "easy":
points = 20
elif difficulty == "medium":
points = max(20, 60 - 20 * list_opened)
else: # hard
points = 100
if completion_time is not None and completion_time <= 15:
points = 150
# Начисляем XP # Начисляем XP
from services.xp import award_xp from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "sentence", stars) xp_result = await award_xp(conn, telegram_id, "sentence", points)
score = xp_result["points"] score = xp_result["points"]
await conn.execute( await conn.execute(
"""INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level) """INSERT INTO sentence_progress (user_id, sentence_id, completed_at, score, level, completion_time)
VALUES ($1, $2, NOW(), $3, $4)""", VALUES ($1, $2, NOW(), $3, $4, $5)
telegram_id, sentence_id, score, row["level"], ON CONFLICT (user_id, sentence_id) DO UPDATE
SET completed_at = NOW(), score = $3, level = $4, completion_time = $5""",
telegram_id, sentence_id, score, row["level"], completion_time or 0,
) )
# 🔧 НОВОЕ (16.10.2026): серии в sentence_stats (PK user_id).
await conn.execute("""
INSERT INTO sentence_stats (user_id, total_score, no_mistakes_streak, perfect_streak, updated_at)
VALUES ($1, $2,
CASE WHEN $3 = 0 THEN 1 ELSE 0 END,
CASE WHEN $3 = 0 AND $4 = 0 THEN 1 ELSE 0 END,
NOW())
ON CONFLICT (user_id) DO UPDATE
SET total_score = sentence_stats.total_score + $2,
no_mistakes_streak = CASE WHEN $3 = 0 THEN sentence_stats.no_mistakes_streak + 1 ELSE 0 END,
perfect_streak = CASE WHEN $3 = 0 AND $4 = 0 THEN sentence_stats.perfect_streak + 1 ELSE 0 END,
updated_at = NOW()
""", telegram_id, score, wrong_checks, list_opened)
# 🔧 НОВОЕ (16.10.2026): читаем серии/очки для достижений.
stats_row = await conn.fetchrow(
"SELECT total_score, no_mistakes_streak, perfect_streak FROM sentence_stats WHERE user_id = $1",
telegram_id
)
sentence_total_score = stats_row["total_score"] if stats_row else 0
sentence_no_mistakes = stats_row["no_mistakes_streak"] if stats_row else 0
sentence_perfect_streak = stats_row["perfect_streak"] if stats_row else 0
# 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences — # 🔧 ФИКС (23.09.2026): achievements_nested_pool_acquire_sentences —
# раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(), # раньше check_and_award_achievements вызывался ВНУТРИ async with pool.acquire(),
# что могло привести к дедлоку пула. Теперь собираем данные внутри блока, # что могло привести к дедлоку пула. Теперь собираем данные внутри блока,
@@ -268,6 +328,9 @@ async def check_sentence(request: Request):
achievements_to_check = [ achievements_to_check = [
("sentences_completed", sentences_completed), ("sentences_completed", sentences_completed),
("total_score", grand_total), ("total_score", grand_total),
("sentence_no_mistakes", sentence_no_mistakes),
("sentence_perfect_streak", sentence_perfect_streak),
("sentence_xp", sentence_total_score),
] ]
if completion_time is not None and completion_time > 0: if completion_time is not None and completion_time > 0:
achievements_to_check.append(("speed_sentence", int(completion_time))) achievements_to_check.append(("speed_sentence", int(completion_time)))
@@ -287,7 +350,6 @@ async def check_sentence(request: Request):
"score": score, "score": score,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP # 🆕 XP
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],
@@ -315,21 +377,14 @@ async def get_sentence_stats(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( total = await conn.fetchval("SELECT COUNT(*) FROM sentences")
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
)
current_level = user["current_level"] if user else "A1"
total = await conn.fetchval(
"SELECT COUNT(*) FROM sentences WHERE level = $1", current_level
)
completed = await conn.fetchval( completed = await conn.fetchval(
"SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COUNT(*) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
total_score = await conn.fetchval( total_score = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND level = $2", "SELECT COALESCE(SUM(score), 0) FROM sentence_progress WHERE user_id = $1 AND completed_at IS NOT NULL",
telegram_id, current_level telegram_id
) )
return { return {
@@ -338,5 +393,4 @@ async def get_sentence_stats(request: Request):
"remaining": total - (completed or 0), "remaining": total - (completed or 0),
"total_score": total_score or 0, "total_score": total_score or 0,
"progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0, "progress_percent": round(((completed or 0) / total * 100), 1) if total > 0 else 0,
"level": current_level,
} }
+51 -11
View File
@@ -91,8 +91,12 @@ async def get_user_lang(conn, user_id: int) -> str:
async def get_teacher_ai_usage(conn, user_id: int) -> int: async def get_teacher_ai_usage(conn, user_id: int) -> int:
"""Получает количество AI-команд учителя за сегодня.""" """Получает количество AI-команд учителя за сегодня."""
# 🔧 ФИКС (03.11.2026): было COUNT(*) — считало СТРОКИ, а не команды.
# Таблица teacher_ai_usage хранит всё в одной строке на юзера (UNIQUE
# user_id+usage_date), где command_count растёт. COUNT(*) всегда давал
# 0 или 1 → счётчик «застревал» на «0 из 5». Теперь читаем command_count.
count = await conn.fetchval(""" count = await conn.fetchval("""
SELECT COUNT(*) FROM teacher_ai_usage SELECT command_count FROM teacher_ai_usage
WHERE user_id = $1 AND usage_date = CURRENT_DATE WHERE user_id = $1 AND usage_date = CURRENT_DATE
""", user_id) """, user_id)
return count or 0 return count or 0
@@ -110,10 +114,9 @@ async def increment_teacher_ai_usage(conn, user_id: int) -> None:
async def check_ai_limit(conn, user_id: int) -> bool: async def check_ai_limit(conn, user_id: int) -> bool:
"""Проверяет, может ли пользователь использовать AI-команду.""" """Проверяет, может ли пользователь использовать AI-команду."""
if user_id in ADMIN_IDS: # 🔧 (03.11.2026): лимит временно отключён — Oleg тестирует раздел.
return True # Вернём лимит (TEACHER_AI_DAILY_LIMIT) перед запуском для реальных юзеров.
usage = await get_teacher_ai_usage(conn, user_id) return True
return usage < TEACHER_AI_DAILY_LIMIT
async def start_learning_session(conn, user_id: int, level_code: str, topic_id: str, session_type: str) -> int: async def start_learning_session(conn, user_id: int, level_code: str, topic_id: str, session_type: str) -> int:
@@ -271,6 +274,8 @@ async def call_ai(prompt: str, system_prompt: str, max_tokens: int = 500) -> str
ai_response = ai_response.strip() ai_response = ai_response.strip()
ai_response = re.sub(r'\s*\([a-z_]+_[a-z_]+\)', '', ai_response) ai_response = re.sub(r'\s*\([a-z_]+_[a-z_]+\)', '', ai_response)
# 🔧 ФИКС (03.11.2026): убираем длинные тире (— и –) — заменяем на дефис.
ai_response = ai_response.replace('—', '-').replace('–', '-')
return ai_response return ai_response
except Exception as e: except Exception as e:
logger.error(f"AI error: {str(e)}") logger.error(f"AI error: {str(e)}")
@@ -1005,10 +1010,13 @@ async def teacher_free_message(request: Request):
lang = await get_user_lang(conn, telegram_id) lang = await get_user_lang(conn, telegram_id)
if not await check_ai_limit(conn, telegram_id): if not await check_ai_limit(conn, telegram_id):
usage = await get_teacher_ai_usage(conn, telegram_id)
return { return {
"response": "", "response": "",
"limit_exceeded": True, "limit_exceeded": True,
"message": get_ai_limit_message(lang) "message": get_ai_limit_message(lang),
"usage": usage,
"limit": TEACHER_AI_DAILY_LIMIT,
} }
context_parts = [] context_parts = []
@@ -1025,13 +1033,27 @@ async def teacher_free_message(request: Request):
context_text = "\n".join(context_parts) if context_parts else "" context_text = "\n".join(context_parts) if context_parts else ""
system_prompt = f"""Ты — Марек, учитель польского языка в приложении Filwords PL. # 🔧 (04.11.2026): Марек — учитель в Pleily (не Filwords PL).
Ты дружелюбный, поддерживающий и краткий. # Учитываем родной язык ученика: для каждого языка — свои нюансы объяснения.
lang_nuances = {
"pl": "Ученик — носитель польского языка. Объясняй углублённо: стилистика, нюансы, редкие формы, синонимы. Не переводи на другие языки.",
"ru": "Ученик — русскоговорящий. Объясняй через сходства и различия с русским: падежи, ложные друзья, похожие слова. Предупреждай о типичных ошибках русскоговорящих.",
"uk": "Ученик — украиноговорящий. Объясняй через сходства и различия с украинским: много общего, но есть ложные друзья. Предупреждай о типичных ошибках украиноговорящих.",
"en": "Ученик — англоговорящий. Объясняй через английский: грамматические параллели, ложные друзья, произношение. Предупреждай о типичных ошибках англоговорящих.",
}
nuance_text = lang_nuances.get(lang, lang_nuances["en"])
system_prompt = f"""Ты — Марек, дружелюбный учитель польского языка в приложении Pleily.
Ты помогаешь ученику выучить польский язык.
Отвечай на языке: {lang}. Отвечай на языке: {lang}.
Не используй markdown. Не используй markdown и длинные тире (—).
{nuance_text}
{context_text} {context_text}
Ученик может спросить что угодно: объяснить тему, перевести фразу, дать пример. Ты специализируешься ТОЛЬКО на Польше: польский язык, польская история, польская культура, жизнь в Польше, польские документы и всё, что связано с Польшей.
Если вопрос НЕ касается Польши, польского языка, польской истории, польской культуры, жизни в Польше или польских документов — вежливо откажись и скажи, что ты специализируешься только на Польше и польском языке. Не отвечай на посторонние вопросы (программирование, кулинария других стран, общие знания и т.п.).
Ученик может спросить что угодно про Польшу: объяснить тему, перевести фразу, дать пример, рассказать об истории или жизни в Польше.
Отвечай кратко (1-3 предложения) и по делу.""" Отвечай кратко (1-3 предложения) и по делу."""
# 🔧 ФИКС (05.10.2026): max_tokens_for_v4_pro — 300 → 900 # 🔧 ФИКС (05.10.2026): max_tokens_for_v4_pro — 300 → 900
@@ -1041,7 +1063,25 @@ async def teacher_free_message(request: Request):
async with pool.acquire() as conn: async with pool.acquire() as conn:
await increment_teacher_ai_usage(conn, telegram_id) await increment_teacher_ai_usage(conn, telegram_id)
return {"response": ai_response} async with pool.acquire() as conn:
usage = await get_teacher_ai_usage(conn, telegram_id)
return {"response": ai_response, "usage": usage, "limit": TEACHER_AI_DAILY_LIMIT}
@router.get("/ai-usage")
async def teacher_ai_usage(request: Request):
"""
Возвращает количество использованных AI-запросов учителя за сегодня
и дневной лимит.
"""
telegram_id, _ = await require_auth(request)
pool = await get_pool()
async with pool.acquire() as conn:
usage = await get_teacher_ai_usage(conn, telegram_id)
return {"usage": usage, "limit": TEACHER_AI_DAILY_LIMIT}
@router.post("/diagnostic-test") @router.post("/diagnostic-test")
+58 -27
View File
@@ -14,7 +14,7 @@ async def get_next_quiz(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id "SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
) )
if not user: if not user:
raise HTTPException(401, "User not registered") raise HTTPException(401, "User not registered")
@@ -22,6 +22,12 @@ async def get_next_quiz(request: Request):
lang = user["app_language"] or "pl" lang = user["app_language"] or "pl"
current_level = user["current_level"] or "A1" current_level = user["current_level"] or "A1"
if lang == 'pl':
raise HTTPException(403, "ChooseWord не поддерживает польский язык. Используйте другой язык.")
difficulty = user.get("difficulty") or "medium"
wrong_count = {"easy": 2, "medium": 3, "hard": 4}.get(difficulty, 3)
progress = await conn.fetchrow( progress = await conn.fetchrow(
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1", "SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
telegram_id telegram_id
@@ -73,7 +79,7 @@ async def get_next_quiz(request: Request):
LIMIT 5 LIMIT 5
""", current_level, correct_polish, *exclude_for_wrong) """, current_level, correct_polish, *exclude_for_wrong)
if len(wrong_words) < 2: if len(wrong_words) < wrong_count:
# 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words. # 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words.
wrong_words = await conn.fetch(""" wrong_words = await conn.fetch("""
SELECT word_pl SELECT word_pl
@@ -90,7 +96,7 @@ async def get_next_quiz(request: Request):
if wl not in seen: if wl not in seen:
wrong_options.append(w["word_pl"]) wrong_options.append(w["word_pl"])
seen.add(wl) seen.add(wl)
if len(wrong_options) >= 2: if len(wrong_options) >= wrong_count:
break break
recent_words = recent_words + [correct_polish] + wrong_options recent_words = recent_words + [correct_polish] + wrong_options
@@ -107,20 +113,14 @@ async def get_next_quiz(request: Request):
options = wrong_options + [correct_polish] options = wrong_options + [correct_polish]
random.shuffle(options) random.shuffle(options)
if total_guessed <= 10: time_limit = 10 if difficulty == "hard" else None
difficulty = "easy"
elif total_guessed <= 30:
difficulty = "medium"
elif total_guessed <= 60:
difficulty = "hard"
else:
difficulty = "expert"
return { return {
"correct_polish": correct_polish, "correct_polish": correct_polish,
"translation": translation, "translation": translation,
"options": options, "options": options,
"difficulty": difficulty, "difficulty": difficulty,
"time_limit": time_limit,
} }
@@ -157,6 +157,17 @@ async def check_quiz_answer(request: Request):
pool = await get_pool() pool = await get_pool()
async with pool.acquire() as conn: async with pool.acquire() as conn:
# Проверка языка
lang = await conn.fetchval(
"SELECT app_language FROM users WHERE telegram_id = $1", telegram_id
) or "pl"
if lang == 'pl':
raise HTTPException(403, "ChooseWord не поддерживает польский язык.")
difficulty = await conn.fetchval(
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
) or "medium"
# Читаем серверный streak и mistakes # Читаем серверный streak и mistakes
current_streak = await conn.fetchval( current_streak = await conn.fetchval(
"SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1", "SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1",
@@ -166,6 +177,10 @@ async def check_quiz_answer(request: Request):
"SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1", "SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1",
telegram_id telegram_id
) or 0 ) or 0
no_mistakes_streak = await conn.fetchval(
"SELECT no_mistakes_streak FROM word_quiz_progress WHERE user_id = $1",
telegram_id
) or 0
if is_correct: if is_correct:
current_streak += 1 current_streak += 1
@@ -183,32 +198,41 @@ async def check_quiz_answer(request: Request):
score = 0 score = 0
if is_correct: if is_correct:
# 🆕 Расчёт звёзд для "Выбери слово" # 🆕 Фиксированные очки по сложности (ChooseWord)
# Старт 5 звёзд. Штрафы: if difficulty == "easy":
# -1 за каждый неверный (макс 3) points = max(20, min(60, 60 - 20 * mistakes))
# -1 если time > 30 сек elif difficulty == "medium":
time_penalty = 1 if (completion_time and completion_time > 30) else 0 points = max(20, min(80, 80 - 20 * mistakes))
wrong_penalty = min(mistakes, 3) else: # hard
stars = max(1, 5 - wrong_penalty - time_penalty) points = max(20, min(110, 110 - 20 * mistakes))
if completion_time is not None and completion_time > 10:
points = 20
# Начисляем XP # Начисляем XP
from services.xp import award_xp from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "choose", stars) xp_result = await award_xp(conn, telegram_id, "choose", points)
score = xp_result["points"] score = xp_result["points"]
# no_mistakes_streak: +1 если раунд чистый, иначе сброс
if mistakes == 0:
no_mistakes_streak += 1
else:
no_mistakes_streak = 0
# Сбрасываем mistakes + обновляем серию # Сбрасываем mistakes + обновляем серию
await conn.execute(""" await conn.execute("""
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1 UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
""", telegram_id) """, telegram_id)
await conn.execute(""" await conn.execute("""
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak) INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, no_mistakes_streak)
VALUES ($1, 1, $2, $3) VALUES ($1, 1, $2, $3, $4)
ON CONFLICT (user_id) DO UPDATE ON CONFLICT (user_id) DO UPDATE
SET words_guessed = word_quiz_progress.words_guessed + 1, SET words_guessed = word_quiz_progress.words_guessed + 1,
total_score = word_quiz_progress.total_score + $2, total_score = word_quiz_progress.total_score + $2,
correct_streak = $3 correct_streak = $3,
""", telegram_id, score, current_streak) no_mistakes_streak = $4
""", telegram_id, score, current_streak, no_mistakes_streak)
# 🆕 Обновляем best_streak в choose_progress # 🆕 Обновляем best_streak в choose_progress
await conn.execute(""" await conn.execute("""
@@ -230,12 +254,20 @@ async def check_quiz_answer(request: Request):
("quiz_guessed", total_guessed), ("quiz_guessed", total_guessed),
("total_score", xp_result["total_xp"]), ("total_score", xp_result["total_xp"]),
] ]
if current_streak >= 10: if current_streak >= 5:
achievements_to_check.append(("quiz_perfect_streak", current_streak)) achievements_to_check.append(("quiz_correct_streak", current_streak))
if no_mistakes_streak > 0:
achievements_to_check.append(("quiz_no_mistakes_streak", no_mistakes_streak))
if mistakes == 0: if mistakes == 0:
achievements_to_check.append(("quiz_no_mistakes", 1)) achievements_to_check.append(("quiz_no_mistakes", 1))
if completion_time is not None and 0 < completion_time <= 5:
achievements_to_check.append(("quiz_speed_5", 5))
if completion_time is not None and 0 < completion_time <= 3: if completion_time is not None and 0 < completion_time <= 3:
achievements_to_check.append(("quiz_speed", 3)) achievements_to_check.append(("quiz_speed_3", 3))
if completion_time is not None and 0 < completion_time <= 2:
achievements_to_check.append(("quiz_speed_2", 2))
if completion_time is not None and 0 < completion_time <= 1:
achievements_to_check.append(("quiz_speed_1", 1))
else: else:
# При 3 ошибках — утешительный XP (10) # При 3 ошибках — утешительный XP (10)
if mistakes >= 3: if mistakes >= 3:
@@ -268,7 +300,6 @@ async def check_quiz_answer(request: Request):
"correct_streak": current_streak, "correct_streak": current_streak,
"new_achievements": new_achievements, "new_achievements": new_achievements,
# 🆕 XP-поля # 🆕 XP-поля
"stars": xp_result["stars"],
"base_points": xp_result["base_points"], "base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"], "multiplier": xp_result["multiplier"],
"points": xp_result["points"], "points": xp_result["points"],
+133
View File
@@ -0,0 +1,133 @@
"""
Генерирует фразу дня и сохраняет в БД (таблица daily_phrases).
Запускается по cron в 5:00 утра, чтобы фраза была готова заранее —
до того, как первый пользователь откроет её в приложении.
Эндпоинт GET /teacher/phrase-of-day потом просто отдаёт готовую фразу из кэша.
Запуск вручную (из папки backend):
python scripts/generate_daily_phrase.py
Cron (на сервере, пример):
0 5 * * * cd /root/filwordspl/backend && /usr/bin/python3 scripts/generate_daily_phrase.py >> /var/log/daily_phrase.log 2>&1
"""
import asyncio
import json
import os
import random
import sys
from datetime import datetime, timezone
# Добавляем корень backend в sys.path, чтобы работали импорты
# config / database / routers.teacher (как в FastAPI-приложении).
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
from database import get_pool
from routers.teacher import call_ai
TOPICS = [
"приветствие и знакомство",
"семья и друзья",
"еда и напитки",
"покупки и магазины",
"транспорт и путешествия",
"работа и профессии",
"погода и времена года",
"дом и квартира",
"хобби и свободное время",
"здоровье и самочувствие",
"город и местность",
"ежедневная рутина",
]
async def main():
pool = await get_pool()
async with pool.acquire() as conn:
today = datetime.now(timezone.utc).date()
existing = await conn.fetchrow(
"SELECT * FROM daily_phrases WHERE phrase_date = $1", today
)
if existing:
print(f"Фраза на {today} уже есть, пропускаю: {existing['phrase_pl']}")
return
selected_topic = random.choice(TOPICS)
system_prompt = f"""Ты — учитель польского языка. Создай фразу дня для изучения польского.
Тема фразы: {selected_topic}.
Фраза должна быть уровня A2-B1, полезной в повседневной жизни.
Верни ответ строго в таком формате (без markdown, просто текст):
PHRASE: [фраза на польском]
RU: [перевод на русский]
UK: [перевод на украинский]
EN: [перевод на английский]
PL_GRAMMAR: [грамматический разбор на польском, 1-2 предложения]
RU_GRAMMAR: [грамматический разбор на русском, 1-2 предложения]
UK_GRAMMAR: [грамматический разбор на украинском, 1-2 предложения]
EN_GRAMMAR: [грамматический разбор на английском, 1-2 предложения]"""
user_prompt = f"Создай фразу дня на тему: {selected_topic}."
ai_response = await call_ai(user_prompt, system_prompt, max_tokens=3000)
# Fallback значения (если AI не ответил)
phrase_pl = "Lepiej późno niż wcale."
translations = {
"ru": "Лучше поздно, чем никогда.",
"uk": "Краще пізно, ніж ніколи.",
"en": "Better late than never.",
}
grammar_breakdowns = {
"pl": "Lepiej - przyslowek w stopniu wyzszym. Pozno - przyslowek.",
"ru": "Lepiej - наречие в сравнительной степени. Pozno - наречие.",
"uk": "Lepiej - прислівник у вищому ступені. Pozno - прислівник.",
"en": "Lepiej - adverb in comparative degree. Pozno - adverb.",
}
if ai_response:
lines = ai_response.strip().split("\n")
for line in lines:
line = line.strip()
if line.startswith("PHRASE:"):
phrase_pl = line.replace("PHRASE:", "").strip()
elif line.startswith("RU:"):
translations["ru"] = line.replace("RU:", "").strip()
elif line.startswith("UK:"):
translations["uk"] = line.replace("UK:", "").strip()
elif line.startswith("EN:"):
translations["en"] = line.replace("EN:", "").strip()
elif line.startswith("PL_GRAMMAR:"):
grammar_breakdowns["pl"] = line.replace("PL_GRAMMAR:", "").strip()
elif line.startswith("RU_GRAMMAR:"):
grammar_breakdowns["ru"] = line.replace("RU_GRAMMAR:", "").strip()
elif line.startswith("UK_GRAMMAR:"):
grammar_breakdowns["uk"] = line.replace("UK_GRAMMAR:", "").strip()
elif line.startswith("EN_GRAMMAR:"):
grammar_breakdowns["en"] = line.replace("EN_GRAMMAR:", "").strip()
await conn.execute(
"""
INSERT INTO daily_phrases (phrase_date, phrase_pl, translations, grammar_breakdowns)
VALUES ($1, $2, $3::jsonb, $4::jsonb)
ON CONFLICT (phrase_date) DO UPDATE SET
phrase_pl = EXCLUDED.phrase_pl,
translations = EXCLUDED.translations,
grammar_breakdowns = EXCLUDED.grammar_breakdowns
""",
today,
phrase_pl,
json.dumps(translations, ensure_ascii=False),
json.dumps(grammar_breakdowns, ensure_ascii=False),
)
print(f"Фраза дня сгенерирована: {phrase_pl} ({today})")
await pool.close()
if __name__ == "__main__":
asyncio.run(main())
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env python3
"""
Сброс прогресса и достижений пользователя (для теста «как новый юзер»).
Что делает:
- удаляет весь игровой прогресс (филворд, пузыри, угадай слово,
предложения, печать, обучение, XP-лог, серии, волны, статистику слов);
- удаляет выданные достижения (user_achievements);
- обнуляет XP в user_profile (total_xp, weekly_xp);
- сбрасывает users.last_completed_level, last_completed_by_level, current_level.
Что НЕ трогает:
- саму учётку (users: telegram_id, device_id, apple_id, source);
- настройки (difficulty, app_language);
- авторизацию (auth_identities);
- поддержку (support_tickets / support_messages).
Запуск (из папки backend/):
python scripts/reset_user_progress.py --telegram-id -1
python scripts/reset_user_progress.py --device-id 11111111-2222-3333-4444-555555555555
python scripts/reset_user_progress.py --all-pleily
python scripts/reset_user_progress.py --telegram-id -1 --yes # без подтверждения
Без --yes скрипт спросит подтверждение.
"""
import argparse
import asyncio
import logging
import sys
from pathlib import Path
sys.path.insert(0, str(Path(__file__).parent.parent))
from database import get_pool
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
logger = logging.getLogger(__name__)
# Таблицы, где user_id = telegram_id. Чистим по каждому найденному юзеру.
USER_TABLES = [
"user_progress",
"sentence_progress",
"typing_progress",
"user_achievements",
"daily_logins",
"word_quiz_progress",
"bubble_words_progress",
"sentence_stats",
"choose_progress",
"user_seen_levels",
"user_game_progress",
"wave_results",
"user_seen_bubble_levels",
"user_word_stats",
"xp_log",
"typing_hints_used",
"chat_history",
"chat_usage",
"user_learning_answers",
"user_learning_answers_archive",
"user_lesson_progress",
"user_topic_progress",
"user_skill_mastery",
"learning_sessions",
"ai_user_context",
"teacher_chat_history",
"teacher_ai_usage",
]
async def resolve_user_ids(conn, telegram_id, device_id, all_pleily):
"""Возвращает список telegram_id, которых нужно сбросить."""
if telegram_id is not None:
row = await conn.fetchrow(
"SELECT telegram_id FROM users WHERE telegram_id = $1", telegram_id
)
if not row:
logger.error(f"❌ Пользователь с telegram_id={telegram_id} не найден")
return []
return [row["telegram_id"]]
if device_id is not None:
row = await conn.fetchrow(
"SELECT telegram_id FROM users WHERE device_id = $1::uuid", device_id
)
if not row:
logger.error(f"❌ Пользователь с device_id={device_id} не найден")
return []
return [row["telegram_id"]]
if all_pleily:
rows = await conn.fetch(
"SELECT telegram_id FROM users WHERE telegram_id < 0 OR source = 'pleily_device'"
)
return [r["telegram_id"] for r in rows]
return []
async def reset_user(conn, user_id: int) -> None:
"""Чистит прогресс одного пользователя в одной транзакции."""
async with conn.transaction():
for table in USER_TABLES:
await conn.execute(f"DELETE FROM {table} WHERE user_id = $1", user_id)
# Обнуляем XP-профиль (строку оставляем, чтобы не ломать FK).
await conn.execute(
"""
UPDATE user_profile
SET total_xp = 0, weekly_xp = 0, updated_at = NOW()
WHERE user_id = $1
""",
user_id,
)
# Сбрасываем прогресс уровней в users.
await conn.execute(
"""
UPDATE users
SET last_completed_level = 0,
last_completed_by_level = '{}'::jsonb,
current_level = 'A1'
WHERE telegram_id = $1
""",
user_id,
)
async def main() -> None:
parser = argparse.ArgumentParser(description="Сброс прогресса и достижений пользователя")
group = parser.add_mutually_exclusive_group(required=True)
group.add_argument("--telegram-id", type=int, help="telegram_id юзера (у Pleily отрицательный)")
group.add_argument("--device-id", type=str, help="UUID устройства (Pleily)")
group.add_argument("--all-pleily", action="store_true", help="сбросить ВСЕХ Pleily-юзеров")
parser.add_argument("--yes", action="store_true", help="не спрашивать подтверждение")
args = parser.parse_args()
pool = await get_pool()
async with pool.acquire() as conn:
user_ids = await resolve_user_ids(conn, args.telegram_id, args.device_id, args.all_pleily)
if not user_ids:
logger.warning("⚠️ Некого сбрасывать — выхожу")
return
logger.info(f"Найдено пользователей: {len(user_ids)} → {user_ids}")
if not args.yes:
answer = input(
f"Сбросить прогресс и достижения для {len(user_ids)} юзер(ов)? [y/N]: "
).strip().lower()
if answer not in ("y", "yes", "д", "да"):
logger.info("Отменено.")
return
for uid in user_ids:
await reset_user(conn, uid)
logger.info(f"✅ Сброшено: telegram_id={uid}")
logger.info("🎉 Готово! Можно тестировать как новый пользователь.")
if __name__ == "__main__":
asyncio.run(main())
+69 -28
View File
@@ -1966,44 +1966,85 @@ async def test_sentences_stats(smoke_user):
assert passed assert passed
async def test_sentences_hint(smoke_user, smoke_conn): async def test_sentences_show_answer_medium(smoke_user, smoke_conn):
"""GET /sentences/{id}/hint → sentence_pl, лимит 1 раз.""" """POST /sentences/show-answer — Medium: лимит 2 (200, 200, 403)."""
client = smoke_user client = smoke_user
# Берём предложение, которое юзер ещё НЕ проходил и НЕ брал подсказку await smoke_conn.execute(
sentence_id = await smoke_conn.fetchval(""" "UPDATE users SET difficulty = 'medium' WHERE telegram_id = $1", SMOKE_USER_ID
SELECT id FROM sentences )
WHERE id NOT IN (
SELECT sentence_id FROM sentence_hints_used WHERE user_id = $1
)
ORDER BY id LIMIT 1
""", SMOKE_USER_ID)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id: if not sentence_id:
pytest.skip("Нет предложений для hint-теста") pytest.skip("Нет предложений для show-answer теста")
return return
# 1. Первый запрос — 200 # Чистим list_opened, чтобы начать с 0
resp1 = await client.get(f"/sentences/{sentence_id}/hint") await smoke_conn.execute(
ok1 = resp1.status_code == 200 "DELETE FROM sentence_progress WHERE user_id = $1 AND sentence_id = $2",
body1 = resp1.json() if ok1 else {}
has_sentence = bool(body1.get("sentence_pl"))
# 2. Проверка в БД
recorded = await smoke_conn.fetchval(
"SELECT 1 FROM sentence_hints_used WHERE user_id = $1 AND sentence_id = $2",
SMOKE_USER_ID, sentence_id, SMOKE_USER_ID, sentence_id,
) is not None )
# 3. Второй запрос — 403 (лимит) resp1 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
resp2 = await client.get(f"/sentences/{sentence_id}/hint") resp2 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
limit_ok = resp2.status_code == 403 resp3 = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
passed = ok1 and has_sentence and recorded and limit_ok passed = resp1.status_code == 200 and resp2.status_code == 200 and resp3.status_code == 403
RESULTS.append(ScenarioResult( RESULTS.append(ScenarioResult(
"sentences_hint", "sentences", passed, "sentences_show_answer_medium", "sentences", passed,
f"first={resp1.status_code}, recorded={recorded}, second={resp2.status_code} (ожидали 403)", f"medium: 1={resp1.status_code}, 2={resp2.status_code}, 3={resp3.status_code} (ожидали 200/200/403)",
{"first_status": resp1.status_code, "recorded": recorded, "second_status": resp2.status_code}, {"first": resp1.status_code, "second": resp2.status_code, "third": resp3.status_code},
))
assert passed
async def test_sentences_show_answer_hard(smoke_user, smoke_conn):
"""POST /sentences/show-answer — Hard: сразу 403."""
client = smoke_user
await smoke_conn.execute(
"UPDATE users SET difficulty = 'hard' WHERE telegram_id = $1", SMOKE_USER_ID
)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id:
pytest.skip("Нет предложений для show-answer теста")
return
resp = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
passed = resp.status_code == 403
RESULTS.append(ScenarioResult(
"sentences_show_answer_hard", "sentences", passed,
f"hard: status={resp.status_code} (ожидали 403)",
{"status": resp.status_code},
))
assert passed
async def test_sentences_show_answer_easy(smoke_user, smoke_conn):
"""POST /sentences/show-answer — Easy: без лимита (несколько 200)."""
client = smoke_user
await smoke_conn.execute(
"UPDATE users SET difficulty = 'easy' WHERE telegram_id = $1", SMOKE_USER_ID
)
sentence_id = await smoke_conn.fetchval("SELECT id FROM sentences ORDER BY id LIMIT 1")
if not sentence_id:
pytest.skip("Нет предложений для show-answer теста")
return
statuses = []
for _ in range(3):
r = await client.post("/sentences/show-answer", json={"sentence_id": sentence_id})
statuses.append(r.status_code)
passed = all(s == 200 for s in statuses)
RESULTS.append(ScenarioResult(
"sentences_show_answer_easy", "sentences", passed,
f"easy: statuses={statuses} (ожидали все 200)",
{"statuses": statuses},
)) ))
assert passed assert passed