Merge branch 'release/0.3.1'

Author: s3rius

README.md

@@ -6,11 +6,12 @@
 
 This repo adds integration between your aiogram application and taskiq.
 
-It runs all startup and shutdown events of your application and adds 2 dependencies,
+It runs all startup and shutdown events of your application and adds 3 dependencies,
 that you can use in your tasks.
 
-1. Dispatcher - that were used along with executor;
-2. Bot - your bot instance.
+1. `Dispatcher` - that were used along with executor;
+2. `Bot` - your main bot instance;
+3. `List[Bot]` - all your bots.
 
 ## Usage
 
@@ -36,6 +37,7 @@ from your_project.tkq import broker
 
 dp = Dispatcher()
 bot = Bot(token="TOKEN")
+bot2 = Bot(token="TOKEN")
 
 
 @dp.startup()
@@ -80,6 +82,7 @@ taskiq_aiogram.init(
     broker,
     "your_project.__main__:dp",
     "your_project.__main__:bot",
+    "your_project.__main__:bot2",
 )
 ```
 

pyproject.toml

@@ -3,7 +3,7 @@ name = "taskiq-aiogram"
 description = "Taskiq integration with Aiogram"
 authors = ["Taskiq team <taskiq@no-reply.com>"]
 maintainers = ["Taskiq team <taskiq@no-reply.com>"]
-version = "0.3.0"
+version = "0.3.1"
 readme = "README.md"
 license = "LICENSE"
 classifiers = [

taskiq_aiogram/initializer.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Awaitable, Callable
+from typing import Any, Awaitable, Callable, List
 
 from aiogram import Bot, Dispatcher
 from taskiq import AsyncBroker, TaskiqEvents, TaskiqState
@@ -12,18 +12,18 @@
 logger = logging.getLogger("taskiq.taskiq_aiogram")
 
 
-def startup_event_generator(
+def startup_event_generator(  # noqa: C901
     broker: AsyncBroker,
     dispatcher_path: str,
-    bot_path: str,
+    *bots_paths: str,
     **kwargs: str,
 ) -> Callable[[TaskiqState], Awaitable[None]]:
     """
     Generate startup event for broker.
 
     :param broker: current broker.
     :param dispatcher_path: python-path to the dispatcher object.
-    :param bot_path: python-path to the bot.
+    :param bots_paths: python-paths to bots objects.
     :param kwargs: random key-word arguments.
 
     :returns: startup event handler.
@@ -36,29 +36,33 @@ async def startup(state: TaskiqState) -> None:
         dispatcher = import_object(dispatcher_path)
         if not isinstance(dispatcher, Dispatcher):
             raise ValueError("Dispatcher should be an instance of dispatcher.")
-        bot = import_object(bot_path)
-        if not isinstance(bot, Bot):
-            raise ValueError("Bots should be instances of Bot class.")
+        bots = []
+        for bot_path in bots_paths:
+            bot = import_object(bot_path)
+            if not isinstance(bot, Bot):
+                raise ValueError("Bots should be instances of Bot class.")
+            bots.append(bot)
 
         workflow_data = {
             "dispatcher": dispatcher,
-            "bots": [bot],
+            "bots": bots,
             **dispatcher.workflow_data,
             **kwargs,
         }
         if "bot" in workflow_data:
             workflow_data.pop("bot")
 
-        state[BOT_KEY] = bot
+        state[BOT_KEY] = bots
         state[WORKFLOW_KEY] = workflow_data
         state[DISPATCHER_KEY] = dispatcher
 
-        await dispatcher.emit_startup(bot=bot, **workflow_data)
+        await dispatcher.emit_startup(bot=bots[-1], **workflow_data)
 
         broker.add_dependency_context(
             {
                 Dispatcher: dispatcher,
-                Bot: bot,
+                Bot: bots[-1],
+                List[Bot]: bots,
             },
         )
 
@@ -84,12 +88,12 @@ def shutdown_event_generator(
     async def shutdown(state: TaskiqState) -> None:
         if not broker.is_worker_process:
             return
-        bot: Bot = state[BOT_KEY]
+        bots: List[Bot] = state[BOT_KEY]
         workflow_data: dict[str, Any] = state[WORKFLOW_KEY]
         dispatcher: Dispatcher = state[DISPATCHER_KEY]
 
         try:
-            await dispatcher.emit_shutdown(bot, **workflow_data)
+            await dispatcher.emit_shutdown(bots[-1], **workflow_data)
         except Exception as exc:
             logger.warn(f"Error found while shutting down: {exc}")
 
@@ -100,6 +104,7 @@ def init(
     broker: AsyncBroker,
     dispatcher: str,
     bot: str,
+    *other_bots: str,
     **kwargs: Any,
 ) -> None:
     """
@@ -116,6 +121,7 @@ def init(
     :param broker: current broker.
     :param dispatcher: python-path to the dispatcher.
     :param bot: bot to use.
+    :param other_bots: python-paths to other bots.
     :param kwargs: random key-word arguments for shutdown and startup events.
     """
     broker.add_event_handler(
@@ -124,6 +130,7 @@ def init(
             broker,
             dispatcher,
             bot,
+            *other_bots,
             **kwargs,
         ),
     )