From f4f02f7078c2658cf644ba847af511482c455bc0 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:06:24 +0000 Subject: [PATCH 1/7] =?UTF-8?q?[Eva]=20=D0=A3=D1=87=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=20AI:=20=D0=B7=D0=B0=D0=BF=D1=80=D0=B5=D1=82=20?= =?UTF-8?q?=D0=B4=D0=BB=D0=B8=D0=BD=D0=BD=D1=8B=D1=85=20=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=B5=20=D0=B2=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/teacher.py b/routers/teacher.py index 2f20f17..b8162e9 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -1028,7 +1028,7 @@ async def teacher_free_message(request: Request): system_prompt = f"""Ты — Марек, учитель польского языка в приложении Filwords PL. Ты дружелюбный, поддерживающий и краткий. Отвечай на языке: {lang}. -Не используй markdown. +Не используй markdown и длинные тире (—). {context_text} Ученик может спросить что угодно: объяснить тему, перевести фразу, дать пример. -- 2.54.0 From 5f72bfee6ad9e1d70530a62de0a1afb26aa6f606 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:06:38 +0000 Subject: [PATCH 2/7] =?UTF-8?q?[Eva]=20=D0=A3=D1=87=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=20AI:=20usage/limit=20=D0=B2=20=D0=BE=D1=82=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D0=B5=20free-message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/teacher.py b/routers/teacher.py index b8162e9..76adfef 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -1041,7 +1041,10 @@ async def teacher_free_message(request: Request): async with pool.acquire() as conn: 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.post("/diagnostic-test") -- 2.54.0 From 0c6111d789f5cf6ff926c3a28651c12336825f89 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:06:47 +0000 Subject: [PATCH 3/7] =?UTF-8?q?[Eva]=20=D0=A3=D1=87=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=20AI:=20usage/limit=20=D0=BF=D1=80=D0=B8=20=D0=B8?= =?UTF-8?q?=D1=81=D1=87=D0=B5=D1=80=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8=20=D0=BB?= =?UTF-8?q?=D0=B8=D0=BC=D0=B8=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/teacher.py b/routers/teacher.py index 76adfef..3395145 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -1005,10 +1005,13 @@ async def teacher_free_message(request: Request): lang = await get_user_lang(conn, telegram_id) if not await check_ai_limit(conn, telegram_id): + usage = await get_teacher_ai_usage(conn, telegram_id) return { "response": "", "limit_exceeded": True, - "message": get_ai_limit_message(lang) + "message": get_ai_limit_message(lang), + "usage": usage, + "limit": TEACHER_AI_DAILY_LIMIT, } context_parts = [] -- 2.54.0 From 0bb061c31f7335bcbd4331678052de72c5bb2c72 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:06:59 +0000 Subject: [PATCH 4/7] =?UTF-8?q?[Eva]=20=D0=A3=D1=87=D0=B8=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=20AI:=20=D1=8D=D0=BD=D0=B4=D0=BF=D0=BE=D0=B8=D0=BD?= =?UTF-8?q?=D1=82=20GET=20/teacher/ai-usage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/routers/teacher.py b/routers/teacher.py index 3395145..be495a5 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -1050,6 +1050,21 @@ async def teacher_free_message(request: Request): 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") async def teacher_diagnostic_test(request: Request): """ -- 2.54.0 From fe6019ecbcfc3602d958ec1ba1b4d5ce5f1e1939 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:09:35 +0000 Subject: [PATCH 5/7] =?UTF-8?q?[Eva]=20=D0=A3=D0=B1=D0=B8=D1=80=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B4=D0=BB=D0=B8=D0=BD=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=B5=20=D0=B2=20=D0=BE=D1=82=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=B0=D1=85=20AI=20=D1=83=D1=87=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/teacher.py b/routers/teacher.py index be495a5..8b159b9 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -271,6 +271,8 @@ async def call_ai(prompt: str, system_prompt: str, max_tokens: int = 500) -> str ai_response = ai_response.strip() ai_response = re.sub(r'\s*\([a-z_]+_[a-z_]+\)', '', ai_response) + # 🔧 ФИКС (03.11.2026): убираем длинные тире (— и –) — заменяем на дефис. + ai_response = ai_response.replace('—', '-').replace('–', '-') return ai_response except Exception as e: logger.error(f"AI error: {str(e)}") -- 2.54.0 From 9f92995522d0eebf53fff5d1151d37289a1f57e5 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:17:19 +0000 Subject: [PATCH 6/7] =?UTF-8?q?[Eva]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81?= =?UTF-8?q?=D1=87=D1=91=D1=82=D1=87=D0=B8=D0=BA=D0=B0=20AI-=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2:=20command=5Fcount=20?= =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20COUNT(*)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routers/teacher.py b/routers/teacher.py index 8b159b9..6f010e7 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -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: """Получает количество 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(""" - SELECT COUNT(*) FROM teacher_ai_usage + SELECT command_count FROM teacher_ai_usage WHERE user_id = $1 AND usage_date = CURRENT_DATE """, user_id) return count or 0 -- 2.54.0 From 32e250ddaea6906707d94d78345522022f214f0a Mon Sep 17 00:00:00 2001 From: Drobysh Date: Tue, 3 Nov 2026 18:17:40 +0000 Subject: [PATCH 7/7] =?UTF-8?q?[Eva]=20=D0=9E=D1=82=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D1=91=D0=BD=20=D0=BB=D0=B8=D0=BC=D0=B8=D1=82=20AI-=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D1=83=D1=87=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8F=20(=D1=82=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/teacher.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/routers/teacher.py b/routers/teacher.py index 6f010e7..d75cb71 100644 --- a/routers/teacher.py +++ b/routers/teacher.py @@ -114,10 +114,9 @@ async def increment_teacher_ai_usage(conn, user_id: int) -> None: async def check_ai_limit(conn, user_id: int) -> bool: """Проверяет, может ли пользователь использовать AI-команду.""" - if user_id in ADMIN_IDS: - return True - usage = await get_teacher_ai_usage(conn, user_id) - return usage < TEACHER_AI_DAILY_LIMIT + # 🔧 (03.11.2026): лимит временно отключён — Oleg тестирует раздел. + # Вернём лимит (TEACHER_AI_DAILY_LIMIT) перед запуском для реальных юзеров. + return True async def start_learning_session(conn, user_id: int, level_code: str, topic_id: str, session_type: str) -> int: -- 2.54.0