telegrinder 0.1.dev167__py3-none-any.whl → 0.1.dev168__py3-none-any.whl

telegrinder/bot/cute_types/callback_query.py

@@ -217,7 +217,7 @@ class CallbackQueryCute(BaseCute[CallbackQuery], CallbackQuery, kw_only=True, di
     )
     async def edit_text(
         self,
-        text: str | None,
+        text: str,
         inline_message_id: int | None = None,
         chat_id: int | str | None = None,
         message_id: int | None = None,

telegrinder/bot/dispatch/dispatch.py

@@ -135,7 +135,9 @@ class Dispatch(
 
     async def feed(self, event: Update, api: ABCAPI) -> bool:
         logger.debug("Processing update (update_id={})", event.update_id)
-        await self.raw_event.process(event, api)
+        loop = asyncio.get_running_loop()
+        loop.create_task(self.raw_event.process(event, api))
+        
         for view in self.get_views().values():
             if await view.check(event):
                 logger.debug(
@@ -143,10 +145,9 @@ class Dispatch(
                     event.update_id,
                     view.__class__.__name__,
                 )
-                await view.process(event, api)
+                loop.create_task(view.process(event, api))
                 return True
 
-        loop = asyncio.get_running_loop()
         ctx = Context()
         found = False
         for handler in self.default_handlers:

telegrinder/bot/dispatch/handler/func.py

@@ -46,7 +46,7 @@ class FuncHandler(ABCHandler[EventT], typing.Generic[EventT, F, ErrorHandlerT]):
             self.dataclass,
             self.error_handler,
         )
-
+    
     async def check(self, api: ABCAPI, event: Update, ctx: Context | None = None) -> bool:
         if self.update_type is not None and self.update_type != event.update_type.unwrap_or_none():
             return False

telegrinder/bot/dispatch/view/abc.py

@@ -67,13 +67,64 @@ class BaseView(ABCView, typing.Generic[EventType]):
                         return Some(generic_type)
         return Nothing()
 
-    @classmethod
-    def get_raw_event(cls, update: Update) -> Option[Model]:
+    @staticmethod
+    def get_raw_event(update: Update) -> Option[Model]:
         match update.update_type:
             case Some(update_type):
                 return getattr(update, update_type.value)
             case _:
                 return Nothing()
+    
+    @typing.overload
+    @classmethod
+    def to_handler(
+        cls,
+        *rules: ABCRule[EventType],
+    ) -> typing.Callable[
+        [FuncType[EventType]],
+        FuncHandler[EventType, FuncType[EventType], ErrorHandler[EventType]],
+    ]: ...
+
+    @typing.overload
+    @classmethod
+    def to_handler(
+        cls,
+        *rules: ABCRule[EventType],
+        error_handler: ErrorHandlerT,
+        is_blocking: bool = True,
+    ) -> typing.Callable[
+        [FuncType[EventType]], FuncHandler[EventType, FuncType[EventType], ErrorHandlerT]
+    ]: ...
+
+    @typing.overload
+    @classmethod
+    def to_handler(
+        cls,
+        *rules: ABCRule[EventType],
+        error_handler: typing.Literal[None] = None,
+        is_blocking: bool = True,
+    ) -> typing.Callable[
+        [FuncType[EventType]],
+        FuncHandler[EventType, FuncType[EventType], ErrorHandler[EventType]],
+    ]: ...
+
+    @classmethod
+    def to_handler(  # type: ignore
+        cls,
+        *rules: ABCRule[EventType],
+        error_handler: ABCErrorHandler | None = None,
+        is_blocking: bool = True,
+    ):
+        def wrapper(func: FuncType[EventType]):
+            return FuncHandler(
+                func,
+                list(rules),
+                is_blocking=is_blocking,
+                dataclass=None,
+                error_handler=error_handler or ErrorHandler(),
+            )
+
+        return wrapper
 
     @typing.overload
     def __call__(

telegrinder/bot/dispatch/waiter_machine/machine.py

@@ -39,7 +39,7 @@ class WaiterMachine:
     ) -> None:
         view_name = state_view.__class__.__name__
         if view_name not in self.storage:
-            raise LookupError("No record of view {!r} found".format(view_name))
+            raise LookupError("No record of view {!r} found.".format(view_name))
 
         short_state = self.storage[view_name].pop(id, None)
         if short_state is None:
@@ -49,13 +49,7 @@ class WaiterMachine:
                 )
             )
 
-        waiters = typing.cast(
-            typing.Iterable[asyncio.Future[typing.Any]],
-            short_state.event._waiters,  # type: ignore
-        )
-        for future in waiters:
-            future.cancel()
-
+        short_state.cancel()
         await self.call_behaviour(
             state_view,
             short_state.event,
@@ -69,9 +63,9 @@ class WaiterMachine:
         state_view: "BaseStateView[EventModel]",
         linked: EventModel | tuple[ABCAPI, Identificator],
         *rules: ABCRule[EventModel],
-        default: Behaviour = None,
-        on_drop: Behaviour = None,
-        expiration: datetime.timedelta | int | None = None,
+        default: Behaviour[EventModel] | None = None,
+        on_drop: Behaviour[EventModel] | None = None,
+        expiration: datetime.timedelta | float | None = None,
     ) -> tuple[EventModel, Context]:
         if isinstance(expiration, int | float):
             expiration = datetime.timedelta(seconds=expiration)
@@ -86,6 +80,7 @@ class WaiterMachine:
         if not key:
             raise RuntimeError("Unable to get state key.")
 
+        view_name = state_view.__class__.__name__
         event = asyncio.Event()
         short_state = ShortState(
             key,
@@ -96,17 +91,17 @@ class WaiterMachine:
             default_behaviour=default,
             on_drop_behaviour=on_drop,
         )
-        view_name = state_view.__class__.__name__
+        
         if view_name not in self.storage:
             state_view.middlewares.insert(0, WaiterMiddleware(self, state_view))
             self.storage[view_name] = LimitedDict()
 
-        self.storage[view_name][key] = short_state
+        if (deleted_short_state := self.storage[view_name].set(key, short_state)) is not None:
+            deleted_short_state.cancel()
+        
         await event.wait()
-
-        e, ctx = getattr(event, "context")
         self.storage[view_name].pop(key, None)
-        return e, ctx
+        return getattr(event, "context")
 
     async def call_behaviour(
         self,
@@ -118,8 +113,10 @@ class WaiterMachine:
     ) -> None:
         # TODO: support param view as a behaviour
 
-        ctx = Context(**context)
+        if behaviour is None:
+            return
 
+        ctx = Context(**context)
         if isinstance(event, asyncio.Event):
             event, preset_ctx = typing.cast(
                 tuple[EventModel, Context],
@@ -127,9 +124,6 @@ class WaiterMachine:
             )
             ctx.update(preset_ctx)
 
-        if behaviour is None:
-            return
-
         if await behaviour.check(event.api, update, ctx):
             await behaviour.run(event, ctx)
         

telegrinder/bot/dispatch/waiter_machine/short_state.py

@@ -34,6 +34,16 @@ class ShortState(typing.Generic[EventModel]):
 
     def __post_init__(self, expiration: datetime.timedelta | None = None) -> None:
         self.expiration_date = (datetime.datetime.now() - expiration) if expiration is not None else None
+    
+    def cancel(self) -> None:
+        """Cancel schedule waiters."""
+
+        waiters = typing.cast(
+            typing.Iterable[asyncio.Future[typing.Any]],
+            self.event._waiters,  # type: ignore
+        )
+        for future in waiters:
+            future.cancel()
 
 
 __all__ = ("ShortState",)

telegrinder/bot/rules/callback_data.py

@@ -16,10 +16,8 @@ from .markup import Markup, PatternLike, check_string
 
 CallbackQuery: typing.TypeAlias = CallbackQueryCute
 Validator: typing.TypeAlias = typing.Callable[[typing.Any], bool | typing.Awaitable[bool]]
-MapDict: typing.TypeAlias = dict[
-    str, "typing.Any | type[typing.Any] | Validator | list[MapDict] | MapDict"
-]
-CallbackMap: typing.TypeAlias = list[tuple[str, "typing.Any | type | Validator | CallbackMap"]]
+MapDict: typing.TypeAlias = dict[str, "typing.Any | type[typing.Any] | Validator | list[MapDict] | MapDict"]
+CallbackMap: typing.TypeAlias = list[tuple[str, "typing.Any | type[typing.Any] | Validator | CallbackMap"]]
 CallbackMapStrict: typing.TypeAlias = list[tuple[str, "Validator | CallbackMapStrict"]]
 
 
@@ -41,7 +39,7 @@ class CallbackQueryDataRule(CallbackQueryRule, abc.ABC, requires=[HasData()]):
 
 
 class CallbackDataMap(CallbackQueryDataRule):
-    def __init__(self, mapping: MapDict) -> None:
+    def __init__(self, mapping: MapDict, /) -> None:
         self.mapping = self.transform_to_callbacks(
             self.transform_to_map(mapping),
         )
@@ -86,12 +84,12 @@ class CallbackDataMap(CallbackQueryDataRule):
             result = validator(value)
             if inspect.isawaitable(result):
                 result = await result
-            return result  # type: ignore
+            return result
 
         return False
 
     @classmethod
-    async def match(cls, callback_data: dict, callback_map: CallbackMapStrict) -> bool:
+    async def match(cls, callback_data: dict[str, typing.Any], callback_map: CallbackMapStrict) -> bool:
         """Matches callback_data with callback_map recursively."""
 
         for key, validator in callback_map:
@@ -121,7 +119,7 @@ class CallbackDataMap(CallbackQueryDataRule):
 
 
 class CallbackDataEq(CallbackQueryDataRule):
-    def __init__(self, value: str):
+    def __init__(self, value: str, /) -> None:
         self.value = value
 
     async def check(self, event: CallbackQuery, ctx: Context) -> bool:
@@ -129,7 +127,7 @@ class CallbackDataEq(CallbackQueryDataRule):
 
 
 class CallbackDataJsonEq(CallbackQueryDataRule):
-    def __init__(self, d: dict[str, typing.Any]):
+    def __init__(self, d: dict[str, typing.Any], /) -> None:
         self.d = d
 
     async def check(self, event: CallbackQuery, ctx: Context) -> bool:
@@ -137,7 +135,7 @@ class CallbackDataJsonEq(CallbackQueryDataRule):
 
 
 class CallbackDataJsonModel(CallbackQueryDataRule):
-    def __init__(self, model: type[msgspec.Struct] | type[DataclassInstance]):
+    def __init__(self, model: type[msgspec.Struct] | type[DataclassInstance], /) -> None:
         self.model = model
 
     async def check(self, event: CallbackQuery, ctx: Context) -> bool:
@@ -148,7 +146,7 @@ class CallbackDataJsonModel(CallbackQueryDataRule):
 
 
 class CallbackDataMarkup(CallbackQueryDataRule):
-    def __init__(self, patterns: PatternLike | list[PatternLike]):
+    def __init__(self, patterns: PatternLike | list[PatternLike], /) -> None:
         self.patterns = Markup(patterns).patterns
 
     async def check(self, event: CallbackQuery, ctx: Context) -> bool:

telegrinder/bot/scenario/checkbox.py

@@ -33,13 +33,13 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         self,
         waiter_machine: WaiterMachine,
         chat_id: int,
-        msg: str,
+        message: str,
         *,
         ready_text: str = "Ready",
         max_in_row: int = 3,
     ) -> None:
         self.chat_id = chat_id
-        self.msg = msg
+        self.message = message
         self.choices: list[Choice] = []
         self.ready = ready_text
         self.max_in_row = max_in_row
@@ -58,7 +58,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
             self.waiter_machine,
             self.ready,
             self.chat_id,
-            self.msg,
+            self.message,
         )
 
     def get_markup(self) -> InlineKeyboardMarkup:
@@ -101,7 +101,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
                 # Toggle choice
                 self.choices[i].is_picked = not self.choices[i].is_picked
                 await cb.edit_text(
-                    text=self.msg,
+                    text=self.message,
                     parse_mode=self.PARSE_MODE,
                     reply_markup=self.get_markup(),
                 )
@@ -118,7 +118,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         message = (
             await api.send_message(
                 chat_id=self.chat_id,
-                text=self.msg,
+                text=self.message,
                 parse_mode=self.PARSE_MODE,
                 reply_markup=self.get_markup(),
             )

telegrinder/bot/scenario/choice.py

@@ -1,6 +1,7 @@
 import typing
 
 from telegrinder.bot.cute_types import CallbackQueryCute
+from telegrinder.bot.dispatch.waiter_machine import WaiterMachine
 
 from .checkbox import Checkbox
 
@@ -22,9 +23,9 @@ class SingleChoice(Checkbox):
             if choice.code == code:
                 self.choices[i].is_picked = True
                 await cb.ctx_api.edit_message_text(
+                    text=self.message,
                     chat_id=cb.message.unwrap().v.chat.id,
                     message_id=cb.message.unwrap().v.message_id,
-                    text=self.msg,
                     parse_mode=self.PARSE_MODE,
                     reply_markup=self.get_markup(),
                 )
@@ -36,10 +37,10 @@ class SingleChoice(Checkbox):
         api: "API",
         view: "BaseStateView[CallbackQueryCute]",
     ) -> tuple[str, int]:
-        if len([choice for choice in self.choices if choice.is_picked]) != 1:
+        if len(tuple(choice for choice in self.choices if choice.is_picked)) != 1:
             raise ValueError("Exactly one choice must be picked")
         choices, m_id = await super().wait(api, view)
-        return list(choices.keys())[list(choices.values()).index(True)], m_id
+        return tuple(choices.keys())[tuple(choices.values()).index(True)], m_id
 
 
 __all__ = ("SingleChoice",)

telegrinder/tools/__init__.py

@@ -100,8 +100,8 @@ __all__ = (
     "KeyboardSetBase",
     "KeyboardSetYAML",
     "Lifespan",
-    "Link",
     "LimitedDict",
+    "Link",
     "LoopWrapper",
     "Mention",
     "ParseMode",

telegrinder/tools/limited_dict.py

@@ -11,12 +11,22 @@ class LimitedDict(UserDict[KT, VT]):
         self.maxlimit = maxlimit
         self.queue: deque[KT] = deque(maxlen=maxlimit)
 
-    def __setitem__(self, key: KT, value: VT, /) -> None:
+    def set(self, key: KT, value: VT, /) -> VT | None:
+        """Set item in the dictionary.
+        Returns a value that was deleted when the limit in the dictionary
+        was reached, otherwise None.
+        """
+
+        deleted_item = None
         if len(self.queue) >= self.maxlimit:
-            self.pop(self.queue.popleft(), None)
+            deleted_item = self.pop(self.queue.popleft(), None)
         if key not in self.queue:
             self.queue.append(key)
         super().__setitem__(key, value)
+        return deleted_item
+
+    def __setitem__(self, key: KT, value: VT, /) -> None:
+        self.set(key, value)
     
     def __delitem__(self, key: KT) -> None:
         if key in self.queue:

telegrinder/types/methods.py

@@ -139,9 +139,7 @@ class APIMethods:
         )
         return full_result(method_response, bool)
 
-    async def get_webhook_info(
-        self, **other: typing.Any
-    ) -> Result[WebhookInfo, APIError]:
+    async def get_webhook_info(self, **other: typing.Any) -> Result[WebhookInfo, APIError]:
         """Method `getWebhookInfo`, see the [documentation](https://core.telegram.org/bots/api#getwebhookinfo)
 
         Use this method to get current webhook status. Requires no parameters.
@@ -215,11 +213,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -357,11 +351,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[MessageId, APIError]:
@@ -473,11 +463,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -546,11 +532,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -630,11 +612,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -714,11 +692,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -805,11 +779,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -889,11 +859,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -960,11 +926,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -1020,9 +982,7 @@ class APIMethods:
     async def send_media_group(
         self,
         chat_id: int | str,
-        media: list[
-            InputMediaAudio | InputMediaDocument | InputMediaPhoto | InputMediaVideo
-        ],
+        media: list[InputMediaAudio | InputMediaDocument | InputMediaPhoto | InputMediaVideo],
         business_connection_id: str | None = None,
         message_thread_id: int | None = None,
         disable_notification: bool | None = None,
@@ -1076,11 +1036,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -1147,11 +1103,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -1216,11 +1168,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -1285,11 +1233,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -1373,11 +1317,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:
@@ -2379,9 +2319,7 @@ class APIMethods:
         )
         return full_result(method_response, bool)
 
-    async def get_forum_topic_icon_stickers(
-        self, **other: typing.Any
-    ) -> Result[list[Sticker], APIError]:
+    async def get_forum_topic_icon_stickers(self, **other: typing.Any) -> Result[list[Sticker], APIError]:
         """Method `getForumTopicIconStickers`, see the [documentation](https://core.telegram.org/bots/api#getforumtopiciconstickers)
 
         Use this method to get custom emoji stickers, which can be used as a forum
@@ -3011,9 +2949,7 @@ class APIMethods:
         self,
         chat_id: int | None = None,
         **other: typing.Any,
-    ) -> Result[
-        Variative[MenuButtonCommands, MenuButtonWebApp, MenuButtonDefault], APIError
-    ]:
+    ) -> Result[Variative[MenuButtonCommands, MenuButtonWebApp, MenuButtonDefault], APIError]:
         """Method `getChatMenuButton`, see the [documentation](https://core.telegram.org/bots/api#getchatmenubutton)
 
         Use this method to get the current value of the bot's menu button in a private 
@@ -3028,8 +2964,7 @@ class APIMethods:
             get_params(locals()),
         )
         return full_result(
-            method_response,
-            Variative[MenuButtonCommands, MenuButtonWebApp, MenuButtonDefault],
+            method_response, Variative[MenuButtonCommands, MenuButtonWebApp, MenuButtonDefault]
         )
 
     async def set_my_default_administrator_rights(
@@ -3424,11 +3359,7 @@ class APIMethods:
         protect_content: bool | None = None,
         reply_parameters: ReplyParameters | None = None,
         reply_markup: (
-            InlineKeyboardMarkup
-            | ReplyKeyboardMarkup
-            | ReplyKeyboardRemove
-            | ForceReply
-            | None
+            InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply | None
         ) = None,
         **other: typing.Any,
     ) -> Result[Message, APIError]:

telegrinder/types/objects.py

@@ -492,9 +492,7 @@ class ChatFullInfo(Model):
     personal_chat: Option["Chat"] = Nothing
     """Optional. For private chats, the personal channel of the user."""
 
-    available_reactions: Option[
-        list[Variative["ReactionTypeEmoji", "ReactionTypeCustomEmoji"]]
-    ] = Nothing
+    available_reactions: Option[list[Variative["ReactionTypeEmoji", "ReactionTypeCustomEmoji"]]] = Nothing
     """Optional. List of available reactions allowed in the chat. If omitted, 
     then all emoji reactions are allowed."""
 
@@ -647,12 +645,7 @@ class Message(MaybeInaccessibleMessage):
     bot chat which might share the same identifier."""
 
     forward_origin: Option[
-        Variative[
-            "MessageOriginUser",
-            "MessageOriginHiddenUser",
-            "MessageOriginChat",
-            "MessageOriginChannel",
-        ]
+        Variative["MessageOriginUser", "MessageOriginHiddenUser", "MessageOriginChat", "MessageOriginChannel"]
     ] = Nothing
     """Optional. Information about the original message for forwarded messages."""
 
@@ -941,9 +934,7 @@ class Message(MaybeInaccessibleMessage):
         Full name, for `private` chat."""
 
         return (
-            self.chat.full_name.unwrap()
-            if self.chat.type == ChatType.PRIVATE
-            else self.chat.title.unwrap()
+            self.chat.full_name.unwrap() if self.chat.type == ChatType.PRIVATE else self.chat.title.unwrap()
         )
 
     def __eq__(self, other: typing.Any) -> bool:
@@ -1049,10 +1040,7 @@ class ExternalReplyInfo(Model):
     """
 
     origin: Variative[
-        "MessageOriginUser",
-        "MessageOriginHiddenUser",
-        "MessageOriginChat",
-        "MessageOriginChannel",
+        "MessageOriginUser", "MessageOriginHiddenUser", "MessageOriginChat", "MessageOriginChannel"
     ]
     """Origin of the message replied to by the given message."""
 
@@ -1785,9 +1773,7 @@ class BackgroundTypeFill(BackgroundType):
     type: typing.Literal["fill"]
     """Type of the background, always `fill`."""
 
-    fill: Variative[
-        "BackgroundFillSolid", "BackgroundFillGradient", "BackgroundFillFreeformGradient"
-    ]
+    fill: Variative["BackgroundFillSolid", "BackgroundFillGradient", "BackgroundFillFreeformGradient"]
     """The background fill."""
 
     dark_theme_dimming: int
@@ -1829,9 +1815,7 @@ class BackgroundTypePattern(BackgroundType):
     document: "Document"
     """Document with the pattern."""
 
-    fill: Variative[
-        "BackgroundFillSolid", "BackgroundFillGradient", "BackgroundFillFreeformGradient"
-    ]
+    fill: Variative["BackgroundFillSolid", "BackgroundFillGradient", "BackgroundFillFreeformGradient"]
     """The background fill that is combined with the pattern."""
 
     intensity: int
@@ -1865,10 +1849,7 @@ class ChatBackground(Model):
     """
 
     type: Variative[
-        "BackgroundTypeFill",
-        "BackgroundTypeWallpaper",
-        "BackgroundTypePattern",
-        "BackgroundTypeChatTheme",
+        "BackgroundTypeFill", "BackgroundTypeWallpaper", "BackgroundTypePattern", "BackgroundTypeChatTheme"
     ]
     """Type of the background."""
 
@@ -3111,9 +3092,7 @@ class Birthdate(Model):
         """Optional. Contains the user's age, if the user has a birth year specified."""
 
         return self.year.map(
-            lambda year: (
-                (datetime.now() - datetime(year, self.month, self.day)) // 365
-            ).days
+            lambda year: ((datetime.now() - datetime(year, self.month, self.day)) // 365).days
         )
 
 
@@ -3528,9 +3507,7 @@ class ChatBoost(Model):
     """Point in time (Unix timestamp) when the boost will automatically expire, 
     unless the booster's Telegram Premium subscription is prolonged."""
 
-    source: Variative[
-        "ChatBoostSourcePremium", "ChatBoostSourceGiftCode", "ChatBoostSourceGiveaway"
-    ]
+    source: Variative["ChatBoostSourcePremium", "ChatBoostSourceGiftCode", "ChatBoostSourceGiveaway"]
     """Source of the added boost."""
 
 
@@ -3562,9 +3539,7 @@ class ChatBoostRemoved(Model):
     remove_date: datetime
     """Point in time (Unix timestamp) when the boost was removed."""
 
-    source: Variative[
-        "ChatBoostSourcePremium", "ChatBoostSourceGiftCode", "ChatBoostSourceGiveaway"
-    ]
+    source: Variative["ChatBoostSourcePremium", "ChatBoostSourceGiftCode", "ChatBoostSourceGiveaway"]
     """Source of the removed boost."""
 
 
@@ -4196,9 +4171,7 @@ class InlineQueryResultGif(InlineQueryResult):
     gif_duration: Option[int] = Nothing
     """Optional. Duration of the GIF in seconds."""
 
-    thumbnail_mime_type: Option[
-        typing.Literal["image/jpeg", "image/gif", "video/mp4"]
-    ] = Nothing
+    thumbnail_mime_type: Option[typing.Literal["image/jpeg", "image/gif", "video/mp4"]] = Nothing
     """Optional. MIME type of the thumbnail, must be one of `image/jpeg`, `image/gif`, 
     or `video/mp4`. Defaults to `image/jpeg`."""
 
@@ -4259,9 +4232,7 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
     mpeg4_duration: Option[int] = Nothing
     """Optional. Video duration in seconds."""
 
-    thumbnail_mime_type: Option[
-        typing.Literal["image/jpeg", "image/gif", "video/mp4"]
-    ] = Nothing
+    thumbnail_mime_type: Option[typing.Literal["image/jpeg", "image/gif", "video/mp4"]] = Nothing
     """Optional. MIME type of the thumbnail, must be one of `image/jpeg`, `image/gif`, 
     or `video/mp4`. Defaults to `image/jpeg`."""
 

{telegrinder-0.1.dev167.dist-info → telegrinder-0.1.dev168.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: telegrinder
-Version: 0.1.dev167
+Version: 0.1.dev168
 Summary: Framework for effective and reliable async telegram bot building.
 Home-page: https://github.com/timoniq/telegrinder
 License: MIT
@@ -49,23 +49,23 @@ Still in development.
 
 Install using pip:
 
-```
+```console
 pip install telegrinder
 ```
 
 Using poetry:
 
-```
+```console
 poetry add telegrinder
 ```
 
 Install from github:
 
-```
+```console
 pip install -U https://github.com/timoniq/telegrinder/archive/dev.zip
 ```
 
-```
+```console
 poetry add git+https://github.com/timoniq/telegrinder.git#dev
 ```
 

{telegrinder-0.1.dev167.dist-info → telegrinder-0.1.dev168.dist-info}/RECORD

@@ -8,7 +8,7 @@ telegrinder/bot/__init__.py,sha256=91NKeAbQH10sZ0Lzm-qENoxJRHz2SNvOy-30Ww5gzkA,1
 telegrinder/bot/bot.py,sha256=FZFyi-CLEcJYlOz5BbL5Ev6dZQ5VhVqxh1nYburXplQ,2464
 telegrinder/bot/cute_types/__init__.py,sha256=XDcZJMKDFYJExvaNSm3B-bMQ2_wRETALz7-OWAytBC0,457
 telegrinder/bot/cute_types/base.py,sha256=k20aJtTNoLn_63xQUFU-upVcwvwT0OX6odTLnCBY-xQ,4521
-telegrinder/bot/cute_types/callback_query.py,sha256=kCPjELrzRNEfa3h_gxbl12bkS6ejY8pTNxCJZTNZuNw,20244
+telegrinder/bot/cute_types/callback_query.py,sha256=1Ss32Qkl2b_nGQt0B8GxWNAdL1qYf3akd2PV7ZjRII4,20237
 telegrinder/bot/cute_types/chat_join_request.py,sha256=Rkgu8myVlxbyGX2YIyyMRk5Io_fXqzNFcaTjzuBJ-jw,2237
 telegrinder/bot/cute_types/chat_member_updated.py,sha256=3zoAiSSiFScXcAp8956nxsHTzaiD44boHKALFx_9XkY,10883
 telegrinder/bot/cute_types/inline_query.py,sha256=QmaYkXSOQHrkWs7N6eD_HiTGGOtegN10hVppU37z3bE,2475
@@ -19,10 +19,10 @@ telegrinder/bot/dispatch/__init__.py,sha256=z4pWNEdWBHKP902bvtUe4WWhtMKW-LgPj5Dd
 telegrinder/bot/dispatch/abc.py,sha256=YX184RfqSTMtxrt6qyNRu9uhlPHJLEJY3RKsLfBV7nw,462
 telegrinder/bot/dispatch/composition.py,sha256=bR_fBib4mHEDFgDyGvmejGG1hHBV5zeFWuv2RBHPKXY,2942
 telegrinder/bot/dispatch/context.py,sha256=lVnFaZm1jWlfG9JbtE5c_0pBV1pWlExvh24ESkO5Nag,2278
-telegrinder/bot/dispatch/dispatch.py,sha256=PHwp3VfN8b9xiFZ2e5rR0VyezG7kHEcObjWxfX_W4so,5193
+telegrinder/bot/dispatch/dispatch.py,sha256=9ym7VUFxwMvT1Eq92zSMWatbKmEXgoE-buuvk9ampTs,5226
 telegrinder/bot/dispatch/handler/__init__.py,sha256=mzchbArrm0eoTEeVKHYrtJX4WSfW5t6T4xDU3-mtYaA,169
 telegrinder/bot/dispatch/handler/abc.py,sha256=ry5gMUxB6buiDksAFiuWM-LcIAg5S8rJZlW_0PWpVJA,570
-telegrinder/bot/dispatch/handler/func.py,sha256=QBR8vudGmDn1euc3UuecWJxuWiB-yXzdEm0acZtcfKI,3018
+telegrinder/bot/dispatch/handler/func.py,sha256=nfVpTf4MvHuOtH6tV07S-tdAR2iVWHeuD896a5SCyhg,3022
 telegrinder/bot/dispatch/handler/message_reply.py,sha256=_3gb3NLAwfTw7FTd7iga2tSe5WZ8IU9AdxwDWq5nMqI,1811
 telegrinder/bot/dispatch/middleware/__init__.py,sha256=qDuTt2ZZKX9UMjPdw5xaaNZdMI-i3P4Px2T8qbYCMJw,61
 telegrinder/bot/dispatch/middleware/abc.py,sha256=Aj9aEQ0yNM-pprUOdnYAmoIbq4wPMgyhCP8EUAvxzXs,413
@@ -33,7 +33,7 @@ telegrinder/bot/dispatch/return_manager/callback_query.py,sha256=actPlW6JqZ2Qi8t
 telegrinder/bot/dispatch/return_manager/inline_query.py,sha256=Clo6Uvl__Ja9u5yg6RSJBjyqhhSpJINtq2NFS_pG45Q,489
 telegrinder/bot/dispatch/return_manager/message.py,sha256=ZrCrvq8wNmz8TTykoVMzneKk11cIqkCFZIOynZ5PjAQ,1160
 telegrinder/bot/dispatch/view/__init__.py,sha256=x8qPwRWosGNTk89tvyiWZhHKvVK2IqFI87D7YTrRKbk,569
-telegrinder/bot/dispatch/view/abc.py,sha256=AgtskFpCln5tYDdx9nJqYUaU8DO5W5AlXvfnygY6zwE,5639
+telegrinder/bot/dispatch/view/abc.py,sha256=xCqoH4b0Kb-ZTLTmnULCjpFAfI1nHG4svcZ-efMwjhc,7043
 telegrinder/bot/dispatch/view/box.py,sha256=4cLaC6U31RbPC0AqrHIjtB_Av-Wbip9gJ0yODZ-jClA,3825
 telegrinder/bot/dispatch/view/callback_query.py,sha256=ALQm-cUFDQggZqwGVOEVodvpTcYKXCebwYDbLcZ36cE,560
 telegrinder/bot/dispatch/view/chat_join_request.py,sha256=y1wQMrPSiqxDHQm7TqdOA-ecAP3rnocYTzQxa7-7vws,447
@@ -42,9 +42,9 @@ telegrinder/bot/dispatch/view/inline_query.py,sha256=hRwrgfhgS5YF0E6eUrR8FuWVHUM
 telegrinder/bot/dispatch/view/message.py,sha256=Fb7GRVCsVhE5xHZtFyiNntKcqtGCVzj2pEIOLcfFMm8,1175
 telegrinder/bot/dispatch/view/raw.py,sha256=U1nY4sE_8TSR7nlyYh8Zn8qysfEWYS_dKhPGglE9VFw,3438
 telegrinder/bot/dispatch/waiter_machine/__init__.py,sha256=RUuq-J1qZMeREL8omM8kxEfgAz3-7h3B9NhzSjLTMqA,190
-telegrinder/bot/dispatch/waiter_machine/machine.py,sha256=rWAIwl9-igZ4V40XF87ItdiQBdjiqKvQmVzDKyZr39M,4114
+telegrinder/bot/dispatch/waiter_machine/machine.py,sha256=lmPHxGMXELFW18N4Z9UAcFSqthXZUIEbumINTo-2-OM,4047
 telegrinder/bot/dispatch/waiter_machine/middleware.py,sha256=YdB3KSJRo11aoUfpV48Rm2GC14ea9ucJWL2ACRiTnig,2706
-telegrinder/bot/dispatch/waiter_machine/short_state.py,sha256=zAtIVsQo1xHXwKeWn8GAsK4mlzzmzCDBUqc9g6r5FTg,1294
+telegrinder/bot/dispatch/waiter_machine/short_state.py,sha256=qqKu5bt3GpP15CSEB6vutmARgCaElcuiTC3GymqWSBE,1575
 telegrinder/bot/polling/__init__.py,sha256=OqfIFPS_V6UrCg-vCv9pkMFzTKdNbDP2faBfATs_TGg,94
 telegrinder/bot/polling/abc.py,sha256=-5BpX55SJfDlEJWt15yOXWCizQRrgeY5oiA5eHkm1Nw,434
 telegrinder/bot/polling/polling.py,sha256=omSV2HhNIY78DTzll5yswRrEtYbbhFZGi5Q4QGHI_fE,4681
@@ -55,7 +55,7 @@ telegrinder/bot/rules/adapter/abc.py,sha256=VxRGQbNtdfA6gZyTk0JjJBdB5n_7g6uwseew
 telegrinder/bot/rules/adapter/errors.py,sha256=2r_UBTWm5-heU-NchBfobC1f848EWeC64nKvprGnAAY,73
 telegrinder/bot/rules/adapter/event.py,sha256=SHCKW-bE0LS9jK6v2ciZTi5ELVw8WLcYJQ5b2qD53kc,2160
 telegrinder/bot/rules/adapter/raw_update.py,sha256=K0bwq3Hh-hIs_xbEYDOgZHMS4r-Zvo3VKs1B3gkJLGA,752
-telegrinder/bot/rules/callback_data.py,sha256=iZYDyOej2bSToo1eYQKRM7TryknC3KpvuZUJYJGcciQ,5398
+telegrinder/bot/rules/callback_data.py,sha256=_-T3Mg0o0xmYwcXBn5a4dkIuXuCntK8EQ0WSvvMTqsE,5452
 telegrinder/bot/rules/chat_join.py,sha256=pWVMhrKi40-1vhBNQqV24i98GGJ0SwhagrvGeL1hMas,1401
 telegrinder/bot/rules/command.py,sha256=2qzcLr_r4g7i5Hndhfd7zyoDfVCLPplr-Ijbr_yE4jo,3322
 telegrinder/bot/rules/enum_text.py,sha256=O8J1xm5AtLnLVfIIbY1B1lygm9XLZ86YeApa4LuDn1o,954
@@ -75,8 +75,8 @@ telegrinder/bot/rules/text.py,sha256=MIEbbIu6X2zcOD70hM0TrQI4jN2ulKmuREos3BN7Ii4
 telegrinder/bot/rules/update.py,sha256=0ccDDD4QW2qx6hBMwNteUnGRbsGbrdE2fCkCx6AmuEA,480
 telegrinder/bot/scenario/__init__.py,sha256=Ehe2uH-eQ-vRBPxIzdmE23B-FBOAa9YQyndmb6K8C5E,166
 telegrinder/bot/scenario/abc.py,sha256=3AZYRjZlkbDtyFbsKdZ6BefzWYlJ0DOrGwh8jI3nzv4,474
-telegrinder/bot/scenario/checkbox.py,sha256=vjedhLVurQtSbpFDPwMuLx5j5OJxa0Iv6aV8Ufd_jYw,4128
-telegrinder/bot/scenario/choice.py,sha256=-NYyzgfGI0njVuT-EY0j3jS4tPlsKOEkZaUagtns7dE,1442
+telegrinder/bot/scenario/checkbox.py,sha256=ULsdt40AXqqiTnN5iXiiw5TJ7j4IFoQOg92TF3zg_XA,4152
+telegrinder/bot/scenario/choice.py,sha256=-Jes6CHx8nWgoKSClkDc3Y62t5IoG6HF1Ud3LG6yWZg,1519
 telegrinder/client/__init__.py,sha256=ZiS1Wb_l_kv3FHzEEi1oXtFLwlA_HXmWOzeN0xA3E7Y,104
 telegrinder/client/abc.py,sha256=OxsTX_PLYBEeFT9zpidFUzAbQL9BM7rQqru7zdn5DiQ,1611
 telegrinder/client/aiohttp.py,sha256=AqmuHd6Z3zy96YBe7xIMC4U8Hi9SA7j-0EI7xYE3ZCU,4085
@@ -97,7 +97,7 @@ telegrinder/node/tools/__init__.py,sha256=TI_o7MbS4DUOSkNNgJGLocXfRybPFv2WOhBty0
 telegrinder/node/tools/generator.py,sha256=rs7UcFxgnXgjiSdFPyChqZW4K4oRcmiPst6nYYOSrnw,1024
 telegrinder/node/update.py,sha256=QD-m9soBgsP3voTbhaErWdE1FciwYyJCIFNDYf_zra0,253
 telegrinder/rules.py,sha256=BFB8RFwKKxqs9HFfo_p0RfulQNonPZAX8cHpmnG7qCU,39
-telegrinder/tools/__init__.py,sha256=lDcl3dDXQ_4daAmxoe9r8lyAsUhG79MZHgmq3uSpSko,2961
+telegrinder/tools/__init__.py,sha256=rEVbGICWyacwGe_HmE_yTjK3ySAr37khJN3PumFNnZQ,2961
 telegrinder/tools/buttons.py,sha256=0p-hebPWNVPfX6f_8CNtruRZ_W9monthz0Mb3rwPFRY,2414
 telegrinder/tools/error_handler/__init__.py,sha256=WmYWZCNhhSk32j4lIOltEwzoYUx086TGTbOF5h3Ps7s,207
 telegrinder/tools/error_handler/abc.py,sha256=w5t2sWa_xt9iy7pdphiFs1kgmsll7A7eaPbm3Yes8t0,888
@@ -120,7 +120,7 @@ telegrinder/tools/kb_set/__init__.py,sha256=k1KCQTnvEgJ2y4KlghhJWOh5rccwg_27cs82
 telegrinder/tools/kb_set/base.py,sha256=mbZs-ViUErfSibzyN064IqZp76LBJPg3NB4D9v4VFtg,243
 telegrinder/tools/kb_set/yaml.py,sha256=rDoVkdfxp3gz-pS82nB1LDQU8cyckErwMee4nCXHunI,2027
 telegrinder/tools/keyboard.py,sha256=oHwFnqj_pmKsxI6AnvFgZWQYqSkyK-Lgnnd6qbNTmEI,3730
-telegrinder/tools/limited_dict.py,sha256=SkfHdDI3hb02zVDaKpFwTggcVU7yYqcudSRNsKqKYA4,763
+telegrinder/tools/limited_dict.py,sha256=rSWMDxgMVyhVj4z4q_JHoJGd16RE23EnsZS7wkYmw-k,1082
 telegrinder/tools/loop_wrapper/__init__.py,sha256=ZQ5jmE1lOKnqJlMZ9k2OYmjvOEhOlHPijUWqZ4nHIgk,165
 telegrinder/tools/loop_wrapper/abc.py,sha256=ET_Dp-kRz75Jo1fZB3qofUgEXN4FqlU0xH2diESKGCM,266
 telegrinder/tools/loop_wrapper/loop_wrapper.py,sha256=4JvtVIy14oAMYUy0Z3hayFqFXvoh6cBdgmnFHMo4s0Y,5701
@@ -128,10 +128,10 @@ telegrinder/tools/magic.py,sha256=ijUw7LipMPn0vO7UJzUpx5kNNRL_MTFArTxnxn_8qEU,18
 telegrinder/tools/parse_mode.py,sha256=JyQ-x9YAMPLhIIiUX01acyKkpWgs5TBA07W-iUyPHpE,92
 telegrinder/types/__init__.py,sha256=IDaQRxugF7lh8LHFjs1fjAQY9y6Z5en_j8CezBdoL7E,6036
 telegrinder/types/enums.py,sha256=LRPPSB95NhKnt5hd3dW_wMhiGEzGjyWSo5bheAfyz_s,19152
-telegrinder/types/methods.py,sha256=RPDCeYHuVFtF0CT3XW4Gq8fI26P5ql4UqyVdQdIeXTE,186543
-telegrinder/types/objects.py,sha256=QWlpNjjJc1jRBpG8cFKGLXhSyIiwtUHP2aIw446oPo8,228684
+telegrinder/types/methods.py,sha256=XpyM-YbjOj-7MPZBfLt3lhvNgLLXzx26t3DkZzaaAGc,185746
+telegrinder/types/objects.py,sha256=nJIU4UUTdWAW_t_v30JI6y1vwkKY1g_essO-G8p2HeE,228423
 telegrinder/verification_utils.py,sha256=ZUgHsouZjs930D5rI_w7VGy0ub69vovwKXeKjqgrSNc,1028
-telegrinder-0.1.dev167.dist-info/LICENSE,sha256=J9ngGsqHCNNjpm3xYPT7EnlzsnjhfqNXej5mJFjM6lw,1094
-telegrinder-0.1.dev167.dist-info/METADATA,sha256=CPe-uupiL9vzJsSSiPLo9qvA78F9CnRNsbKOUn-hBfA,2892
-telegrinder-0.1.dev167.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-telegrinder-0.1.dev167.dist-info/RECORD,,
+telegrinder-0.1.dev168.dist-info/LICENSE,sha256=J9ngGsqHCNNjpm3xYPT7EnlzsnjhfqNXej5mJFjM6lw,1094
+telegrinder-0.1.dev168.dist-info/METADATA,sha256=RdF6R_kPU7KoIJVFIdcCFBHkuz35NT_lp-tV2BVbjfs,2920
+telegrinder-0.1.dev168.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+telegrinder-0.1.dev168.dist-info/RECORD,,