pyrogram-client 0.0.8.dev1__tar.gz → 0.0.11.dev0__tar.gz

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/.pre-commit-config.yaml

@@ -23,7 +23,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   ### Ruff version.
-  rev: v0.12.4
+  rev: v0.15.5
   hooks:
     ### Run the linter.
     - id: ruff

{pyrogram_client-0.0.8.dev1/pyrogram_client.egg-info → pyrogram_client-0.0.11.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev1
+Version: 0.0.11.dev0
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/pyro-client
 Project-URL: Repository, https://gitlab.com/XyncNet/pyro-client

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/pyro_client/client/base.py

@@ -1,13 +1,19 @@
 import asyncio
-from collections import OrderedDict
 from io import BytesIO
 from typing import Literal
 
 from pyrogram import Client
 from pyrogram.errors import AuthKeyUnregistered, Unauthorized
-from pyrogram.filters import chat, contact, AndFilter
+from pyrogram.filters import chat, contact
 from pyrogram.handlers import MessageHandler
-from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardMarkup, KeyboardButton
+from pyrogram.types import (
+    Message,
+    InlineKeyboardMarkup,
+    InlineKeyboardButton,
+    ReplyKeyboardMarkup,
+    KeyboardButton,
+    ReplyKeyboardRemove,
+)
 from x_auth.models import Session, App, Username
 
 from pyro_client.storage import PgStorage
@@ -42,7 +48,10 @@ class BaseClient(Client):
             self.api_id = app.id
             self.api_hash = app.hsh
             # await session.fetch_related("api")
-        self.storage.session = session
+        else:
+            self.storage.session = session
+            self.api_id = session.api.id
+            self.api_hash = session.api.hsh
 
     async def start(self, use_qr: bool = False, except_ids: list[int] = None):
         if not self.is_connected:
@@ -78,33 +87,29 @@ class BaseClient(Client):
         else:
             return await self.send_message(uid, txt, reply_markup=ikm)
 
-    async def wait_from(self, uid: int, topic: str, past: int = 0, timeout: int = 10) -> str | None:
+    def subscribe_for(self, uid: int, topic: str) -> tuple[MessageHandler, int]:
         fltr = chat(uid)
         if topic == "phone":
             fltr &= contact
-        handler = MessageHandler(self.got_msg, fltr)
-        # handler, g = self.add_handler(handler, 1)
-        g = 0
-        if g not in self.dispatcher.groups:
-            self.dispatcher.groups[g] = []
-            self.dispatcher.groups = OrderedDict(sorted(self.dispatcher.groups.items()))
-        self.dispatcher.groups[g].append(handler)
         self.storage.session.state |= {uid: {"waiting_for": topic}}
-        #
+        return self.add_handler(MessageHandler(self.got_msg, fltr))
+
+    async def wait_from(
+        self, uid: int, topic: str, hg: tuple[MessageHandler, int], past: int = 0, timeout: int = 10
+    ) -> str | None:
         while past < timeout:
             if txt := self.storage.session.state.get(uid, {}).pop(topic, None):
-                # self.remove_handler(handler)
-                self.dispatcher.groups[g].remove(handler)
-                #
+                self.remove_handler(*hg)
                 return txt
-            await asyncio.sleep(1)
-            past += 1
-        return self.remove_handler(handler, g)
+            await asyncio.sleep(2)
+            past += 2
+        return self.remove_handler(*hg)
 
     async def got_msg(self, _, msg: Message):
         if tpc := self.storage.session.state.get(msg.from_user.id, {}).pop("waiting_for", None):
-            self.storage.session.state[msg.from_user.id][tpc] = msg.contact.phone_number if tpc == "phone" else msg.text
-
-    def rm_handler(self, uid: int):
-        for gi, grp in self.dispatcher.groups.items():
-            [self.remove_handler(h, gi) for h in grp if isinstance(h.filters, AndFilter) and uid in h.filters.base]
+            if tpc == "phone":
+                res = msg.contact.phone_number
+                await msg.reply("Thanks👌", reply_markup=ReplyKeyboardRemove())
+            else:
+                res = msg.text
+            self.storage.session.state[msg.from_user.id] = {tpc: res}

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/pyro_client/client/bot.py

@@ -18,7 +18,8 @@ class BotClient(BaseClient):
         super().__init__(bid, bot_token=bt or None)
 
     async def wait_auth_from(self, uid: int, topic: AuthTopic, past: int = 0, timeout: int = 60) -> str:
-        return await super().wait_from(uid, topic, past, timeout)
+        hg = self.subscribe_for(uid, topic)
+        return await super().wait_from(uid, topic, hg, past, timeout)
 
 
 async def main():

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/pyro_client/client/file.py

@@ -1,5 +1,9 @@
+import logging
 from io import BytesIO
+from x_model import init_db
+from pyro_client.loader import TORM
 
+from aiohttp import ClientSession
 from pyrogram.raw.functions.messages import UploadMedia
 from pyrogram.raw.functions.upload import GetFile
 from pyrogram.raw.types import (
@@ -13,6 +17,8 @@ from pyrogram.raw.types import (
 )
 from pyrogram.raw.types.upload import File
 from pyrogram.types import Message
+from xync_schema import models
+from xync_schema.enums import FileType
 
 from pyro_client.client.bot import BotClient
 
@@ -24,8 +30,8 @@ class FileClient(BotClient):
 
     @staticmethod
     def ref_dec(full_ref: bytes) -> tuple[int, int, bytes]:
-        pid, ah = int.from_bytes(full_ref[:8], "big"), int.from_bytes(full_ref[8:16], "big", signed=True)
-        return pid, ah, full_ref[16:]
+        pid, access_hash = int.from_bytes(full_ref[:8], "big"), int.from_bytes(full_ref[8:16], "big", signed=True)
+        return pid, access_hash, full_ref[16:]
 
     async def save_doc(self, byts: bytes, ctype: str) -> tuple[MessageMediaDocument, bytes]:
         in_file = await self.save_file(BytesIO(byts))
@@ -44,8 +50,8 @@ class FileClient(BotClient):
         return upp, self.ref_enc(upp.photo.id, upp.photo.access_hash, upp.photo.file_reference)
 
     async def get_doc(self, fid: bytes) -> File:
-        pid, ah, ref = self.ref_dec(fid)
-        loc = InputDocumentFileLocation(id=pid, access_hash=ah, file_reference=ref, thumb_size="x")
+        pid, access_hash, ref = self.ref_dec(fid)
+        loc = InputDocumentFileLocation(id=pid, access_hash=access_hash, file_reference=ref, thumb_size="x")
         return await self.invoke(GetFile(location=loc, offset=0, limit=512 * 1024))
 
     async def get_photo(self, fid: bytes, st: str) -> File:
@@ -56,3 +62,29 @@ class FileClient(BotClient):
     async def bot_got_msg(self, _, msg: Message):
         if state := self.storage.session.state.pop("bot", None):
             self.storage.session.state[state] = msg.text
+
+
+async def main():
+    cn = await init_db(TORM)
+
+    logging.basicConfig(level=logging.INFO)
+
+    bc: FileClient = FileClient(6806432376)
+    # bc1: BotClient = BotClient(TOKEN)
+    await bc.start()
+    ss = ClientSession()
+    url = "https://xync.net/images/logo.png"
+    if (resp := await ss.get(url)).ok:
+        byts = await resp.read()
+        upf, ref = await bc.save_doc(byts, resp.content_type)
+        typ = FileType[resp.content_type.split("/")[-1].split("+")[0]]
+        file, _ = await models.File.update_or_create({"ref": ref, "size": len(byts), "typ": typ}, name=url, using_db=cn)
+        return file
+    # await bc1.start()
+    return await bc.stop()
+
+
+if __name__ == "__main__":
+    from asyncio import run
+
+    run(main())

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/pyro_client/client/user.py

@@ -98,7 +98,7 @@ class UserClient(BaseClient):
             user = await Username[self.storage.session.id]
             if not (user.phone and (phone := str(user.phone))):
                 phone = await self.ask_for("phone", "Phone plz")
-                user.phone = phone
+                user.phone = phone and int(phone[1:] if phone.startswith("+") else phone)
                 await user.save()
             self.phone_number = phone
             if (dc := self.get_dc()) != 2:
@@ -175,11 +175,14 @@ async def main():
     # await models.Proxy.load_list(WSToken)
     # session = await models.Session.filter(is_bot__isnull=True).order_by("-date").prefetch_related("proxy").first()
     bc: BotClient = BotClient(6806432376)
-    uc: UserClient = UserClient(7314099964, bc)
+    uc: UserClient = UserClient(193017646, bc)
     # try:
     await uc.start()
     # b = await uc.resolve_peer('xyncnetbot')
     await uc.send("/start", bc.me.username)
+
+    hg = uc.subscribe_for(1038938370, "code")
+    await uc.wait_from(1038938370, "code", hg)
     # except Exception as e:
     #     print(e.MESSAGE)
     #     await uc.send(e.MESSAGE)

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0}/pyro_client/storage.py

@@ -14,6 +14,8 @@ def get_input_peer(peer_id: int, access_hash: int, peer_type: PeerType):
         return raw.types.InputPeerChat(chat_id=-peer_id)
     if peer_type in [PeerType.channel, PeerType.supergroup]:
         return raw.types.InputPeerChannel(channel_id=utils.get_channel_id(peer_id), access_hash=access_hash)
+    if peer_type in [PeerType.forum]:
+        return raw.types.InputPeerChannel(channel_id=utils.get_channel_id(peer_id), access_hash=access_hash)
     raise ValueError(f"Invalid peer type: {peer_type.name}")
 
 

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.11.dev0/pyrogram_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev1
+Version: 0.0.11.dev0
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/pyro-client
 Project-URL: Repository, https://gitlab.com/XyncNet/pyro-client