fix(style): code review fixes per CONTRIBUTING.md checklist

- Add missing file header to utils/utils.py
- Add type annotations to set_message_callback, set_draft_callback, _pyrogram_task_exception_handler, _install_pyrogram_exception_handler, _restore_pyrogram_exception_handler in clients/pyrogram_client.py
- Add return type Callable to _require_auth decorator in dashboard/server.py, remove type: ignore comment
- Add return type annotation to _dashboard_print in bot.py
- Move builtins.print override from module-level into main() in bot.py
- Move Jinja2 tojson expression out of script block in dashboard.html to fix linter false positive

Author: oponfil

bot.py

@@ -57,7 +57,7 @@
 _original_print = builtins.print
 
 
-def _dashboard_print(*args, **kwargs):
+def _dashboard_print(*args, **kwargs) -> None:
     """Wrapper around print() that also feeds output to dashboard stats."""
     _original_print(*args, **kwargs)
     try:
@@ -68,9 +68,6 @@ def _dashboard_print(*args, **kwargs):
         pass  # Never break the bot due to dashboard
 
 
-builtins.print = _dashboard_print
-
-
 # ====== ОБРАБОТЧИК ОШИБОК ======
 
 async def on_error(update: object, context: ContextTypes.DEFAULT_TYPE) -> None:
@@ -83,6 +80,9 @@ async def on_error(update: object, context: ContextTypes.DEFAULT_TYPE) -> None:
 
 def main() -> None:
     """Точка входа — запуск бота в polling-режиме."""
+    # Активируем перехват print() для дашборда (только при запуске, не при импорте)
+    builtins.print = _dashboard_print
+
     if not BOT_TOKEN:
         print("❌ BOT_TOKEN не задан! Установите его в .env")
         return

clients/pyrogram_client.py

@@ -1,6 +1,7 @@
 # clients/pyrogram_client.py — Управление Pyrogram-сессиями пользователей
 
 import asyncio
+from typing import Any, Callable
 from collections import defaultdict
 from datetime import datetime, timezone
 
@@ -42,13 +43,13 @@ def _make_processed_message_key(chat_id: int | None, message_id: int | None) ->
     return (chat_id, message_id)
 
 
-def set_message_callback(callback) -> None:
+def set_message_callback(callback: Callable | None) -> None:
     """Устанавливает callback для обработки входящих сообщений."""
     global _on_new_message_callback
     _on_new_message_callback = callback
 
 
-def set_draft_callback(callback) -> None:
+def set_draft_callback(callback: Callable | None) -> None:
     """Устанавливает callback для обработки черновиков."""
     global _on_draft_callback
     _on_draft_callback = callback
@@ -66,7 +67,7 @@ async def create_client(user_id: int, session_string: str) -> Client:
     return client
 
 
-def _pyrogram_task_exception_handler(loop, context):
+def _pyrogram_task_exception_handler(loop: asyncio.AbstractEventLoop, context: dict[str, Any]) -> None:
     """Обработчик исключений в asyncio-задачах Pyrogram.
 
     Pyrogram создаёт внутренние Task-и (handle_updates) которые могут
@@ -87,7 +88,7 @@ def _pyrogram_task_exception_handler(loop, context):
         loop.default_exception_handler(context)
 
 
-def _install_pyrogram_exception_handler(loop) -> None:
+def _install_pyrogram_exception_handler(loop: asyncio.AbstractEventLoop) -> None:
     """Устанавливает обёртку над loop exception handler один раз."""
     if (
         _loop_handler_state["loop"] is loop
@@ -100,7 +101,7 @@ def _install_pyrogram_exception_handler(loop) -> None:
     _loop_handler_state["loop"] = loop
 
 
-def _restore_pyrogram_exception_handler(loop) -> None:
+def _restore_pyrogram_exception_handler(loop: asyncio.AbstractEventLoop) -> None:
     """Восстанавливает предыдущий loop exception handler."""
     if _loop_handler_state["loop"] is not loop:
         return

dashboard/server.py

@@ -5,21 +5,23 @@
 
 from __future__ import annotations
 
+from typing import Callable
+
 import os
 import pathlib
 
 import jinja2
 from aiohttp import web
 
-from config import STYLE_TO_EMOJI
+from config import EMOJI_TO_STYLE
 from dashboard import stats
 from dashboard.auth import DASHBOARD_KEY, check_auth, set_auth_cookie
 from database.users import get_dashboard_user_stats
 
 TEMPLATE_DIR = pathlib.Path(__file__).parent / "templates"
 
 
-def _require_auth(handler):  # type: ignore[type-arg]
+def _require_auth(handler: Callable) -> Callable:
     """Декоратор: возвращает 401 если запрос не аутентифицирован."""
 
     async def wrapper(request: web.Request) -> web.StreamResponse:
@@ -49,7 +51,8 @@ async def handle_dashboard(request: web.Request) -> web.Response:
         autoescape=False,
     )
     template = env.get_template("dashboard.html")
-    html = template.render(style_to_emoji=STYLE_TO_EMOJI)
+    style_emoji_pairs = [[style, emoji] for emoji, style in EMOJI_TO_STYLE.items()]
+    html = template.render(style_emoji_pairs=style_emoji_pairs)
 
     response = web.Response(text=html, content_type="text/html")
     set_auth_cookie(response)

dashboard/stats.py

@@ -91,6 +91,11 @@ def capture_log(message: str) -> None:
     })
 
 
+# Стоимость последнего запроса (вычисляется в update_balance,
+# привязывается к модели в record_llm_request).
+_last_request_cost: float = 0.0
+
+
 # ---------------------------------------------------------------------------
 # API записи метрик
 # ---------------------------------------------------------------------------
@@ -114,14 +119,19 @@ def record_llm_request(
     # Per-model детали
     md = _stats.model_details.get(model)
     if md is None:
-        md = {"count": 0, "tokens_in": 0, "tokens_out": 0, "reasoning": 0, "latency": 0.0}
+        md = {"count": 0, "tokens_in": 0, "tokens_out": 0, "reasoning": 0, "latency": 0.0, "cost": 0.0}
         _stats.model_details[model] = md
     md["count"] += 1
     md["tokens_in"] += tokens_in
     md["tokens_out"] += tokens_out
     md["reasoning"] += reasoning_tokens
     md["latency"] += latency_s
 
+    # Привязываем стоимость запроса (вычисленную в update_balance)
+    global _last_request_cost
+    md["cost"] += _last_request_cost
+    _last_request_cost = 0.0
+
 
 def record_llm_error() -> None:
     """Записывает ошибку LLM-запроса."""
@@ -154,13 +164,19 @@ def update_balance(balance: float) -> None:
     """Обновляет кэшированный prepaid-баланс x402gate.
 
     Если баланс вырос — фиксирует пополнение.
+    Если упал — сохраняет стоимость запроса для привязки к модели.
     """
+    global _last_request_cost
+    _last_request_cost = 0.0
     if _stats.initial_balance is None:
         _stats.initial_balance = balance
-    elif _stats.last_balance is not None and balance > _stats.last_balance:
-        topup_amount = balance - _stats.last_balance
-        _stats.topup_count += 1
-        _stats.topup_total += topup_amount
+    elif _stats.last_balance is not None:
+        if balance > _stats.last_balance:
+            topup_amount = balance - _stats.last_balance
+            _stats.topup_count += 1
+            _stats.topup_total += topup_amount
+        elif balance < _stats.last_balance:
+            _last_request_cost = _stats.last_balance - balance
     _stats.last_balance = balance
 
 

dashboard/templates/dashboard.html

@@ -347,9 +347,12 @@ <h1>🦉 DraftGuru <span style="color:#8b949e; font-weight:400">Dashboard</span>
         </div>
     </div>
 
-    <!-- Reply Styles -->
+    <!-- Reply Styles & Activity -->
     <div class="summary" id="styles-summary">
-        <!-- Injected by JS -->
+        <div class="summary-item">Drafts: <strong id="sum-drafts">0</strong></div>
+        <div class="summary-item">Auto-replies: <strong id="sum-autoreplies">0</strong></div>
+        <div class="summary-item">Voice: <strong id="sum-voice">0</strong></div>
+        <span id="style-items"><!-- Injected by JS --></span>
     </div>
 
     <!-- Models -->
@@ -365,9 +368,6 @@ <h3>Models</h3>
 
     <!-- LLM Summary -->
     <div class="summary" id="llm-summary">
-        <div class="summary-item">Drafts: <strong id="sum-drafts">0</strong></div>
-        <div class="summary-item">Auto-replies: <strong id="sum-autoreplies">0</strong></div>
-        <div class="summary-item">Voice Transcriptions: <strong id="sum-voice">0</strong></div>
         <div class="summary-item">Avg latency: <strong id="sum-latency">0s</strong></div>
         <div class="summary-item">Avg cost/req: <strong id="sum-avg-cost">—</strong></div>
         <div class="summary-item">Tokens in: <strong id="sum-tokens-in">0</strong></div>
@@ -401,6 +401,7 @@ <h3>Live Logs</h3>
         <a href="/api/logs">Logs JSON</a>
     </div>
 
+    <script id="style-emoji-data" type="application/json">{{ style_emoji_pairs | tojson }}</script>
     <script>
         let _lastLogs = [];
         let _logFilter = 'ALL';
@@ -477,6 +478,8 @@ <h3>Live Logs</h3>
                 const d = details[m];
                 const short = m.split('/').pop();
                 const avgLat = d.count > 0 ? (d.latency / d.count).toFixed(2) : '0';
+                const totalCost = d.cost ? '$' + d.cost.toFixed(4) : '—';
+                const avgCostModel = d.count > 0 && d.cost ? '$' + (d.cost / d.count).toFixed(4) : '—';
                 html += `<div class="card">
                     <div class="card-header">
                         <span class="card-name">${escHtml(short)}</span>
@@ -487,17 +490,19 @@ <h3>Live Logs</h3>
                         <div class="metric">Tokens out<strong>${formatNumber(d.tokens_out)}</strong></div>
                         <div class="metric">Reasoning<strong>${formatNumber(d.reasoning)}</strong></div>
                         <div class="metric">Avg latency<strong>${avgLat}s</strong></div>
+                        <div class="metric">Total cost<strong>${totalCost}</strong></div>
+                        <div class="metric">Avg cost/req<strong>${avgCostModel}</strong></div>
                     </div>
                 </div>`;
             }
 
             grid.innerHTML = html;
 
             // Commands bar
+            const allCommands = ['/start', '/connect', '/disconnect', '/status', '/settings', '/chats', '/poke'];
             const cmds = stats.commands || {};
-            const cmdNames = Object.keys(cmds).sort((a, b) => cmds[b] - cmds[a]);
             const cmdBar = document.getElementById('commands-summary');
-            cmdBar.innerHTML = cmdNames.map(c => `<div class="summary-item">${escHtml(c)}: <strong>${cmds[c]}</strong></div>`).join('');
+            cmdBar.innerHTML = allCommands.map(c => `<div class="summary-item">${escHtml(c)}: <strong>${cmds[c] || 0}</strong></div>`).join('');
         }
 
         function copyLogs() {
@@ -568,13 +573,10 @@ <h3>Live Logs</h3>
                 }
 
                 // Reply styles bar
-                const styleEmojis = {{ style_to_emoji | tojson }};
+                const styleEmojiPairs = JSON.parse(document.getElementById('style-emoji-data').textContent);
                 const draftStyles = stats.draft_styles || {};
-                const styleBar = document.getElementById('styles-summary');
-                const styleNames = Object.keys(styleEmojis);
-                styleBar.innerHTML = styleNames.map(s => {
+                document.getElementById('style-items').innerHTML = styleEmojiPairs.map(([s, emoji]) => {
                     const count = draftStyles[s] || 0;
-                    const emoji = styleEmojis[s];
                     return `<div class="summary-item">${emoji} ${s}: <strong>${count}</strong></div>`;
                 }).join('');
 

utils/utils.py

@@ -1,3 +1,5 @@
+# utils/utils.py — Утилиты общего назначения (форматирование, декораторы, стили)
+
 import asyncio
 from collections import defaultdict
 from contextlib import asynccontextmanager