pyrogram-client 0.0.8.dev0__tar.gz → 0.0.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev0
+Version: 0.0.9
 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.dev0 → pyrogram_client-0.0.9}/pyro_client/client/base.py

@@ -1,11 +1,10 @@
 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 x_auth.models import Session, App, Username
@@ -41,7 +40,7 @@ class BaseClient(Client):
             session = await Session.create(id=self.uid, api=app, user=username, is_bot=bt)
             self.api_id = app.id
             self.api_hash = app.hsh
-            await session.fetch_related("api")
+            # await session.fetch_related("api")
         self.storage.session = session
 
     async def start(self, use_qr: bool = False, except_ids: list[int] = None):
@@ -78,33 +77,26 @@ 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]
+            self.storage.session.state[msg.from_user.id] = {
+                tpc: msg.contact.phone_number if tpc == "phone" else msg.text
+            }

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

@@ -1,5 +1,6 @@
+import logging
+
 from pyro_client.client.base import BaseClient, AuthTopic
-from pyro_client.loader import TOKEN
 
 
 class BotClient(BaseClient):
@@ -26,10 +27,12 @@ async def main():
 
     _ = await init_db(TORM, True)
 
+    logging.basicConfig(level=logging.INFO)
+
     bc: BotClient = BotClient(6806432376)
-    bc1: BotClient = BotClient(TOKEN)
+    # bc1: BotClient = BotClient(TOKEN)
     await bc.start()
-    await bc1.start()
+    # await bc1.start()
     await bc.stop()
 
 

pyrogram_client-0.0.9/pyro_client/client/filler.py

@@ -0,0 +1,157 @@
+import re
+from enum import IntEnum
+from inspect import isclass
+from typing import Coroutine
+
+from pyrogram.filters import chat, private
+from pyrogram.handlers import CallbackQueryHandler, MessageHandler
+from pyrogram.types import (
+    Message,
+    User,
+    ReplyKeyboardMarkup,
+    CallbackQuery,
+    KeyboardButton,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
+)
+from xync_schema import models
+from xync_schema.enums import SynonymType, Party, Slip, AbuserType, NameType
+
+from pyro_client.client.file import FileClient
+
+
+async def cbank(txt: str) -> list[tuple[int, str]]:
+    return await models.Pm.filter(norm__startswith=txt[0], bank=True).values_list("id", "norm")
+
+
+async def cppo(txt: str) -> list[tuple[int, str]]:
+    opts = re.findall(r"\d+", txt) or [1, 2, 3, 5, 10]
+    return [(o, str(o)) for o in opts]
+
+
+async def btns(typ: SynonymType.__class__, txt: str = None) -> InlineKeyboardMarkup | None:
+    if lst := synopts[typ]:
+        if isinstance(lst, list):
+            kb = [[InlineKeyboardButton(n, f"st:{typ.name}:{i}")] for i, n in enumerate(lst)]
+        elif isclass(lst) and issubclass(lst, IntEnum):
+            kb = [[InlineKeyboardButton(i.name, f"st:{typ.name}:{i.value}")] for i in lst]
+        else:
+            kb = [[InlineKeyboardButton(n, f"st:{typ.name}:{i}")] for i, n in await lst(txt)]
+        return InlineKeyboardMarkup(kb)
+    else:
+        return lst
+
+
+def get_val(typ: SynonymType.__class__, val: str) -> tuple[SynonymType | int | bool, str]:
+    if isinstance(val, str) and val.isnumeric():
+        val = int(val)
+    if isclass(lst := synopts[typ]) and issubclass(lst, IntEnum):
+        return (v := lst(val)), v.name
+    elif isinstance(lst, list):
+        return val, lst[val]
+    return val, val
+
+
+synopts: dict[SynonymType, list[str] | IntEnum | None | Coroutine] = {
+    SynonymType.name: ["not_slavic", "slavic"],
+    SynonymType.ppo: cppo,
+    SynonymType.from_party: Party,
+    SynonymType.to_party: Party,
+    SynonymType.slip_req: Slip,
+    SynonymType.slip_send: Slip,
+    SynonymType.abuser: AbuserType,
+    SynonymType.scale: ["1", "10", "100", "1000"],
+    SynonymType.slavic: NameType,
+    SynonymType.mtl_like: None,
+    SynonymType.bank: cbank,
+    SynonymType.bank_side: ["except", "only"],
+}
+
+
+class FillerClient(FileClient): ...
+
+
+async def cond_start_handler(bot: FillerClient, msg: Message, *args, **kwargs):
+    me: User = msg.from_user
+    cond = await models.Cond.filter(parsed__isnull=True).order_by("-created_at").first().prefetch_related("parsed")
+    rm = ReplyKeyboardMarkup(
+        [
+            [KeyboardButton("ppo"), KeyboardButton("abuser")],
+            [KeyboardButton("from_party"), KeyboardButton("to_party")],
+            [KeyboardButton("slip_send"), KeyboardButton("slip_req")],
+            [KeyboardButton("name"), KeyboardButton("slavic")],
+            [KeyboardButton("scale"), KeyboardButton("mtl_like")],
+            [KeyboardButton("bank"), KeyboardButton("bank_side")],
+        ]
+    )
+    bot.add_handler(MessageHandler(got_synonym, chat(me.id) & private))
+    bot.storage.session.state |= {me.id: {"synonym": {"id": cond.id}}}
+
+    return await msg.reply_text(await wrap_cond(cond.raw_txt), reply_markup=rm)
+
+
+async def wrap_cond(txt: str):
+    rs = {syn.txt: f'`{syn.txt}`||{syn.typ.name}="{syn.val}"||' for syn in await models.Synonym.all() if syn.txt in txt}
+    [txt := txt.replace(o, n) for o, n in rs.items()]
+    return txt
+
+
+async def got_synonym(bot: FillerClient, msg: Message):
+    if not (msg.text in {st.name for st in SynonymType} and (typ := SynonymType[msg.text])):
+        return await msg.reply_text(
+            f'Нет раздела "{msg.text}", не пиши текст сам, выдели кусок из моего сообщения,'
+            f"ответь на него, выбери кнопку раздела"
+        )
+    if not msg.quote:
+        return await msg.reply_text(f"Вы забыли выделить кусок текста для {msg.text}")
+    me: User = msg.from_user
+    ((state, cidd),) = bot.storage.session.state.get(me.id, {None: {}}).items()
+    if state == "synonym":
+        if typ := SynonymType[msg.text]:
+            bot.storage.session.state[me.id][state] |= {typ: msg.quote.text}
+            # bot.rm_handler(me.id)
+            await models.Synonym.update_or_create({"typ": typ}, txt=msg.quote.text)
+            bot.add_handler(CallbackQueryHandler(got_synonym_val, chat(me.id) & private))
+            if rm := await btns(typ, msg.quote.text):
+                return await msg.reply_text("Уточните", reply_to_message_id=msg.id, reply_markup=rm)
+            return await syn_result(bot, msg, f"st:{typ.name}:1")
+    elif state:
+        ...
+    return await msg.reply_text("Не туда попал")
+
+
+async def got_synonym_val(bot: FillerClient, cbq: CallbackQuery):
+    return await syn_result(bot, cbq.message, cbq.data)
+
+
+async def syn_result(bot: FillerClient, msg: Message, data: str):
+    t, st, sv = data.split(":")
+    if t == "st":
+        typ = SynonymType[st]
+        cid = bot.storage.session.state[msg.chat.id]["synonym"]["id"]
+        txt = bot.storage.session.state[msg.chat.id]["synonym"][typ]
+        val, hval = get_val(typ, sv)
+        syn, _ = await models.Synonym.update_or_create({"val": val}, typ=typ, txt=txt)
+        await models.CondParsed.update_or_create({typ.name: val}, cond_id=cid)
+        await msg.reply_text(
+            f'Текст "{txt}" определен как синоним для `{typ.name}` со значением {hval}',
+            reply_markup=InlineKeyboardMarkup(
+                [
+                    [
+                        InlineKeyboardButton("Готово! Давай новый", f"cond:complete:{cid}"),
+                        # , InlineKeyboardButton('Хватит! Я устал', f'cond:complete:{cid}')
+                    ]
+                ]
+            ),
+        )
+        await wrap_cond(await models.Cond.get(id=cid).values_list("raw_txt", flat=True))
+        # await bot.edit_message_text(bot.me.id, msg.reply_to_message.reply_to_message_id, wrapped_txt)
+        await msg.reply_to_message.delete()
+        await msg.delete()
+        await msg.delete()
+
+    elif t == "cond":
+        await models.CondParsed.update_or_create({"parsed": True}, cond_id=int(sv))
+        await cond_start_handler(bot, msg)
+    else:
+        await msg.reply_text("Где я?")

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

@@ -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.dev0 → pyrogram_client-0.0.9}/pyro_client/storage.py

@@ -4,7 +4,7 @@ from typing import Any
 from pyrogram import raw, utils
 from pyrogram.storage import Storage
 from x_auth.enums import PeerType
-from x_auth.models import Username, Version, Session, Peer, UpdateState
+from x_auth.models import Username, Version, Session, Peer, UpdateState, Dc
 
 
 def get_input_peer(peer_id: int, access_hash: int, peer_type: PeerType):
@@ -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}")
 
 
@@ -136,3 +138,13 @@ class PgStorage(Storage):
             return ver.number
         else:
             await Version.update_or_create(id=value)
+
+    async def server_address(self, value: str = ...) -> str:
+        if value is ...:
+            dc = await Dc[await self.dc_id()]
+            return dc.ip
+        dc = await Dc.get(ip=value)
+        await self.dc_id(dc.id)
+
+    async def port(self, value: int = 443) -> int:
+        return value

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev0
+Version: 0.0.9
 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.dev0 → pyrogram_client-0.0.9}/pyrogram_client.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ pyro_client/client/base.py
 pyro_client/client/bot.py
 pyro_client/client/dc.json
 pyro_client/client/file.py
+pyro_client/client/filler.py
 pyro_client/client/user.py
 pyrogram_client.egg-info/PKG-INFO
 pyrogram_client.egg-info/SOURCES.txt