Update aiogram 3 template

tgbot/utils/misc/bot_commands.py

@@ -2,29 +2,32 @@
 from aiogram import Bot
 from aiogram.types import BotCommand, BotCommandScopeChat, BotCommandScopeDefault
 
-from tgbot.data.config import get_admins
+from tgbot.data.config import BOT_DATABASE_EXPORT, get_admins
+from tgbot.utils.misc.bot_logging import bot_logger
 
-# Commands for users
+# Команды для обычных пользователей
 user_commands = [
-    BotCommand(command="start", description="♻️ Restart bot"),
-    BotCommand(command="menu", description="🌀 Get keyboards"),
+    BotCommand(command="start", description="♻️ Перезапуск бота"),
+    BotCommand(command="menu", description="🌀 Получение клавиатуры"),
 ]
 
-# Commands for admins
+# Команды для админов
 admin_commands = [
-    BotCommand(command="start", description="♻️ Restart bot"),
-    BotCommand(command="menu", description="🌀 Get keyboards"),
-    BotCommand(command="log", description="🖨 Get Logs"),
-    BotCommand(command="db", description="📦 Get Database"),
+    BotCommand(command="start", description="♻️ Перезапуск бота"),
+    BotCommand(command="menu", description="🌀 Получение клавиатуры"),
+    BotCommand(command="log", description="🖨 Получить логи"),
 ]
 
+if BOT_DATABASE_EXPORT:
+    admin_commands.append(BotCommand(command="db", description="📦 Получить БД"))
 
-# Set commands
+
+# Обновление списка команд в Telegram
 async def set_commands(bot: Bot):
     await bot.set_my_commands(user_commands, scope=BotCommandScopeDefault())
 
     for admin in get_admins():
         try:
             await bot.set_my_commands(admin_commands, scope=BotCommandScopeChat(chat_id=admin))
-        except:
-            ...
+        except Exception:
+            bot_logger.warning("Не удалось обновить команды для админа %s", admin, exc_info=True)

tgbot/utils/misc/bot_filters.py

@@ -1,14 +1,30 @@
 # - *- coding: utf- 8 - *-
+from typing import Union
+
 from aiogram.filters import BaseFilter
-from aiogram.types import Message
+from aiogram.types import CallbackQuery, Message
 
 from tgbot.data.config import get_admins
 
 
-# Filter on admin right
+# Проверка, что действия совершает админ
 class IsAdmin(BaseFilter):
-    async def __call__(self, message: Message) -> bool:
-        if message.from_user.id in get_admins():
+    async def __call__(self, event: Union[Message, CallbackQuery]) -> bool:
+        user = getattr(event, "from_user", None)
+
+        return bool(user and user.id in get_admins())
+
+
+# Проверка приватного чата
+class IsPrivate(BaseFilter):
+    async def __call__(self, event: Union[Message, CallbackQuery]) -> bool:
+        chat = getattr(event, "chat", None)
+        message = getattr(event, "message", None)
+
+        if chat is None and message is not None:
+            chat = message.chat
+
+        if chat is None:
             return True
-        else:
-            return False
+
+        return chat.type == "private"

tgbot/utils/misc/bot_logging.py

@@ -1,32 +1,58 @@
 # - *- coding: utf- 8 - *-
-import logging as bot_logger
+import logging
+from logging.handlers import RotatingFileHandler
+from pathlib import Path
 
 import colorlog
 
 from tgbot.data.config import PATH_LOGS
 
-# Logging format
-log_formatter_file = bot_logger.Formatter("%(levelname)s | %(asctime)s | %(filename)s:%(lineno)d | %(message)s")
-log_formatter_console = colorlog.ColoredFormatter(
-    "%(purple)s%(levelname)s %(blue)s|%(purple)s %(asctime)s %(blue)s|%(purple)s %(filename)s:%(lineno)d %(blue)s|%(purple)s %(message)s%(red)s",
-    datefmt="%d-%m-%Y %H:%M:%S",
-)
+LOG_FILE_MAX_BYTES = 5 * 1024 * 1024
+LOG_FILE_BACKUP_COUNT = 5
 
-# Logging in file logs.log
-file_handler = bot_logger.FileHandler(PATH_LOGS, "w", "utf-8")
-file_handler.setFormatter(log_formatter_file)
-file_handler.setLevel(bot_logger.INFO)
+# Папка под логи создается сама, чтобы бот не падал на старте
+log_path = Path(PATH_LOGS)
+log_path.parent.mkdir(parents=True, exist_ok=True)
 
-# Logging in console
-console_handler = bot_logger.StreamHandler()
-console_handler.setFormatter(log_formatter_console)
-console_handler.setLevel(bot_logger.CRITICAL)
+# Один общий логгер для всего шаблона
+bot_logger = logging.getLogger("tgbot")
+bot_logger.setLevel(logging.INFO)
+bot_logger.propagate = False
 
-# Connect logging settings
-bot_logger.basicConfig(
-    format="%(levelname)s | %(asctime)s | %(filename)s:%(lineno)d | %(message)s",
-    handlers=[
-        file_handler,
-        console_handler
-    ]
-)
+if not bot_logger.handlers:
+    # Формат для файла: без цветов
+    file_formatter = logging.Formatter(
+        "%(levelname)s | %(asctime)s | %(name)s | %(filename)s:%(lineno)d | %(message)s",
+        datefmt="%d-%m-%Y %H:%M:%S",
+    )
+    # Формат для консоли: коротко и с цветами
+    console_formatter = colorlog.ColoredFormatter(
+        "%(log_color)s%(levelname)s%(reset)s | %(blue)s%(asctime)s%(reset)s | "
+        "%(purple)s%(filename)s:%(lineno)d%(reset)s | %(message)s",
+        datefmt="%d-%m-%Y %H:%M:%S",
+        log_colors={
+            "DEBUG": "cyan",
+            "INFO": "green",
+            "WARNING": "yellow",
+            "ERROR": "red",
+            "CRITICAL": "bold_red",
+        },
+    )
+
+    # Не очищаем файл, а крутим по размеру
+    file_handler = RotatingFileHandler(
+        log_path,
+        maxBytes=LOG_FILE_MAX_BYTES,
+        backupCount=LOG_FILE_BACKUP_COUNT,
+        encoding="utf-8",
+    )
+    file_handler.setFormatter(file_formatter)
+    file_handler.setLevel(logging.INFO)
+
+    # В консоль выводим то, что важно видеть сразу
+    console_handler = logging.StreamHandler()
+    console_handler.setFormatter(console_formatter)
+    console_handler.setLevel(logging.INFO)
+
+    bot_logger.addHandler(file_handler)
+    bot_logger.addHandler(console_handler)

tgbot/utils/misc/bot_models.py

@@ -3,5 +3,6 @@ from aiogram.fsm.context import FSMContext
 
 from tgbot.services.api_session import AsyncRequestSession
 
+# Короткие алиасы для типизации обработчиков
 FSM = FSMContext
 ARS = AsyncRequestSession