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

telegrinder/tools/error_handler/error_handler.py

@@ -19,13 +19,13 @@ FuncCatcher = typing.Callable[typing.Concatenate[ExceptionT, ...], typing.Awaita
 @dataclasses.dataclass(frozen=True, repr=False)
 class Catcher(typing.Generic[EventT]):
     func: FuncCatcher[BaseException]
-    _: dataclasses.KW_ONLY
     exceptions: list[type[BaseException] | BaseException] = dataclasses.field(
         default_factory=lambda: [],
+        kw_only=True,
     )
-    logging: bool = dataclasses.field(default=False)
-    raise_exception: bool = dataclasses.field(default=False)
-    ignore_errors: bool = dataclasses.field(default=False)
+    logging: bool = dataclasses.field(default=False, kw_only=True)
+    raise_exception: bool = dataclasses.field(default=False, kw_only=True)
+    ignore_errors: bool = dataclasses.field(default=False, kw_only=True)
 
     def __repr__(self) -> str:
         return "<Catcher: function={!r}, logging={}, raise_exception={}, ignore_errors={}>".format(
@@ -57,9 +57,8 @@ class Catcher(typing.Generic[EventT]):
     ) -> Result[typing.Any, BaseException]:
         if self.match_exception(exception):
             logger.debug(
-                "Catcher {!r} caught an exception in handler {!r}, " "running catcher...".format(
-                    self.func.__name__,
-                    handler_name,
+                "Error handler caught an exception {!r} in handler {!r}, running catcher {!r}...".format(
+                    exception, handler_name, self.func.__name__
                 )
             )
             return Ok(
@@ -68,7 +67,7 @@ class Catcher(typing.Generic[EventT]):
                     **magic_bundle(self.func, {"event": event, "api": api} | ctx),  # type: ignore
                 )
             )
-        logger.debug("Failed to match exception {!r}!", exception.__class__.__name__)
+        logger.debug("Failed to match exception {!r}.", exception.__class__.__name__)
         return Error(exception)
 
     def match_exception(self, exception: BaseException) -> bool:
@@ -88,14 +87,11 @@ class ErrorHandler(ABCErrorHandler[EventT]):
         return (
             "<{}: exceptions_handled=[{}], catcher={!r}>".format(
                 self.__class__.__name__,
-                ", ".join(
-                    e.__name__ if isinstance(e, type) else repr(e)
-                    for e in self.catcher.exceptions
-                ),
+                ", ".join(e.__name__ if isinstance(e, type) else repr(e) for e in self.catcher.exceptions),
                 self.catcher,
             )
             if self.catcher is not None
-            else "<{}: No catcher>".format(self.__class__.__name__)
+            else "<{}()>".format(self.__class__.__name__)
         )
 
     def __call__(
@@ -133,6 +129,7 @@ class ErrorHandler(ABCErrorHandler[EventT]):
         ctx: Context,
     ) -> Result[typing.Any, BaseException]:
         assert self.catcher is not None
+        logger.debug("Processing the error handler for handler {!r}...", handler.__name__)
 
         try:
             return await self.catcher(handler, event, api, ctx)
@@ -172,7 +169,7 @@ class ErrorHandler(ABCErrorHandler[EventT]):
             case Ok(value) as ok:
                 if self.catcher.logging:
                     logger.debug(
-                        "Catcher {!r} returned a value: {!r}",
+                        "Catcher {!r} returned: {!r}",
                         self.catcher.func.__name__,
                         value,
                     )

telegrinder/tools/formatting/__init__.py

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

telegrinder/tools/formatting/html.py

@@ -1,3 +1,5 @@
+# NOTE: NEED REFACTORING
+
 import html
 import string
 import typing
@@ -13,7 +15,6 @@ 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
 
@@ -21,6 +22,12 @@ TAG_FORMAT = "<{tag}{data}>{content}</{tag}>"
 QUOT_MARK = '"'
 
 
+class StringFormatterProto(typing.Protocol):
+    def format_field(self, value: typing.Any, fmt: str) -> "HTMLFormatter": ...
+
+    def format(self, __string: str, *args: object, **kwargs: object) -> "HTMLFormatter": ...
+
+
 class StringFormatter(string.Formatter):
     """String formatter, using substitutions from args and kwargs.
     The substitutions are identified by braces ('{' and '}') with
@@ -107,7 +114,7 @@ class StringFormatter(string.Formatter):
 
 
 class FormatString(str):
-    string_formatter = StringFormatter()
+    STRING_FORMATTER: StringFormatterProto = StringFormatter()
 
     def __new__(cls, string: str) -> typing.Self:
         if isinstance(string, TagFormat):
@@ -131,7 +138,7 @@ class FormatString(str):
         return self.__str__()
 
     def format(self, *args: object, **kwargs: object) -> "HTMLFormatter":
-        return self.string_formatter.format(self, *args, **kwargs)
+        return self.STRING_FORMATTER.format(self, *args, **kwargs)
 
 
 class EscapedString(FormatString):
@@ -273,14 +280,6 @@ 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",
@@ -308,5 +307,4 @@ __all__ = (
     "strike",
     "tg_emoji",
     "underline",
-    "user_open_message",
 )

telegrinder/tools/formatting/links.py

@@ -28,10 +28,6 @@ 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",
@@ -39,5 +35,4 @@ __all__ = (
     "get_resolve_domain_link",
     "get_start_bot_link",
     "get_start_group_link",
-    "user_open_message_link",
 )

telegrinder/tools/formatting/spec_html_formats.py

@@ -13,7 +13,6 @@ SpecialFormat: typing.TypeAlias = typing.Union[
     "StartBotLink",
     "StartGroupLink",
     "TgEmoji",
-    "UserOpenMessage",
 ]
 
 
@@ -107,15 +106,6 @@ 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",
@@ -128,5 +118,4 @@ __all__ = (
     "StartBotLink",
     "StartGroupLink",
     "TgEmoji",
-    "UserOpenMessage",
 )

telegrinder/tools/global_context/abc.py

@@ -35,9 +35,7 @@ class GlobalCtxVar(typing.Generic[T]):
 
     @classmethod
     def collect(cls, name: str, ctx_value: T | CtxVariable[T]) -> typing.Self:
-        ctx_value = (
-            CtxVar(ctx_value) if not isinstance(ctx_value, CtxVar | GlobalCtxVar) else ctx_value
-        )
+        ctx_value = CtxVar(ctx_value) if not isinstance(ctx_value, CtxVar | GlobalCtxVar) else ctx_value
         params = ctx_value.__dict__
         params["name"] = name
         return cls(**params)

telegrinder/tools/global_context/global_context.py

@@ -84,7 +84,6 @@ def ctx_var(value: T, *, const: bool = False) -> T:
 @dataclasses.dataclass(frozen=True, eq=False)
 class RootAttr:
     name: str
-    _: dataclasses.KW_ONLY
     can_be_read: bool = dataclasses.field(default=True, kw_only=True)
     can_be_rewritten: bool = dataclasses.field(default=False, kw_only=True)
 
@@ -124,9 +123,7 @@ class Storage:
     order_default=True,
     field_specifiers=(ctx_var,),
 )
-class GlobalContext(
-    ABCGlobalContext, typing.Generic[CtxValueT], dict[str, GlobalCtxVar[CtxValueT]]
-):
+class GlobalContext(ABCGlobalContext, typing.Generic[CtxValueT], dict[str, GlobalCtxVar[CtxValueT]]):
     """GlobalContext.
 
     ```
@@ -315,10 +312,10 @@ class GlobalContext(
         var_value_type: type[T],
     ) -> Option[GlobalCtxVar[T]]: ...
 
-    def pop(self, var_name: str, var_value_type: type[T] = object) -> Option[GlobalCtxVar[T]]:
+    def pop(self, var_name: str, var_value_type=object):  # type: ignore
         """Pop context variable by name."""
 
-        val = self.get(var_name, var_value_type)
+        val = self.get(var_name, var_value_type)  # type: ignore
         if val:
             del self[var_name]
             return val
@@ -334,13 +331,10 @@ class GlobalContext(
         var_value_type: type[T],
     ) -> Option[GlobalCtxVar[T]]: ...
 
-    def get(
-        self,
-        var_name: str,
-        var_value_type: type[T] = object,
-    ) -> Option[GlobalCtxVar[T]]:
+    def get(self, var_name, var_value_type=object):  # type: ignore
         """Get context variable by name."""
 
+        var_value_type = typing.Any if var_value_type is object else type
         generic_types = typing.get_args(get_orig_class(self))
         if generic_types and var_value_type is object:
             var_value_type = generic_types[0]
@@ -369,11 +363,7 @@ class GlobalContext(
         var_value_type: type[T],
     ) -> Option[T]: ...
 
-    def get_value(
-        self,
-        var_name: str,
-        var_value_type: type[T] = object,
-    ) -> Option[T]:
+    def get_value(self, var_name, var_value_type=object):  # type: ignore
         """Get context variable value by name."""
 
         return self.get(var_name, var_value_type).map(lambda var: var.value)

telegrinder/tools/i18n/simple.py

@@ -29,9 +29,7 @@ class SimpleI18n(ABCI18n):
         return result
 
     def get_translator_by_locale(self, locale: str) -> "SimpleTranslator":
-        return SimpleTranslator(
-            locale, self.translators.get(locale, self.translators[self.default_locale])
-        )
+        return SimpleTranslator(locale, self.translators.get(locale, self.translators[self.default_locale]))
 
 
 class SimpleTranslator(ABCTranslator):

telegrinder/tools/kb_set/yaml.py

@@ -44,8 +44,7 @@ class KeyboardSetYAML(KeyboardSetBase):
                 or not isinstance(kb_config["buttons"], list)
             ):
                 raise KeyboardSetError(
-                    "Keyboard should be dict with field buttons which must be a list, "
-                    "check documentation."
+                    "Keyboard should be dict with field buttons which must be a list, " "check documentation."
                 )
 
             buttons = kb_config.pop("buttons")

telegrinder/tools/keyboard.py

@@ -5,7 +5,6 @@ from types import NoneType
 
 from fntypes.option import Nothing, Some
 
-from telegrinder.msgspec_utils import Option
 from telegrinder.types.objects import (
     InlineKeyboardMarkup,
     ReplyKeyboardMarkup,
@@ -18,12 +17,12 @@ DictStrAny: typing.TypeAlias = dict[str, typing.Any]
 AnyMarkup: typing.TypeAlias = InlineKeyboardMarkup | ReplyKeyboardMarkup
 
 
-@dataclasses.dataclass
+@dataclasses.dataclass(kw_only=True)
 class KeyboardModel:
-    resize_keyboard: bool | Option[bool]
-    one_time_keyboard: bool | Option[bool]
-    selective: bool | Option[bool]
-    is_persistent: bool | Option[bool]
+    resize_keyboard: bool
+    one_time_keyboard: bool
+    selective: bool
+    is_persistent: bool
     keyboard: list[list[DictStrAny]]
 
 
@@ -40,7 +39,7 @@ class ABCMarkup(ABC, typing.Generic[ButtonT]):
         pass
 
     @classmethod
-    def empty(cls) -> AnyMarkup:
+    def get_empty_markup(cls) -> AnyMarkup:
         return cls().get_markup()
 
     def add(self, row_or_button: RowButtons[ButtonT] | ButtonT) -> typing.Self:
@@ -102,7 +101,7 @@ class Keyboard(ABCMarkup[Button], KeyboardModel):
     def get_markup(self) -> ReplyKeyboardMarkup:
         return ReplyKeyboardMarkup(**self.dict())
 
-    def get_empty_markup(self, *, selective: bool = False) -> ReplyKeyboardRemove:
+    def keyboard_remove(self, *, selective: bool = False) -> ReplyKeyboardRemove:
         return ReplyKeyboardRemove(remove_keyboard=True, selective=Some(selective))
 
 

telegrinder/tools/limited_dict.py

@@ -27,7 +27,7 @@ class LimitedDict(UserDict[KT, VT]):
 
     def __setitem__(self, key: KT, value: VT, /) -> None:
         self.set(key, value)
-    
+
     def __delitem__(self, key: KT) -> None:
         if key in self.queue:
             self.queue.remove(key)

telegrinder/tools/loop_wrapper/loop_wrapper.py

@@ -48,7 +48,10 @@ class DelayedTask(typing.Generic[CoroFunc]):
             await asyncio.sleep(self.seconds)
             if self.is_cancelled:
                 break
-            await self.handler(*args, **kwargs)
+            try:
+                await self.handler(*args, **kwargs)
+            except Exception as e:
+                logger.exception("Error in delayed task: {}", str(e))
             if not self.repeat:
                 break
 
@@ -63,13 +66,11 @@ class Lifespan:
     shutdown_tasks: list[CoroutineTask[typing.Any]] = dataclasses.field(default_factory=lambda: [])
 
     def on_startup(self, task_or_func: Task) -> Task:
-        task_or_func = to_coroutine_task(task_or_func)
-        self.startup_tasks.append(task_or_func)
+        self.startup_tasks.append(to_coroutine_task(task_or_func))
         return task_or_func
 
     def on_shutdown(self, task_or_func: Task) -> Task:
-        task_or_func = to_coroutine_task(task_or_func)
-        self.shutdown_tasks.append(task_or_func)
+        self.shutdown_tasks.append(to_coroutine_task(task_or_func))
         return task_or_func
 
     def start(self, loop: asyncio.AbstractEventLoop) -> None:

telegrinder/tools/magic.py

@@ -8,8 +8,11 @@ if typing.TYPE_CHECKING:
 
     T = typing.TypeVar("T", bound=ABCRule)
 
+Impl: typing.TypeAlias = type[classmethod]
 FuncType: typing.TypeAlias = types.FunctionType | typing.Callable[..., typing.Any]
+
 TRANSLATIONS_KEY: typing.Final[str] = "_translations"
+IMPL_MARK: typing.Final[str] = "_is_impl"
 
 
 def resolve_arg_names(func: FuncType, start_idx: int = 1) -> tuple[str, ...]:
@@ -21,6 +24,14 @@ def get_default_args(func: FuncType) -> dict[str, typing.Any]:
     return dict(zip(fspec.args[::-1], (fspec.defaults or ())[::-1]))
 
 
+def get_annotations(func: FuncType) -> dict[str, typing.Any]:
+    return {
+        name: parameter.annotation
+        for name, parameter in inspect.signature(func).parameters.items()
+        if parameter.annotation is not inspect._empty
+    }
+
+
 def to_str(s: str | enum.Enum) -> str:
     if isinstance(s, enum.Enum):
         return str(s.value)
@@ -42,11 +53,8 @@ def magic_bundle(
     return args
 
 
-def get_cached_translation(rule: "T", locale: str) -> typing.Optional["T"]:
-    translations = getattr(rule, TRANSLATIONS_KEY, {})
-    if not translations or locale not in translations:
-        return None
-    return translations[locale]
+def get_cached_translation(rule: "T", locale: str) -> "T | None":
+    return getattr(rule, TRANSLATIONS_KEY, {}).get(locale)
 
 
 def cache_translation(base_rule: "T", locale: str, translated_rule: "T") -> None:
@@ -54,6 +62,18 @@ def cache_translation(base_rule: "T", locale: str, translated_rule: "T") -> None
     setattr(base_rule, TRANSLATIONS_KEY, {locale: translated_rule, **translations})
 
 
+def get_impls(cls: type[typing.Any]) -> list[typing.Callable[..., typing.Any]]:
+    functions = [func.__func__ for func in vars(cls).values() if isinstance(func, classmethod)]
+    return [impl for impl in functions if getattr(impl, IMPL_MARK, False) is True]
+
+
+@typing.cast(typing.Callable[..., Impl], lambda f: f)
+def impl(method: typing.Callable[..., typing.Any]):
+    bound_method = classmethod(method)
+    setattr(method, IMPL_MARK, True)
+    return bound_method
+
+
 __all__ = (
     "TRANSLATIONS_KEY",
     "cache_translation",
@@ -61,6 +81,8 @@ __all__ = (
     "get_default_args",
     "get_default_args",
     "magic_bundle",
+    "impl",
     "resolve_arg_names",
     "to_str",
+    "get_annotations",
 )

telegrinder/types/__init__.py

@@ -136,6 +136,9 @@ __all__ = (
     "InputMediaPhoto",
     "InputMediaVideo",
     "InputMessageContent",
+    "InputPaidMedia",
+    "InputPaidMediaPhoto",
+    "InputPaidMediaVideo",
     "InputPollOption",
     "InputSticker",
     "InputTextMessageContent",
@@ -171,6 +174,11 @@ __all__ = (
     "MessageReactionUpdated",
     "Model",
     "OrderInfo",
+    "PaidMedia",
+    "PaidMediaInfo",
+    "PaidMediaPhoto",
+    "PaidMediaPreview",
+    "PaidMediaVideo",
     "PassportData",
     "PassportElementError",
     "PassportElementErrorDataField",
@@ -198,15 +206,22 @@ __all__ = (
     "ReactionTypeCustomEmoji",
     "ReactionTypeEmoji",
     "ReactionTypeType",
+    "RefundedPayment",
     "ReplyKeyboardMarkup",
     "ReplyKeyboardRemove",
     "ReplyParameters",
     "ResponseParameters",
+    "RevenueWithdrawalState",
+    "RevenueWithdrawalStateFailed",
+    "RevenueWithdrawalStatePending",
+    "RevenueWithdrawalStateSucceeded",
     "SentWebAppMessage",
     "SharedUser",
     "ShippingAddress",
     "ShippingOption",
     "ShippingQuery",
+    "StarTransaction",
+    "StarTransactions",
     "Sticker",
     "StickerFormat",
     "StickerSet",
@@ -217,6 +232,11 @@ __all__ = (
     "SwitchInlineQueryChosenChat",
     "TextQuote",
     "TopicIconColor",
+    "TransactionPartner",
+    "TransactionPartnerFragment",
+    "TransactionPartnerOther",
+    "TransactionPartnerTelegramAds",
+    "TransactionPartnerUser",
     "Update",
     "UpdateType",
     "User",