pyroherd 0.2.2__tar.gz → 0.2.4__tar.gz

{pyroherd-0.2.2 → pyroherd-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyroherd
-Version: 0.2.2
+Version: 0.2.4
 Summary: Elegant, modern and asynchronous Telegram MTProto API framework in Python for users and bots
 Home-page: https://github.com/SatrugnaFD
 Download-URL: https://github.com/SatrugnaFD/pyroherd/releases/latest

{pyroherd-0.2.2 → pyroherd-0.2.4}/pyroherd/__init__.py

@@ -16,7 +16,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with Pyroherd.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "0.2.2"
+__version__ = "0.2.4"
 __license__ = "GNU Lesser General Public License v3.0 (LGPL-3.0)"
 __copyright__ = "Copyright (C) 2023-present SatrugnaFD <https://github.com/SatrugnaFD>"
 

{pyroherd-0.2.2 → pyroherd-0.2.4}/pyroherd/methods/advanced/__init__.py

@@ -17,14 +17,12 @@
 #  along with Pyroherd.  If not, see <http://www.gnu.org/licenses/>.
 
 from .invoke import Invoke
-from .recover_gaps import RecoverGaps
 from .resolve_peer import ResolvePeer
 from .save_file import SaveFile
 
 
 class Advanced(
     Invoke,
-    RecoverGaps,
     ResolvePeer,
     SaveFile
 ):

{pyroherd-0.2.2 → pyroherd-0.2.4}/pyroherd/methods/advanced/invoke.py

@@ -17,29 +17,25 @@
 #  along with Pyroherd.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-from typing import TypeVar
 
 import pyroherd
 from pyroherd import raw
 from pyroherd.raw.core import TLObject
 from pyroherd.session import Session
+from pyroherd.methods.messages.business_session import get_session
 
 log = logging.getLogger(__name__)
 
-ReturnType = TypeVar('ReturnType')
-
 
 class Invoke:
     async def invoke(
         self: "pyroherd.Client",
-        query: TLObject[ReturnType],
+        query: TLObject,
         retries: int = Session.MAX_RETRIES,
         timeout: float = Session.WAIT_TIMEOUT,
         sleep_threshold: float = None,
-        retry_delay: float = Session.RETRY_DELAY,
-        recaptcha_token: str = None,
         business_connection_id: str = None
-    ) -> ReturnType:
+    ):
         """Invoke raw Telegram functions.
 
         This method makes it possible to manually call every single Telegram API method in a low-level manner.
@@ -58,21 +54,15 @@ class Invoke:
             query (``RawFunction``):
                 The API Schema function filled with proper arguments.
 
-            retries (``int``, *optional*):
+            retries (``int``):
                 Number of retries.
 
-            timeout (``float``, *optional*):
+            timeout (``float``):
                 Timeout in seconds.
 
-            sleep_threshold (``float``, *optional*):
+            sleep_threshold (``float``):
                 Sleep threshold in seconds.
 
-            retry_delay (``float``, *optional*):
-                Retry delay in seconds on errors.
-
-            recaptcha_token (``str``, *optional*):
-                ReCaptcha token.
-
             business_connection_id (``str``, *optional*):
                 Unique identifier of the business connection.
 
@@ -93,10 +83,7 @@ class Invoke:
                 query=query
             )
 
-            session = await self.get_session(business_connection_id=business_connection_id)
-
-        if recaptcha_token:
-            query = raw.functions.InvokeWithReCaptcha(token=recaptcha_token, query=query)
+            session = await get_session(self, business_connection_id)
 
         if self.no_updates:
             query = raw.functions.InvokeWithoutUpdates(query=query)
@@ -105,11 +92,10 @@ class Invoke:
             query = raw.functions.InvokeWithTakeout(takeout_id=self.takeout_id, query=query)
 
         r = await session.invoke(
-            query=query, retries=retries, timeout=timeout,
-            sleep_threshold=(
-                sleep_threshold if sleep_threshold is not None else self.sleep_threshold
-            ),
-            retry_delay=retry_delay
+            query, retries, timeout,
+            (sleep_threshold
+             if sleep_threshold is not None
+             else self.sleep_threshold)
         )
 
         await self.fetch_peers(getattr(r, "users", []))

pyroherd-0.2.4/pyroherd/methods/advanced/resolve_peer.py

@@ -0,0 +1,125 @@
+#  Pyroherd - Telegram MTProto API Client Library for Python
+#  Copyright (C) 2023-present SatrugnaFD <https://github.com/SatrugnaFD>
+#
+#  This file is part of Pyroherd.
+#
+#  Pyroherd is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Lesser General Public License as published
+#  by the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Pyroherd is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with Pyroherd.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import re
+from typing import Union
+
+import pyroherd
+from pyroherd import raw
+from pyroherd import utils
+from pyroherd.errors import PeerIdInvalid
+
+log = logging.getLogger(__name__)
+
+
+class ResolvePeer:
+    async def resolve_peer(
+        self: "pyroherd.Client",
+        peer_id: Union[int, str]
+    ) -> Union[raw.base.InputPeer, raw.base.InputUser, raw.base.InputChannel]:
+        """Get the InputPeer of a known peer id.
+        Useful whenever an InputPeer type is required.
+
+        .. note::
+
+            This is a utility method intended to be used **only** when working with raw
+            :obj:`functions <pyroherd.api.functions>` (i.e: a Telegram API method you wish to use which is not
+            available yet in the Client class as an easy-to-use method).
+
+        .. include:: /_includes/usable-by/users-bots.rst
+
+        Parameters:
+            peer_id (``int`` | ``str``):
+                The peer id you want to extract the InputPeer from.
+                Can be a direct id (int), a username (str) or a phone number (str).
+
+        Returns:
+            ``InputPeer``: On success, the resolved peer id is returned in form of an InputPeer object.
+
+        Raises:
+            KeyError: In case the peer doesn't exist in the internal database.
+        """
+        if not self.is_connected:
+            raise ConnectionError("Client has not been started yet")
+
+        try:
+            return await self.storage.get_peer_by_id(peer_id)
+        except KeyError:
+            if isinstance(peer_id, str):
+                if peer_id in ("self", "me"):
+                    return raw.types.InputPeerSelf()
+
+                peer_id = re.sub(r"[@+\s]", "", peer_id.lower())
+
+                try:
+                    int(peer_id)
+                except ValueError:
+                    try:
+                        return await self.storage.get_peer_by_username(peer_id)
+                    except KeyError:
+                        await self.invoke(
+                            raw.functions.contacts.ResolveUsername(
+                                username=peer_id
+                            )
+                        )
+
+                        return await self.storage.get_peer_by_username(peer_id)
+                else:
+                    try:
+                        return await self.storage.get_peer_by_phone_number(peer_id)
+                    except KeyError:
+                        raise PeerIdInvalid
+
+            peer_type = utils.get_peer_type(peer_id)
+
+            if peer_type == "user":
+                await self.fetch_peers(
+                    await self.invoke(
+                        raw.functions.users.GetUsers(
+                            id=[
+                                raw.types.InputUser(
+                                    user_id=peer_id,
+                                    access_hash=0
+                                )
+                            ]
+                        )
+                    )
+                )
+            elif peer_type == "chat":
+                await self.invoke(
+                    raw.functions.messages.GetChats(
+                        id=[-peer_id]
+                    )
+                )
+            else:
+                await self.invoke(
+                    raw.functions.channels.GetChannels(
+                        id=[
+                            raw.types.InputChannel(
+                                channel_id=utils.get_channel_id(peer_id),
+                                access_hash=0
+                            )
+                        ]
+                    )
+                )
+
+            try:
+                return await self.storage.get_peer_by_id(peer_id)
+            except KeyError:
+                raise PeerIdInvalid

{pyroherd-0.2.2 → pyroherd-0.2.4}/pyroherd/methods/advanced/save_file.py

@@ -144,7 +144,13 @@ class SaveFile:
             md5_sum = md5() if not is_big and not is_missing_part else None
             dc_id = await self.storage.dc_id()
 
-            session = await self.get_session(dc_id, is_media=True)
+            session = self.media_sessions.get(dc_id)
+            if not session:
+                session = self.media_sessions[dc_id] = Session(
+                    self, dc_id, await self.storage.auth_key(),
+                    await self.storage.test_mode(), is_media=True
+                )
+                await session.start()
 
             workers = [self.loop.create_task(worker(session)) for _ in range(workers_count)]
             queue = asyncio.Queue(1)

{pyroherd-0.2.2 → pyroherd-0.2.4}/pyroherd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyroherd
-Version: 0.2.2
+Version: 0.2.4
 Summary: Elegant, modern and asynchronous Telegram MTProto API framework in Python for users and bots
 Home-page: https://github.com/SatrugnaFD
 Download-URL: https://github.com/SatrugnaFD/pyroherd/releases/latest

pyroherd-0.2.2/pyroherd/methods/advanced/resolve_peer.py

@@ -1,153 +0,0 @@
-#  Pyroherd - Telegram MTProto API Client Library for Python
-#  Copyright (C) 2023-present SatrugnaFD <https://github.com/SatrugnaFD>
-#
-#  This file is part of Pyroherd.
-#
-#  Pyroherd is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU Lesser General Public License as published
-#  by the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Pyroherd is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with Pyroherd.  If not, see <http://www.gnu.org/licenses/>.
-
-import re
-from typing import Optional, Union
-
-import pyroherd
-from pyroherd import raw, utils
-from pyroherd.errors import PeerIdInvalid
-
-
-class ResolvePeer:
-    async def resolve_peer(
-        self: "pyroherd.Client",
-        peer_id: Union[int, str]
-    ) -> Optional["raw.base.InputPeer"]:
-        """Get the InputPeer of a known peer id. Useful whenever an InputPeer type is required.
-
-        .. note::
-
-            This is a utility method intended to be used **only** when working with raw
-            :obj:`functions <pyroherd.api.functions>` (i.e: a Telegram API method you wish to use which is not
-            available yet in the Client class as an easy-to-use method).
-
-        .. include:: /_includes/usable-by/users-bots.rst
-
-        Parameters:
-            peer_id (``int`` | ``str``):
-                The peer id you want to extract the InputPeer from.
-                Can be a direct id (int), a username (str), a link (str) or a phone number (str).
-
-        Returns:
-            :obj:`~pyroherd.raw.base.InputPeer`: On success, the resolved peer id is returned in form of an InputPeer object.
-
-        Raises:
-            KeyError: In case the peer doesn't exist in the internal database.
-        """
-        if not self.is_connected:
-            raise ConnectionError("Client has not been started yet")
-
-        if peer_id is None:
-            return None
-
-        if peer_id in ("self", "me"):
-            return raw.types.InputPeerSelf()
-
-        if peer_id == "empty":
-            return raw.types.InputPeerEmpty()
-
-        if isinstance(peer_id, int):
-            try:
-                return await self.storage.get_peer_by_id(peer_id)
-            except KeyError:
-                peer_type = utils.get_peer_type(peer_id)
-
-                if peer_type == "user":
-                    await self.fetch_peers(
-                        await self.invoke(
-                            raw.functions.users.GetUsers(
-                                id=[
-                                    raw.types.InputUser(
-                                        user_id=utils.get_raw_peer_id(peer_id),
-                                        access_hash=0
-                                    )
-                                ]
-                            )
-                        )
-                    )
-                elif peer_type == "chat":
-                    await self.invoke(
-                        raw.functions.messages.GetChats(
-                            id=[utils.get_raw_peer_id(peer_id)]
-                        )
-                    )
-                else:
-                    await self.invoke(
-                        raw.functions.channels.GetChannels(
-                            id=[
-                                raw.types.InputChannel(
-                                    channel_id=utils.get_raw_peer_id(peer_id),
-                                    access_hash=0
-                                )
-                            ]
-                        )
-                    )
-
-                try:
-                    return await self.storage.get_peer_by_id(peer_id)
-                except KeyError as e:
-                    raise PeerIdInvalid from e
-        elif isinstance(peer_id, str):
-            phone = re.sub(r'[+()\s-]', '', peer_id)
-
-            if phone.isdigit():
-                try:
-                    return await self.storage.get_peer_by_phone_number(phone)
-                except KeyError:
-                    r = await self.invoke(
-                        raw.functions.contacts.ResolvePhone(
-                            phone=phone
-                        )
-                    )
-
-                    return await self.storage.get_peer_by_id(utils.get_peer_id(r.peer))
-            else:
-                username = None
-                channel_id = None
-
-                match = self.CHANNEL_MESSAGE_LINK_RE.match(peer_id.lower())
-
-                if match:
-                    try:
-                        channel_id = utils.get_channel_id(int(match.group(1)))
-                    except ValueError:
-                        username = match.group(1)
-                else:
-                    username = re.sub(r"[@+\s]", "", peer_id.lower())
-
-                if channel_id:
-                    try:
-                        return await self.storage.get_peer_by_id(channel_id)
-                    except KeyError as e:
-                        raise PeerIdInvalid from e
-                elif username:
-                    try:
-                        return await self.storage.get_peer_by_username(username)
-                    except KeyError:
-                        r = await self.invoke(
-                            raw.functions.contacts.ResolveUsername(
-                                username=username
-                            )
-                        )
-
-                        return await self.storage.get_peer_by_id(utils.get_peer_id(r.peer))
-                else:
-                    raise PeerIdInvalid
-        else:
-            raise PeerIdInvalid