fix(hints): word_list не расходует лимит подсказок

This commit is contained in:
2026-10-01 11:43:29 +00:00
parent daa79dd43e
commit 75b10c536b
2 changed files with 138 additions and 29 deletions
+131 -11
View File
@@ -2,9 +2,15 @@
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
@@ -102,10 +108,23 @@ async def get_admin_dashboard(request: Request):
@router.get("/sentry-errors")
async def get_sentry_errors(request: Request):
async def get_sentry_errors(
request: Request,
period: str = "24h",
status: str = "unresolved",
level: Optional[str] = None,
q: Optional[str] = None,
limit: int = 50,
):
"""
Последние ошибки из Sentry.
Возвращает только unresolved (нерешённые) за последние 24 часа.
🔧 ОБНОВЛЕНО (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)
@@ -113,15 +132,47 @@ async def get_sentry_errors(request: Request):
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 = {
"query": "is:unresolved",
"statsPeriod": "24h",
"limit": 20,
}
headers = {
"Authorization": f"Bearer {SENTRY_AUTH_TOKEN}",
"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:
@@ -147,13 +198,82 @@ async def get_sentry_errors(request: Request):
"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)}
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)}
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)}