Упрощена и покрыта тестами логика Dispatcher.__ready()

maxapi/dispatcher.py

@@ -5,7 +5,6 @@
 import warnings
 from asyncio.exceptions import TimeoutError as AsyncioTimeoutError
 from datetime import datetime
-from re import DOTALL, search
 from typing import TYPE_CHECKING, Any, Literal
 
 from aiohttp import ClientConnectorError
@@ -15,7 +14,6 @@
 from .exceptions.dispatcher import HandlerException, MiddlewareException
 from .exceptions.max import InvalidToken, MaxApiError, MaxConnection
 from .filters import filter_attrs
-from .filters.command import CommandsInfo
 from .filters.handler import Handler
 from .loggers import logger_dp
 from .methods.types.getted_updates import (
@@ -24,6 +22,7 @@
 )
 from .types.bot_mixin import BotMixin
 from .types.updates import UNKNOWN_UPDATE_DISCLAIMER, UpdateUnion
+from .utils.commands import extract_commands
 from .utils.time import from_ms, to_ms
 
 try:
@@ -53,7 +52,6 @@
 
 CONNECTION_RETRY_DELAY = 30
 GET_UPDATES_RETRY_DELAY = 5
-COMMANDS_INFO_PATTERN = r"commands_info:\s*(.*?)(?=\n|$)"
 DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 8080
 
@@ -249,7 +247,7 @@ def filter(self, base_filter: BaseFilter) -> None:
 
     async def __ready(self, bot: Bot) -> None:
         """
-        Подготавливает диспетчер: сохраняет бота, регистрирует
+        Подготавливает диспетчер: сохраняет бота, подготавливает
         обработчики, вызывает on_started.
 
         Args:
@@ -259,58 +257,47 @@ async def __ready(self, bot: Bot) -> None:
         self.bot = bot
         self.bot.dispatcher = self
 
-        if self.polling and self.bot.auto_check_subscriptions:
-            response = await self.bot.get_subscriptions()
-
-            if response.subscriptions:
-                logger_subscriptions_text = ", ".join(
-                    [s.url for s in response.subscriptions]
-                )
-                logger_dp.warning(
-                    "БОТ ИГНОРИРУЕТ POLLING! "
-                    "Обнаружены установленные подписки: %s",
-                    logger_subscriptions_text,
-                )
+        if self.polling and bot.auto_check_subscriptions:
+            await self._check_subscriptions(bot)
 
         await self.check_me()
 
         self.routers += [self]
+        self._prepare_handlers(bot)
 
-        for router in self.routers:
-            router.bot = bot
-
-            for handler in router.event_handlers:
-                if handler.base_filters is None:
-                    continue
-
-                for base_filter in handler.base_filters:
-                    commands = getattr(base_filter, "commands", None)
+        if self.on_started_func:
+            await self.on_started_func()
 
-                    if commands and type(commands) is list:
-                        handler_doc = handler.func_event.__doc__
-                        extracted_info = None
+    def _prepare_handlers(self, bot: Bot) -> None:
+        """Подготовить обработчики событий."""
 
-                        if handler_doc:
-                            from_pattern = search(
-                                COMMANDS_INFO_PATTERN, handler_doc, DOTALL
-                            )
-                            if from_pattern:
-                                extracted_info = from_pattern.group(1).strip()
+        handlers_count = 0
 
-                        self.bot.commands.append(
-                            CommandsInfo(commands, extracted_info)
-                        )
+        for router in self.routers:
+            router.bot = bot
 
-        handlers_count = sum(
-            len(router.event_handlers) for router in self.routers
-        )
+            for handler in router.event_handlers:
+                handlers_count += 1
+                extract_commands(handler, bot)
 
         logger_dp.info(
             f"Зарегистрировано {handlers_count} обработчиков событий"
         )
 
-        if self.on_started_func:
-            await self.on_started_func()
+    @staticmethod
+    async def _check_subscriptions(bot: Bot) -> None:
+        """Проверить наличие подписок при запуске polling."""
+        response = await bot.get_subscriptions()
+
+        if subscriptions := response.subscriptions:
+            logger_subscriptions_text = ", ".join(
+                [s.url for s in subscriptions]
+            )
+            logger_dp.warning(
+                "БОТ ИГНОРИРУЕТ POLLING! "
+                "Обнаружены установленные подписки: %s",
+                logger_subscriptions_text,
+            )
 
     def __get_context(
         self, chat_id: int | None, user_id: int | None

maxapi/utils/commands.py

@@ -0,0 +1,38 @@
+from re import DOTALL, search
+
+from maxapi.bot import Bot
+from maxapi.filters.command import CommandsInfo
+from maxapi.filters.handler import Handler
+
+COMMANDS_INFO_PATTERN = r"commands_info:\s*(.*?)(?=\n|$)"
+
+
+def extract_commands(handler: Handler, bot: Bot) -> None:
+    """Извлечь команды из обработчика и добавить их в бота."""
+    if handler.base_filters is None:
+        return
+
+    handler_info = get_handler_info(handler)
+
+    for base_filter in handler.base_filters:
+        commands = getattr(base_filter, "commands", None)
+
+        if commands and isinstance(commands, list):
+            command = CommandsInfo(commands=commands, info=handler_info)
+            bot.commands.append(command)
+
+
+def get_handler_info(handler: Handler) -> str | None:
+    """Получить описание обработчика."""
+    handler_doc = handler.func_event.__doc__
+    if not handler_doc:
+        return None
+
+    from_pattern = search(
+        pattern=COMMANDS_INFO_PATTERN, string=handler_doc, flags=DOTALL
+    )
+    if not from_pattern:
+        return None
+
+    info = from_pattern.group(1).strip()
+    return info or None

pyproject.toml

@@ -107,11 +107,10 @@ target-version = "py310"
 
 
 [tool.ruff.lint]
-# TODO: добавить BLE C90 N PGH PLR TRY
+# TODO: добавить BLE N PGH PLR TRY
 select = ["ALL"]
 ignore = [
     "BLE", # TODO: требует рефакторинга
-    "C90", # TODO: требует рефакторинга
     "G004", # TODO: требует рефакторинга
     "ERA", # TODO: требует рефакторинга
     "N", # TODO: требует рефакторинга
@@ -153,6 +152,19 @@ flake8-type-checking.runtime-evaluated-base-classes = [
 ]
 "dispatcher.py" = [
     "B023", # TODO: требует рефакторинга dispatcher
+    "C90", # TODO: требует рефакторинга dispatcher
+]
+"maxapi/utils/updates.py" = [
+    "C90", # TODO: требует рефакторинга
+]
+"maxapi/methods/send_message.py" = [
+    "C90", # TODO: требует рефакторинга
+]
+"maxapi/methods/edit_message.py" = [
+    "C90", # TODO: требует рефакторинга
+]
+"maxapi/connection/base.py" = [
+    "C90", # TODO: требует рефакторинга
 ]
 
 [tool.ruff.format]