pyrogram-client 0.0.6__tar.gz → 0.0.8__tar.gz

{pyrogram_client-0.0.6 → pyrogram_client-0.0.8}/.pre-commit-config.yaml

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

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

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

@@ -41,17 +41,18 @@ 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):
         if not self.is_connected:
             await self.preload()
             try:
-                await super().start(use_qr=use_qr, except_ids=except_ids or [])
+                return await super().start(use_qr=use_qr, except_ids=except_ids or [])
             except (AuthKeyUnregistered, Unauthorized) as e:
                 await self.storage.session.delete()
                 raise e
+        return self
 
     async def send(
         self,

{pyrogram_client-0.0.6 → pyrogram_client-0.0.8}/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):
@@ -21,17 +22,17 @@ class BotClient(BaseClient):
 
 
 async def main():
-    from x_auth import models
     from x_model import init_db
+    from pyro_client.loader import TORM
 
-    from pyro_client.loader import PG_DSN
+    _ = await init_db(TORM, True)
 
-    _ = await init_db(PG_DSN, models, 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.8/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.6 → pyrogram_client-0.0.8}/pyro_client/client/user.py

@@ -50,7 +50,7 @@ class UserClient(BaseClient):
         # self.proxy: Proxy = self.storage.session.proxy and self.storage.session.proxy.dict()
 
     async def start(self, use_qr: bool = False, except_ids: list[int] = None):
-        if not self.bot.is_connected:
+        if self.bot and not self.bot.is_connected:
             await self.bot.start()
         await super().start(use_qr, except_ids)
         # await self.send("/start", self.bot.uid)
@@ -84,7 +84,7 @@ class UserClient(BaseClient):
                 return v
         return 2
 
-    async def authorize(self, sent_code: SentCode = None) -> User:
+    async def authorize(self, sent_code: SentCode = None) -> User | None:
         sent_code_desc = {
             enums.SentCodeType.APP: "Telegram app",
             enums.SentCodeType.SMS: "SMS",
@@ -134,8 +134,8 @@ class UserClient(BaseClient):
                         except BadRequest as e:
                             await self.send(e.MESSAGE)
                             self.password = None
-            else:
-                raise Exception("User does not sent code")
+                else:
+                    raise Exception("User does not sent code")
             if isinstance(signed_in, User):
                 await self.send("✅")
                 await self.storage.save()
@@ -143,6 +143,7 @@ class UserClient(BaseClient):
 
             if not signed_in:
                 await self.receive("No registered such phone number")
+        return None
 
     async def session_update(self, dc: int):
         await self.session.stop()
@@ -164,12 +165,10 @@ class UserClient(BaseClient):
 
 
 async def main():
-    from x_auth import models
     from x_model import init_db
+    from pyro_client.loader import TORM
 
-    from pyro_client.loader import PG_DSN
-
-    _ = await init_db(PG_DSN, models, True)
+    _ = await init_db(TORM, True)
 
     logging.basicConfig(level=logging.INFO)
 

{pyrogram_client-0.0.6 → pyrogram_client-0.0.8}/pyro_client/loader.py

@@ -1,11 +1,19 @@
 from dotenv import load_dotenv
 from os import getenv as env
 
+from x_auth import models
+
 load_dotenv()
 
 API_ID = env("API_ID")
 API_HASH = env("API_HASH")
-PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'xyncdbs')}:" \
+PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'dbs')}:" \
          f"{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
+TORM = {
+    "connections": {"default": PG_DSN},
+    "apps": {"models": {"models": [models]}},
+    "use_tz": False,
+    "timezone": "UTC",
+}
 TOKEN = env("TOKEN")
 WSToken = env("WST")

{pyrogram_client-0.0.6 → pyrogram_client-0.0.8}/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):
@@ -136,3 +136,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.6 → pyrogram_client-0.0.8/pyrogram_client.egg-info}/PKG-INFO

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