telegrinder 0.3.4__py3-none-any.whl → 0.4.0__py3-none-any.whl

telegrinder/api/token.py

@@ -1,36 +1,36 @@
-import pathlib
-import typing
-from functools import cached_property
-
-from envparse import env
-
-from .error import InvalidTokenError
-
-
-class Token(str):
-    def __new__(cls, token: str) -> typing.Self:
-        if token.count(":") != 1 or not token.split(":")[0].isdigit():
-            raise InvalidTokenError("Invalid token, it should look like this '123:ABC'.")
-        return super().__new__(cls, token)
-
-    def __repr__(self) -> str:
-        return f"<Token: {self.bot_id}:{''.join(self.split(':')[-1])[:6]}...>"
-
-    @classmethod
-    def from_env(
-        cls,
-        var_name: str = "BOT_TOKEN",
-        *,
-        is_read: bool = False,
-        path_to_envfile: str | pathlib.Path | None = None,
-    ) -> typing.Self:
-        if not is_read:
-            env.read_envfile(path_to_envfile)
-        return cls(env.str(var_name))
-
-    @cached_property
-    def bot_id(self) -> int:
-        return int(self.split(":")[0])
-
-
-__all__ = ("Token",)
+import pathlib
+import typing
+from functools import cached_property
+
+from envparse import env
+
+from .error import InvalidTokenError
+
+
+class Token(str):
+    def __new__(cls, token: str, /) -> typing.Self:
+        if token.count(":") != 1 or not token.split(":")[0].isdigit():
+            raise InvalidTokenError("Invalid token, it should look like this: 12345:ABCdef")
+        return super().__new__(cls, token)
+
+    def __repr__(self) -> str:
+        return f"<Token: {self.bot_id}:{''.join(self.split(':')[-1])[:6]}...>"
+
+    @classmethod
+    def from_env(
+        cls,
+        var_name: str = "BOT_TOKEN",
+        *,
+        is_read: bool = False,
+        path_to_envfile: str | pathlib.Path | None = None,
+    ) -> typing.Self:
+        if not is_read:
+            env.read_envfile(path_to_envfile)
+        return cls(env.str(var_name))
+
+    @cached_property
+    def bot_id(self) -> int:
+        return int(self.split(":")[0])
+
+
+__all__ = ("Token",)

telegrinder/bot/__init__.py

@@ -1,67 +1,70 @@
-from telegrinder.bot.bot import Telegrinder
-from telegrinder.bot.cute_types import (
-    BaseCute,
-    CallbackQueryCute,
-    ChatJoinRequestCute,
-    ChatMemberUpdatedCute,
-    InlineQueryCute,
-    MessageCute,
-    UpdateCute,
-)
-from telegrinder.bot.dispatch import (
-    CALLBACK_QUERY_FOR_MESSAGE,
-    CALLBACK_QUERY_FROM_CHAT,
-    CALLBACK_QUERY_IN_CHAT_FOR_MESSAGE,
-    MESSAGE_FROM_USER,
-    MESSAGE_FROM_USER_IN_CHAT,
-    MESSAGE_IN_CHAT,
-    ABCDispatch,
-    ABCHandler,
-    ABCMiddleware,
-    ABCReturnManager,
-    ABCStateView,
-    ABCView,
-    AudioReplyHandler,
-    BaseReturnManager,
-    BaseStateView,
-    BaseView,
-    CallbackQueryReturnManager,
-    CallbackQueryView,
-    ChatJoinRequestView,
-    ChatMemberView,
-    Context,
-    Dispatch,
-    DocumentReplyHandler,
-    FuncHandler,
-    Hasher,
-    InlineQueryReturnManager,
-    Manager,
-    MediaGroupReplyHandler,
-    MessageReplyHandler,
-    MessageReturnManager,
-    MessageView,
-    PhotoReplyHandler,
-    RawEventView,
-    ShortState,
-    StateViewHasher,
-    StickerReplyHandler,
-    VideoReplyHandler,
-    ViewBox,
-    WaiterMachine,
-    clear_wm_storage_worker,
-    register_manager,
-)
-from telegrinder.bot.polling import ABCPolling, Polling
-from telegrinder.bot.rules import (
-    ABCRule,
-    CallbackQueryRule,
-    ChatJoinRequestRule,
-    InlineQueryRule,
-    MessageRule,
-)
-from telegrinder.bot.scenario import ABCScenario, Checkbox, Choice
-
-__all__ = (
+from telegrinder.bot.bot import Telegrinder
+from telegrinder.bot.cute_types import (
+    BaseCute,
+    CallbackQueryCute,
+    ChatJoinRequestCute,
+    ChatMemberUpdatedCute,
+    InlineQueryCute,
+    MessageCute,
+    PreCheckoutQueryCute,
+    UpdateCute,
+)
+from telegrinder.bot.dispatch import (
+    CALLBACK_QUERY_FOR_MESSAGE,
+    CALLBACK_QUERY_FROM_CHAT,
+    CALLBACK_QUERY_IN_CHAT_FOR_MESSAGE,
+    MESSAGE_FROM_USER,
+    MESSAGE_FROM_USER_IN_CHAT,
+    MESSAGE_IN_CHAT,
+    ABCDispatch,
+    ABCHandler,
+    ABCMiddleware,
+    ABCReturnManager,
+    ABCStateView,
+    ABCView,
+    AudioReplyHandler,
+    BaseReturnManager,
+    BaseStateView,
+    BaseView,
+    CallbackQueryReturnManager,
+    CallbackQueryView,
+    ChatJoinRequestView,
+    ChatMemberView,
+    Context,
+    Dispatch,
+    DocumentReplyHandler,
+    FuncHandler,
+    Hasher,
+    InlineQueryReturnManager,
+    Manager,
+    MediaGroupReplyHandler,
+    MessageReplyHandler,
+    MessageReturnManager,
+    MessageView,
+    PhotoReplyHandler,
+    PreCheckoutQueryManager,
+    PreCheckoutQueryView,
+    RawEventView,
+    ShortState,
+    StateViewHasher,
+    StickerReplyHandler,
+    VideoReplyHandler,
+    ViewBox,
+    WaiterMachine,
+    clear_wm_storage_worker,
+    register_manager,
+)
+from telegrinder.bot.polling import ABCPolling, Polling
+from telegrinder.bot.rules import (
+    ABCRule,
+    CallbackQueryRule,
+    ChatJoinRequestRule,
+    InlineQueryRule,
+    MessageRule,
+)
+from telegrinder.bot.scenario import ABCScenario, Checkbox, Choice
+
+__all__ = (
     "ABCDispatch",
     "ABCHandler",
     "ABCMiddleware",
@@ -110,6 +113,9 @@ __all__ = (
     "MessageView",
     "PhotoReplyHandler",
     "Polling",
+    "PreCheckoutQueryCute",
+    "PreCheckoutQueryManager",
+    "PreCheckoutQueryView",
     "RawEventView",
     "ShortState",
     "StateViewHasher",
@@ -120,5 +126,5 @@ __all__ = (
     "ViewBox",
     "WaiterMachine",
     "clear_wm_storage_worker",
-    "register_manager",
-)
+    "register_manager",
+)

telegrinder/bot/bot.py

@@ -1,76 +1,83 @@
-import typing_extensions as typing
-
-from telegrinder.api.api import API
-from telegrinder.bot.dispatch.abc import ABCDispatch
-from telegrinder.bot.dispatch.dispatch import Dispatch
-from telegrinder.bot.polling.abc import ABCPolling
-from telegrinder.bot.polling.polling import Polling
-from telegrinder.modules import logger
-from telegrinder.tools.loop_wrapper import ABCLoopWrapper
-from telegrinder.tools.loop_wrapper.loop_wrapper import LoopWrapper
-
-DispatchT = typing.TypeVar("DispatchT", bound=ABCDispatch, default=Dispatch)
-PollingT = typing.TypeVar("PollingT", bound=ABCPolling, default=Polling)
-LoopWrapperT = typing.TypeVar("LoopWrapperT", bound=ABCLoopWrapper, default=LoopWrapper)
-
-
-class Telegrinder(typing.Generic[DispatchT, PollingT, LoopWrapperT]):
-    def __init__(
-        self,
-        api: API,
-        *,
-        polling: PollingT | None = None,
-        dispatch: DispatchT | None = None,
-        loop_wrapper: LoopWrapperT | None = None,
-    ) -> None:
-        self.api = api
-        self.dispatch = typing.cast(DispatchT, dispatch or Dispatch())
-        self.polling = typing.cast(PollingT, polling or Polling(api))
-        self.loop_wrapper = typing.cast(LoopWrapperT, loop_wrapper or LoopWrapper())
-
-    def __repr__(self) -> str:
-        return "<{}: api={!r}, dispatch={!r}, polling={!r}, loop_wrapper={!r}>".format(
-            self.__class__.__name__,
-            self.api,
-            self.dispatch,
-            self.polling,
-            self.loop_wrapper,
-        )
-
-    @property
-    def on(self) -> DispatchT:
-        return self.dispatch
-
-    async def reset_webhook(self) -> None:
-        if not (await self.api.get_webhook_info()).unwrap().url:
-            return
-        await self.api.delete_webhook()
-
-    async def run_polling(
-        self,
-        *,
-        offset: int = 0,
-        skip_updates: bool = False,
-    ) -> None:
-        if skip_updates:
-            logger.debug("Dropping pending updates")
-            await self.reset_webhook()
-            await self.api.delete_webhook(drop_pending_updates=True)
-        self.polling.offset = offset
-
-        async for updates in self.polling.listen():
-            for update in updates:
-                logger.debug(
-                    "Received update (update_id={}, update_type={!r})",
-                    update.update_id,
-                    update.update_type.name,
-                )
-                self.loop_wrapper.add_task(self.dispatch.feed(update, self.api))
-
-    def run_forever(self, *, offset: int = 0, skip_updates: bool = False) -> None:
-        logger.debug("Running blocking polling (id={})", self.api.id)
-        self.loop_wrapper.add_task(self.run_polling(offset=offset, skip_updates=skip_updates))
-        self.loop_wrapper.run_event_loop()
-
-
-__all__ = ("Telegrinder",)
+import typing_extensions as typing
+
+from telegrinder.api.api import API, HTTPClient
+from telegrinder.bot.dispatch import dispatch as dp
+from telegrinder.bot.dispatch.abc import ABCDispatch
+from telegrinder.bot.polling import polling as pg
+from telegrinder.bot.polling.abc import ABCPolling
+from telegrinder.modules import logger
+from telegrinder.tools.loop_wrapper import ABCLoopWrapper
+from telegrinder.tools.loop_wrapper import loop_wrapper as lw
+
+Dispatch = typing.TypeVar("Dispatch", bound=ABCDispatch, default=dp.Dispatch[HTTPClient])
+Polling = typing.TypeVar("Polling", bound=ABCPolling, default=pg.Polling[HTTPClient])
+LoopWrapper = typing.TypeVar("LoopWrapper", bound=ABCLoopWrapper, default=lw.LoopWrapper)
+
+
+class Telegrinder(typing.Generic[HTTPClient, Dispatch, Polling, LoopWrapper]):
+    def __init__(
+        self,
+        api: API[HTTPClient],
+        *,
+        dispatch: Dispatch | None = None,
+        polling: Polling | None = None,
+        loop_wrapper: LoopWrapper | None = None,
+    ) -> None:
+        self.api = api
+        self.dispatch = typing.cast(Dispatch, dispatch or dp.Dispatch())
+        self.polling = typing.cast(Polling, polling or pg.Polling(api))
+        self.loop_wrapper = typing.cast(LoopWrapper, loop_wrapper or lw.LoopWrapper())
+
+    def __repr__(self) -> str:
+        return "<{}: api={!r}, dispatch={!r}, polling={!r}, loop_wrapper={!r}>".format(
+            self.__class__.__name__,
+            self.api,
+            self.dispatch,
+            self.polling,
+            self.loop_wrapper,
+        )
+
+    @property
+    def on(self) -> Dispatch:
+        return self.dispatch
+
+    async def reset_webhook(self) -> None:
+        if not (await self.api.get_webhook_info()).unwrap().url:
+            return
+        await self.api.delete_webhook()
+
+    async def run_polling(
+        self,
+        *,
+        offset: int = 0,
+        skip_updates: bool = False,
+    ) -> typing.NoReturn:
+        async def polling() -> typing.NoReturn:
+            if skip_updates:
+                logger.debug("Dropping pending updates")
+                await self.reset_webhook()
+                await self.api.delete_webhook(drop_pending_updates=True)
+            self.polling.offset = offset
+
+            async for updates in self.polling.listen():
+                for update in updates:
+                    logger.debug(
+                        "Received update (update_id={}, update_type={!r})",
+                        update.update_id,
+                        update.update_type.name,
+                    )
+                    self.loop_wrapper.add_task(self.dispatch.feed(update, self.api))
+
+        if self.loop_wrapper.is_running:
+            await polling()
+        else:
+            self.loop_wrapper.add_task(polling())
+            self.loop_wrapper.run_event_loop()
+
+    def run_forever(self, *, offset: int = 0, skip_updates: bool = False) -> typing.NoReturn:
+        logger.debug("Running blocking polling (id={})", self.api.id)
+        self.loop_wrapper.add_task(self.run_polling(offset=offset, skip_updates=skip_updates))
+        self.loop_wrapper.run_event_loop()
+
+
+__all__ = ("Telegrinder",)

telegrinder/bot/cute_types/__init__.py

@@ -1,17 +1,19 @@
-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.bot.cute_types.update import UpdateCute
-
-__all__ = (
-    "BaseCute",
-    "CallbackQueryCute",
-    "ChatJoinRequestCute",
-    "ChatMemberUpdatedCute",
-    "InlineQueryCute",
-    "MessageCute",
-    "UpdateCute",
-)
+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.bot.cute_types.pre_checkout_query import PreCheckoutQueryCute
+from telegrinder.bot.cute_types.update import UpdateCute
+
+__all__ = (
+    "BaseCute",
+    "CallbackQueryCute",
+    "ChatJoinRequestCute",
+    "ChatMemberUpdatedCute",
+    "InlineQueryCute",
+    "MessageCute",
+    "PreCheckoutQueryCute",
+    "UpdateCute",
+)