Author SHA1 Message Date
Drobysh 6fc8c83322 [Eva] complete-level: wave_number отдаёт current_wave 2026-10-13 17:46:36 +00:00
Drobysh bffcb4387c [Eva] complete-level: waves_completed/wave_completed/wave_points от current_wave/current_position_in_wave 2026-10-13 17:46:25 +00:00
Drobysh 01ce5dfa2d [Eva] complete-level: читать current_wave/current_position_in_wave вместо session_number/session_level_num 2026-10-13 17:46:12 +00:00
Drobysh ec9108f2a3 [Eva] complete-level: переименовать session_number → current_wave (объявление) 2026-10-13 17:45:56 +00:00
Drobysh 556c11fc95 [Eva] complete-level: поля итогов волны в ответе 2026-10-13 16:35:18 +00:00
Drobysh aa7679c49b [Eva] complete-level: подсчёт итогов волны 2026-10-13 16:34:29 +00:00
Drobysh 9db00df88f [Eva] complete-level: убран дубль чтения session_number 2026-10-13 16:34:16 +00:00
Drobysh 4333aa62a6 [Eva] complete-level: запись wave в user_progress 2026-10-13 16:34:07 +00:00
Drobysh bd743e4c48 [Eva] complete-level: инициализация переменных итогов волны 2026-10-13 16:33:56 +00:00
Drobysh f83fcc0e1c [Eva] Добавлена миграция user_progress.wave INTEGER 2026-10-13 16:28:54 +00:00
Drobysh 20b1cdc464 [Eva] Добавить difficulty в таблицу users 2026-10-13 12:05:45 +00:00
Drobysh e3bc3e8456 [Eva] game.py: difficulty в ответе /game/level/{n} 2026-10-13 11:52:04 +00:00
Drobysh a6fe755fdb [Eva] game.py: difficulty в SELECT /game/level/{n} 2026-10-13 11:51:58 +00:00
Drobysh 959f789f24 [Eva] game.py: формула очков по сложности 2026-10-13 11:51:50 +00:00
Drobysh d181e43ee3 [Eva] game.py: валидация hard-режима в complete-level 2026-10-13 11:51:41 +00:00
Drobysh 6f89336a02 [Eva] game.py: читаем difficulty из users в complete-level 2026-10-13 11:51:33 +00:00
Drobysh f78a1fa19f [Eva] Добавлена миграция users.difficulty 2026-10-13 11:46:06 +00:00
Drobysh 2b5ef446c1 [Eva] Добавлен эндпоинт POST /users/set-difficulty 2026-10-13 11:38:59 +00:00
Drobysh 6e02303ea8 [Eva] waves.py: звёзды → очки (max_points_for_wave, wave_medal) 2026-10-13 11:33:02 +00:00
Drobysh 5e2de6f7e4 [Eva] game.py: убрать ключ stars из ответа complete-level 2026-10-13 11:28:41 +00:00
Drobysh 2dedec5972 [Eva] game.py: звёзды → очки (формула 100−20×подсказки−20×список+бонус) 2026-10-13 11:28:31 +00:00
Drobysh da7182fb6b [Eva] Возврат award_xp без ключа stars 2026-10-13 11:21:07 +00:00
Drobysh b62311d3ed [Eva] Лог level_up: final_points 2026-10-13 11:21:01 +00:00
Drobysh 6f341a7f33 [Eva] user_profile: начисление final_points 2026-10-13 11:20:55 +00:00
Drobysh 981e65e57c [Eva] xp_log: stars=0, base_points, final_points 2026-10-13 11:20:49 +00:00
Drobysh 9c975dde79 [Eva] Расчёт очков: base_points из points, final_points с множителем 2026-10-13 11:20:37 +00:00
Drobysh df3d32ecd5 [Eva] Сигнатура award_xp: stars → points 2026-10-13 11:20:29 +00:00
Drobysh 437921d9dd [Eva] Убрать константы звёзд (POINTS_PER_STAR, MAX_STARS, MIN_STARS) 2026-10-13 11:19:08 +00:00
Drobysh bcc01a0fe8 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#32) from eva/chat-a6f27f-backend into main
Reviewed-on: #32
2026-10-12 11:49:51 +00:00
Drobysh 8338d6b3c8 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#31) from eva/chat-a6f27f-backend into main
Reviewed-on: #31
2026-10-12 11:28:05 +00:00
Drobysh 12c6bbca51 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#30) from eva/chat-a6f27f-backend into main
Reviewed-on: #30
2026-10-11 17:44:58 +00:00
Drobysh 794daad69c Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#29) from eva/chat-a6f27f-backend into main
Reviewed-on: #29
2026-10-11 17:31:01 +00:00
Drobysh 5e9cd0c901 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#28) from eva/chat-a6f27f-backend into main
Reviewed-on: #28
2026-10-11 17:12:01 +00:00
Drobysh ea297b2179 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#27) from eva/chat-a6f27f-backend into main
Reviewed-on: #27
2026-10-11 17:01:40 +00:00
Drobysh 791adfeee9 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#26) from eva/chat-a6f27f-backend into main
Reviewed-on: #26
2026-10-11 16:43:35 +00:00
Drobysh 0a4c0c5d23 Merge pull request '[Eva] Ева, измени в pleily/lib/screens/wordsea' (#25) from eva/chat-a6f27f-backend into main
Reviewed-on: #25
2026-10-11 16:37:22 +00:00
6 changed files with 145 additions and 71 deletions
+26
View File
@@ -229,6 +229,21 @@ async def init_db():
""")
logger.info("Added current_streak column to user_progress")
# ============ Авто-миграция: добавляем wave в user_progress ============
# 🔧 НОВОЕ (13.10.2026): wave — номер волны, к которой относится
# пройденный уровень. Нужен для подсчёта wave_points (сумма очков
# за 10 уровней волны) в модалке итогов волны.
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'user_progress' AND column_name = 'wave'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE user_progress
ADD COLUMN wave INTEGER
""")
logger.info("Added wave column to user_progress")
# ============ sentences ============
await conn.execute("""
CREATE TABLE IF NOT EXISTS sentences (
@@ -1299,6 +1314,17 @@ async def init_db():
""")
logger.info("Added apple_id column to users (Pleily)")
# difficulty
col_exists = await conn.fetchval("""
SELECT 1 FROM information_schema.columns
WHERE table_name = 'users' AND column_name = 'difficulty'
""")
if not col_exists:
await conn.execute("""
ALTER TABLE users ADD COLUMN difficulty TEXT DEFAULT 'medium'
""")
logger.info("Added difficulty column to users (Pleily)")
# app_user_id_seq — sequence для отрицательных user_id
await conn.execute("""
CREATE SEQUENCE IF NOT EXISTS app_user_id_seq
+1
View File
@@ -523,6 +523,7 @@
| last_completed_level | integer | YES | 0 |
| id | integer | NO | nextval('users_id_seq'::regclass) |
| current_level | text | YES | 'A1'::text |
| difficulty | text | YES | 'medium'::text |
## voice_usage
+78 -34
View File
@@ -73,7 +73,7 @@ async def get_level(request: Request, level_number: int):
pool = await get_pool()
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT app_language, current_level, last_completed_level, last_completed_by_level FROM users WHERE telegram_id = $1", telegram_id
"SELECT app_language, current_level, last_completed_level, last_completed_by_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
)
if not user:
@@ -208,6 +208,7 @@ async def get_level(request: Request, level_number: int):
# 🆕 (10.10.2026): волна и позиция в волне.
"wave": wave,
"position_in_wave": pos_in_wave,
"difficulty": user["difficulty"] or "medium",
}
@@ -353,14 +354,23 @@ async def complete_level(request: Request):
fast_streak = 0
no_hints_streak = 0
words_found = 0
# 🆕 (13.10.2026): итоги волны для модалки.
wave_completed = False
wave_points = 0
wave_max_points = 0
wave_medal_result = "none"
current_wave = 1
current_position_in_wave = 1
async with pool.acquire() as conn:
user = await conn.fetchrow(
"SELECT id, telegram_id, last_completed_level, current_level FROM users WHERE telegram_id = $1",
"SELECT id, telegram_id, last_completed_level, current_level, difficulty FROM users WHERE telegram_id = $1",
telegram_id
)
if not user:
raise HTTPException(401, "User not registered")
difficulty = user["difficulty"] or "medium"
level = await conn.fetchrow(
"SELECT id, level_number, grid_size, level FROM levels WHERE id = $1", level_id
@@ -416,29 +426,31 @@ async def complete_level(request: Request):
hints_used = min(max(0, hints_used), 3)
# 🆕 Штрафы (филворд):
# -1 за открытие списка слов (один раз за уровень)
# -1 за использование подсказки (один раз за уровень)
# -1 за превышение времени
# -20 за открытие списка слов (один раз за уровень)
# -20 за каждую подсказку
list_opened = bool(body.get("list_opened", False))
# Лимит времени по размеру сетки
grid_size = level["grid_size"]
time_limits = {5: 45, 6: 60, 7: 90, 8: 120}
time_limit = time_limits.get(grid_size, 60)
# 🔧 НОВОЕ (13.10.2026): на Hard подсказки и список слов недоступны.
if difficulty == "hard" and (hints_used > 0 or list_opened):
raise HTTPException(
status_code=400,
detail="Hints and word list are disabled on Hard difficulty"
)
completion_time_val = completion_time or 0
time_penalty = 1 if (completion_time_val > time_limit) else 0
hint_penalty = 1 if hints_used > 0 else 0
list_penalty = 1 if list_opened else 0
stars = max(
1,
5 - time_penalty - hint_penalty - list_penalty
)
# Очки в зависимости от сложности
if difficulty == "hard":
# Hard: фикс 110 (без подсказок и списка)
points = 110
else:
# Easy / Medium
bonus = 10 if hints_used == 0 else 0
penalty_hints = 20 * hints_used
penalty_list = 0 if difficulty == "easy" else 20 * (1 if list_opened else 0)
points = max(20, min(110, 100 - penalty_hints - penalty_list + bonus))
# Начисляем XP через единую функцию
from services.xp import award_xp
xp_result = await award_xp(conn, telegram_id, "wordsearch", stars)
xp_result = await award_xp(conn, telegram_id, "wordsearch", points)
score = xp_result["points"] # для обратной совместимости
@@ -447,17 +459,41 @@ async def complete_level(request: Request):
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
# Теперь UPSERT с ON CONFLICT DO UPDATE.
# hints_used уже прочитан из БД выше (не доверяем клиенту).
# 🔧 ФИКС (13.10.2026): wave_off_by_one —
# session_level_number хранит позицию СЛЕДУЮЩЕГО уровня
# (уже увеличенную при выдаче), поэтому модалка волны
# срабатывала на 9-м уровне. Читаем current_wave /
# current_position_in_wave — позицию именно завершаемого уровня.
wave_row = await conn.fetchrow(
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
telegram_id,
)
if wave_row and wave_row["current_wave"] and wave_row["current_position_in_wave"]:
current_wave = int(wave_row["current_wave"])
current_position_in_wave = int(wave_row["current_position_in_wave"])
else:
# Fallback для старых записей без current_* полей.
global_level = await conn.fetchval(
"SELECT global_level_number FROM user_game_progress WHERE user_id = $1",
telegram_id,
)
global_level = int(global_level or 1)
from services.waves import wave_for_level, level_in_wave
current_wave = wave_for_level(global_level)
current_position_in_wave = level_in_wave(global_level)
await conn.execute("""
INSERT INTO user_progress
(user_id, level_id, completed_at, hints_used, score, level, current_streak)
VALUES ($1, $2, NOW(), $3, $4, $5, 0)
(user_id, level_id, completed_at, hints_used, score, level, current_streak, wave)
VALUES ($1, $2, NOW(), $3, $4, $5, 0, $6)
ON CONFLICT (user_id, level_id) DO UPDATE
SET completed_at = NOW(),
hints_used = $3,
score = $4,
level = $5,
current_streak = 0
""", telegram_id, level_id, hints_used, score, level_name)
current_streak = 0,
wave = $6
""", telegram_id, level_id, hints_used, score, level_name, current_wave)
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
# Обновляем только users.last_completed_level — глобальный.
@@ -509,19 +545,22 @@ async def complete_level(request: Request):
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
) or 0
wave_row = await conn.fetchrow(
"SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
telegram_id,
)
session_number = int(wave_row["session_number"] or 1) if wave_row else 1
session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1
# Пройдено волн = session_number - 1; если только что завершили
# Пройдено волн = current_wave - 1; если только что завершили
# 10-й уровень волны — волна пройдена (+1).
waves_completed = session_number - 1
if session_level_number == 10:
waves_completed = current_wave - 1
if current_position_in_wave == 10:
waves_completed += 1
# 🆕 (13.10.2026): итоги волны для модалки.
from services.waves import max_points_for_wave, wave_medal
wave_completed = (current_position_in_wave == 10)
wave_points = await conn.fetchval(
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2",
telegram_id, current_wave,
) or 0
wave_max_points = max_points_for_wave()
wave_medal_result = wave_medal(wave_points, wave_max_points)
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
wordsearch_xp = total_score
@@ -603,7 +642,6 @@ async def complete_level(request: Request):
"already_completed": False,
"new_achievements": new_achievements,
# 🆕 XP-поля
"stars": xp_result["stars"],
"base_points": xp_result["base_points"],
"multiplier": xp_result["multiplier"],
"points": xp_result["points"],
@@ -614,6 +652,12 @@ async def complete_level(request: Request):
"rank_key": xp_result["rank_key"],
"xp_in_level": xp_result["xp_in_level"],
"xp_needed": xp_result["xp_needed"],
# 🆕 (13.10.2026): итоги волны для модалки.
"wave_completed": wave_completed,
"wave_number": current_wave,
"wave_points": wave_points,
"wave_max_points": wave_max_points,
"wave_medal": wave_medal_result,
}
+20
View File
@@ -76,6 +76,26 @@ async def set_language(request: Request):
}
@router.post("/set-difficulty")
async def set_difficulty(request: Request):
"""Устанавливает уровень сложности (easy/medium/hard)."""
user_id, _ = await require_auth(request)
body = await request.json()
difficulty = body.get("difficulty", "medium")
if difficulty not in {"easy", "medium", "hard"}:
raise HTTPException(400, "Unsupported difficulty")
pool = await get_pool()
async with pool.acquire() as conn:
await conn.execute(
"UPDATE users SET difficulty = $1 WHERE telegram_id = $2",
difficulty, user_id,
)
return {"status": "ok", "difficulty": difficulty}
@router.post("/set-level")
async def set_level(request: Request):
"""Устанавливает текущий уровень пользователя (A1, A2, B1, B2, C1, C2)"""
+9 -13
View File
@@ -45,22 +45,18 @@ def grid_size_for(global_level: int) -> int:
return sizes[0] if pos <= HALF_WAVE else sizes[1]
def max_stars_for_wave() -> int:
"""Максимум звёзд за волну (10 уровней × 5 звёзд)."""
return WAVE_SIZE * 5
def max_points_for_wave() -> int:
"""Максимум очков за волну: 10 уровней × 110 = 1100."""
return 10 * 110
def wave_medal(stars_earned: int) -> str:
"""
Медаль волны по доле звёзд.
Пороги: gold >= 90%, silver >= 70%, bronze >= 50%, else 'none'.
"""
total = max_stars_for_wave()
pct = stars_earned / total if total > 0 else 0
if pct >= 0.90:
def wave_medal(points: int, max_points: int) -> str:
"""Медаль за волну: gold ≥90%, silver ≥70%, bronze ≥50%, иначе none."""
pct = 100 * points / max_points if max_points > 0 else 0
if pct >= 90:
return "gold"
if pct >= 0.70:
if pct >= 70:
return "silver"
if pct >= 0.50:
if pct >= 50:
return "bronze"
return "none"
+11 -24
View File
@@ -35,15 +35,6 @@ GAMES = ["wordsearch", "choose", "sentence", "bubbles"]
# Множитель игры дня
FEATURED_MULTIPLIER = 1.5
# Базовая ставка: 1 звезда = 20 XP
POINTS_PER_STAR = 20
# Максимум звёзд за уровень
MAX_STARS = 5
# Минимум звёзд за пройденный уровень
MIN_STARS = 1
# Коэффициенты баланса (настроить после первых 1000 сессий)
# Применяются к base_points ДО множителя игры дня.
GAME_XP_COEF: dict[str, float] = {
@@ -192,7 +183,7 @@ async def award_xp(
conn,
user_id: int,
game: str,
stars: int,
points: int,
) -> dict:
"""
Единая функция начисления опыта.
@@ -201,11 +192,10 @@ async def award_xp(
conn: asyncpg connection (уже acquired)
user_id: telegram_id (может быть отрицательным для Pleily)
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
stars: 1..5
points: готовые очки за уровень (20–110), формула считается до вызова
Returns:
{
"stars": int,
"base_points": int,
"multiplier": float,
"points": int,
@@ -219,18 +209,16 @@ async def award_xp(
}
"""
# 1. Валидация
stars = max(MIN_STARS, min(MAX_STARS, int(stars)))
if game not in GAME_XP_COEF:
raise ValueError(f"Unknown game: {game}")
# 2. База
base = stars * POINTS_PER_STAR
base = int(round(base * GAME_XP_COEF.get(game, 1.0)))
# 2. База с коэффициентом игры (для баланса)
base_points = int(round(points * GAME_XP_COEF.get(game, 1.0)))
# 3. Множитель игры дня
is_featured = (game == featured_game())
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
points = int(round(base * multiplier))
final_points = int(round(base_points * multiplier))
# 4. Читаем текущий total_xp
row = await conn.fetchrow(
@@ -259,11 +247,11 @@ async def award_xp(
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
VALUES ($1, $2, $3, $4, $5, $6)
""",
user_id, game, stars, base, multiplier, points,
user_id, game, 0, base_points, multiplier, final_points,
)
# 6. Обновляем user_profile
new_total = old_total + points
new_total = old_total + final_points
await conn.execute(
"""
UPDATE user_profile
@@ -272,7 +260,7 @@ async def award_xp(
updated_at = NOW()
WHERE user_id = $1
""",
user_id, points,
user_id, final_points,
)
# 7. Считаем новый уровень
@@ -287,14 +275,13 @@ async def award_xp(
}
logger.info(
"[xp] user=%s level_up %s → %s (%s), +%s xp",
user_id, old_level, new_level, rank_key, points,
user_id, old_level, new_level, rank_key, final_points,
)
return {
"stars": stars,
"base_points": base,
"base_points": base_points,
"multiplier": multiplier,
"points": points,
"points": final_points,
"featured": is_featured,
"level_up": level_up,
"total_xp": new_total,