From 79d50b7edc8fb1d781ff078f2995c815a7be3624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D1=81=D0=B5=D0=B2=D0=BE=D0=BB=D0=BE=D0=B4?= Date: Fri, 15 Sep 2023 22:07:54 +0300 Subject: [PATCH] update ```aiogram``` and ```aiogram-dialog``` aiogram release 3.0.0 aiogram-dialog release 2.0.0 --- README.md | 4 ++-- app/__main__.py | 20 ++++++++++---------- app/dialogs/__init__.py | 12 ++++++++---- requirements.txt | 4 ++-- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 40b1410..06192d9 100644 --- a/README.md +++ b/README.md @@ -12,10 +12,10 @@ ## Features -* ![aiogram 3](https://img.shields.io/badge/dev--3.x-aiogram-blue) as a main library +* ![aiogram 3](https://img.shields.io/badge/3.0.0-aiogram-blue) as a main library * ![pyrogram](https://img.shields.io/badge/latest-pyrogram-orange) (Optional) for MTProto requests, such as bulk delete, resolve by username and list participants in a group -* ![aiogram-dialog](https://img.shields.io/badge/beta--2.x-aiogram__dialog-green) (Optional) for creating multi-step +* ![aiogram-dialog](https://img.shields.io/badge/2.0.0-aiogram__dialog-green) (Optional) for creating multi-step dialogs * ☁️ Webhook and long polling with local Bot API server support * 🎨 Beautiful and informative colored logs diff --git a/app/__main__.py b/app/__main__.py index a6429cb..dd3adc1 100644 --- a/app/__main__.py +++ b/app/__main__.py @@ -8,7 +8,7 @@ from aiogram.fsm.storage.memory import MemoryStorage from aiogram.fsm.storage.redis import DefaultKeyBuilder, RedisStorage from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application -from aiogram_dialog import DialogRegistry +from aiogram_dialog import setup_dialogs from aiohttp import web from pyrogram import Client @@ -16,23 +16,19 @@ from app.arguments import parse_arguments from app.config import Config, parse_config from app.db import close_orm, init_orm -from app.dialogs import register_dialogs +from app.dialogs import get_dialog_router from app.handlers import get_handlers_router from app.inline.handlers import get_inline_router from app.middlewares import register_middlewares from app.commands import remove_bot_commands, setup_bot_commands -async def on_startup( - dispatcher: Dispatcher, bot: Bot, config: Config, registry: DialogRegistry -): - +async def on_startup(dispatcher: Dispatcher, bot: Bot, config: Config): register_middlewares(dp=dispatcher, config=config) dispatcher.include_router(get_handlers_router()) dispatcher.include_router(get_inline_router()) - - register_dialogs(registry) + dispatcher.include_router(get_dialog_router()) await setup_bot_commands(bot, config) @@ -95,7 +91,11 @@ async def main(): except FileExistsError: await db.migrate_models(tortoise_config) - session = AiohttpSession(api=TelegramAPIServer.from_base(config.api.bot_api_url, is_local=config.api.is_local)) + session = AiohttpSession( + api=TelegramAPIServer.from_base( + config.api.bot_api_url, is_local=config.api.is_local + ) + ) token = config.bot.token bot_settings = {"session": session, "parse_mode": "HTML"} @@ -113,7 +113,7 @@ async def main(): dp.startup.register(on_startup) dp.shutdown.register(on_shutdown) - registry = DialogRegistry(dp) + registry = setup_dialogs(dp) context_kwargs = {"config": config, "registry": registry} diff --git a/app/dialogs/__init__.py b/app/dialogs/__init__.py index 3576658..f645ba8 100644 --- a/app/dialogs/__init__.py +++ b/app/dialogs/__init__.py @@ -1,7 +1,11 @@ -from aiogram_dialog import DialogRegistry +from aiogram import Router -def register_dialogs(registry: DialogRegistry): - from . import sample_dialog +def get_dialog_router() -> Router: + from .sample_dialog import ui - registry.register(sample_dialog.ui) + dialog_routers = Router() + + dialog_routers.include_router(ui) + + return dialog_routers diff --git a/requirements.txt b/requirements.txt index ed0aab8..a0eaaac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ aerich -aiogram-dialog==2.0.0b11 -aiogram==3.0.0b5 +aiogram-dialog==2.0.0 +aiogram==3.0.0 aiohttp aiosqlite cachetools