Pytdbot 0.9.5.dev0__tar.gz → 0.9.6__tar.gz

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Pytdbot
-Version: 0.9.5.dev0
+Version: 0.9.6
 Summary: Easy-to-use asynchronous TDLib wrapper for Python.
 Home-page: https://github.com/pytdbot/client
 Author: AYMEN Mohammed
@@ -30,7 +30,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.50-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
+# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.52-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
 
 Pytdbot (Python TDLib) is an asynchronous [**TDLib**](https://github.com/tdlib/td) wrapper for **Telegram** users/bots written in **Python**.
 

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/Pytdbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Pytdbot
-Version: 0.9.5.dev0
+Version: 0.9.6
 Summary: Easy-to-use asynchronous TDLib wrapper for Python.
 Home-page: https://github.com/pytdbot/client
 Author: AYMEN Mohammed
@@ -30,7 +30,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.50-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
+# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.52-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
 
 Pytdbot (Python TDLib) is an asynchronous [**TDLib**](https://github.com/tdlib/td) wrapper for **Telegram** users/bots written in **Python**.
 

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/Pytdbot.egg-info/SOURCES.txt

@@ -23,14 +23,13 @@ pytdbot/methods/td_functions.py
 pytdbot/tdjson/__init__.py
 pytdbot/tdjson/tdjson.py
 pytdbot/types/__init__.py
+pytdbot/types/td_types.py
+pytdbot/types/bound_methods/__init__.py
+pytdbot/types/bound_methods/callback_query.py
+pytdbot/types/bound_methods/chatActions.py
+pytdbot/types/bound_methods/file.py
+pytdbot/types/bound_methods/message.py
 pytdbot/types/plugins/__init__.py
-pytdbot/types/td_types/__init__.py
-pytdbot/types/td_types/types.py
-pytdbot/types/td_types/bound_methods/__init__.py
-pytdbot/types/td_types/bound_methods/callback_query.py
-pytdbot/types/td_types/bound_methods/chatActions.py
-pytdbot/types/td_types/bound_methods/file.py
-pytdbot/types/td_types/bound_methods/message.py
 pytdbot/types/tdserver/__init__.py
 pytdbot/types/tdserver/schedule.py
 pytdbot/types/tdserver/stats.py

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/README.md

@@ -1,4 +1,4 @@
-# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.50-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
+# Pytdbot [![Version](https://img.shields.io/pypi/v/Pytdbot?style=flat&logo=pypi)](https://pypi.org/project/Pytdbot) [![TDLib version](https://img.shields.io/badge/TDLib-v1.8.52-blue?logo=telegram)](https://github.com/tdlib/td) [![Downloads](https://static.pepy.tech/personalized-badge/pytdbot?period=month&units=none&left_color=grey&right_color=brightgreen&left_text=Downloads)](https://pepy.tech/project/pytdbot) [![Telegram Chat](https://img.shields.io/badge/Pytdbot%20chat-blue?logo=telegram&label=Telegram)](https://t.me/pytdbotchat)
 
 Pytdbot (Python TDLib) is an asynchronous [**TDLib**](https://github.com/tdlib/td) wrapper for **Telegram** users/bots written in **Python**.
 

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/pytdbot/__init__.py

@@ -13,7 +13,7 @@ __all__ = [
     "Client",
 ]
 
-__version__ = "0.9.5.dev0"
+__version__ = "0.9.6"
 __copyright__ = "Copyright (c) 2022-2025 Pytdbot, AYMENJD"
 __license__ = "MIT License"
 

{pytdbot-0.9.5.dev0 → pytdbot-0.9.6}/pytdbot/client.py

@@ -7,7 +7,7 @@ from os.path import join as join_path
 from pathlib import Path
 from platform import python_implementation, python_version
 from threading import current_thread, main_thread
-from typing import Callable, Dict, Union
+from typing import Callable, Dict, Type, Union
 
 import aio_pika
 from deepdiff import DeepDiff
@@ -94,6 +94,9 @@ class Client(Decorators, Methods):
         workers (``int``, *optional*):
             Number of workers to handle updates. Default is ``5``. If set to ``None``, updates will be immediately handled instead of being queued, which can impact performance.
 
+        default_handlers_timeout (``float``, *optional*):
+            Default timeout for handlers. If set, each handler will be awaited with this timeout (ignored if ``timeout`` is set when registering handler). Default is ``None`` (no timeout)
+
         no_updates (``bool``, *optional*):
             Whether the client should handle updates or not. Applicable only when using [TDLib Server](https://github.com/pytdbot/tdlib-server). Default is ``False``
 
@@ -128,10 +131,14 @@ class Client(Decorators, Methods):
         loop: asyncio.AbstractEventLoop = None,
         options: dict = None,
         workers: int = 5,
+        queue_size: int = 1000,
+        default_handlers_timeout: float = None,
         no_updates: bool = False,
+        load_messages_before_reply: bool = False,
         td_verbosity: int = 2,
         td_log: LogStream = None,
         user_bot: bool = False,
+        server_ack: bool = True,
     ) -> None:
         self.__api_id = api_id
         self.__api_hash = api_hash
@@ -158,9 +165,13 @@ class Client(Decorators, Methods):
         self.use_message_database = use_message_database
         self.td_options = options
         self.workers = workers
+        self.queue_size = queue_size
+        self.default_handlers_timeout = default_handlers_timeout
         self.no_updates = no_updates
+        self.load_messages_before_reply = load_messages_before_reply
         self.queue = asyncio.Queue()
         self.user_bot = user_bot
+        self.server_ack = server_ack
         self.my_id = (
             get_bot_id_from_token(self.__token)
             if isinstance(self.__token, str)
@@ -179,6 +190,12 @@ class Client(Decorators, Methods):
         self.is_rabbitmq = True if rabbitmq_url else False
         self.options = {}
         self.allow_outgoing_message_types: tuple = (types.MessagePaymentRefunded,)
+        self.get_message_methods = {
+            "getmessage",
+            "getmessagelocally",
+            "getrepliedmessage",
+            "getcallbackquerymessage",
+        }  # TODO: improve this
 
         self._check_init_args()
 
@@ -240,13 +257,16 @@ class Client(Decorators, Methods):
         return await self.invoke({"@type": "getServerStats"})
 
     async def scheduleEvent(
-        self, data: dict, send_at: int
+        self, name: str, payload: str, send_at: int
     ) -> Union["pytdbot.types.ScheduledEvent", "pytdbot.types.Error"]:
         """Schedule an event
 
         Parameters:
-            data (:class:`dict`):
-                The event data to be scheduled
+            name (:class:`str`):
+                Event name
+
+            payload (:class:`str`):
+                The event payload to be scheduled
 
             send_at (:class:`int`):
                 Unix timestamp when the event should be sent
@@ -254,13 +274,20 @@ class Client(Decorators, Methods):
 
         self._check_rabbitmq()
 
-        if not isinstance(data, dict):
-            raise ValueError("data must be dict")
+        if not isinstance(name, str):
+            raise ValueError("name must be str")
+        if not isinstance(payload, str):
+            raise ValueError("payload must be str")
         if not isinstance(send_at, (int, float)):
             raise ValueError("send_at must be int")
 
         return await self.invoke(
-            {"@type": "scheduleEvent", "data": data, "send_at": send_at}
+            {
+                "@type": "scheduleEvent",
+                "name": name,
+                "payload": payload,
+                "send_at": send_at,
+            }
         )
 
     async def cancelScheduledEvent(
@@ -326,17 +353,18 @@ class Client(Decorators, Methods):
 
     def add_handler(
         self,
-        update_type: str,
+        update_type: Union[Type["pytdbot.types.Update"], str],
         func: Callable,
         filters: pytdbot.filters.Filter = None,
         position: int = None,
         inner_object: bool = False,
+        timeout: float = None,
         is_from_plugin: bool = False,
     ) -> None:
         r"""Add an update handler
 
         Parameters:
-            update_type (``str``):
+            update_type (``str`` || :class:`~pytdbot.types.Update`):
                 An update type
 
             func (``Callable``):
@@ -351,6 +379,9 @@ class Client(Decorators, Methods):
             inner_object (``bool``, *optional*):
                 Wether to pass an inner object of update or not; for example ``UpdateNewMessage.message``. Default is ``False``
 
+            timeout (``float``, *optional*):
+                Max execution time for the handler before it timeout. If ``None``, ``Client.default_handlers_timeout`` is preferred. Default is ``None``
+
             is_from_plugin (``bool``, *optional*):
                 Wether this handler is from a loaded plugin (this can help reloading plugin during runtime; for development only). Default is ``False``
 
@@ -359,23 +390,34 @@ class Client(Decorators, Methods):
         """
 
         if not isinstance(update_type, str):
-            raise TypeError("update_type must be str")
-        elif not isinstance(func, Callable):
+            if issubclass(update_type, types.Update):
+                update_type = update_type.getType()
+            else:
+                raise TypeError(
+                    "update_type must be str or subclass of pytdbot.types.Update"
+                )
+        if not isinstance(func, Callable):
             raise TypeError("func must be callable")
-        elif filters is not None and not isinstance(filters, Filter):
+        if filters is not None and not isinstance(filters, Filter):
             raise TypeError("filters must be instance of pytdbot.filters.Filter")
-        else:
-            handler = Handler(
-                func, update_type, filters, position, inner_object, is_from_plugin
-            )
 
-            if update_type not in self._handlers:
-                self._handlers[update_type] = []
+        handler = Handler(
+            func=func,
+            update_type=update_type,
+            filter=filters,
+            position=position,
+            inner_object=inner_object,
+            timeout=timeout,
+            is_from_plugin=is_from_plugin,
+        )
 
-            if isinstance(position, int):
-                self._handlers[update_type].insert(position, handler)
-            else:
-                self._handlers[update_type].append(handler)
+        if update_type not in self._handlers:
+            self._handlers[update_type] = []
+
+        if isinstance(position, int):
+            self._handlers[update_type].insert(position, handler)
+        else:
+            self._handlers[update_type].append(handler)
 
         self._update_handlers()
 
@@ -451,56 +493,78 @@ class Client(Decorators, Methods):
         """
 
         request = obj_to_dict(request)
-
         request["@extra"] = {"id": create_extra_id()}
-
-        future = self._create_request_future(request)
+        request_method = request["@type"].lower()
 
         if (
             self.logger.root.level >= DEBUG or self.logger.level >= DEBUG
         ):  # dumping all requests may create performance issues
             self.logger.debug(f"Sending: {dumps(request, indent=4)}")
 
-        is_chat_attempted_load = request["@type"].lower() == "getchat"
+        is_chat_attempted_load = request_method == "getchat"
+        is_message_attempted_load = request_method in self.get_message_methods
 
         while True:
             future = self._create_request_future(request)
             await self.__send(request)
             result = await future
 
-            if isinstance(result, types.Error):
-                if result.code == 400:
-                    if result.message.startswith(
-                        "Failed to parse JSON object as TDLib request:"
-                    ):
-                        raise ValueError(result.message)
+            if not isinstance(result, types.Error):
+                break
+
+            error_code = result.code
+            error_message = result.message
 
-                    if not is_chat_attempted_load and (
-                        result.message == "Chat not found" and "chat_id" in request
-                    ):
-                        is_chat_attempted_load = True
+            if error_message.startswith(
+                "Failed to parse JSON object as TDLib request:"
+            ):
+                raise ValueError(error_message)
+
+            if error_code != 400:
+                break
+
+            chat_id = request.get("chat_id")
+            message_id = request.get("message_id")
+
+            if not is_message_attempted_load and (
+                error_message == "Message not found" and (chat_id and message_id)
+            ):
+                is_message_attempted_load = True
 
-                        chat_id = request["chat_id"]
+                self.logger.debug(f"Attempt to load message {message_id} in {chat_id}")
 
-                        self.logger.debug(f"Attempt to load chat {chat_id}")
+                message = await self.getMessage(chat_id=chat_id, message_id=message_id)
+                if message:
+                    self.logger.debug(f"Message {message_id} in {chat_id} is loaded")
+                    continue
+                else:
+                    self.logger.debug(
+                        f"Failed to load message {message_id} in {chat_id}"
+                    )
 
-                        load_chat = await self.getChat(chat_id)
+            if not is_chat_attempted_load and (
+                error_message == "Chat not found" and chat_id
+            ):
+                is_chat_attempted_load = True
 
-                        if not isinstance(load_chat, types.Error):
-                            self.logger.debug(f"Chat {chat_id} is loaded")
+                self.logger.debug(f"Attempt to load chat {chat_id}")
 
-                            reply_to_message_id = (request.get("reply_to") or {}).get(
-                                "message_id", 0
-                            )
+                chat = await self.getChat(chat_id)
+                if not isinstance(chat, types.Error):
+                    self.logger.debug(f"Chat {chat_id} is loaded")
 
-                            # if the request is a reply to another message
-                            # load the replied message to avoid "Message not found"
-                            if reply_to_message_id > 0:
-                                await self.getMessage(chat_id, reply_to_message_id)
+                    reply_to_message_id = (request.get("reply_to") or {}).get(
+                        "message_id", 0
+                    )
 
-                            continue
+                    # if the request is a reply to another message
+                    # load the replied message to avoid "Message not found"
+                    if reply_to_message_id > 0:
+                        await self.getMessage(chat_id, reply_to_message_id)
 
-                        self.logger.error(f"Couldn't load chat {chat_id}")
+                    continue
+                else:
+                    self.logger.error(f"Couldn't load chat {chat_id}")
 
             break
 
@@ -701,12 +765,13 @@ class Client(Decorators, Methods):
             for handler in handlers_to_load:
                 if asyncio.iscoroutinefunction(handler.func):
                     self.add_handler(
-                        handler.update_type,
-                        handler.func,
-                        handler.filter,
-                        handler.position,
-                        handler.inner_object,
-                        True,
+                        update_type=handler.update_type,
+                        func=handler.func,
+                        filters=handler.filter,
+                        position=handler.position,
+                        inner_object=handler.inner_object,
+                        timeout=handler.timeout,
+                        is_from_plugin=True,
                     )
                     handlers += 1
                     plugin_handlers_count += 1
@@ -785,7 +850,22 @@ class Client(Decorators, Methods):
                     elif not filter_function(self, handler_value):
                         continue
 
-                await initializer(self, handler_value)
+                if (
+                    self.default_handlers_timeout is None
+                    and initializer.timeout is None
+                ):
+                    await initializer(self, handler_value)
+                else:
+                    timeout = initializer.timeout or self.default_handlers_timeout
+                    try:
+                        await asyncio.wait_for(
+                            initializer(self, handler_value),
+                            timeout=timeout,
+                        )
+                    except asyncio.TimeoutError:
+                        self.logger.warning(
+                            f"Initializer {initializer} timed out after {timeout} seconds"
+                        )
             except StopHandlers as e:
                 raise e
             except Exception:
@@ -806,7 +886,18 @@ class Client(Decorators, Methods):
                     elif not filter_function(self, handler_value):
                         continue
 
-                await handler(self, handler_value)
+                if self.default_handlers_timeout is None and handler.timeout is None:
+                    await handler(self, handler_value)
+                else:
+                    timeout = handler.timeout or self.default_handlers_timeout
+                    try:
+                        await asyncio.wait_for(
+                            handler(self, handler_value), timeout=timeout
+                        )
+                    except asyncio.TimeoutError:
+                        self.logger.warning(
+                            f"Handler {handler} timed out after {timeout} seconds"
+                        )
             except StopHandlers as e:
                 raise e
             except Exception:
@@ -828,7 +919,19 @@ class Client(Decorators, Methods):
                     elif not filter_function(self, handler_value):
                         continue
 
-                await finalizer(self, handler_value)
+                if self.default_handlers_timeout is None and finalizer.timeout is None:
+                    await finalizer(self, handler_value)
+                else:
+                    try:
+                        timeout = finalizer.timeout or self.default_handlers_timeout
+                        await asyncio.wait_for(
+                            finalizer(self, handler_value),
+                            timeout=timeout,
+                        )
+                    except asyncio.TimeoutError:
+                        self.logger.warning(
+                            f"Finalizer {finalizer} timed out after {timeout} seconds"
+                        )
             except StopHandlers as e:
                 raise e
             except Exception:
@@ -869,6 +972,9 @@ class Client(Decorators, Methods):
             `AuthorizationError`
         """
 
+        if self.is_rabbitmq:
+            return
+
         if isinstance(self.__database_encryption_key, str):
             self.__database_encryption_key = self.__database_encryption_key.encode(
                 "utf-8"
@@ -1060,13 +1166,22 @@ class Client(Decorators, Methods):
         await self.__rqueues["notify"].consume(self.__on_update, no_ack=True)
 
     async def __rabbitmq_iterator(self):
-        async with self.__rqueues["updates"].iterator() as iterator:
+        async with self.__rqueues["updates"].iterator(
+            no_ack=not self.server_ack
+        ) as iterator:
             async for message in iterator:
-                await self.queue.put(message)
+                if self.queue.qsize() > self.queue_size:
+                    await message.nack(requeue=True)
+                    continue
+
+                self.queue.put_nowait(message)
 
     async def __rabbitmq_worker(self):
         while self.is_running:
-            message: aio_pika.IncomingMessage = await self.queue.get()
+            try:
+                message: aio_pika.IncomingMessage = self.queue.get_nowait()
+            except asyncio.QueueEmpty:
+                message: aio_pika.IncomingMessage = await self.queue.get()
 
             try:
                 update = json_loads(message.body)
@@ -1103,7 +1218,8 @@ class Client(Decorators, Methods):
 
     async def __handle_authorization_state_wait_phone_number(self):
         if (
-            self.authorization_state != "authorizationStateWaitPhoneNumber"
+            self.is_rabbitmq
+            or self.authorization_state != "authorizationStateWaitPhoneNumber"
             or not self.__token
         ):
             return