telegrinder 0.1.dev161__py3-none-any.whl → 0.1.dev162__py3-none-any.whl

telegrinder/bot/dispatch/composition.py

@@ -37,7 +37,7 @@ class Composition:
                 return None
         return NodeCollection(nodes)
     
-    async def __call__(self, **kwargs) -> typing.Any:
+    async def __call__(self, **kwargs: typing.Any) -> typing.Any:
         return await self.func(**magic_bundle(self.func, kwargs, start_idx=0, bundle_ctx=False))  # type: ignore
 
 

telegrinder/bot/dispatch/dispatch.py

@@ -87,7 +87,7 @@ class Dispatch(
                     break
         return found
 
-    def load(self, external: typing.Self):
+    def load(self, external: typing.Self) -> None:
         view_external = external.get_views()
         for name, view in self.get_views().items():
             assert (

telegrinder/bot/dispatch/waiter_machine/short_state.py

@@ -11,7 +11,7 @@ if typing.TYPE_CHECKING:
     from .machine import Identificator
 
 EventModel = typing.TypeVar("EventModel", bound=BaseCute)
-Behaviour = ABCHandler | None
+Behaviour: typing.TypeAlias = ABCHandler | None
 
 
 class ShortState(typing.Generic[EventModel]):

telegrinder/bot/scenario/checkbox.py

@@ -43,7 +43,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         self.choices: list[Choice] = []
         self.ready = ready_text
         self.max_in_row = max_in_row
-        self.random_code = secrets.token_hex(16)
+        self.random_code = secrets.token_hex(8)
         self.waiter_machine = waiter_machine
 
     def get_markup(self) -> InlineKeyboardMarkup:
@@ -73,7 +73,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         is_picked: bool = False,
     ) -> typing.Self:
         self.choices.append(
-            Choice(name, is_picked, default_text, picked_text, secrets.token_hex(16)),
+            Choice(name, is_picked, default_text, picked_text, secrets.token_hex(8)),
         )
         return self
 
@@ -103,7 +103,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         assert len(self.choices) > 1
         message = (
             await api.send_message(
-                self.chat_id,
+                chat_id=self.chat_id,
                 text=self.msg,
                 parse_mode=self.PARSE_MODE,
                 reply_markup=self.get_markup(),
@@ -111,7 +111,6 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         ).unwrap()
         
         while True:
-            q: CallbackQueryCute
             q, _ = await self.waiter_machine.wait(view, (api, message.message_id))
             should_continue = await self.handle(q)
             await q.answer(self.CALLBACK_ANSWER)

telegrinder/modules.py

@@ -4,14 +4,16 @@ import typing
 from choicelib import choice_in_order
 
 
+@typing.runtime_checkable
 class JSONModule(typing.Protocol):
-    def loads(self, s: str | bytes) -> dict[str, typing.Any] | list[typing.Any]:
+    def loads(self, s: str | bytes) -> typing.Any:
         ...
 
-    def dumps(self, o: dict[str, typing.Any] | list[typing.Any]) -> str:
+    def dumps(self, o: typing.Any) -> str:
         ...
 
 
+@typing.runtime_checkable
 class LoggerModule(typing.Protocol):
     def debug(self, __msg: object, *args: object, **kwargs: object) -> None:
         ...
@@ -47,7 +49,7 @@ class LoggerModule(typing.Protocol):
 
 logger: LoggerModule
 json: JSONModule = choice_in_order(
-    ["ujson", "hyperjson", "orjson"], do_import=True, default="telegrinder.msgspec_json"
+    ["orjson", "ujson", "hyperjson"], do_import=True, default="telegrinder.msgspec_json"
 )
 logging_module = choice_in_order(["loguru"], default="logging")
 logging_level = os.getenv("LOGGER_LEVEL", default="DEBUG").upper()

telegrinder/msgspec_json.py

@@ -3,11 +3,11 @@ import typing
 from .msgspec_utils import decoder, encoder
 
 
-def loads(s: str | bytes) -> dict[str, typing.Any] | list[typing.Any]:
-    return decoder.decode(s, type=dict[str, typing.Any] | list[typing.Any])  # type: ignore
+def loads(s: str | bytes) -> typing.Any:
+    return decoder.decode(s)
 
 
-def dumps(o: dict[str, typing.Any] | list[typing.Any]) -> str:
+def dumps(o: typing.Any) -> str:
     return encoder.encode(o)
 
 

telegrinder/msgspec_utils.py

@@ -8,7 +8,6 @@ T = typing.TypeVar("T")
 Ts = typing.TypeVarTuple("Ts")
 
 if typing.TYPE_CHECKING:
-    import types
     from datetime import datetime
 
     from fntypes.option import Option
@@ -48,10 +47,6 @@ def msgspec_convert(obj: typing.Any, t: type[T]) -> Result[T, msgspec.Validation
         return Error(exc)
 
 
-def datetime_dec_hook(tp: type[datetime], obj: int | float) -> datetime:
-    return tp.fromtimestamp(obj)
-
-
 def option_dec_hook(tp: type[Option[typing.Any]], obj: typing.Any) -> Option[typing.Any]:
     if obj is None:
         return Nothing
@@ -88,37 +83,23 @@ def variative_dec_hook(tp: type[Variative], obj: typing.Any) -> Variative:
 
     raise TypeError(
         "Object of type `{}` does not belong to types `{}`".format(
-            repr_type(type(obj)),
+            repr_type(obj.__class__),
             " | ".join(map(repr_type, union_types)),
         )
     )
 
 
-def datetime_enc_hook(obj: datetime) -> int:
-    return int(obj.timestamp())
-
-
-def option_enc_hook(obj: Option[typing.Any]) -> typing.Any | None:
-    return obj.value if isinstance(obj, fntypes.option.Some) else None
-
-
-def variative_enc_hook(obj: Variative[typing.Any]) -> typing.Any:
-    return obj.v
-
-
 class Decoder:
     def __init__(self) -> None:
-        self.dec_hooks: dict[
-            typing.Union[type[typing.Any], "types.UnionType"], DecHook[typing.Any]
-        ] = {
+        self.dec_hooks: dict[typing.Any, DecHook[typing.Any]] = {
             Option: option_dec_hook,
             Variative: variative_dec_hook,
-            datetime: datetime_dec_hook,
+            datetime: lambda t, obj: t.fromtimestamp(obj),
         }
 
-    def add_dec_hook(self, tp: type[T]):
+    def add_dec_hook(self, t: T):  # type: ignore
         def decorator(func: DecHook[T]) -> DecHook[T]:
-            return self.dec_hooks.setdefault(get_origin(tp), func)
+            return self.dec_hooks.setdefault(get_origin(t), func)  # type: ignore
         
         return decorator
     
@@ -150,12 +131,30 @@ class Decoder:
             builtin_types=builtin_types,
             str_keys=str_keys,
         )
+    
+    @typing.overload
+    def decode(self, buf: str | bytes) -> typing.Any:
+        ...
+    
+    @typing.overload
+    def decode(self, buf: str | bytes, *, strict: bool = True) -> typing.Any:
+        ...
 
+    @typing.overload
     def decode(
         self,
         buf: str | bytes,
         *,
-        type: type[T] = dict,
+        type: type[T],
+        strict: bool = True,
+    ) -> T:
+        ...
+
+    def decode(
+        self,
+        buf: str | bytes,
+        *,
+        type: type[T] = typing.Any,  # type: ignore
         strict: bool = True,
     ) -> T:
         return msgspec.json.decode(
@@ -168,11 +167,11 @@ class Decoder:
 
 class Encoder:
     def __init__(self) -> None:
-        self.enc_hooks: dict[type, EncHook] = {
-            fntypes.option.Some: option_enc_hook,
-            fntypes.option.Nothing: option_enc_hook,
-            Variative: variative_enc_hook,
-            datetime: datetime_enc_hook,
+        self.enc_hooks: dict[typing.Any, EncHook[typing.Any]] = {
+            fntypes.option.Some: lambda opt: opt.value,
+            fntypes.option.Nothing: lambda _: None,
+            Variative: lambda variative: variative.v,
+            datetime: lambda date: int(date.timestamp()),
         }
 
     def add_dec_hook(self, tp: type[T]):
@@ -182,13 +181,17 @@ class Encoder:
         return decorator
     
     def enc_hook(self, obj: object) -> object:
-        origin_type = get_origin(type(obj))
+        origin_type = get_origin(obj.__class__)
         if origin_type not in self.enc_hooks:
             raise NotImplementedError(
                 "Not implemented encode hook for "
                 f"object of type `{repr_type(origin_type)}`."
             )
         return self.enc_hooks[origin_type](obj)
+
+    @typing.overload
+    def encode(self, obj: typing.Any) -> str:
+        ...
     
     @typing.overload
     def encode(self, obj: typing.Any, *, as_str: typing.Literal[True] = True) -> str:
@@ -215,12 +218,8 @@ __all__ = (
     "get_origin",
     "repr_type",
     "msgspec_convert",
-    "datetime_dec_hook",
-    "datetime_enc_hook",
     "option_dec_hook",
-    "option_enc_hook",
     "variative_dec_hook",
-    "variative_enc_hook",
     "datetime",
     "decoder",
     "encoder",

telegrinder/tools/__init__.py

@@ -14,6 +14,7 @@ from .formatting import (
     StartBotLink,
     StartGroupLink,
     TgEmoji,
+    UserOpenMessage,
     block_quote,
     bold,
     channel_boost_link,
@@ -37,6 +38,8 @@ from .formatting import (
     strike,
     tg_emoji,
     underline,
+    user_open_message,
+    user_open_message_link,
 )
 from .global_context import (
     ABCGlobalContext,
@@ -109,6 +112,7 @@ __all__ = (
     "StartGroupLink",
     "TelegrinderCtx",
     "TgEmoji",
+    "UserOpenMessage",
     "block_quote",
     "bold",
     "channel_boost_link",
@@ -135,4 +139,6 @@ __all__ = (
     "strike",
     "tg_emoji",
     "underline",
+    "user_open_message",
+    "user_open_message_link",
 )

telegrinder/tools/buttons.py

@@ -26,13 +26,11 @@ class DataclassInstance(typing.Protocol):
 class BaseButton:
     def get_data(self) -> dict[str, typing.Any]:
         return {
-            k: v
-            if k != "callback_data" or isinstance(v, str)
-            else encoder.encode(v)
+            k: v if k != "callback_data" or isinstance(v, str) else encoder.encode(v)
             for k, v in dataclasses.asdict(self).items()
             if v is not None
         }
-    
+
 
 class RowButtons(typing.Generic[ButtonT]):
     buttons: list[ButtonT]
@@ -65,18 +63,15 @@ class InlineButton(BaseButton):
     url: str | None = None
     login_url: dict[str, typing.Any] | LoginUrl | None = None
     pay: bool | None = None
-    callback_data: typing.Union[
-        str,
-        dict[str, typing.Any],
-        DataclassInstance,
-        msgspec.Struct,
-    ] | None = None
+    callback_data: (
+        str | dict[str, typing.Any] | DataclassInstance | msgspec.Struct | None
+    ) = None
     callback_game: dict[str, typing.Any] | CallbackGame | None = None
     switch_inline_query: str | None = None
     switch_inline_query_current_chat: str | None = None
-    switch_inline_query_chosen_chat: dict[
-        str, typing.Any
-    ] | SwitchInlineQueryChosenChat | None = None
+    switch_inline_query_chosen_chat: (
+        dict[str, typing.Any] | SwitchInlineQueryChosenChat | None
+    ) = None
     web_app: dict[str, typing.Any] | WebAppInfo | None = None
 
 

telegrinder/tools/formatting/__init__.py

@@ -18,6 +18,7 @@ from .html import (
     strike,
     tg_emoji,
     underline,
+    user_open_message,
 )
 from .links import (
     get_channel_boost_link,
@@ -26,6 +27,7 @@ from .links import (
     get_resolve_domain_link,
     get_start_bot_link,
     get_start_group_link,
+    user_open_message_link,
 )
 from .spec_html_formats import (
     BaseSpecFormat,
@@ -39,6 +41,7 @@ from .spec_html_formats import (
     StartBotLink,
     StartGroupLink,
     TgEmoji,
+    UserOpenMessage,
 )
 
 __all__ = (
@@ -55,6 +58,7 @@ __all__ = (
     "StartBotLink",
     "StartGroupLink",
     "TgEmoji",
+    "UserOpenMessage",
     "block_quote",
     "bold",
     "channel_boost_link",
@@ -78,4 +82,6 @@ __all__ = (
     "strike",
     "tg_emoji",
     "underline",
+    "user_open_message",
+    "user_open_message_link",
 )

telegrinder/tools/formatting/html.py

@@ -13,6 +13,7 @@ from .links import (
     get_resolve_domain_link,
     get_start_bot_link,
     get_start_group_link,
+    user_open_message_link,
 )
 from .spec_html_formats import SpecialFormat, is_spec_format
 
@@ -274,6 +275,14 @@ def underline(string: str) -> TagFormat:
     return TagFormat(string, tag="u")
 
 
+def user_open_message(
+    user_id: int,
+    message: str | None = None,
+    string: str | None = None,
+) -> TagFormat:
+    return link(user_open_message_link(user_id, message), string)
+
+
 __all__ = (
     "FormatString",
     "HTMLFormatter",
@@ -301,4 +310,5 @@ __all__ = (
     "strike",
     "tg_emoji",
     "underline",
+    "user_open_message",
 )

telegrinder/tools/formatting/links.py

@@ -22,6 +22,12 @@ def get_invite_chat_link(invite_link: str) -> str:
     return f"tg://join?invite={invite_link}"
 
 
+def user_open_message_link(user_id: int, message: str | None = None) -> str:
+    return f"tg://openmessage?user_id={user_id}" + (
+        "" if not message else f"&msg?text={message}"
+    )
+
+
 __all__ = (
     "get_channel_boost_link",
     "get_invite_chat_link",
@@ -29,4 +35,5 @@ __all__ = (
     "get_resolve_domain_link",
     "get_start_bot_link",
     "get_start_group_link",
+    "user_open_message_link",
 )

telegrinder/tools/formatting/spec_html_formats.py

@@ -5,14 +5,16 @@ from telegrinder.types.enums import ProgrammingLanguage
 
 SpecialFormat = typing.Union[
     "ChannelBoostLink",
-    "Mention",
+    "InviteChatLink",
     "Link",
+    "Mention",
     "PreCode",
-    "TgEmoji",
+    "ResolveDomain",
+    "SpecialFormat",
     "StartBotLink",
     "StartGroupLink",
-    "ResolveDomain",
-    "InviteChatLink",
+    "TgEmoji",
+    "UserOpenMessage",
 ]
 
 
@@ -26,13 +28,13 @@ def is_spec_format(obj: typing.Any) -> typing.TypeGuard[SpecialFormat]:
 
 @dataclasses.dataclass(repr=False)
 class BaseSpecFormat:
-    __formatter_name__: typing.ClassVar[str]
+    __formatter_name__: typing.ClassVar[str] = dataclasses.field(init=False, repr=False)
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__!r}: {self.__formatter_name__!r}>"
+        return f"<Special formatter {self.__class__.__name__!r} -> {self.__formatter_name__!r}>"
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class ChannelBoostLink(BaseSpecFormat):
     __formatter_name__ = "channel_boost_link"
 
@@ -40,7 +42,7 @@ class ChannelBoostLink(BaseSpecFormat):
     string: str | None = None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class InviteChatLink(BaseSpecFormat):
     __formatter_name__ = "invite_chat_link"
 
@@ -48,7 +50,7 @@ class InviteChatLink(BaseSpecFormat):
     string: str | None = None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class Mention(BaseSpecFormat):
     __formatter_name__ = "mention"
 
@@ -56,7 +58,7 @@ class Mention(BaseSpecFormat):
     user_id: int
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class Link(BaseSpecFormat):
     __formatter_name__ = "link"
 
@@ -64,7 +66,7 @@ class Link(BaseSpecFormat):
     string: str | None = None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class PreCode(BaseSpecFormat):
     __formatter_name__ = "pre_code"
 
@@ -72,7 +74,7 @@ class PreCode(BaseSpecFormat):
     lang: str | ProgrammingLanguage | None = None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class TgEmoji(BaseSpecFormat):
     __formatter_name__ = "tg_emoji"
     
@@ -80,7 +82,7 @@ class TgEmoji(BaseSpecFormat):
     emoji_id: int
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class StartBotLink(BaseSpecFormat):
     __formatter_name__ = "start_bot_link"
 
@@ -89,7 +91,7 @@ class StartBotLink(BaseSpecFormat):
     string: str | None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class StartGroupLink(BaseSpecFormat):
     __formatter_name__ = "start_group_link"
 
@@ -98,7 +100,7 @@ class StartGroupLink(BaseSpecFormat):
     string: str | None = None
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(repr=False)
 class ResolveDomain(BaseSpecFormat):
     __formatter_name__ = "resolve_domain"
 
@@ -106,6 +108,15 @@ class ResolveDomain(BaseSpecFormat):
     string: str | None = None
 
 
+@dataclasses.dataclass(repr=False)
+class UserOpenMessage(BaseSpecFormat):
+    __formatter_name__ = "user_open_message"
+
+    user_id: int
+    message: str | None = None
+    string: str | None = None
+
+
 __all__ = (
     "BaseSpecFormat",
     "ChannelBoostLink",
@@ -118,4 +129,5 @@ __all__ = (
     "StartBotLink",
     "StartGroupLink",
     "TgEmoji",
+    "UserOpenMessage",
 )

telegrinder/tools/keyboard.py

@@ -91,9 +91,6 @@ class Keyboard(ABCMarkup[Button], KeyboardModel):
     selective: bool = dataclasses.field(default=False)
     is_persistent: bool = dataclasses.field(default=False)
 
-    def get_empty_markup(self, *, selective: bool = False) -> ReplyKeyboardRemove:
-        return ReplyKeyboardRemove(remove_keyboard=True, selective=selective)  # type: ignore
-
     def dict(self) -> DictStrAny:
         self.keyboard = [row for row in self.keyboard if row]
         return {
@@ -105,6 +102,9 @@ class Keyboard(ABCMarkup[Button], KeyboardModel):
     def get_markup(self) -> ReplyKeyboardMarkup:
         return ReplyKeyboardMarkup(**self.dict())
 
+    def get_empty_markup(self, *, selective: bool = False) -> ReplyKeyboardRemove:
+        return ReplyKeyboardRemove(remove_keyboard=True, selective=Some(selective))
+
 
 class InlineKeyboard(ABCMarkup[InlineButton]):
     BUTTON = InlineButton

telegrinder/tools/loop_wrapper/abc.py

@@ -1,18 +1,18 @@
 import typing
 from abc import ABC, abstractmethod
 
-CoroutineTask = typing.Coroutine[typing.Any, typing.Any, typing.Any]
-CoroutineFunc = typing.Callable[..., CoroutineTask]
+CoroutineTask: typing.TypeAlias = typing.Coroutine[typing.Any, typing.Any, typing.Any]
+CoroutineFunc: typing.TypeAlias = typing.Callable[..., CoroutineTask]
 
 
 class ABCLoopWrapper(ABC):
     @abstractmethod
     def add_task(self, task: CoroutineFunc | CoroutineTask) -> None:
-        ...
+        pass
 
     @abstractmethod
     def run_event_loop(self) -> None:
-        ...
+        pass
 
 
 __all__ = ("ABCLoopWrapper",)

telegrinder/types/enums.py

@@ -415,6 +415,10 @@ class UpdateType(str, enum.Enum):
     CHAT_JOIN_REQUEST = "chat_join_request"
     CHAT_BOOST = "chat_boost"
     REMOVED_CHAT_BOOST = "removed_chat_boost"
+    BUSINESS_CONNECTION = "business_connection"
+    BUSINESS_MESSAGE = "business_message"
+    EDITED_BUSINESS_MESSAGE = "edited_business_message"
+    DELETE_BUSINESS_MESSAGE = "delete_business_messages"
 
 
 class BotCommandScopeType(str, enum.Enum):