Update default parse_mode propagation.

aiogram/api/client/bot.py

@@ -147,6 +147,10 @@ class Bot(ContextInstanceMixin["Bot"]):
         self.parse_mode = parse_mode
         self.__token = token
 
+    @property
+    def token(self) -> str:
+        return self.__token
+
     @property
     def id(self) -> int:
         """
@@ -278,7 +282,7 @@ class Bot(ContextInstanceMixin["Bot"]):
         :param method:
         :return:
         """
-        return await self.session.make_request(self.__token, method, timeout=request_timeout)
+        return await self.session.make_request(self, method, timeout=request_timeout)
 
     def __hash__(self) -> int:
         """

aiogram/api/client/session/aiohttp.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import (
+    TYPE_CHECKING,
     Any,
     AsyncGenerator,
     Dict,
@@ -20,6 +21,9 @@ from aiogram.api.methods import Request, TelegramMethod
 
 from .base import BaseSession
 
+if TYPE_CHECKING:
+    from ..bot import Bot
+
 T = TypeVar("T")
 _ProxyBasic = Union[str, Tuple[str, BasicAuth]]
 _ProxyChain = Iterable[_ProxyBasic]
@@ -126,12 +130,12 @@ class AiohttpSession(BaseSession):
         return form
 
     async def make_request(
-        self, token: str, call: TelegramMethod[T], timeout: Optional[int] = None
+        self, bot: Bot, call: TelegramMethod[T], timeout: Optional[int] = None
     ) -> T:
         session = await self.create_session()
 
-        request = call.build_request()
+        request = call.build_request(bot)
-        url = self.api.api_url(token=token, method=request.method)
+        url = self.api.api_url(token=bot.token, method=request.method)
         form = self.build_form_data(request)
 
         async with session.post(

aiogram/api/client/session/base.py

@@ -4,7 +4,17 @@ import abc
 import datetime
 import json
 from types import TracebackType
-from typing import Any, AsyncGenerator, Callable, ClassVar, Optional, Type, TypeVar, Union
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    AsyncGenerator,
+    Callable,
+    ClassVar,
+    Optional,
+    Type,
+    TypeVar,
+    Union,
+)
 
 from aiogram.utils.exceptions import TelegramAPIError
 
@@ -13,6 +23,9 @@ from ...methods import Response, TelegramMethod
 from ...types import UNSET
 from ..telegram import PRODUCTION, TelegramAPIServer
 
+if TYPE_CHECKING:
+    from ..bot import Bot
+
 T = TypeVar("T")
 _JsonLoads = Callable[..., Any]
 _JsonDumps = Callable[..., str]
@@ -37,7 +50,7 @@ class BaseSession(abc.ABC):
 
     @abc.abstractmethod
     async def make_request(
-        self, token: str, method: TelegramMethod[T], timeout: Optional[int] = UNSET
+        self, bot: Bot, method: TelegramMethod[T], timeout: Optional[int] = UNSET
     ) -> T:  # pragma: no cover
         pass
 

aiogram/api/methods/add_sticker_to_set.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InputFile, MaskPosition
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class AddStickerToSet(TelegramMethod[bool]):
     """
@@ -34,7 +39,7 @@ class AddStickerToSet(TelegramMethod[bool]):
     mask_position: Optional[MaskPosition] = None
     """A JSON-serialized object for position where the mask should be placed on faces"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"png_sticker", "tgs_sticker"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/answer_callback_query.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class AnswerCallbackQuery(TelegramMethod[bool]):
     """
@@ -33,7 +38,7 @@ class AnswerCallbackQuery(TelegramMethod[bool]):
     """The maximum amount of time in seconds that the result of the callback query may be cached
     client-side. Telegram apps will support caching starting in version 3.14. Defaults to 0."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="answerCallbackQuery", data=data)

aiogram/api/methods/answer_inline_query.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import InlineQueryResult
 from .base import Request, TelegramMethod, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class AnswerInlineQuery(TelegramMethod[bool]):
     """
@@ -36,8 +41,8 @@ class AnswerInlineQuery(TelegramMethod[bool]):
     """Deep-linking parameter for the /start message sent to the bot when user presses the switch
     button. 1-64 characters, only A-Z, a-z, 0-9, _ and - are allowed."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data["results"])
+        prepare_parse_mode(bot, data["results"])
 
         return Request(method="answerInlineQuery", data=data)

aiogram/api/methods/answer_pre_checkout_query.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class AnswerPreCheckoutQuery(TelegramMethod[bool]):
     """
@@ -26,7 +31,7 @@ class AnswerPreCheckoutQuery(TelegramMethod[bool]):
     amazing black T-shirts while you were busy filling out your payment details. Please choose
     a different color or garment!"). Telegram will display this message to the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="answerPreCheckoutQuery", data=data)

aiogram/api/methods/answer_shipping_query.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import ShippingOption
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class AnswerShippingQuery(TelegramMethod[bool]):
     """
@@ -27,7 +32,7 @@ class AnswerShippingQuery(TelegramMethod[bool]):
     impossible to complete the order (e.g. "Sorry, delivery to your desired address is
     unavailable'). Telegram will display this message to the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="answerShippingQuery", data=data)

aiogram/api/methods/base.py

@@ -66,7 +66,7 @@ class TelegramMethod(abc.ABC, BaseModel, Generic[T]):
         pass
 
     @abc.abstractmethod
-    def build_request(self) -> Request:  # pragma: no cover
+    def build_request(self, bot: Bot) -> Request:  # pragma: no cover
         pass
 
     def dict(self, **kwargs: Any) -> Any:
@@ -125,7 +125,7 @@ def prepare_media_file(data: Dict[str, Any], files: Dict[str, InputFile]) -> Non
         data["media"]["media"] = f"attach://{tag}"
 
 
-def prepare_parse_mode(root: Any, parse_mode_property: str = "parse_mode") -> None:
+def prepare_parse_mode(bot: Bot, root: Any, parse_mode_property: str = "parse_mode") -> None:
     """
     Find and set parse_mode with highest priority.
 
@@ -136,14 +136,9 @@ def prepare_parse_mode(root: Any, parse_mode_property: str = "parse_mode") -> No
     """
     if isinstance(root, list):
         for item in root:
-            prepare_parse_mode(item, parse_mode_property=parse_mode_property)
+            prepare_parse_mode(bot=bot, root=item, parse_mode_property=parse_mode_property)
-        return
+    elif root.get(parse_mode_property, UNSET) is UNSET:
-
+        if bot.parse_mode:
-    if root.get(parse_mode_property, UNSET) is UNSET:
-        from ..client.bot import Bot
-
-        bot = Bot.get_current(no_error=True)
-        if bot and bot.parse_mode:
             root[parse_mode_property] = bot.parse_mode
         else:
             root[parse_mode_property] = None

aiogram/api/methods/create_new_sticker_set.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InputFile, MaskPosition
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class CreateNewStickerSet(TelegramMethod[bool]):
     """
@@ -40,7 +45,7 @@ class CreateNewStickerSet(TelegramMethod[bool]):
     mask_position: Optional[MaskPosition] = None
     """A JSON-serialized object for position where the mask should be placed on faces"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"png_sticker", "tgs_sticker"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/delete_chat_photo.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class DeleteChatPhoto(TelegramMethod[bool]):
     """
@@ -18,7 +23,7 @@ class DeleteChatPhoto(TelegramMethod[bool]):
     """Unique identifier for the target chat or username of the target channel (in the format
     @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="deleteChatPhoto", data=data)

aiogram/api/methods/delete_chat_sticker_set.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class DeleteChatStickerSet(TelegramMethod[bool]):
     """
@@ -19,7 +24,7 @@ class DeleteChatStickerSet(TelegramMethod[bool]):
     """Unique identifier for the target chat or username of the target supergroup (in the format
     @supergroupusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="deleteChatStickerSet", data=data)

aiogram/api/methods/delete_message.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class DeleteMessage(TelegramMethod[bool]):
     """
@@ -28,7 +33,7 @@ class DeleteMessage(TelegramMethod[bool]):
     message_id: int
     """Identifier of the message to delete"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="deleteMessage", data=data)

aiogram/api/methods/delete_sticker_from_set.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class DeleteStickerFromSet(TelegramMethod[bool]):
     """
@@ -15,7 +20,7 @@ class DeleteStickerFromSet(TelegramMethod[bool]):
     sticker: str
     """File identifier of the sticker"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="deleteStickerFromSet", data=data)

aiogram/api/methods/delete_webhook.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class DeleteWebhook(TelegramMethod[bool]):
     """
@@ -13,7 +18,7 @@ class DeleteWebhook(TelegramMethod[bool]):
 
     __returning__ = bool
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="deleteWebhook", data=data)

aiogram/api/methods/edit_message_caption.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import UNSET, InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class EditMessageCaption(TelegramMethod[Union[Message, bool]]):
     """
@@ -28,8 +33,8 @@ class EditMessageCaption(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for an inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data)
+        prepare_parse_mode(bot, data)
 
         return Request(method="editMessageCaption", data=data)

aiogram/api/methods/edit_message_live_location.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class EditMessageLiveLocation(TelegramMethod[Union[Message, bool]]):
     """
@@ -30,7 +35,7 @@ class EditMessageLiveLocation(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for a new inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="editMessageLiveLocation", data=data)

aiogram/api/methods/edit_message_media.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InlineKeyboardMarkup, InputFile, InputMedia, Message
 from .base import Request, TelegramMethod, prepare_media_file, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class EditMessageMedia(TelegramMethod[Union[Message, bool]]):
     """
@@ -30,9 +35,9 @@ class EditMessageMedia(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for a new inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data["media"])
+        prepare_parse_mode(bot, data["media"])
 
         files: Dict[str, InputFile] = {}
         prepare_media_file(data=data, files=files)

aiogram/api/methods/edit_message_reply_markup.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class EditMessageReplyMarkup(TelegramMethod[Union[Message, bool]]):
     """
@@ -24,7 +29,7 @@ class EditMessageReplyMarkup(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for an inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="editMessageReplyMarkup", data=data)

aiogram/api/methods/edit_message_text.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import UNSET, InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class EditMessageText(TelegramMethod[Union[Message, bool]]):
     """
@@ -30,7 +35,7 @@ class EditMessageText(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for an inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="editMessageText", data=data)

aiogram/api/methods/export_chat_invite_link.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class ExportChatInviteLink(TelegramMethod[str]):
     """
@@ -23,7 +28,7 @@ class ExportChatInviteLink(TelegramMethod[str]):
     """Unique identifier for the target chat or username of the target channel (in the format
     @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="exportChatInviteLink", data=data)

aiogram/api/methods/forward_message.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class ForwardMessage(TelegramMethod[Message]):
     """
@@ -24,7 +29,7 @@ class ForwardMessage(TelegramMethod[Message]):
     disable_notification: Optional[bool] = None
     """Sends the message silently. Users will receive a notification with no sound."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="forwardMessage", data=data)

aiogram/api/methods/get_chat.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from ..types import Chat
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetChat(TelegramMethod[Chat]):
     """
@@ -19,7 +24,7 @@ class GetChat(TelegramMethod[Chat]):
     """Unique identifier for the target chat or username of the target supergroup or channel (in
     the format @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getChat", data=data)

aiogram/api/methods/get_chat_administrators.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Union
 
 from ..types import ChatMember
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetChatAdministrators(TelegramMethod[List[ChatMember]]):
     """
@@ -20,7 +25,7 @@ class GetChatAdministrators(TelegramMethod[List[ChatMember]]):
     """Unique identifier for the target chat or username of the target supergroup or channel (in
     the format @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getChatAdministrators", data=data)

aiogram/api/methods/get_chat_member.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from ..types import ChatMember
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetChatMember(TelegramMethod[ChatMember]):
     """
@@ -20,7 +25,7 @@ class GetChatMember(TelegramMethod[ChatMember]):
     user_id: int
     """Unique identifier of the target user"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getChatMember", data=data)

aiogram/api/methods/get_chat_members_count.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetChatMembersCount(TelegramMethod[int]):
     """
@@ -16,7 +21,7 @@ class GetChatMembersCount(TelegramMethod[int]):
     """Unique identifier for the target chat or username of the target supergroup or channel (in
     the format @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getChatMembersCount", data=data)

aiogram/api/methods/get_file.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from ..types import File
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetFile(TelegramMethod[File]):
     """
@@ -22,7 +27,7 @@ class GetFile(TelegramMethod[File]):
     file_id: str
     """File identifier to get info about"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getFile", data=data)

aiogram/api/methods/get_game_high_scores.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import GameHighScore
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetGameHighScores(TelegramMethod[List[GameHighScore]]):
     """
@@ -27,7 +32,7 @@ class GetGameHighScores(TelegramMethod[List[GameHighScore]]):
     inline_message_id: Optional[str] = None
     """Required if chat_id and message_id are not specified. Identifier of the inline message"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getGameHighScores", data=data)

aiogram/api/methods/get_me.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from ..types import User
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetMe(TelegramMethod[User]):
     """
@@ -14,7 +19,7 @@ class GetMe(TelegramMethod[User]):
 
     __returning__ = User
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getMe", data=data)

aiogram/api/methods/get_my_commands.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List
 
 from ..types import BotCommand
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetMyCommands(TelegramMethod[List[BotCommand]]):
     """
@@ -14,7 +19,7 @@ class GetMyCommands(TelegramMethod[List[BotCommand]]):
 
     __returning__ = List[BotCommand]
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getMyCommands", data=data)

aiogram/api/methods/get_sticker_set.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from ..types import StickerSet
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetStickerSet(TelegramMethod[StickerSet]):
     """
@@ -16,7 +21,7 @@ class GetStickerSet(TelegramMethod[StickerSet]):
     name: str
     """Name of the sticker set"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getStickerSet", data=data)

aiogram/api/methods/get_updates.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import Update
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetUpdates(TelegramMethod[List[Update]]):
     """
@@ -37,7 +42,7 @@ class GetUpdates(TelegramMethod[List[Update]]):
     list to receive all updates regardless of type (default). If not specified, the previous
     setting will be used."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getUpdates", data=data)

aiogram/api/methods/get_user_profile_photos.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from ..types import UserProfilePhotos
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetUserProfilePhotos(TelegramMethod[UserProfilePhotos]):
     """
@@ -22,7 +27,7 @@ class GetUserProfilePhotos(TelegramMethod[UserProfilePhotos]):
     """Limits the number of photos to be retrieved. Values between 1-100 are accepted. Defaults to
     100."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getUserProfilePhotos", data=data)

aiogram/api/methods/get_webhook_info.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from ..types import WebhookInfo
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class GetWebhookInfo(TelegramMethod[WebhookInfo]):
     """
@@ -15,7 +20,7 @@ class GetWebhookInfo(TelegramMethod[WebhookInfo]):
 
     __returning__ = WebhookInfo
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="getWebhookInfo", data=data)

aiogram/api/methods/kick_chat_member.py

@@ -1,8 +1,13 @@
+from __future__ import annotations
+
 import datetime
-from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class KickChatMember(TelegramMethod[bool]):
     """
@@ -25,7 +30,7 @@ class KickChatMember(TelegramMethod[bool]):
     """Date when the user will be unbanned, unix time. If user is banned for more than 366 days or
     less than 30 seconds from the current time they are considered to be banned forever"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="kickChatMember", data=data)

aiogram/api/methods/leave_chat.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class LeaveChat(TelegramMethod[bool]):
     """
@@ -16,7 +21,7 @@ class LeaveChat(TelegramMethod[bool]):
     """Unique identifier for the target chat or username of the target supergroup or channel (in
     the format @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="leaveChat", data=data)

aiogram/api/methods/pin_chat_message.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class PinChatMessage(TelegramMethod[bool]):
     """
@@ -23,7 +28,7 @@ class PinChatMessage(TelegramMethod[bool]):
     """Pass True, if it is not necessary to send a notification to all chat members about the new
     pinned message. Notifications are always disabled in channels."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="pinChatMessage", data=data)

aiogram/api/methods/promote_chat_member.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class PromoteChatMember(TelegramMethod[bool]):
     """
@@ -39,7 +44,7 @@ class PromoteChatMember(TelegramMethod[bool]):
     privileges or demote administrators that he has promoted, directly or indirectly (promoted
     by administrators that were appointed by him)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="promoteChatMember", data=data)

aiogram/api/methods/restrict_chat_member.py

@@ -1,9 +1,14 @@
+from __future__ import annotations
+
 import datetime
-from typing import Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import ChatPermissions
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class RestrictChatMember(TelegramMethod[bool]):
     """
@@ -28,7 +33,7 @@ class RestrictChatMember(TelegramMethod[bool]):
     more than 366 days or less than 30 seconds from the current time, they are considered to be
     restricted forever"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="restrictChatMember", data=data)

aiogram/api/methods/send_animation.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendAnimation(TelegramMethod[Message]):
     """
@@ -59,7 +64,7 @@ class SendAnimation(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"animation", "thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_audio.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendAudio(TelegramMethod[Message]):
     """
@@ -59,7 +64,7 @@ class SendAudio(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"audio", "thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_chat_action.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendChatAction(TelegramMethod[bool]):
     """
@@ -29,7 +34,7 @@ class SendChatAction(TelegramMethod[bool]):
     record_audio or upload_audio for audio files, upload_document for general files,
     find_location for location data, record_video_note or upload_video_note for video notes."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendChatAction", data=data)

aiogram/api/methods/send_contact.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -9,6 +11,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendContact(TelegramMethod[Message]):
     """
@@ -40,7 +45,7 @@ class SendContact(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendContact", data=data)

aiogram/api/methods/send_dice.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -9,6 +11,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendDice(TelegramMethod[Message]):
     """
@@ -36,7 +41,7 @@ class SendDice(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendDice", data=data)

aiogram/api/methods/send_document.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendDocument(TelegramMethod[Message]):
     """
@@ -52,7 +57,7 @@ class SendDocument(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"document", "thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_game.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendGame(TelegramMethod[Message]):
     """
@@ -26,7 +31,7 @@ class SendGame(TelegramMethod[Message]):
     """A JSON-serialized object for an inline keyboard. If empty, one 'Play game_title' button
     will be shown. If not empty, the first button must launch the game."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendGame", data=data)

aiogram/api/methods/send_invoice.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import InlineKeyboardMarkup, LabeledPrice, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendInvoice(TelegramMethod[Message]):
     """
@@ -66,7 +71,7 @@ class SendInvoice(TelegramMethod[Message]):
     """A JSON-serialized object for an inline keyboard. If empty, one 'Pay total price' button
     will be shown. If not empty, the first button must be a Pay button."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendInvoice", data=data)

aiogram/api/methods/send_location.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -9,6 +11,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendLocation(TelegramMethod[Message]):
     """
@@ -39,7 +44,7 @@ class SendLocation(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendLocation", data=data)

aiogram/api/methods/send_media_group.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
 from ..types import InputFile, InputMediaPhoto, InputMediaVideo, Message
 from .base import Request, TelegramMethod, prepare_input_media, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendMediaGroup(TelegramMethod[List[Message]]):
     """
@@ -24,9 +29,9 @@ class SendMediaGroup(TelegramMethod[List[Message]]):
     reply_to_message_id: Optional[int] = None
     """If the messages are a reply, ID of the original message"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data["media"])
+        prepare_parse_mode(bot, data["media"])
 
         files: Dict[str, InputFile] = {}
         prepare_input_media(data, files)

aiogram/api/methods/send_message.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -10,6 +12,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendMessage(TelegramMethod[Message]):
     """
@@ -39,8 +44,8 @@ class SendMessage(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data)
+        prepare_parse_mode(bot, data)
 
         return Request(method="sendMessage", data=data)

aiogram/api/methods/send_photo.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendPhoto(TelegramMethod[Message]):
     """
@@ -43,7 +48,7 @@ class SendPhoto(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"photo"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_poll.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -10,6 +12,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_parse_mode
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendPoll(TelegramMethod[Message]):
     """
@@ -59,8 +64,8 @@ class SendPoll(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
-        prepare_parse_mode(data, parse_mode_property="explanation_parse_mode")
+        prepare_parse_mode(bot, data, parse_mode_property="explanation_parse_mode")
 
         return Request(method="sendPoll", data=data)

aiogram/api/methods/send_sticker.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -10,6 +12,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendSticker(TelegramMethod[Message]):
     """
@@ -38,7 +43,7 @@ class SendSticker(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"sticker"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_venue.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -9,6 +11,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendVenue(TelegramMethod[Message]):
     """
@@ -45,7 +50,7 @@ class SendVenue(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="sendVenue", data=data)

aiogram/api/methods/send_video.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendVideo(TelegramMethod[Message]):
     """
@@ -60,7 +65,7 @@ class SendVideo(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"video", "thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_video_note.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     ForceReply,
@@ -10,6 +12,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendVideoNote(TelegramMethod[Message]):
     """
@@ -49,7 +54,7 @@ class SendVideoNote(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"video_note", "thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/send_voice.py

@@ -1,4 +1,6 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import (
     UNSET,
@@ -11,6 +13,9 @@ from ..types import (
 )
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SendVoice(TelegramMethod[Message]):
     """
@@ -49,7 +54,7 @@ class SendVoice(TelegramMethod[Message]):
     """Additional interface options. A JSON-serialized object for an inline keyboard, custom reply
     keyboard, instructions to remove reply keyboard or to force a reply from the user."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"voice"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/set_chat_administrator_custom_title.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatAdministratorCustomTitle(TelegramMethod[bool]):
     """
@@ -21,7 +26,7 @@ class SetChatAdministratorCustomTitle(TelegramMethod[bool]):
     custom_title: str
     """New custom title for the administrator; 0-16 characters, emoji are not allowed"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setChatAdministratorCustomTitle", data=data)

aiogram/api/methods/set_chat_description.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatDescription(TelegramMethod[bool]):
     """
@@ -20,7 +25,7 @@ class SetChatDescription(TelegramMethod[bool]):
     description: Optional[str] = None
     """New chat description, 0-255 characters"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setChatDescription", data=data)

aiogram/api/methods/set_chat_permissions.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from ..types import ChatPermissions
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatPermissions(TelegramMethod[bool]):
     """
@@ -21,7 +26,7 @@ class SetChatPermissions(TelegramMethod[bool]):
     permissions: ChatPermissions
     """New default chat permissions"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setChatPermissions", data=data)

aiogram/api/methods/set_chat_photo.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from ..types import InputFile
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatPhoto(TelegramMethod[bool]):
     """
@@ -21,7 +26,7 @@ class SetChatPhoto(TelegramMethod[bool]):
     photo: InputFile
     """New chat photo, uploaded using multipart/form-data"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"photo"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/set_chat_sticker_set.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatStickerSet(TelegramMethod[bool]):
     """
@@ -21,7 +26,7 @@ class SetChatStickerSet(TelegramMethod[bool]):
     sticker_set_name: str
     """Name of the sticker set to be set as the group sticker set"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setChatStickerSet", data=data)

aiogram/api/methods/set_chat_title.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetChatTitle(TelegramMethod[bool]):
     """
@@ -20,7 +25,7 @@ class SetChatTitle(TelegramMethod[bool]):
     title: str
     """New chat title, 1-255 characters"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setChatTitle", data=data)

aiogram/api/methods/set_game_score.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetGameScore(TelegramMethod[Union[Message, bool]]):
     """
@@ -32,7 +37,7 @@ class SetGameScore(TelegramMethod[Union[Message, bool]]):
     inline_message_id: Optional[str] = None
     """Required if chat_id and message_id are not specified. Identifier of the inline message"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setGameScore", data=data)

aiogram/api/methods/set_my_commands.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List
 
 from ..types import BotCommand
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetMyCommands(TelegramMethod[bool]):
     """
@@ -17,7 +22,7 @@ class SetMyCommands(TelegramMethod[bool]):
     """A JSON-serialized list of bot commands to be set as the list of the bot's commands. At most
     100 commands can be specified."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setMyCommands", data=data)

aiogram/api/methods/set_passport_data_errors.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List
 
 from ..types import PassportElementError
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetPassportDataErrors(TelegramMethod[bool]):
     """
@@ -24,7 +29,7 @@ class SetPassportDataErrors(TelegramMethod[bool]):
     errors: List[PassportElementError]
     """A JSON-serialized array describing the errors"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setPassportDataErrors", data=data)

aiogram/api/methods/set_sticker_position_in_set.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetStickerPositionInSet(TelegramMethod[bool]):
     """
@@ -18,7 +23,7 @@ class SetStickerPositionInSet(TelegramMethod[bool]):
     position: int
     """New sticker position in the set, zero-based"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="setStickerPositionInSet", data=data)

aiogram/api/methods/set_sticker_set_thumb.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InputFile
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetStickerSetThumb(TelegramMethod[bool]):
     """
@@ -27,7 +32,7 @@ class SetStickerSetThumb(TelegramMethod[bool]):
     Internet, or upload a new one using multipart/form-data.. Animated sticker set thumbnail
     can't be uploaded via HTTP URL."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"thumb"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/set_webhook.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, List, Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, List, Optional
 
 from ..types import InputFile
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class SetWebhook(TelegramMethod[bool]):
     """
@@ -43,7 +48,7 @@ class SetWebhook(TelegramMethod[bool]):
     list to receive all updates regardless of type (default). If not specified, the previous
     setting will be used."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"certificate"})
 
         files: Dict[str, InputFile] = {}

aiogram/api/methods/stop_message_live_location.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class StopMessageLiveLocation(TelegramMethod[Union[Message, bool]]):
     """
@@ -26,7 +31,7 @@ class StopMessageLiveLocation(TelegramMethod[Union[Message, bool]]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for a new inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="stopMessageLiveLocation", data=data)

aiogram/api/methods/stop_poll.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
 from ..types import InlineKeyboardMarkup, Poll
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class StopPoll(TelegramMethod[Poll]):
     """
@@ -22,7 +27,7 @@ class StopPoll(TelegramMethod[Poll]):
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """A JSON-serialized object for a new message inline keyboard."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="stopPoll", data=data)

aiogram/api/methods/unban_chat_member.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class UnbanChatMember(TelegramMethod[bool]):
     """
@@ -20,7 +25,7 @@ class UnbanChatMember(TelegramMethod[bool]):
     user_id: int
     """Unique identifier of the target user"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="unbanChatMember", data=data)

aiogram/api/methods/unpin_chat_message.py

@@ -1,7 +1,12 @@
-from typing import Any, Dict, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict, Union
 
 from .base import Request, TelegramMethod
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class UnpinChatMessage(TelegramMethod[bool]):
     """
@@ -18,7 +23,7 @@ class UnpinChatMessage(TelegramMethod[bool]):
     """Unique identifier for the target chat or username of the target channel (in the format
     @channelusername)"""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict()
 
         return Request(method="unpinChatMessage", data=data)

aiogram/api/methods/upload_sticker_file.py

@@ -1,8 +1,13 @@
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Dict
 
 from ..types import File, InputFile
 from .base import Request, TelegramMethod, prepare_file
 
+if TYPE_CHECKING:
+    from ..client.bot import Bot
+
 
 class UploadStickerFile(TelegramMethod[File]):
     """
@@ -20,7 +25,7 @@ class UploadStickerFile(TelegramMethod[File]):
     """PNG image with the sticker, must be up to 512 kilobytes in size, dimensions must not exceed
     512px, and either width or height must be exactly 512px."""
 
-    def build_request(self) -> Request:
+    def build_request(self, bot: Bot) -> Request:
         data: Dict[str, Any] = self.dict(exclude={"png_sticker"})
 
         files: Dict[str, InputFile] = {}

aiogram/dispatcher/dispatcher.py

@@ -219,7 +219,7 @@ class Dispatcher(Router):
                 # TODO: handle exceptions
                 response: Any = process_updates.result()
                 if isinstance(response, TelegramMethod):
-                    request = response.build_request()
+                    request = response.build_request(bot=bot)
                     return request.render_webhook_request()
 
             else:

tests/mocked_bot.py

@@ -25,9 +25,9 @@ class MockedSession(BaseSession):
         pass
 
     async def make_request(
-        self, token: str, method: TelegramMethod[T], timeout: Optional[int] = UNSET
+        self, bot: Bot, method: TelegramMethod[T], timeout: Optional[int] = UNSET
     ) -> T:
-        self.requests.append(method.build_request())
+        self.requests.append(method.build_request(bot))
         response: Response[T] = self.responses.pop()
         self.raise_for_status(response)
         return response.result  # type: ignore

tests/test_api/test_client/test_bot.py

@@ -42,12 +42,13 @@ class TestBot:
             new_callable=CoroutineMock,
         ) as mocked_make_request:
             await bot(method)
-            mocked_make_request.assert_awaited_with("42:TEST", method)
+            mocked_make_request.assert_awaited_with(bot, method, timeout=None)
 
     @pytest.mark.asyncio
     async def test_close(self):
-        bot = Bot("42:TEST", session=AiohttpSession())
+        session = AiohttpSession()
-        await bot.session.create_session()
+        bot = Bot("42:TEST", session=session)
+        await session.create_session()
 
         with patch(
             "aiogram.api.client.session.aiohttp.AiohttpSession.close", new_callable=CoroutineMock

tests/test_api/test_client/test_session/test_aiohttp_session.py

@@ -5,9 +5,11 @@ import aiohttp_socks
 import pytest
 from aresponses import ResponsesMockServer
 
+from aiogram import Bot
 from aiogram.api.client.session.aiohttp import AiohttpSession
 from aiogram.api.methods import Request, TelegramMethod
 from aiogram.api.types import InputFile
+from tests.mocked_bot import MockedBot
 
 try:
     from asynctest import CoroutineMock, patch
@@ -147,7 +149,7 @@ class TestAiohttpSession:
         assert isinstance(fields[1][2], BareInputFile)
 
     @pytest.mark.asyncio
-    async def test_make_request(self, aresponses: ResponsesMockServer):
+    async def test_make_request(self, bot: MockedBot, aresponses: ResponsesMockServer):
         aresponses.add(
             aresponses.ANY,
             "/bot42:TEST/method",
@@ -164,14 +166,14 @@ class TestAiohttpSession:
         class TestMethod(TelegramMethod[int]):
             __returning__ = int
 
-            def build_request(self) -> Request:
+            def build_request(self, bot: Bot) -> Request:
                 return Request(method="method", data={})
 
         call = TestMethod()
         with patch(
             "aiogram.api.client.session.base.BaseSession.raise_for_status"
         ) as patched_raise_for_status:
-            result = await session.make_request("42:TEST", call)
+            result = await session.make_request(bot, call)
             assert isinstance(result, int)
             assert result == 42
 

tests/test_api/test_methods/test_answer_inline_query.py

@@ -29,17 +29,14 @@ class TestAnswerInlineQuery:
         assert request.method == "answerInlineQuery"
         assert response == prepare_result.result
 
-    def test_parse_mode(self):
+    def test_parse_mode(self, bot: MockedBot):
         query = AnswerInlineQuery(
             inline_query_id="query id",
             results=[InlineQueryResultPhoto(id="result id", photo_url="photo", thumb_url="thumb")],
         )
-        request = query.build_request()
+        request = query.build_request(bot)
         assert request.data["results"][0]["parse_mode"] is None
 
-        token = Bot.set_current(Bot(token="42:TEST", parse_mode="HTML"))
+        new_bot = Bot(token="42:TEST", parse_mode="HTML")
-        try:
+        request = query.build_request(new_bot)
-            request = query.build_request()
+        assert request.data["results"][0]["parse_mode"] == "HTML"
-            assert request.data["results"][0]["parse_mode"] == "HTML"
-        finally:
-            Bot.reset_current(token)

tests/test_api/test_methods/test_base.py

@@ -4,6 +4,7 @@ import pytest
 
 from aiogram import Bot
 from aiogram.api.methods.base import prepare_parse_mode
+from tests.mocked_bot import MockedBot
 
 
 class TestPrepareFile:
@@ -35,19 +36,19 @@ class TestPrepareParseMode:
     )
     @pytest.mark.asyncio
     async def test_default_parse_mode(
-        self, parse_mode: str, data: Dict[str, str], result: Optional[str]
+        self, bot: MockedBot, parse_mode: str, data: Dict[str, str], result: Optional[str]
     ):
         async with Bot(token="42:TEST", parse_mode=parse_mode).context() as bot:
             assert bot.parse_mode == parse_mode
-            prepare_parse_mode(data)
+            prepare_parse_mode(bot, data)
             assert data.get("parse_mode") == result
 
     @pytest.mark.asyncio
     async def test_list(self):
         data = [{}] * 2
         data.append({"parse_mode": "HTML"})
-        async with Bot(token="42:TEST", parse_mode="Markdown").context():
+        bot = Bot(token="42:TEST", parse_mode="Markdown")
-            prepare_parse_mode(data)
+        prepare_parse_mode(bot, data)
 
         assert isinstance(data, list)
         assert len(data) == 3
@@ -56,7 +57,7 @@ class TestPrepareParseMode:
         assert data[1]["parse_mode"] == "Markdown"
         assert data[2]["parse_mode"] == "HTML"
 
-    def test_bot_not_in_context(self):
+    def test_bot_not_in_context(self, bot: MockedBot):
         data = {}
-        prepare_parse_mode(data)
+        prepare_parse_mode(bot, data)
         assert data["parse_mode"] is None