xync-client 0.0.127__tar.gz → 0.0.130__tar.gz

{xync_client-0.0.127/xync_client.egg-info → xync_client-0.0.130}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.127
+Version: 0.0.130
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -14,7 +14,7 @@ Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pypng
-Requires-Dist: kurigram<2.2.10
+Requires-Dist: kurigram
 Requires-Dist: payeer-api
 Requires-Dist: playwright
 Requires-Dist: python-dotenv

{xync_client-0.0.127 → xync_client-0.0.130}/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "pyotp",
     "pypng",
 #    "kurigram @ git+https://github.com/mixartemev/pyrogram.git",
-    "kurigram<2.2.10",
+    "kurigram",
     "payeer-api",
     "playwright",
     "python-dotenv",

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client/Bybit/InAgent.py

@@ -5,10 +5,11 @@ from datetime import datetime, timezone
 from uuid import uuid4
 
 import websockets
-from asyncio import run
+from asyncio import run, sleep
 from decimal import Decimal
 
 from playwright.async_api import async_playwright
+from pydantic import ValidationError
 from pyro_client.client.file import FileClient
 from tortoise.transactions import in_transaction
 
@@ -78,7 +79,10 @@ class InAgentClient(BaseInAgentClient):
                         case "OTC_ORDER_STATUS":
                             match data["type"]:
                                 case "STATUS_CHANGE":
-                                    upd = StatusChange.model_validate(data["data"])
+                                    try:
+                                        upd = StatusChange.model_validate(data["data"])
+                                    except ValidationError as e:
+                                        logging.error(e)
                                     order = self.agent_client.api.get_order_details(orderId=upd.id)
                                     order = OrderFull.model_validate(order["result"])
                                     order_db = await models.Order.get_or_none(
@@ -114,12 +118,32 @@ class InAgentClient(BaseInAgentClient):
                                                     dict(
                                                         amount=int(float(order.amount) * 100),
                                                         accepted_at=datetime.now(timezone.utc),
+                                                        order=order_db,
                                                     ),
-                                                    order=order_db,
                                                     # pm_id=order_db.cred.pmcur.pm_id,
                                                     pmid=tid,
                                                 )
-                                                if not is_new:
+
+                                                if not is_new:  # если по этому платежу уже отпущен другая продажа
+                                                    continue
+
+                                                # если висят незавершенные продажи с такой же суммой
+                                                pos = (await self.agent_client.get_orders_active(1))["result"]["items"]
+                                                if [
+                                                    o
+                                                    for o in pos
+                                                    if (
+                                                        o["amount"] == order.amount
+                                                        and o["id"] != upd.id
+                                                        and int(order.createDate) < int(o["createDate"]) + 3600 * 000
+                                                    )
+                                                ]:
+                                                    await self.agent_client.ex_client.bot.send(
+                                                        f"[Duplicate amount!]"
+                                                        f"(https://www.bybit.com/ru-RU/p2p/orderList/{order.id})",
+                                                        self.agent_client.actor.person.user.username_id,
+                                                    )
+                                                    logging.warning("Duplicate amount!")
                                                     continue
 
                                                 # !!! ОТПРАВЛЯЕМ ДЕНЬГИ !!!
@@ -195,8 +219,8 @@ class InAgentClient(BaseInAgentClient):
                                             msg, _ = await models.Msg.update_or_create(
                                                 {
                                                     "to_maker": upd.userId == self.agent_client.actor.exid and im_taker,
+                                                    "sent_at": datetime.fromtimestamp(float(upd.createDate) / 1000),
                                                 },
-                                                sent_at=datetime.fromtimestamp(float(upd.createDate) / 1000),
                                                 txt=upd.message,
                                                 order=order_db,
                                             )
@@ -292,7 +316,10 @@ class InAgentClient(BaseInAgentClient):
             )
             # проверяем не отправляли ли мы уже перевод по этому ордеру
             if t := await models.Transfer.get_or_none(order=order_db, amount=order_db.amount):
-                await pma.bot.send(f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {dest} #{t.pmid}!")
+                await pma.bot.send(
+                    f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {dest} #{t.pmid}!",
+                    self.agent_client.actor.person.user.username_id,
+                )
                 raise Exception(f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {dest} #{t.pmid}!")
 
             # ставим в бд статус "оплачен"
@@ -307,12 +334,22 @@ class InAgentClient(BaseInAgentClient):
                 order=order_db,
                 pmid=tid,
             )
-            # отправляем продавцу чек
-            if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{dest}.png").get("result"):
+            await self.send_receipt(str(order_db.exid), tid)  # отправляем продавцу чек
+            logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
+
+    async def send_receipt(self, oexid: str, tid: int) -> tuple[PmAgentClient | None, models.CredEx] | None:
+        try:
+            if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{tid}.png").get("result"):
+                await sleep(0.5)
                 self.agent_client.api.send_chat_message(
-                    orderId=str(order_db.exid), contentType="pic", message=res["url"], msgUuid=uuid4().hex
+                    orderId=oexid, contentType="pic", message=res["url"], msgUuid=uuid4().hex
                 )
-            logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
+        except Exception as e:
+            logging.error(e)
+        await sleep(0.5)
+        self.agent_client.api.send_chat_message(
+            orderId=oexid, contentType="str", message=f"#{tid}", msgUuid=uuid4().hex
+        )
 
     async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient | None, models.CredEx] | None:
         cdxs = await models.CredEx.filter(
@@ -360,13 +397,17 @@ async def main():
     )
 
     async with FileClient(TOKEN) as b:
+        b: FileClient
         cl: InAgentClient = actor.in_client(b)
         # await cl.agent_client.export_my_ads()
         payeer_cl = Client(actor.person.user.username_id)
         for pma in actor.person.user.pm_agents:
             cl.pmacs[pma.pm_id] = await payeer_cl.start(await async_playwright().start(), False)
-
-        _ = await cl.start_listen()
+        try:
+            _ = await cl.start_listen()
+        except Exception as e:
+            await b.send("😱Bybit InAgent CRASHED!!!😱", actor.person.user.username_id)
+            await b.send(e.__repr__(), actor.person.user.username_id)
         await cl.agent_client.close()
 
 

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client/Bybit/agent.py

@@ -393,8 +393,10 @@ class AgentClient(BaseAgentClient):  # Bybit client
             },
         )
 
-    def get_orders_active(self, begin_time: int, end_time: int, status: int, side: int, token_id: str):
-        return self._post(
+    async def get_orders_active(
+        self, side: int = None, status: int = None, begin_time: int = None, end_time: int = None, token_id: str = None
+    ):
+        return await self._post(
             "/fiat/otc/order/pending/simplifyList",
             {
                 "status": status,
@@ -664,7 +666,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 volume = asset.free * 10**-coinex.scale
             volume = str(round(volume, coinex.scale))
 
-            ads: list[Ad] = await self.ads(coinex, curex, taker_side, pmexs)
+            try:
+                ads: list[Ad] = await self.ads(coinex, curex, taker_side, pmexs)
+            except Exception:
+                await sleep(1)
+                ads: list[Ad] = await self.ads(coinex, curex, taker_side, pmexs)
+
             if race.vm_filter:
                 ads = [ad for ad in ads if "VA" in ad.authTag]
             self.overprice_filter(ads, race.ceil * 10**-curex.scale, k)  # обрезаем сверху все ads дороже нашего потолка
@@ -755,12 +762,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                         raise e
                 elif ExcCode(e.status_code) == ExcCode.InsufficientBalance:
                     asset = await models.Asset.get(addr__actor=self.actor, addr__coin_id=coinex.coin_id)
-                    req.quantity = str(
-                        round(
-                            asset.free * 10**-coinex.scale,
-                            coinex.coin.scale or coinex.scale,
-                        )
-                    )
+                    req.quantity = str(round(asset.free * 10**-coinex.scale, coinex.scale))
                     _res = self.ad_upd(req)
                 elif ExcCode(e.status_code) == ExcCode.RareLimit:
                     sad = [
@@ -1184,94 +1186,81 @@ async def main():
     actor = (
         await models.Actor.filter(ex_id=4, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
-    async with FileClient(TOKEN) as b:
-        b: FileClient
-        # b.add_handler(MessageHandler(cond_start_handler, command("cond")))
-        cl: AgentClient = actor.client(b)
-
-        # await cl.ex_client.set_pairs()
-        # await cl.ex_client.set_pms()
-        # await cl.set_creds()
-        # await cl.export_my_ads()
-
-        # создание гонок по мои активным объявам:
-        # for ma in cl.my_ads():
-        #     my_ad = await models.MyAd.get(ad__exid=ma.id).prefetch_related('ad__pms', 'ad__pair_side__pair')
-        #     race, _ = await models.Race.update_or_create(
-        #         {"started": True, "vm_filter": True, "target_place": 5},
-        #         road=my_ad
-        #     )
-
-        # for name in names:
-        #     s, _ = await models.Synonym.update_or_create(typ=SynonymType.name, txt=name)
-        #     await s.curs.add(rub.cur)
-
-        # пока порешали рейс-кондишн, очищаем сиротские условия при каждом запуске
-        # [await c.delete() for c in await Cond.filter(ads__isnull=True)]
-        cl.all_conds = {
-            c.id: (c.raw_txt, {a.maker.exid for a in c.ads}) for c in await Cond.all().prefetch_related("ads__maker")
-        }
-        for curr, old in await CondSim.filter().values_list("cond_id", "cond_rel_id"):
-            cl.cond_sims[curr] = old
-            cl.rcond_sims[old] |= {curr}
-
-        cl.build_tree()
-        a = set()
-
-        def check_tree(tre):
-            for p, c in tre.items():
-                a.add(p)
-                check_tree(c)
-
-        for pr, ch in cl.tree.items():
-            check_tree(ch)
-        if ct := set(cl.tree.keys()) & a:
-            logging.exception(f"cycle cids: {ct}")
-
-        # await cl.get_api_orders(43, 1741294800000, 1749157199999)
-
-        races = await models.Race.filter(started=True).prefetch_related(
-            "road__ad__pair_side__pair__cur",
-            "road__ad__pms",
-        )
-        tasks = [asyncio.create_task(cl.racing(race), name=f"Rc{race.id}") for race in races]
-        # await cl.actual_cond()
+    filebot = FileClient(TOKEN)
+    await filebot.start()
+    # b.add_handler(MessageHandler(cond_start_handler, command("cond")))
+    cl: AgentClient = actor.client(filebot)
+
+    # await cl.ex_client.set_pairs()
+    # await cl.ex_client.set_pms()
+    # await cl.set_creds()
+    # await cl.export_my_ads()
+
+    # создание гонок по мои активным объявам:
+    # for ma in cl.my_ads():
+    #     my_ad = await models.MyAd.get(ad__exid=ma.id).prefetch_related('ad__pms', 'ad__pair_side__pair')
+    #     race, _ = await models.Race.update_or_create(
+    #         {"started": True, "vm_filter": True, "target_place": 5},
+    #         road=my_ad
+    #     )
+
+    # for name in names:
+    #     s, _ = await models.Synonym.update_or_create(typ=SynonymType.name, txt=name)
+    #     await s.curs.add(rub.cur)
+
+    # пока порешали рейс-кондишн, очищаем сиротские условия при каждом запуске
+    # [await c.delete() for c in await Cond.filter(ads__isnull=True)]
+    cl.all_conds = {
+        c.id: (c.raw_txt, {a.maker.exid for a in c.ads}) for c in await Cond.all().prefetch_related("ads__maker")
+    }
+    for curr, old in await CondSim.filter().values_list("cond_id", "cond_rel_id"):
+        cl.cond_sims[curr] = old
+        cl.rcond_sims[old] |= {curr}
+
+    cl.build_tree()
+    a = set()
+
+    def check_tree(tre):
+        for p, c in tre.items():
+            a.add(p)
+            check_tree(c)
+
+    for pr, ch in cl.tree.items():
+        check_tree(ch)
+    if ct := set(cl.tree.keys()) & a:
+        logging.exception(f"cycle cids: {ct}")
+
+    # await cl.get_api_orders(43, 1741294800000, 1749157199999)
+
+    races = await models.Race.filter(started=True).prefetch_related(
+        "road__ad__pair_side__pair__cur",
+        "road__ad__pms",
+    )
+    tasks = [asyncio.create_task(cl.racing(race), name=f"Rc{race.id}") for race in races]
+    # await cl.actual_cond()
+    try:
         await gather(
             *tasks
             # cl.get_api_orders(),  # 10, 1738357200000, 1742504399999
-            # cl.racing(usdt, rub, False, ["volet"], 83.88),  # гонка в стакане покупки - мы продаем
-            # cl.racing(usdt, rub, True, ["volet"], 81.51),  # гонка в стакане продажи - мы покупаем
-            # cl.racing(usdt, rub, False, ["payeer"], 81.49),  # гонка в стакане покупки - мы продаем
-            # cl.racing(usdt, rub, True, ["payeer"], 80.7),  # гонка в стакане продажи - мы покупаем
-            # cl.racing(eth, rub, False, ["volet"], 300_000),
-            # cl.racing(eth, rub, True, ["volet"], 296_000),
-            # cl.racing(eth, rub, False, ["payeer"], 300_000),
-            # cl.racing(eth, rub, True, ["payeer"], 296_000),
-            # cl.racing(btc, rub, False, ["volet"], 9_800_000),
-            # cl.racing(btc, rub, True, ["volet"], 9_700_000),
-            # cl.racing(btc, rub, False, ["payeer"], 9_800_000),
-            # cl.racing(btc, rub, True, ["payeer"], 9_700_000),
-            # cl.racing(usdc, rub, False, ["volet"], 80.98),
-            # cl.racing(usdc, rub, True, ["volet"], 80.01),
-            # cl.racing(usdc, rub, False, ["payeer"], 80.98),
-            # cl.racing(usdc, rub, True, ["payeer"], 80.01),
-            # cl.parse_ads(usdt, rub, False, ceil=81, volume=360),
-            # cl.parse_ads(usdt, rub, True, ceil=80, volume=360),
         )
-
-        # bor = BaseOrderReq(
-        #     ad_id="1861440060199632896",
-        #     # asset_amount=40,
-        #     fiat_amount=3000,
-        #     amount_is_fiat=True,
-        #     is_sell=False,
-        #     cur_exid=rub.exid,
-        #     coin_exid=usdt.exid,
-        #     coin_scale=usdt.coin.scale,
-        # )
-        # res: OrderResp = await cl.order_request(bor)
-        # await cl.cancel_order(res.orderId)
-        await cl.close()
+    except Exception as e:
+        await filebot.send("🤬Bybit agent CRASHED!!!🤬", actor.person.user.username_id)
+        await filebot.send(e.__repr__(), actor.person.user.username_id)
+        raise e
+    # bor = BaseOrderReq(
+    #     ad_id="1861440060199632896",
+    #     # asset_amount=40,
+    #     fiat_amount=3000,
+    #     amount_is_fiat=True,
+    #     is_sell=False,
+    #     cur_exid=rub.exid,
+    #     coin_exid=usdt.exid,
+    #     coin_scale=usdt.coin.scale,
+    # )
+    # res: OrderResp = await cl.order_request(bor)
+    # await cl.cancel_order(res.orderId)
+    await filebot.stop()
+    await cl.close()
 
 
 if __name__ == "__main__":

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client/Bybit/etype/order.py

@@ -297,11 +297,11 @@ class _BaseChange(BaseModel):
     userId: int
     makerUserId: int
     id: str
-    status: StatusApi
     createDate: int
     side: int
     appealedTimes: int
     totalAppealedTimes: int
+    status: StatusApi = None
 
 
 class StatusChange(_BaseChange):

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client/Pms/Payeer/__init__.py

@@ -82,7 +82,7 @@ class Client(PmAgentClient):
                 await page.click(f".history-id-{trans_num} a.link")
                 sleep(1)
                 receipt = await page.query_selector(".ui-dialog.ui-corner-all")
-                return trans_num, await receipt.screenshot(path=f"tmp/{dest}.png"), int(has_amount - amount)
+                return trans_num, await receipt.screenshot(path=f"tmp/{trans_num}.png"), int(has_amount - amount)
             else:
                 await self.bot.send("Payeer хз", self.uid, photo=await self.page.screenshot())
                 return -1

xync_client-0.0.130/xync_client/details.py

@@ -0,0 +1,27 @@
+import asyncio
+from xync_client.loader import TORM
+from x_model import init_db
+from xync_schema import models
+import re
+from typing import List, Dict
+
+phrases = ["дай(те)?", "номер", "рек(и|визиты)", "карту", "банк(и|а)?", "куда", "(на )?как(ой|ую)", "актуал"]
+
+
+async def request_for_details(phrases_to_find) -> List[Dict[str, str]]:
+    _ = await init_db(TORM, True)
+    msgs = await models.Msg.all().values("txt")
+    patterns = [re.compile(rf"\b{phrase}\b", re.IGNORECASE) for phrase in phrases_to_find]
+    results = []
+    for msg in msgs:
+        if not msg["txt"]:
+            continue
+        for pattern in patterns:
+            if pattern.search(msg["txt"]):
+                results.append({pattern.pattern: msg["txt"]})
+
+    return results
+
+
+if __name__ == "__main__":
+    asyncio.run(request_for_details(phrases))

{xync_client-0.0.127 → xync_client-0.0.130/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.127
+Version: 0.0.130
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -14,7 +14,7 @@ Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pypng
-Requires-Dist: kurigram<2.2.10
+Requires-Dist: kurigram
 Requires-Dist: payeer-api
 Requires-Dist: playwright
 Requires-Dist: python-dotenv

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ tests/_todo_refact/Gate/test_gate.py
 tests/_todo_refact/Wallet/test_agent.py
 tests/_todo_refact/Wallet/test_ex.py
 xync_client/__init__.py
+xync_client/details.py
 xync_client/loader.py
 xync_client/pm_unifier.py
 xync_client.egg-info/PKG-INFO

{xync_client-0.0.127 → xync_client-0.0.130}/xync_client.egg-info/requires.txt

@@ -7,7 +7,7 @@ python-binance
 pybit
 pyotp
 pypng
-kurigram<2.2.10
+kurigram
 payeer-api
 playwright
 python-dotenv