Update pydantic to V2 (#1202)

* Update pydantic, fix errors and warnings (all?)

* Fixed typehints

* Reformat code, removed unused imports

* Fixed typing extensions version compatibility

* Fixed coverage

* Describe changes

* Regen code

.butcher/schema/schema.json

@@ -2928,9 +2928,9 @@
             },
             {
               "type": "String",
-              "description": "If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n\nNote: This offers an easy way for users to start using your bot in inline mode when they are currently in a private chat with it. Especially useful when combined with switch_pm… actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.",
-              "html_description": "<td><em>Optional</em>. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.<br/>\n<br/>\n<strong>Note:</strong> This offers an easy way for users to start using your bot in <a href=\"/bots/inline\">inline mode</a> when they are currently in a private chat with it. Especially useful when combined with <a href=\"#answerinlinequery\"><em>switch_pm&#8230;</em></a> actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.</td>",
-              "rst_description": "*Optional*. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n\n\n\n**Note:** This offers an easy way for users to start using your bot in `inline mode <https://core.telegram.org/bots/inline>`_ when they are currently in a private chat with it. Especially useful when combined with `https://core.telegram.org/bots/api#answerinlinequery <https://core.telegram.org/bots/api#answerinlinequery>`_ *switch_pm…* actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.\n",
+              "description": "If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.",
+              "html_description": "<td><em>Optional</em>. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.</td>",
+              "rst_description": "*Optional*. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n",
               "name": "switch_inline_query",
               "required": false
             },
@@ -9629,9 +9629,9 @@
             },
             {
               "type": "WebAppInfo",
-              "description": "Description of the Web App that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method web_app_switch_inline_query inside the Web App.",
-              "html_description": "<td><em>Optional</em>. Description of the <a href=\"/bots/webapps\">Web App</a> that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method <em>web_app_switch_inline_query</em> inside the Web App.</td>",
-              "rst_description": "*Optional*. Description of the `Web App <https://core.telegram.org/bots/webapps>`_ that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method *web_app_switch_inline_query* inside the Web App.\n",
+              "description": "Description of the Web App that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method switchInlineQuery inside the Web App.",
+              "html_description": "<td><em>Optional</em>. Description of the <a href=\"/bots/webapps\">Web App</a> that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method <a href=\"/bots/webapps#initializing-web-apps\">switchInlineQuery</a> inside the Web App.</td>",
+              "rst_description": "*Optional*. Description of the `Web App <https://core.telegram.org/bots/webapps>`_ that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method `switchInlineQuery <https://core.telegram.org/bots/webapps#initializing-web-apps>`_ inside the Web App.\n",
               "name": "web_app",
               "required": false
             },

.butcher/types/InlineKeyboardButton/entity.json

@@ -53,9 +53,9 @@
       },
       {
         "type": "String",
-        "description": "If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n\nNote: This offers an easy way for users to start using your bot in inline mode when they are currently in a private chat with it. Especially useful when combined with switch_pm… actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.",
-        "html_description": "<td><em>Optional</em>. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.<br/>\n<br/>\n<strong>Note:</strong> This offers an easy way for users to start using your bot in <a href=\"/bots/inline\">inline mode</a> when they are currently in a private chat with it. Especially useful when combined with <a href=\"#answerinlinequery\"><em>switch_pm&#8230;</em></a> actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.</td>",
-        "rst_description": "*Optional*. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n\n\n\n**Note:** This offers an easy way for users to start using your bot in `inline mode <https://core.telegram.org/bots/inline>`_ when they are currently in a private chat with it. Especially useful when combined with `https://core.telegram.org/bots/api#answerinlinequery <https://core.telegram.org/bots/api#answerinlinequery>`_ *switch_pm…* actions - in this case the user will be automatically returned to the chat they switched from, skipping the chat selection screen.\n",
+        "description": "If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.",
+        "html_description": "<td><em>Optional</em>. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.</td>",
+        "rst_description": "*Optional*. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. May be empty, in which case just the bot's username will be inserted.\n",
         "name": "switch_inline_query",
         "required": false
       },

.butcher/types/InlineQueryResultsButton/entity.json

@@ -21,9 +21,9 @@
       },
       {
         "type": "WebAppInfo",
-        "description": "Description of the Web App that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method web_app_switch_inline_query inside the Web App.",
-        "html_description": "<td><em>Optional</em>. Description of the <a href=\"/bots/webapps\">Web App</a> that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method <em>web_app_switch_inline_query</em> inside the Web App.</td>",
-        "rst_description": "*Optional*. Description of the `Web App <https://core.telegram.org/bots/webapps>`_ that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method *web_app_switch_inline_query* inside the Web App.\n",
+        "description": "Description of the Web App that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method switchInlineQuery inside the Web App.",
+        "html_description": "<td><em>Optional</em>. Description of the <a href=\"/bots/webapps\">Web App</a> that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method <a href=\"/bots/webapps#initializing-web-apps\">switchInlineQuery</a> inside the Web App.</td>",
+        "rst_description": "*Optional*. Description of the `Web App <https://core.telegram.org/bots/webapps>`_ that will be launched when the user presses the button. The Web App will be able to switch back to the inline mode using the method `switchInlineQuery <https://core.telegram.org/bots/webapps#initializing-web-apps>`_ inside the Web App.\n",
         "name": "web_app",
         "required": false
       },

CHANGES/1202.misc.rst

@@ -0,0 +1,6 @@
+Updated `Pydantic to V2 <https://docs.pydantic.dev/2.0/migration/>`_
+
+.. warning::
+
+    Be careful, not all libraries is already updated to using V2
+    (for example at the time, when this warning was added FastAPI still not support V2)

aiogram/client/session/aiohttp.py

@@ -141,7 +141,7 @@ class AiohttpSession(BaseSession):
     def build_form_data(self, bot: Bot, method: TelegramMethod[TelegramType]) -> FormData:
         form = FormData(quote_fields=False)
         files: Dict[str, InputFile] = {}
-        for key, value in method.dict().items():
+        for key, value in method.model_dump(warnings=False).items():
             value = self.prepare_value(value, bot=bot, files=files)
             if not value:
                 continue

aiogram/client/session/middlewares/base.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Awaitable, Callable, Union
+from typing import TYPE_CHECKING, Protocol
 
 from aiogram.methods import Response, TelegramMethod
 from aiogram.methods.base import TelegramType
@@ -9,16 +9,24 @@ from aiogram.methods.base import TelegramType
 if TYPE_CHECKING:
     from ...bot import Bot
 
-NextRequestMiddlewareType = Callable[
-    ["Bot", TelegramMethod[TelegramType]], Awaitable[Response[TelegramType]]
-]
-RequestMiddlewareType = Union[
-    "BaseRequestMiddleware",
-    Callable[
-        [NextRequestMiddlewareType[TelegramType], "Bot", TelegramMethod[TelegramType]],
-        Awaitable[Response[TelegramType]],
-    ],
-]
+
+class NextRequestMiddlewareType(Protocol[TelegramType]):  # pragma: no cover
+    async def __call__(
+        self,
+        bot: "Bot",
+        method: TelegramMethod[TelegramType],
+    ) -> Response[TelegramType]:
+        pass
+
+
+class RequestMiddlewareType(Protocol):  # pragma: no cover
+    async def __call__(
+        self,
+        make_request: NextRequestMiddlewareType[TelegramType],
+        bot: "Bot",
+        method: TelegramMethod[TelegramType],
+    ) -> Response[TelegramType]:
+        pass
 
 
 class BaseRequestMiddleware(ABC):

aiogram/client/session/middlewares/manager.py

@@ -1,68 +1,48 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Awaitable,
-    Callable,
-    List,
-    Optional,
-    Sequence,
-    Union,
-    overload,
-)
+from typing import Any, Callable, List, Optional, Sequence, Union, cast, overload
 
 from aiogram.client.session.middlewares.base import (
     NextRequestMiddlewareType,
     RequestMiddlewareType,
 )
-from aiogram.methods import Response
-from aiogram.methods.base import TelegramMethod, TelegramType
-from aiogram.types import TelegramObject
-
-if TYPE_CHECKING:
-    from aiogram import Bot
+from aiogram.methods.base import TelegramType
 
 
-class RequestMiddlewareManager(Sequence[RequestMiddlewareType[TelegramObject]]):
+class RequestMiddlewareManager(Sequence[RequestMiddlewareType]):
     def __init__(self) -> None:
-        self._middlewares: List[RequestMiddlewareType[TelegramObject]] = []
+        self._middlewares: List[RequestMiddlewareType] = []
 
     def register(
         self,
-        middleware: RequestMiddlewareType[TelegramObject],
-    ) -> RequestMiddlewareType[TelegramObject]:
+        middleware: RequestMiddlewareType,
+    ) -> RequestMiddlewareType:
         self._middlewares.append(middleware)
         return middleware
 
-    def unregister(self, middleware: RequestMiddlewareType[TelegramObject]) -> None:
+    def unregister(self, middleware: RequestMiddlewareType) -> None:
         self._middlewares.remove(middleware)
 
     def __call__(
         self,
-        middleware: Optional[RequestMiddlewareType[TelegramObject]] = None,
-    ) -> Union[
-        Callable[[RequestMiddlewareType[TelegramObject]], RequestMiddlewareType[TelegramObject]],
-        RequestMiddlewareType[TelegramObject],
-    ]:
+        middleware: Optional[RequestMiddlewareType] = None,
+    ) -> Union[Callable[[RequestMiddlewareType], RequestMiddlewareType], RequestMiddlewareType,]:
         if middleware is None:
             return self.register
         return self.register(middleware)
 
     @overload
-    def __getitem__(self, item: int) -> RequestMiddlewareType[TelegramObject]:
+    def __getitem__(self, item: int) -> RequestMiddlewareType:
         pass
 
     @overload
-    def __getitem__(self, item: slice) -> Sequence[RequestMiddlewareType[TelegramObject]]:
+    def __getitem__(self, item: slice) -> Sequence[RequestMiddlewareType]:
         pass
 
     def __getitem__(
         self, item: Union[int, slice]
-    ) -> Union[
-        RequestMiddlewareType[TelegramObject], Sequence[RequestMiddlewareType[TelegramObject]]
-    ]:
+    ) -> Union[RequestMiddlewareType, Sequence[RequestMiddlewareType]]:
         return self._middlewares[item]
 
     def __len__(self) -> int:
@@ -70,10 +50,10 @@ class RequestMiddlewareManager(Sequence[RequestMiddlewareType[TelegramObject]]):
 
     def wrap_middlewares(
         self,
-        callback: Callable[[Bot, TelegramMethod[TelegramType]], Awaitable[Response[TelegramType]]],
+        callback: NextRequestMiddlewareType[TelegramType],
         **kwargs: Any,
     ) -> NextRequestMiddlewareType[TelegramType]:
         middleware = partial(callback, **kwargs)
         for m in reversed(self._middlewares):
-            middleware = partial(m, middleware)  # type: ignore
-        return middleware
+            middleware = partial(m, middleware)
+        return cast(NextRequestMiddlewareType[TelegramType], middleware)

aiogram/dispatcher/middlewares/user_context.py

@@ -1,5 +1,4 @@
-from contextlib import contextmanager
-from typing import Any, Awaitable, Callable, Dict, Iterator, Optional, Tuple
+from typing import Any, Awaitable, Callable, Dict, Optional, Tuple
 
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types import Chat, TelegramObject, Update, User

aiogram/filters/callback_data.py

@@ -110,7 +110,7 @@ class CallbackData(BaseModel):
         :return: instance of CallbackData
         """
         prefix, *parts = value.split(cls.__separator__)
-        names = cls.__fields__.keys()
+        names = cls.model_fields.keys()
         if len(parts) != len(names):
             raise TypeError(
                 f"Callback data {cls.__name__!r} takes {len(names)} arguments "
@@ -120,8 +120,8 @@ class CallbackData(BaseModel):
             raise ValueError(f"Bad prefix ({prefix!r} != {cls.__prefix__!r})")
         payload = {}
         for k, v in zip(names, parts):  # type: str, Optional[str]
-            if field := cls.__fields__.get(k):
-                if v == "" and not field.required:
+            if field := cls.model_fields.get(k):
+                if v == "" and not field.is_required():
                     v = None
             payload[k] = v
         return cls(**payload)

aiogram/methods/add_sticker_to_set.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import InputSticker
 from .base import TelegramMethod
 

aiogram/methods/answer_callback_query.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from .base import TelegramMethod
 

aiogram/methods/answer_inline_query.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from pydantic import Field
 
@@ -32,12 +32,12 @@ class AnswerInlineQuery(TelegramMethod[bool]):
     """Pass the offset that a client should send in the next query with the same text to receive more results. Pass an empty string if there are no more results or if you don't support pagination. Offset length can't exceed 64 bytes."""
     button: Optional[InlineQueryResultsButton] = None
     """A JSON-serialized object describing a button to be shown above inline query results"""
-    switch_pm_parameter: Optional[str] = Field(None, deprecated=True)
+    switch_pm_parameter: Optional[str] = Field(None, json_schema_extra={"deprecated": True})
     """`Deep-linking <https://core.telegram.org/bots/features#deep-linking>`_ parameter for the /start message sent to the bot when user presses the switch button. 1-64 characters, only :code:`A-Z`, :code:`a-z`, :code:`0-9`, :code:`_` and :code:`-` are allowed.
 
 .. deprecated:: API:6.7
    https://core.telegram.org/bots/api-changelog#april-21-2023"""
-    switch_pm_text: Optional[str] = Field(None, deprecated=True)
+    switch_pm_text: Optional[str] = Field(None, json_schema_extra={"deprecated": True})
     """If passed, clients will display a button with specified text that switches the user to a private chat with the bot and sends the bot a start message with the parameter *switch_pm_parameter*
 
 .. deprecated:: API:6.7

aiogram/methods/answer_pre_checkout_query.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from .base import TelegramMethod
 

aiogram/methods/answer_shipping_query.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import ShippingOption
 from .base import TelegramMethod

aiogram/methods/answer_web_app_query.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import InlineQueryResult, SentWebAppMessage
 from .base import TelegramMethod
 

aiogram/methods/approve_chat_join_request.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/ban_chat_member.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/ban_chat_sender_chat.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/base.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Dict, Generator, Generic, Optional, TypeVar
 
-from pydantic import BaseConfig, BaseModel, Extra, root_validator
-from pydantic.generics import GenericModel
+from pydantic import BaseModel, ConfigDict
+from pydantic.functional_validators import model_validator
 
 from ..types import InputFile, ResponseParameters
 from ..types.base import UNSET_TYPE
@@ -16,16 +16,15 @@ TelegramType = TypeVar("TelegramType", bound=Any)
 
 
 class Request(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     method: str
 
     data: Dict[str, Optional[Any]]
     files: Optional[Dict[str, InputFile]]
 
-    class Config(BaseConfig):
-        arbitrary_types_allowed = True
 
-
-class Response(GenericModel, Generic[TelegramType]):
+class Response(BaseModel, Generic[TelegramType]):
     ok: bool
     result: Optional[TelegramType] = None
     description: Optional[str] = None
@@ -33,16 +32,14 @@ class Response(GenericModel, Generic[TelegramType]):
     parameters: Optional[ResponseParameters] = None
 
 
-class TelegramMethod(ABC, BaseModel, Generic[TelegramType]):
-    class Config(BaseConfig):
-        # use_enum_values = True
-        extra = Extra.allow
-        allow_population_by_field_name = True
-        arbitrary_types_allowed = True
-        orm_mode = True
-        smart_union = True  # https://github.com/aiogram/aiogram/issues/901
+class TelegramMethod(BaseModel, Generic[TelegramType], ABC):
+    model_config = ConfigDict(
+        extra="allow",
+        populate_by_name=True,
+        arbitrary_types_allowed=True,
+    )
 
-    @root_validator(pre=True)
+    @model_validator(mode="before")
     def remove_unset(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """
         Remove UNSET before fields validation.
@@ -64,12 +61,6 @@ class TelegramMethod(ABC, BaseModel, Generic[TelegramType]):
     def __api_method__(self) -> str:
         pass
 
-    def dict(self, **kwargs: Any) -> Any:
-        # override dict of pydantic.BaseModel to overcome exporting request_timeout field
-        exclude = kwargs.pop("exclude", set())
-
-        return super().dict(exclude=exclude, **kwargs)
-
     def build_response(self, data: Dict[str, Any]) -> Response[TelegramType]:
         # noinspection PyTypeChecker
         return Response[self.__returning__](**data)  # type: ignore
@@ -77,8 +68,6 @@ class TelegramMethod(ABC, BaseModel, Generic[TelegramType]):
     async def emit(self, bot: Bot) -> TelegramType:
         return await bot(self)
 
-    as_ = emit
-
     def __await__(self) -> Generator[Any, None, TelegramType]:
         from aiogram.client.bot import Bot
 

aiogram/methods/close.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import TelegramMethod
 
 

aiogram/methods/close_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/close_general_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/copy_message.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/create_chat_invite_link.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import ChatInviteLink
 from .base import TelegramMethod

aiogram/methods/create_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import ForumTopic
 from .base import TelegramMethod

aiogram/methods/create_invoice_link.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import LabeledPrice
 from .base import TelegramMethod

aiogram/methods/create_new_sticker_set.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import InputSticker
 from .base import TelegramMethod

aiogram/methods/decline_chat_join_request.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/delete_chat_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/delete_chat_sticker_set.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/delete_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/delete_message.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/delete_my_commands.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import BotCommandScope
 from .base import TelegramMethod

aiogram/methods/delete_sticker_from_set.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import TelegramMethod
 
 

aiogram/methods/delete_sticker_set.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import TelegramMethod
 
 

aiogram/methods/delete_webhook.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from .base import TelegramMethod
 

aiogram/methods/edit_chat_invite_link.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import ChatInviteLink
 from .base import TelegramMethod

aiogram/methods/edit_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/edit_general_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/edit_message_caption.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import UNSET_PARSE_MODE, InlineKeyboardMarkup, Message, MessageEntity
 from .base import TelegramMethod

aiogram/methods/edit_message_live_location.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import TelegramMethod

aiogram/methods/edit_message_media.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import InlineKeyboardMarkup, InputMedia, Message
 from .base import TelegramMethod

aiogram/methods/edit_message_reply_markup.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import InlineKeyboardMarkup, Message
 from .base import TelegramMethod

aiogram/methods/edit_message_text.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import UNSET_PARSE_MODE, InlineKeyboardMarkup, Message, MessageEntity
 from ..types.base import UNSET_DISABLE_WEB_PAGE_PREVIEW

aiogram/methods/export_chat_invite_link.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/forward_message.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import Message
 from ..types.base import UNSET_PROTECT_CONTENT

aiogram/methods/get_chat.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from ..types import Chat
 from .base import TelegramMethod

aiogram/methods/get_chat_administrators.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Union
+from typing import List, Union
 
 from ..types import (
     ChatMemberAdministrator,

aiogram/methods/get_chat_member.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from ..types import (
     ChatMemberAdministrator,

aiogram/methods/get_chat_member_count.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/get_chat_menu_button.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import MenuButtonCommands, MenuButtonDefault, MenuButtonWebApp
 from .base import TelegramMethod

aiogram/methods/get_custom_emoji_stickers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List
+from typing import List
 
 from ..types import Sticker
 from .base import TelegramMethod

aiogram/methods/get_file.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import File
 from .base import TelegramMethod
 

aiogram/methods/get_forum_topic_icon_stickers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List
+from typing import List
 
 from ..types import Sticker
 from .base import TelegramMethod

aiogram/methods/get_game_high_scores.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import GameHighScore
 from .base import TelegramMethod

aiogram/methods/get_me.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import User
 from .base import TelegramMethod
 

aiogram/methods/get_my_commands.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import BotCommand, BotCommandScope
 from .base import TelegramMethod

aiogram/methods/get_my_default_administrator_rights.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import ChatAdministratorRights
 from .base import TelegramMethod

aiogram/methods/get_my_description.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import BotDescription
 from .base import TelegramMethod

aiogram/methods/get_my_short_description.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import BotShortDescription
 from .base import TelegramMethod

aiogram/methods/get_sticker_set.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import StickerSet
 from .base import TelegramMethod
 

aiogram/methods/get_updates.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+from typing import List, Optional
 
 from ..types import Update
 from .base import TelegramMethod

aiogram/methods/get_user_profile_photos.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import UserProfilePhotos
 from .base import TelegramMethod

aiogram/methods/get_webhook_info.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from ..types import WebhookInfo
 from .base import TelegramMethod
 

aiogram/methods/hide_general_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/leave_chat.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/log_out.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from .base import TelegramMethod
 
 

aiogram/methods/pin_chat_message.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/promote_chat_member.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/reopen_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/reopen_general_forum_topic.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/restrict_chat_member.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import ChatPermissions
 from .base import TelegramMethod

aiogram/methods/revoke_chat_invite_link.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from ..types import ChatInviteLink
 from .base import TelegramMethod

aiogram/methods/send_animation.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_audio.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_chat_action.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/send_contact.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_dice.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_document.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_game.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from ..types import InlineKeyboardMarkup, Message
 from ..types.base import UNSET_PROTECT_CONTENT

aiogram/methods/send_invoice.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import InlineKeyboardMarkup, LabeledPrice, Message
 from ..types.base import UNSET_PROTECT_CONTENT

aiogram/methods/send_location.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_media_group.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     InputMediaAudio,

aiogram/methods/send_message.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_poll.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_sticker.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_venue.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_video.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/send_video_note.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import (
     ForceReply,

aiogram/methods/send_voice.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional, Union
+from typing import List, Optional, Union
 
 from ..types import (
     UNSET_PARSE_MODE,

aiogram/methods/set_chat_administrator_custom_title.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/set_chat_description.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from .base import TelegramMethod
 

aiogram/methods/set_chat_menu_button.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import MenuButtonCommands, MenuButtonDefault, MenuButtonWebApp
 from .base import TelegramMethod

aiogram/methods/set_chat_permissions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import ChatPermissions
 from .base import TelegramMethod

aiogram/methods/set_chat_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from ..types import InputFile
 from .base import TelegramMethod

aiogram/methods/set_chat_sticker_set.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/set_chat_title.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import Union
 
 from .base import TelegramMethod
 

aiogram/methods/set_custom_emoji_sticker_set_thumbnail.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional
+from typing import Optional
 
 from .base import TelegramMethod
 

aiogram/methods/set_game_score.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Optional, Union
+from typing import Optional, Union
 
 from ..types import Message
 from .base import TelegramMethod