telegrinder 0.1.dev170__py3-none-any.whl → 0.2.0__py3-none-any.whl

telegrinder/bot/cute_types/message.py

@@ -2,15 +2,24 @@ from __future__ import annotations
 
 import typing
 
-from fntypes.co import Option, Result, Some, Variative
+import fntypes.option
+from fntypes.co import Result, Some, Variative
 
-from telegrinder.api import ABCAPI, APIError
+from telegrinder.api import API, APIError
+from telegrinder.bot.cute_types.base import BaseCute, compose_method_params, shortcut
+from telegrinder.bot.cute_types.utils import (
+    compose_link_preview_options,
+    compose_reactions,
+    compose_reply_params,
+    input_media,
+)
 from telegrinder.model import get_params
-from telegrinder.msgspec_utils import Nothing
-from telegrinder.types import (
+from telegrinder.msgspec_utils import Nothing, Option
+from telegrinder.types.objects import (
     ChatAction,
     DiceEmoji,
     ForceReply,
+    InaccessibleMessage,
     InlineKeyboardMarkup,
     InputFile,
     InputMedia,
@@ -28,14 +37,6 @@ from telegrinder.types import (
     User,
 )
 
-from .base import BaseCute, compose_method_params, shortcut
-from .utils import (
-    compose_link_preview_options,
-    compose_reactions,
-    compose_reply_params,
-    input_media,
-)
-
 if typing.TYPE_CHECKING:
     from datetime import datetime
 
@@ -127,7 +128,7 @@ async def execute_method_edit(
 
     result = await getattr(update.ctx_api, method_name)(**params)
     return result.map(
-        lambda v: Variative["MessageCute", bool](
+        lambda v: Variative[MessageCute, bool](
             v.only()
             .map(
                 lambda x: MessageCute.from_update(x, bound_api=update.api),
@@ -139,9 +140,9 @@ async def execute_method_edit(
 
 def get_entity_value(
     entity_value: typing.Literal["user", "url", "custom_emoji_id", "language"],
-    entities: Option[list[MessageEntity]] = Nothing,
-    caption_entities: Option[list[MessageEntity]] = Nothing,
-) -> Option[typing.Any]:
+    entities: fntypes.option.Option[list[MessageEntity]] = Nothing,
+    caption_entities: fntypes.option.Option[list[MessageEntity]] = Nothing,
+) -> fntypes.option.Option[typing.Any]:
     ents = entities.unwrap_or(caption_entities.unwrap_or_none())
     if not ents:
         return Nothing
@@ -152,28 +153,38 @@ def get_entity_value(
 
 
 class MessageCute(BaseCute[Message], Message, kw_only=True):
-    api: ABCAPI
+    api: API
+
+    reply_to_message: Option[MessageCute] = Nothing
+    """Optional. For replies in the same chat and message thread, the original
+    message. Note that the Message object in this field will not contain further
+    reply_to_message fields even if it itself is a reply."""
+
+    pinned_message: Option[Variative[MessageCute, InaccessibleMessage]] = Nothing
+    """Optional. Specified message was pinned. Note that the Message object in
+    this field will not contain further reply_to_message fields even if it
+    itself is a reply."""
 
     @property
-    def mentioned_user(self) -> Option[User]:
+    def mentioned_user(self) -> fntypes.option.Option[User]:
         """Mentioned user without username."""
 
         return get_entity_value("user", self.entities, self.caption_entities)
 
     @property
-    def url(self) -> Option[str]:
+    def url(self) -> fntypes.option.Option[str]:
         """Clickable text URL."""
 
         return get_entity_value("url", self.entities, self.caption_entities)
 
     @property
-    def programming_language(self) -> Option[str]:
+    def programming_language(self) -> fntypes.option.Option[str]:
         """The programming language of the entity text."""
 
         return get_entity_value("language", self.entities, self.caption_entities)
 
     @property
-    def custom_emoji_id(self) -> Option[str]:
+    def custom_emoji_id(self) -> fntypes.option.Option[str]:
         """Unique identifier of the custom emoji."""
 
         return get_entity_value("custom_emoji_id", self.entities, self.caption_entities)

telegrinder/bot/cute_types/update.py

@@ -2,17 +2,64 @@ import typing
 
 from fntypes.co import Nothing, Some
 
-from telegrinder.api import ABCAPI
+from telegrinder.api import API
+from telegrinder.bot.cute_types.base import BaseCute
+from telegrinder.bot.cute_types.callback_query import CallbackQueryCute
+from telegrinder.bot.cute_types.chat_join_request import ChatJoinRequestCute
+from telegrinder.bot.cute_types.chat_member_updated import ChatMemberUpdatedCute
+from telegrinder.bot.cute_types.inline_query import InlineQueryCute
+from telegrinder.bot.cute_types.message import MessageCute
 from telegrinder.msgspec_utils import Option
 from telegrinder.types import Model, Update
 
-from .base import BaseCute
-
 ModelT = typing.TypeVar("ModelT", bound=Model)
 
 
 class UpdateCute(BaseCute[Update], Update, kw_only=True):
-    api: ABCAPI
+    api: API
+
+    message: Option[MessageCute] = Nothing()
+    """Optional. New incoming message of any kind - text, photo, sticker, etc."""
+
+    edited_message: Option[MessageCute] = Nothing()
+    """Optional. New version of a message that is known to the bot and was edited.
+    This update may at times be triggered by changes to message fields that are
+    either unavailable or not actively used by your bot."""
+
+    channel_post: Option[MessageCute] = Nothing()
+    """Optional. New incoming channel post of any kind - text, photo, sticker,
+    etc."""
+
+    edited_channel_post: Option[MessageCute] = Nothing()
+    """Optional. New version of a channel post that is known to the bot and was edited.
+    This update may at times be triggered by changes to message fields that are
+    either unavailable or not actively used by your bot."""
+
+    business_message: Option[MessageCute] = Nothing()
+    """Optional. New message from a connected business account."""
+
+    edited_business_message: Option[MessageCute] = Nothing()
+    """Optional. New version of a message from a connected business account."""
+
+    inline_query: Option[InlineQueryCute] = Nothing()
+    """Optional. New incoming inline query."""
+
+    callback_query: Option[CallbackQueryCute] = Nothing()
+    """Optional. New incoming callback query."""
+
+    my_chat_member: Option[ChatMemberUpdatedCute] = Nothing()
+    """Optional. The bot's chat member status was updated in a chat. For private
+    chats, this update is received only when the bot is blocked or unblocked
+    by the user."""
+
+    chat_member: Option[ChatMemberUpdatedCute] = Nothing()
+    """Optional. A chat member's status was updated in a chat. The bot must be an
+    administrator in the chat and must explicitly specify `chat_member` in
+    the list of allowed_updates to receive these updates."""
+
+    chat_join_request: Option[ChatJoinRequestCute] = Nothing()
+    """Optional. A request to join the chat has been sent. The bot must have the can_invite_users
+    administrator right in the chat to receive these updates."""
 
     @property
     def incoming_update(self) -> Model:

telegrinder/bot/cute_types/utils.py

@@ -1,41 +1,13 @@
 import typing
 
 from telegrinder.model import get_params
-from telegrinder.types import (
-    ChatPermissions,
-    InlineKeyboardMarkup,
-    InlineQueryResultArticle,
-    InlineQueryResultAudio,
-    InlineQueryResultCachedAudio,
-    InlineQueryResultCachedDocument,
-    InlineQueryResultCachedGif,
-    InlineQueryResultCachedMpeg4Gif,
-    InlineQueryResultCachedPhoto,
-    InlineQueryResultCachedSticker,
-    InlineQueryResultCachedVideo,
-    InlineQueryResultCachedVoice,
-    InlineQueryResultContact,
-    InlineQueryResultDocument,
-    InlineQueryResultGame,
-    InlineQueryResultGif,
-    InlineQueryResultLocation,
-    InlineQueryResultMpeg4Gif,
-    InlineQueryResultPhoto,
-    InlineQueryResultVenue,
-    InlineQueryResultVideo,
-    InlineQueryResultVoice,
-    InputContactMessageContent,
+from telegrinder.types.objects import (
     InputFile,
-    InputInvoiceMessageContent,
-    InputLocationMessageContent,
     InputMediaAnimation,
     InputMediaAudio,
     InputMediaDocument,
     InputMediaPhoto,
     InputMediaVideo,
-    InputTextMessageContent,
-    InputVenueMessageContent,
-    LabeledPrice,
     LinkPreviewOptions,
     MessageEntity,
     ReactionEmoji,
@@ -51,13 +23,6 @@ InputMedia: typing.TypeAlias = typing.Union[
     InputMediaPhoto,
     InputMediaVideo,
 ]
-InputMessageContent: typing.TypeAlias = typing.Union[
-    InputTextMessageContent,
-    InputLocationMessageContent,
-    InputVenueMessageContent,
-    InputContactMessageContent,
-    InputInvoiceMessageContent,
-]
 
 INPUT_MEDIA_TYPES: typing.Final[dict[str, type[InputMedia]]] = {
     "animation": InputMediaAnimation,
@@ -69,7 +34,7 @@ INPUT_MEDIA_TYPES: typing.Final[dict[str, type[InputMedia]]] = {
 
 
 def compose_reactions(
-    reactions: (str | ReactionEmoji | ReactionType | list[str | ReactionEmoji | ReactionType]),
+    reactions: str | ReactionEmoji | ReactionType | list[str | ReactionEmoji | ReactionType],
     /,
 ) -> list[ReactionType]:
     if not isinstance(reactions, list):
@@ -80,7 +45,7 @@ def compose_reactions(
             if isinstance(emoji, ReactionEmoji)
             else (ReactionTypeEmoji("emoji", ReactionEmoji(emoji)) if isinstance(emoji, str) else emoji)
         )
-        for emoji in ([reactions] if isinstance(reactions, str) else reactions)
+        for emoji in ([reactions] if isinstance(reactions, str) else reactions)  # type: ignore
     ]
 
 
@@ -110,26 +75,6 @@ def compose_link_preview_options(
     return LinkPreviewOptions(**get_params(locals()))
 
 
-def compose_chat_permissions(
-    *,
-    can_send_messages: bool | None = None,
-    can_send_audios: bool | None = None,
-    can_send_documents: bool | None = None,
-    can_send_photos: bool | None = None,
-    can_send_videos: bool | None = None,
-    can_send_video_notes: bool | None = None,
-    can_send_voice_notes: bool | None = None,
-    can_send_polls: bool | None = None,
-    can_send_other_messages: bool | None = None,
-    can_add_web_page_previews: bool | None = None,
-    can_change_info: bool | None = None,
-    can_invite_users: bool | None = None,
-    can_pin_messages: bool | None = None,
-    can_manage_topics: bool | None = None,
-) -> ChatPermissions:
-    return ChatPermissions(**get_params(locals()))
-
-
 def input_media(
     type: typing.Literal["animation", "audio", "document", "photo", "video"],
     media: str | InputFile,
@@ -142,417 +87,9 @@ def input_media(
     return INPUT_MEDIA_TYPES[type](**get_params(locals()))
 
 
-def input_contact_message_content(
-    phone_number: str,
-    first_name: str,
-    *,
-    last_name: str | None = None,
-    vcard: str | None = None,
-) -> InputContactMessageContent:
-    return InputContactMessageContent(**get_params(locals()))
-
-
-def input_invoice_message_content(
-    title: str,
-    description: str,
-    payload: str,
-    provider_token: str,
-    currency: str,
-    prices: list[LabeledPrice],
-    *,
-    max_tip_amount: int | None = None,
-    suggested_tip_amounts: list[int] | None = None,
-    provider_data: str | None = None,
-    photo_url: str | None = None,
-    photo_size: int | None = None,
-    photo_width: int | None = None,
-    photo_height: int | None = None,
-    need_name: bool | None = None,
-    need_phone_number: bool | None = None,
-    need_email: bool | None = None,
-    need_shipping_address: bool | None = None,
-    send_phone_number_to_provider: bool | None = None,
-) -> InputInvoiceMessageContent:
-    return InputInvoiceMessageContent(**get_params(locals()))
-
-
-def input_location_message_content(
-    latitude: float,
-    longitude: float,
-    *,
-    horizontal_accuracy: float | None = None,
-    live_period: int | None = None,
-    heading: int | None = None,
-    proximity_alert_radius: int | None = None,
-) -> InputLocationMessageContent:
-    return InputLocationMessageContent(**get_params(locals()))
-
-
-def input_text_message_content(
-    message_text: str,
-    *,
-    parse_mode: str | None = None,
-    entities: list[MessageEntity] | None = None,
-    disable_web_page_preview: bool | None = None,
-) -> InputTextMessageContent:
-    return InputTextMessageContent(**get_params(locals()))
-
-
-def input_venue_message_content(
-    latitude: float,
-    longitude: float,
-    title: str,
-    address: str,
-    *,
-    foursquare_id: str | None = None,
-    foursquare_type: str | None = None,
-    google_place_id: str | None = None,
-    google_place_type: str | None = None,
-) -> InputVenueMessageContent:
-    return InputVenueMessageContent(**get_params(locals()))
-
-
-def inline_query_article(
-    id: str,
-    title: str,
-    input_message_content: InputMessageContent,
-    *,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    url: str | None = None,
-    hide_url: bool | None = None,
-    description: str | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultArticle:
-    return InlineQueryResultArticle(type="article", **get_params(locals()))
-
-
-def inline_query_audio(
-    id: str,
-    audio_url: str,
-    *,
-    title: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    performer: str | None = None,
-    audio_duration: int | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultAudio:
-    return InlineQueryResultAudio(type="audio", **get_params(locals()))
-
-
-def inline_query_contact(
-    id: str,
-    phone_number: str,
-    first_name: str,
-    *,
-    last_name: str | None = None,
-    vcard: str | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultContact:
-    return InlineQueryResultContact(type="contact", **get_params(locals()))
-
-
-def inline_query_document(
-    id: str,
-    title: str,
-    document_url: str,
-    mime_type: str,
-    *,
-    description: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultDocument:
-    return InlineQueryResultDocument(type="document", **get_params(locals()))
-
-
-def inline_query_gif(
-    id: str,
-    gif_url: str,
-    *,
-    gif_width: int | None = None,
-    gif_height: int | None = None,
-    gif_duration: int | None = None,
-    title: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_mime_type: str | None = None,
-) -> InlineQueryResultGif:
-    return InlineQueryResultGif(type="gif", **get_params(locals()))
-
-
-def inline_query_location(
-    id: str,
-    latitude: float,
-    longitude: float,
-    *,
-    title: str | None = None,
-    horizontal_accuracy: float | None = None,
-    live_period: int | None = None,
-    heading: int | None = None,
-    proximity_alert_radius: int | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultLocation:
-    return InlineQueryResultLocation(type="location", **get_params(locals()))
-
-
-def inline_query_venue(
-    id: str,
-    latitude: float,
-    longitude: float,
-    title: str,
-    address: str,
-    *,
-    foursquare_id: str | None = None,
-    foursquare_type: str | None = None,
-    google_place_id: str | None = None,
-    google_place_type: str | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultVenue:
-    return InlineQueryResultVenue(type="venue", **get_params(locals()))
-
-
-def inline_query_video(
-    id: str,
-    video_url: str,
-    mime_type: str,
-    thumb_url: str,
-    *,
-    title: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    video_width: int | None = None,
-    video_height: int | None = None,
-    video_duration: int | None = None,
-    description: str | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    thumbnail_url: str | None = None,
-    thumbnail_width: int | None = None,
-    thumbnail_height: int | None = None,
-) -> InlineQueryResultVideo:
-    return InlineQueryResultVideo(type="video", **get_params(locals()))
-
-
-def inline_query_game(
-    id: str,
-    game_short_name: str,
-    *,
-    reply_markup: InlineKeyboardMarkup | None = None,
-) -> InlineQueryResultGame:
-    return InlineQueryResultGame(type="game", **get_params(locals()))
-
-
-def inline_query_voice(
-    id: str,
-    voice_url: str,
-    title: str,
-    *,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-    duration: int | None = None,
-) -> InlineQueryResultVoice:
-    return InlineQueryResultVoice(type="voice", **get_params(locals()))
-
-
-def inline_query_photo(
-    id: str,
-    photo_url: str,
-    thumb_url: str,
-    *,
-    photo_width: int | None = None,
-    photo_height: int | None = None,
-    title: str | None = None,
-    description: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultPhoto:
-    return InlineQueryResultPhoto(type="photo", **get_params(locals()))
-
-
-def inline_query_mpeg4_gif(
-    id: str,
-    mpeg4_url: str,
-    *,
-    mpeg4_width: int | None = None,
-    mpeg4_height: int | None = None,
-    mpeg4_duration: int | None = None,
-    thumb_url: str | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultMpeg4Gif:
-    return InlineQueryResultMpeg4Gif(type="mpeg4_gif", **get_params(locals()))
-
-
-def inline_query_cached_sticker(
-    id: str,
-    sticker_file_id: str,
-    *,
-    reply_markup: InlineKeyboardMarkup | None = None,
-) -> InlineQueryResultCachedSticker:
-    return InlineQueryResultCachedSticker(type="sticker", **get_params(locals()))
-
-
-def inline_query_cached_document(
-    id: str,
-    document_file_id: str,
-    *,
-    title: str | None = None,
-    description: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedDocument:
-    return InlineQueryResultCachedDocument(type="document", **get_params(locals()))
-
-
-def inline_query_cached_audio(
-    id: str,
-    audio_file_id: str,
-    *,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedAudio:
-    return InlineQueryResultCachedAudio(type="audio", **get_params(locals()))
-
-
-def inline_query_cached_video(
-    id: str,
-    video_file_id: str,
-    *,
-    title: str | None = None,
-    description: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedVideo:
-    return InlineQueryResultCachedVideo(type="video", **get_params(locals()))
-
-
-def inline_query_cached_gif(
-    id: str,
-    gif_file_id: str,
-    *,
-    title: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedGif:
-    return InlineQueryResultCachedGif(type="gif", **get_params(locals()))
-
-
-def inline_query_cached_mpeg4_gif(
-    id: str,
-    mpeg4_file_id: str,
-    *,
-    title: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedMpeg4Gif:
-    return InlineQueryResultCachedMpeg4Gif(type="mpeg4_gif", **get_params(locals()))
-
-
-def inline_query_cached_voice(
-    id: str,
-    voice_file_id: str,
-    *,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedVoice:
-    return InlineQueryResultCachedVoice(type="voice", **get_params(locals()))
-
-
-def inline_query_cached_photo(
-    id: str,
-    photo_file_id: str,
-    *,
-    title: str | None = None,
-    description: str | None = None,
-    caption: str | None = None,
-    parse_mode: str | None = None,
-    caption_entities: list[MessageEntity] | None = None,
-    reply_markup: InlineKeyboardMarkup | None = None,
-    input_message_content: InputMessageContent | None = None,
-) -> InlineQueryResultCachedPhoto:
-    return InlineQueryResultCachedPhoto(type="photo", **get_params(locals()))
-
-
 __all__ = (
-    "compose_chat_permissions",
     "compose_link_preview_options",
     "compose_reactions",
     "compose_reply_params",
-    "inline_query_article",
-    "inline_query_audio",
-    "inline_query_cached_audio",
-    "inline_query_cached_document",
-    "inline_query_cached_gif",
-    "inline_query_cached_mpeg4_gif",
-    "inline_query_cached_photo",
-    "inline_query_cached_sticker",
-    "inline_query_cached_video",
-    "inline_query_cached_voice",
-    "inline_query_contact",
-    "inline_query_document",
-    "inline_query_game",
-    "inline_query_gif",
-    "inline_query_location",
-    "inline_query_mpeg4_gif",
-    "inline_query_photo",
-    "inline_query_venue",
-    "inline_query_video",
-    "inline_query_voice",
-    "input_contact_message_content",
-    "input_invoice_message_content",
-    "input_location_message_content",
     "input_media",
-    "input_text_message_content",
-    "input_venue_message_content",
 )