279 lines
10 KiB
Python
279 lines
10 KiB
Python
"""
|
|
Admin Router — админ-панель с реальной статистикой проекта.
|
|
1. /admin/dashboard — общая статистика (юзеры, онлайн, по уровням)
|
|
2. /admin/sentry-errors — ошибки из Sentry (через API)
|
|
3. /admin/sentry-stats — сводка по ошибкам Sentry
|
|
|
|
🔧 ОБНОВЛЕНО (01.10.2026):
|
|
- /sentry-errors: расширенные фильтры (period, status, level, q, limit)
|
|
- /sentry-stats: новый эндпоинт для сводки
|
|
"""
|
|
import os
|
|
import logging
|
|
from typing import Optional
|
|
import httpx
|
|
from fastapi import APIRouter, Request, HTTPException
|
|
from auth import require_auth
|
|
from database import get_pool
|
|
from config import ADMIN_IDS
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter(prefix="/admin", tags=["admin"])
|
|
|
|
# ============ Настройки Sentry ============
|
|
SENTRY_AUTH_TOKEN = os.getenv("SENTRY_AUTH_TOKEN", "")
|
|
SENTRY_ORG_SLUG = os.getenv("SENTRY_ORG_SLUG", "drobysh")
|
|
SENTRY_PROJECT_SLUG = os.getenv("SENTRY_PROJECT_SLUG", "filwords-backend")
|
|
SENTRY_API_BASE = os.getenv("SENTRY_API_BASE", "https://de.sentry.io/api/0")
|
|
|
|
|
|
def _require_admin(telegram_id: int):
|
|
"""Проверка, что пользователь — админ."""
|
|
if telegram_id not in ADMIN_IDS:
|
|
raise HTTPException(403, "Access denied")
|
|
|
|
|
|
@router.get("/dashboard")
|
|
async def get_admin_dashboard(request: Request):
|
|
"""
|
|
Общая статистика проекта:
|
|
- Всего пользователей / новых сегодня / онлайн
|
|
- Активных за 24 часа
|
|
- Распределение по уровням языка
|
|
"""
|
|
telegram_id, _ = await require_auth(request)
|
|
_require_admin(telegram_id)
|
|
|
|
pool = await get_pool()
|
|
async with pool.acquire() as conn:
|
|
# Всего пользователей
|
|
total_users = await conn.fetchval("SELECT COUNT(*) FROM users") or 0
|
|
|
|
# Новых сегодня
|
|
new_today = await conn.fetchval(
|
|
"SELECT COUNT(*) FROM users WHERE created_at::date = CURRENT_DATE"
|
|
) or 0
|
|
|
|
# 🔧 ФИКС (24.09.2026): online_now_counts_all_today_logins —
|
|
# раньше daily_logins брал ВСЕХ, кто заходил сегодня → метрика бесполезна.
|
|
# Теперь фильтруем по 30 минутам. Но daily_logins хранит только ДАТУ,
|
|
# без времени, поэтому используем NOW()-based проверки по другим таблицам.
|
|
# daily_logins оставляем только если login_date = CURRENT_DATE И
|
|
# есть свежая активность. Проще — убрать ветку daily_logins из online_now.
|
|
online_now = await conn.fetchval("""
|
|
SELECT COUNT(DISTINCT user_id) FROM (
|
|
SELECT user_id FROM user_progress WHERE completed_at > NOW() - INTERVAL '30 minutes'
|
|
UNION
|
|
SELECT user_id FROM sentence_progress WHERE completed_at > NOW() - INTERVAL '30 minutes'
|
|
UNION
|
|
SELECT user_id FROM user_learning_answers WHERE created_at > NOW() - INTERVAL '30 minutes'
|
|
UNION
|
|
SELECT user_id FROM chat_history WHERE created_at > NOW() - INTERVAL '30 minutes'
|
|
) active
|
|
""") or 0
|
|
|
|
# Активных за 24 часа
|
|
active_24h = await conn.fetchval("""
|
|
SELECT COUNT(DISTINCT user_id) FROM (
|
|
SELECT user_id FROM user_progress WHERE completed_at > NOW() - INTERVAL '24 hours'
|
|
UNION
|
|
SELECT user_id FROM sentence_progress WHERE completed_at > NOW() - INTERVAL '24 hours'
|
|
UNION
|
|
SELECT user_id FROM user_learning_answers WHERE created_at > NOW() - INTERVAL '24 hours'
|
|
UNION
|
|
SELECT user_id FROM daily_logins WHERE login_date = CURRENT_DATE
|
|
) active
|
|
""") or 0
|
|
|
|
# 🔧 ФИКС (23.09.2026): admin_level_counts_n_plus_1 — раньше 6 отдельных
|
|
# COUNT(*) в цикле. Теперь один GROUP BY + сборка dict в Python.
|
|
level_counts = {"A1": 0, "A2": 0, "B1": 0, "B2": 0, "C1": 0, "C2": 0}
|
|
rows = await conn.fetch("""
|
|
SELECT current_level, COUNT(*) as cnt
|
|
FROM users
|
|
WHERE current_level = ANY($1::text[])
|
|
GROUP BY current_level
|
|
""", ["A1", "A2", "B1", "B2", "C1", "C2"])
|
|
for row in rows:
|
|
level_counts[row["current_level"]] = row["cnt"]
|
|
|
|
return {
|
|
"total_users": total_users,
|
|
"new_today": new_today,
|
|
"online_now": online_now,
|
|
"active_24h": active_24h,
|
|
"level_counts": level_counts,
|
|
}
|
|
|
|
|
|
@router.get("/sentry-errors")
|
|
async def get_sentry_errors(
|
|
request: Request,
|
|
period: str = "24h",
|
|
status: str = "unresolved",
|
|
level: Optional[str] = None,
|
|
q: Optional[str] = None,
|
|
limit: int = 50,
|
|
):
|
|
"""
|
|
🔧 ОБНОВЛЕНО (01.10.2026): расширенные фильтры для Sentry.
|
|
|
|
Параметры:
|
|
- period: '1h', '24h', '7d', '14d', '30d' (по умолчанию 24h)
|
|
- status: 'unresolved', 'resolved', 'all' (по умолчанию unresolved)
|
|
- level: 'error', 'warning', 'info', 'debug' (опционально)
|
|
- q: поиск по title
|
|
- limit: 1-100 (по умолчанию 50)
|
|
"""
|
|
telegram_id, _ = await require_auth(request)
|
|
_require_admin(telegram_id)
|
|
|
|
if not SENTRY_AUTH_TOKEN:
|
|
return {"errors": [], "error": "SENTRY_AUTH_TOKEN not configured"}
|
|
|
|
# Валидация
|
|
# 🔧 ФИКС (01.10.2026): sentry_free_plan_periods —
|
|
# Free plan Sentry поддерживает ТОЛЬКО '', '24h', '14d'.
|
|
# Остальные → 400 Bad Request.
|
|
if period not in ("", "24h", "14d"):
|
|
period = "24h"
|
|
if status not in ("unresolved", "resolved", "all"):
|
|
status = "unresolved"
|
|
if level and level not in ("error", "warning", "info", "debug", "fatal"):
|
|
level = None
|
|
if limit < 1:
|
|
limit = 1
|
|
elif limit > 100:
|
|
limit = 100
|
|
|
|
# Собираем query для Sentry
|
|
query_parts = []
|
|
if status == "unresolved":
|
|
query_parts.append("is:unresolved")
|
|
elif status == "resolved":
|
|
query_parts.append("is:resolved")
|
|
# 'all' — без фильтра статуса
|
|
|
|
if level:
|
|
query_parts.append(f"level:{level}")
|
|
|
|
if q and q.strip():
|
|
query_parts.append(q.strip())
|
|
|
|
query = " ".join(query_parts) if query_parts else ""
|
|
|
|
url = f"{SENTRY_API_BASE}/projects/{SENTRY_ORG_SLUG}/{SENTRY_PROJECT_SLUG}/issues/"
|
|
params = {
|
|
"statsPeriod": period,
|
|
"limit": limit,
|
|
"sort": "freq", # сортировка по частоте
|
|
}
|
|
if query:
|
|
params["query"] = query
|
|
|
|
headers = {"Authorization": f"Bearer {SENTRY_AUTH_TOKEN}"}
|
|
|
|
try:
|
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
response = await client.get(url, params=params, headers=headers)
|
|
|
|
if response.status_code != 200:
|
|
logger.error(f"Sentry API error: {response.status_code} — {response.text[:200]}")
|
|
return {"errors": [], "error": f"Sentry API: {response.status_code}"}
|
|
|
|
raw_issues = response.json()
|
|
|
|
errors = []
|
|
for issue in raw_issues:
|
|
errors.append({
|
|
"id": issue.get("id"),
|
|
"short_id": issue.get("shortId"),
|
|
"title": issue.get("title"),
|
|
"culprit": issue.get("culprit"),
|
|
"level": issue.get("level"),
|
|
"count": int(issue.get("count", 0)),
|
|
"user_count": issue.get("userCount", 0),
|
|
"first_seen": issue.get("firstSeen"),
|
|
"last_seen": issue.get("lastSeen"),
|
|
"permalink": issue.get("permalink"),
|
|
"priority": issue.get("priority"),
|
|
"status": issue.get("status"), # unresolved / resolved
|
|
"metadata": issue.get("metadata", {}),
|
|
})
|
|
|
|
return {"errors": errors, "count": len(errors), "query": query or "(no filter)"}
|
|
|
|
except httpx.TimeoutException:
|
|
logger.error("Sentry API timeout")
|
|
return {"errors": [], "error": "Sentry API timeout"}
|
|
except Exception as e:
|
|
logger.error(f"Sentry API unexpected error: {e}")
|
|
return {"errors": [], "error": str(e)}
|
|
|
|
|
|
@router.get("/sentry-stats")
|
|
async def get_sentry_stats(request: Request, period: str = "24h"):
|
|
"""
|
|
🔧 НОВОЕ (01.10.2026): сводка по ошибкам Sentry.
|
|
|
|
Возвращает:
|
|
- total_unresolved: всего нерешённых
|
|
- total_24h: новых за 24ч
|
|
- by_level: распределение по уровням (error / warning / info)
|
|
- top_culprits: топ-5 проблемных файлов
|
|
"""
|
|
telegram_id, _ = await require_auth(request)
|
|
_require_admin(telegram_id)
|
|
|
|
if not SENTRY_AUTH_TOKEN:
|
|
return {"error": "SENTRY_AUTH_TOKEN not configured"}
|
|
|
|
# 🔧 ФИКС (01.10.2026): sentry_free_plan_periods — только '', '24h', '14d'.
|
|
if period not in ("", "24h", "14d"):
|
|
period = "24h"
|
|
|
|
url = f"{SENTRY_API_BASE}/projects/{SENTRY_ORG_SLUG}/{SENTRY_PROJECT_SLUG}/issues/"
|
|
params = {
|
|
"query": "is:unresolved",
|
|
"statsPeriod": period,
|
|
"limit": 100,
|
|
}
|
|
headers = {"Authorization": f"Bearer {SENTRY_AUTH_TOKEN}"}
|
|
|
|
try:
|
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
|
response = await client.get(url, params=params, headers=headers)
|
|
|
|
if response.status_code != 200:
|
|
return {"error": f"Sentry API: {response.status_code}"}
|
|
|
|
raw_issues = response.json()
|
|
|
|
# Считаем
|
|
by_level: dict = {}
|
|
culprits: dict = {}
|
|
|
|
for issue in raw_issues:
|
|
lvl = issue.get("level", "error")
|
|
by_level[lvl] = by_level.get(lvl, 0) + 1
|
|
|
|
culprit = issue.get("culprit", "unknown")
|
|
culprits[culprit] = culprits.get(culprit, 0) + int(issue.get("count", 0))
|
|
|
|
top_culprits = sorted(
|
|
[{"culprit": k, "count": v} for k, v in culprits.items()],
|
|
key=lambda x: x["count"],
|
|
reverse=True,
|
|
)[:5]
|
|
|
|
return {
|
|
"total_unresolved": len(raw_issues),
|
|
"by_level": by_level,
|
|
"top_culprits": top_culprits,
|
|
"period": period,
|
|
}
|
|
|
|
except Exception as e:
|
|
logger.error(f"Sentry stats error: {e}")
|
|
return {"error": str(e)} |