Fixed subtypes and union types generation, new enums added (#1213)

* Fixed subtypes and union types generation, new enums added

* Added changes description

aiogram/types/chat_member.py

@@ -1,13 +1,7 @@
 from __future__ import annotations
 
-import datetime
-from typing import TYPE_CHECKING, Optional
-
 from .base import TelegramObject
 
-if TYPE_CHECKING:
-    from .user import User
-
 
 class ChatMember(TelegramObject):
     """
@@ -22,60 +16,3 @@ class ChatMember(TelegramObject):
 
     Source: https://core.telegram.org/bots/api#chatmember
     """
-
-    status: str
-    """The member's status in the chat"""
-    user: Optional[User] = None
-    """*Optional*. Information about the user"""
-    is_anonymous: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user's presence in the chat is hidden"""
-    custom_title: Optional[str] = None
-    """*Optional*. Custom title for this user"""
-    can_be_edited: Optional[bool] = None
-    """*Optional*. :code:`True`, if the bot is allowed to edit administrator privileges of that user"""
-    can_manage_chat: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can access the chat event log, chat statistics, message statistics in channels, see channel members, see anonymous administrators in supergroups and ignore slow mode. Implied by any other administrator privilege"""
-    can_delete_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can delete messages of other users"""
-    can_manage_video_chats: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can manage video chats"""
-    can_restrict_members: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can restrict, ban or unban chat members"""
-    can_promote_members: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can add new administrators with a subset of their own privileges or demote administrators that they have promoted, directly or indirectly (promoted by administrators that were appointed by the user)"""
-    can_change_info: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to change the chat title, photo and other settings"""
-    can_invite_users: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to invite new users to the chat"""
-    can_post_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can post in the channel; channels only"""
-    can_edit_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the administrator can edit messages of other users and can pin messages; channels only"""
-    can_pin_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to pin messages; groups and supergroups only"""
-    can_manage_topics: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to create, rename, close, and reopen forum topics; supergroups only"""
-    is_member: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is a member of the chat at the moment of the request"""
-    can_send_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send text messages, contacts, invoices, locations and venues"""
-    can_send_audios: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send audios"""
-    can_send_documents: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send documents"""
-    can_send_photos: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send photos"""
-    can_send_videos: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send videos"""
-    can_send_video_notes: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send video notes"""
-    can_send_voice_notes: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send voice notes"""
-    can_send_polls: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send polls"""
-    can_send_other_messages: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to send animations, games, stickers and use inline bots"""
-    can_add_web_page_previews: Optional[bool] = None
-    """*Optional*. :code:`True`, if the user is allowed to add web page previews to their messages"""
-    until_date: Optional[datetime.datetime] = None
-    """*Optional*. Date when restrictions will be lifted for this user; unix time. If 0, then the user is restricted forever"""

aiogram/types/inline_query_result_article.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
 
 
 class InlineQueryResultArticle(InlineQueryResult):
@@ -23,7 +27,13 @@ class InlineQueryResultArticle(InlineQueryResult):
     """Unique identifier for this result, 1-64 Bytes"""
     title: str
     """Title of the result"""
-    input_message_content: InputMessageContent
+    input_message_content: Union[
+        InputTextMessageContent,
+        InputLocationMessageContent,
+        InputVenueMessageContent,
+        InputContactMessageContent,
+        InputInvoiceMessageContent,
+    ]
     """Content of the message to be sent"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""

aiogram/types/inline_query_result_audio.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -40,5 +44,13 @@ class InlineQueryResultAudio(InlineQueryResult):
     """*Optional*. Audio duration in seconds"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the audio"""

aiogram/types/inline_query_result_cached_audio.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -34,5 +38,13 @@ class InlineQueryResultCachedAudio(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the audio"""

aiogram/types/inline_query_result_cached_document.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -38,5 +42,13 @@ class InlineQueryResultCachedDocument(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the file"""

aiogram/types/inline_query_result_cached_gif.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -35,5 +39,13 @@ class InlineQueryResultCachedGif(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the GIF animation"""

aiogram/types/inline_query_result_cached_mpeg4_gif.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -35,5 +39,13 @@ class InlineQueryResultCachedMpeg4Gif(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the video animation"""

aiogram/types/inline_query_result_cached_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -37,5 +41,13 @@ class InlineQueryResultCachedPhoto(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the photo"""

aiogram/types/inline_query_result_cached_sticker.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
 
 
 class InlineQueryResultCachedSticker(InlineQueryResult):
@@ -26,5 +30,13 @@ class InlineQueryResultCachedSticker(InlineQueryResult):
     """A valid file identifier of the sticker"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the sticker"""

aiogram/types/inline_query_result_cached_video.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -37,5 +41,13 @@ class InlineQueryResultCachedVideo(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the video"""

aiogram/types/inline_query_result_cached_voice.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -36,5 +40,13 @@ class InlineQueryResultCachedVoice(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the voice message"""

aiogram/types/inline_query_result_contact.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
 
 
 class InlineQueryResultContact(InlineQueryResult):
@@ -32,7 +36,15 @@ class InlineQueryResultContact(InlineQueryResult):
     """*Optional*. Additional data about the contact in the form of a `vCard <https://en.wikipedia.org/wiki/VCard>`_, 0-2048 bytes"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the contact"""
     thumbnail_url: Optional[str] = None
     """*Optional*. Url of the thumbnail for the result"""

aiogram/types/inline_query_result_document.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -40,7 +44,15 @@ class InlineQueryResultDocument(InlineQueryResult):
     """*Optional*. Short description of the result"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. Inline keyboard attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the file"""
     thumbnail_url: Optional[str] = None
     """*Optional*. URL of the thumbnail (JPEG only) for the file"""

aiogram/types/inline_query_result_gif.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -45,5 +49,13 @@ class InlineQueryResultGif(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the GIF animation"""

aiogram/types/inline_query_result_location.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
 
 
 class InlineQueryResultLocation(InlineQueryResult):
@@ -38,7 +42,15 @@ class InlineQueryResultLocation(InlineQueryResult):
     """*Optional*. For live locations, a maximum distance for proximity alerts about approaching another chat member, in meters. Must be between 1 and 100000 if specified."""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the location"""
     thumbnail_url: Optional[str] = None
     """*Optional*. Url of the thumbnail for the result"""

aiogram/types/inline_query_result_mpeg4_gif.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -45,5 +49,13 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the video animation"""

aiogram/types/inline_query_result_photo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -43,5 +47,13 @@ class InlineQueryResultPhoto(InlineQueryResult):
     """*Optional*. List of special entities that appear in the caption, which can be specified instead of *parse_mode*"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the photo"""

aiogram/types/inline_query_result_venue.py

@@ -1,13 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
 
 
 class InlineQueryResultVenue(InlineQueryResult):
@@ -40,7 +44,15 @@ class InlineQueryResultVenue(InlineQueryResult):
     """*Optional*. Google Places type of the venue. (See `supported types <https://developers.google.com/places/web-service/supported_types>`_.)"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the venue"""
     thumbnail_url: Optional[str] = None
     """*Optional*. Url of the thumbnail for the result"""

aiogram/types/inline_query_result_video.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -49,5 +53,13 @@ class InlineQueryResultVideo(InlineQueryResult):
     """*Optional*. Short description of the result"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the video. This field is **required** if InlineQueryResultVideo is used to send an HTML-page as a result (e.g., a YouTube video)."""

aiogram/types/inline_query_result_voice.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional
+from typing import TYPE_CHECKING, List, Literal, Optional, Union
 
 from ..enums import InlineQueryResultType
 from .base import UNSET_PARSE_MODE
@@ -8,7 +8,11 @@ from .inline_query_result import InlineQueryResult
 
 if TYPE_CHECKING:
     from .inline_keyboard_markup import InlineKeyboardMarkup
-    from .input_message_content import InputMessageContent
+    from .input_contact_message_content import InputContactMessageContent
+    from .input_invoice_message_content import InputInvoiceMessageContent
+    from .input_location_message_content import InputLocationMessageContent
+    from .input_text_message_content import InputTextMessageContent
+    from .input_venue_message_content import InputVenueMessageContent
     from .message_entity import MessageEntity
 
 
@@ -38,5 +42,13 @@ class InlineQueryResultVoice(InlineQueryResult):
     """*Optional*. Recording duration in seconds"""
     reply_markup: Optional[InlineKeyboardMarkup] = None
     """*Optional*. `Inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_ attached to the message"""
-    input_message_content: Optional[InputMessageContent] = None
+    input_message_content: Optional[
+        Union[
+            InputTextMessageContent,
+            InputLocationMessageContent,
+            InputVenueMessageContent,
+            InputContactMessageContent,
+            InputInvoiceMessageContent,
+        ]
+    ] = None
     """*Optional*. Content of the message to be sent instead of the voice recording"""

aiogram/types/message.py

@@ -67,7 +67,7 @@ if TYPE_CHECKING:
     from .general_forum_topic_unhidden import GeneralForumTopicUnhidden
     from .inline_keyboard_markup import InlineKeyboardMarkup
     from .input_file import InputFile
-    from .input_media import InputMedia
+    from .input_media_animation import InputMediaAnimation
     from .input_media_audio import InputMediaAudio
     from .input_media_document import InputMediaDocument
     from .input_media_photo import InputMediaPhoto
@@ -2774,7 +2774,13 @@ class Message(TelegramObject):
 
     def edit_media(
         self,
-        media: InputMedia,
+        media: Union[
+            InputMediaAnimation,
+            InputMediaDocument,
+            InputMediaAudio,
+            InputMediaPhoto,
+            InputMediaVideo,
+        ],
         inline_message_id: Optional[str] = None,
         reply_markup: Optional[InlineKeyboardMarkup] = None,
         **kwargs: Any,

aiogram/types/passport_element_error_data_field.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorDataField(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrordatafield
     """
 
-    source: Literal["data"] = "data"
+    source: Literal[PassportElementErrorType.DATA] = PassportElementErrorType.DATA
     """Error source, must be *data*"""
     type: str
     """The section of the user's Telegram Passport which has the error, one of 'personal_details', 'passport', 'driver_license', 'identity_card', 'internal_passport', 'address'"""

aiogram/types/passport_element_error_file.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorFile(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorfile
     """
 
-    source: Literal["file"] = "file"
+    source: Literal[PassportElementErrorType.FILE] = PassportElementErrorType.FILE
     """Error source, must be *file*"""
     type: str
     """The section of the user's Telegram Passport which has the issue, one of 'utility_bill', 'bank_statement', 'rental_agreement', 'passport_registration', 'temporary_registration'"""

aiogram/types/passport_element_error_files.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import List, Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorFiles(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorfiles
     """
 
-    source: Literal["files"] = "files"
+    source: Literal[PassportElementErrorType.FILES] = PassportElementErrorType.FILES
     """Error source, must be *files*"""
     type: str
     """The section of the user's Telegram Passport which has the issue, one of 'utility_bill', 'bank_statement', 'rental_agreement', 'passport_registration', 'temporary_registration'"""

aiogram/types/passport_element_error_front_side.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorFrontSide(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorfrontside
     """
 
-    source: Literal["front_side"] = "front_side"
+    source: Literal[PassportElementErrorType.FRONT_SIDE] = PassportElementErrorType.FRONT_SIDE
     """Error source, must be *front_side*"""
     type: str
     """The section of the user's Telegram Passport which has the issue, one of 'passport', 'driver_license', 'identity_card', 'internal_passport'"""

aiogram/types/passport_element_error_reverse_side.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorReverseSide(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorreverseside
     """
 
-    source: Literal["reverse_side"] = "reverse_side"
+    source: Literal[PassportElementErrorType.REVERSE_SIDE] = PassportElementErrorType.REVERSE_SIDE
     """Error source, must be *reverse_side*"""
     type: str
     """The section of the user's Telegram Passport which has the issue, one of 'driver_license', 'identity_card'"""

aiogram/types/passport_element_error_selfie.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorSelfie(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorselfie
     """
 
-    source: Literal["selfie"] = "selfie"
+    source: Literal[PassportElementErrorType.SELFIE] = PassportElementErrorType.SELFIE
     """Error source, must be *selfie*"""
     type: str
     """The section of the user's Telegram Passport which has the issue, one of 'passport', 'driver_license', 'identity_card', 'internal_passport'"""

aiogram/types/passport_element_error_translation_file.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,9 @@ class PassportElementErrorTranslationFile(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrortranslationfile
     """
 
-    source: Literal["translation_file"] = "translation_file"
+    source: Literal[
+        PassportElementErrorType.TRANSLATION_FILE
+    ] = PassportElementErrorType.TRANSLATION_FILE
     """Error source, must be *translation_file*"""
     type: str
     """Type of element of the user's Telegram Passport which has the issue, one of 'passport', 'driver_license', 'identity_card', 'internal_passport', 'utility_bill', 'bank_statement', 'rental_agreement', 'passport_registration', 'temporary_registration'"""

aiogram/types/passport_element_error_translation_files.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import List, Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,9 @@ class PassportElementErrorTranslationFiles(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrortranslationfiles
     """
 
-    source: Literal["translation_files"] = "translation_files"
+    source: Literal[
+        PassportElementErrorType.TRANSLATION_FILES
+    ] = PassportElementErrorType.TRANSLATION_FILES
     """Error source, must be *translation_files*"""
     type: str
     """Type of element of the user's Telegram Passport which has the issue, one of 'passport', 'driver_license', 'identity_card', 'internal_passport', 'utility_bill', 'bank_statement', 'rental_agreement', 'passport_registration', 'temporary_registration'"""

aiogram/types/passport_element_error_unspecified.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import Literal
 
+from ..enums import PassportElementErrorType
 from .passport_element_error import PassportElementError
 
 
@@ -12,7 +13,7 @@ class PassportElementErrorUnspecified(PassportElementError):
     Source: https://core.telegram.org/bots/api#passportelementerrorunspecified
     """
 
-    source: Literal["unspecified"] = "unspecified"
+    source: Literal[PassportElementErrorType.UNSPECIFIED] = PassportElementErrorType.UNSPECIFIED
     """Error source, must be *unspecified*"""
     type: str
     """Type of element of the user's Telegram Passport which has the issue"""