xync-client 0.0.57.dev11__tar.gz → 0.0.57.dev13__tar.gz

{xync_client-0.0.57.dev11/xync_client.egg-info → xync_client-0.0.57.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev11
+Version: 0.0.57.dev13
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.57.dev11 → xync_client-0.0.57.dev13}/xync_client/Bybit/agent.py

@@ -12,6 +12,7 @@ from asyncpg import ConnectionDoesNotExistError
 from bybit_p2p import P2P
 from bybit_p2p._exceptions import FailedRequestError
 from pyro_client.client.file import FileClient
+from tortoise.exceptions import IntegrityError
 from tortoise.expressions import F, Q
 from urllib3.exceptions import ReadTimeoutError
 from x_model import init_db
@@ -383,11 +384,17 @@ class AgentClient(BaseAgentClient):  # Bybit client
         )
 
     async def get_api_orders(
-        self, begin_time: int = None, end_time: int = None, status: int = None, side: int = None, token_id: str = None
+        self,
+        page: int = 1,
+        begin_time: int = None,
+        end_time: int = None,
+        status: int = None,
+        side: int = None,
+        token_id: str = None,
     ):
         try:
             lst = self.api.get_orders(
-                page=1,
+                page=page,
                 size=30,
                 # status=status,  # 50 - завершено
                 # tokenId=token_id,
@@ -397,43 +404,62 @@ class AgentClient(BaseAgentClient):  # Bybit client
             )
         except FailedRequestError as e:
             if e.status_code == 10000:
-                await sleep(1, await self.get_api_orders(begin_time, end_time, status, side, token_id))
+                await sleep(1, await self.get_api_orders(page, begin_time, end_time, status, side, token_id))
         ords = {int(o["id"]): OrderItem.model_validate(o) for o in lst["result"]["items"]}
         for oid, o in ords.items():
             fo = self.api.get_order_details(orderId=oid)
             order = OrderFull.model_validate(fo["result"])
+            await sleep(0.5)
             ad = Ad(**self.api.get_ad_details(itemId=order.itemId)["result"])
             maker_name = o.buyerRealName, o.sellerRealName  # ad.side
             im_maker = order.makerUserId == o.userId
             taker_id = (o.userId, o.targetUserId)[int(im_maker)]
             taker_nick = (self.actor.name, o.targetNickName)[int(im_maker)]
-            ad_db, cond_isnew = await self.cond_upsert(ad, maker_name[ad.side])
+            ad_db, cond_isnew = await self.cond_upsert(ad, maker_name[ad.side], force=True)
             if not ad_db:
                 ...
-            cred = order.confirmedPayTerm
-            if not (credex := await models.CredEx.get_or_none(exid=cred.id, ex=self.ex_client.ex)):
-                if not (crd := await models.Cred.get_or_none(pmcur__pm__pmex__exid=cred.paymentType)):
-                    extr = cred.bankName or cred.branchName or cred.qrcode or cred.payMessage or cred.paymentExt1
-                    crd = await models.Cred.create(
-                        detail=cred.accountNo,
-                        pmcur=await Pmcur.get(pm__pmex__exid=cred.paymentType, cur__ticker=ad.currencyId),
-                        person=ad_db.maker.person,
-                        name=cred.realName,
-                        extra=extr,
+            if (cred := order.confirmedPayTerm).paymentType:
+                if not (credex := await models.CredEx.get_or_none(exid=cred.id, ex=self.ex_client.ex)):
+                    if (
+                        await Pmcur.filter(
+                            pm__pmexs__ex=self.ex_client.ex, pm__pmexs__exid=cred.paymentType, cur__ticker=ad.currencyId
+                        ).count()
+                        != 1
+                    ):
+                        ...
+                    pmcur = await Pmcur.get(
+                        pm__pmexs__ex=self.ex_client.ex, pm__pmexs__exid=cred.paymentType, cur__ticker=ad.currencyId
                     )
-                credex = await models.CredEx.create(exid=cred.id, ex=self.ex_client.ex, cred=crd)
+                    if not (
+                        crd := await models.Cred.get_or_none(
+                            pmcur=pmcur, person=ad_db.maker.person, detail=cred.accountNo
+                        )
+                    ):
+                        extr = cred.bankName or cred.branchName or cred.qrcode or cred.payMessage or cred.paymentExt1
+                        crd = await models.Cred.create(
+                            detail=cred.accountNo,
+                            pmcur=pmcur,
+                            person=ad_db.maker.person,
+                            name=cred.realName,
+                            extra=extr,
+                        )
+                    credex = await models.CredEx.create(exid=cred.id, ex=self.ex_client.ex, cred=crd)
             taker_person, _ = await Person.get_or_create(name=maker_name[::-1][ad.side])
-            taker, _ = await Actor.get_or_create(
-                {"name": taker_nick}, person=taker_person, ex=self.ex_client.ex, exid=taker_id
-            )
+            try:
+                taker, _ = await Actor.get_or_create(
+                    {"name": taker_nick, "person": taker_person}, ex=self.ex_client.ex, exid=taker_id
+                )
+            except IntegrityError as e:
+                logging.error(e)
             order_db, _ = await models.Order.update_or_create(
                 {
                     "amount": o.amount,
                     "status": OrderStatus[Statuses(o.status).name],
                     "created_at": int(o.createDate[:-3]),
-                    "payed_at": int(order.transferDate[:-3]),
-                    "confirmed_at": int(order.updateDate[:-3]),  # todo: check
-                    "cred_id": credex.cred_id,
+                    "payed_at": order.transferDate != "0" and int(order.transferDate[:-3]),
+                    "confirmed_at": Statuses(o.status) == Statuses.completed and int(order.updateDate[:-3]),
+                    "appealed_at": o.status == 30 and int(order.updateDate[:-3]),
+                    "cred_id": cred.paymentType and credex.cred_id or None,
                     "taker": taker,
                 },
                 exid=o.id,
@@ -454,7 +480,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 for m in msgs
             ]
             _ = await models.Msg.bulk_create(msgs_db, ignore_conflicts=True)
-            ...
+        logging.info(f"orders page#{page} imported ok!")
+        if len(ords) == 30:
+            await self.get_api_orders(page + 1, begin_time, end_time, status, side, token_id)
 
     async def mad_upd(self, mad: Ad, attrs: dict, cxids: list[str]):
         if not [setattr(mad, k, v) for k, v in attrs.items() if getattr(mad, k) != v]:
@@ -509,7 +537,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
     ):
         k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
 
-        creds: dict[models.Pmex, models.CredEx] = await get_creds(pms, self.actor.ex)
+        creds: dict[models.Pmex, models.CredEx] = await get_creds(pms, self.actor.ex, curex.cur)
         if not volume:
             if is_sell:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
                 # todo: we using the only one fiat exactly from THE FIRST cred
@@ -598,7 +626,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
         k = (-1) ** int(is_sell)  # on_buy=1, on_sell=-1
 
         if pms:
-            creds: dict[models.Pmex, models.CredEx] = await get_creds(pms, self.actor.ex)
+            creds: dict[models.Pmex, models.CredEx] = await get_creds(pms, self.actor.ex, curex.cur)
             [str(p.exid) for p in creds.values()]
 
             if is_sell:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
@@ -616,10 +644,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
             pairex__pair__cur_id=curex.cur_id,
             sell=is_sell,
         )
-        self.all_conds = {
-            c.id: (c.raw_txt, {str(a.maker.exid) for a in c.ads})
-            for c in await Cond.all().prefetch_related("ads__maker")
-        }
         while self.actor.person.user.status > 0:  # todo: depends on rest asset/fiat
             ads: list[Ad] = await self.ads(coinex, curex, is_sell, pms and list(creds.keys()))
 
@@ -656,10 +680,18 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     logging.warning("Connection failed. Restarting..")
             await sleep(6)
 
-    async def cond_upsert(self, ad: Ad, rname: str = None, dr: Direction = None) -> tuple[models.Ad, bool]:
-        sim = None
+    async def cond_upsert(
+        self, ad: Ad, rname: str = None, dr: Direction = None, force: bool = False
+    ) -> tuple[models.Ad, bool]:
+        sim, cid = None, None
         # если точно такое условие уже есть в бд, ниче делать не надо
-        if not (cleaned := clean(ad.remark)) or cleaned in {oc[0] for oc in self.all_conds.values()}:
+        if not (cleaned := clean(ad.remark)) or (cid := {oc[0]: ci for ci, oc in self.all_conds.items()}.get(cleaned)):
+            if force:
+                return (
+                    await models.Ad.get_or_none(exid=ad.id).prefetch_related("maker__person")
+                    or await self.ad_create(ad, cid, rname, dr),
+                    False,
+                )
             return None, False
         # если эта объява уже есть в бд
         if ad_db := await models.Ad.get_or_none(exid=ad.id).prefetch_related("cond__ads__maker", "maker__person"):
@@ -676,7 +708,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     return ad_db, True
             # проверка на всякий что точно нет такого условия
             if new_cond := await Cond.get_or_none(raw_txt=cleaned):
-                logging.exception("!!!!!!!!!", rest_uids)
+                logging.warning(f"Условие {new_cond.id} появилось в бд из других потоков")
+                if rest_ads and rest_uids:
+                    logging.exception("И оно есть объявах других юезров", rest_ads, rest_uids)
             # если других объяв со старым условием этой обявы нет, либо они все этого же юзера
             # обновляем условие (в тч во всех ЕГО объявах)
             ad_db.cond.last_ver = ad_db.cond.raw_txt
@@ -707,6 +741,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
         new_cond = await Cond.create(raw_txt=cleaned)
         self.all_conds[new_cond.id] = new_cond.raw_txt, {ad.userId}
+        # если нашелся похожий текст у другого юзера, добавим связь с % похожести
+        if sim:
+            await self.sim_new(new_cond.id, sim, old_cid)
+
+        return await self.ad_create(ad, new_cond.id), True
+
+    async def ad_create(self, ad: Ad, cid: int, rname: str = None, dr: Direction = None) -> models.Ad:
         act_df = {}
         if int(ad.userId) != self.actor.exid:
             act_df |= {"name": ad.nickName}
@@ -718,7 +759,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
             amount=float(ad.quantity) * float(ad.price),
             min_fiat=ad.minAmount,
             max_fiat=ad.maxAmount,
-            cond=new_cond,
+            cond_id=cid,
             exid=int(ad.id),
             direction=dr
             or await Direction.get(
@@ -729,13 +770,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
             ),
             maker=actor,
         )
-
-        # если нашелся похожий текст у другого юзера, добавим связь с % похожести
-        if sim:
-            await self.sim_new(new_cond.id, sim, old_cid)
-
         await ad_db.fetch_related("cond", "maker__person")
-        return ad_db, True
+        return ad_db
 
     async def sim_new(self, new_cid: int, sim: int, old_cid: int):
         if not sim:
@@ -749,80 +785,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
             sim_db.similarity = get_sim(new_txt, op_cond.raw_txt)
             await sim_db.save()
 
-    #
-    # async def cond_upsert(
-    #     self, ad: Ad, rname: str = None, dr: Direction = None, cid: int = 0
-    # ) -> tuple[models.Ad, bool]:
-    #     sim = None
-    #     dr = dr or await Direction.get(
-    #         sell=ad.side,
-    #         pairex__ex=self.ex_client.ex,
-    #         pairex__pair__coin__ticker=ad.tokenId,
-    #         pairex__pair__cur__ticker=ad.currencyId,
-    #     )
-    #     # если точно такого условия еще нет в бд
-    #     old_conds = self.all_conds.copy() if cid else self.all_conds
-    #     if cid:  # если есть то это не текущий проверяемый cond
-    #         old_conds.pop(cid)
-    #     if (cleaned := clean(ad.remark)) and cleaned not in {oc[0] for oc in old_conds.values()}:
-    #         # находим все старые тексты похожие на 90% и более
-    #         if sim_connds := {
-    #             old_cid: (txt, sim)
-    #             for old_cid, (txt, uids) in old_conds.items()
-    #             if len(cleaned) > 15
-    #             and ad.userId not in uids
-    #             and cid not in self.sim_conds.get(old_cid, {})
-    #             and (sim := int((SequenceMatcher(None, cleaned, txt).ratio() - 0.9) * 10_000))
-    #             > self.cond_sims.get(cid, (..., 0))[1]
-    #         }:
-    #             # если есть, берем самый похожий из них
-    #             old_cid, (txt, sim) = max(sim_connds.items(), key=lambda x: x[1])
-    #             old_ads = await models.Ad.filter(cond_id=old_cid, maker__exid=int(ad.userId)).prefetch_related("cond")
-    #             for old_ad in old_ads:
-    #                 # и у этого чела есть объява с почти таким же текстом
-    #                 if old_ad.exid == int(ad.id):  # и он изменил текст как раз в ней
-    #                     # заменяем текст без создания нового cond
-    #                     await old_ad.cond.update_or_create(raw_txt=cleaned)
-    #                     await old_ad.fetch_related("cond")
-    #                     return old_ad, False
-    #                 # но это не она, значит у него есть другая объява с похожим, но чуть отличающимся текстом
-    #                 logging.warning(f"ad#{ad.id}-cond#{old_cid} txt updated:\n{txt}\n|\n|\nV\n{cleaned}")
-    #     if not cid:
-    #         cond, isnew = await Cond.get_or_create(raw_txt=cleaned)
-    #         cid = cond.id
-    #         if isnew:
-    #             self.all_conds[cid] = cond.raw_txt, {ad.userId}
-    #     if sim and sim_connds:  # если нашелся похожий текст у другого юзера, добавим связь с % похожести
-    #         await CondSim.update_or_create({"similarity": sim, "cond_rel_id": old_cid}, cond_id=cid)
-    #         self.cond_sims[cid] = old_cid, sim
-    #         self.sim_conds[old_cid].add(cid)
-    #     if not ad.price:
-    #         return
-    #     act_df = {"name": ad.nickName}
-    #     if rname:
-    #         act_df |= {"person": await Person.get_or_create(name=rname)}
-    #     actor, _ = await Actor.update_or_create(act_df, exid=ad.userId, ex=self.ex_client.ex)
-    #     ad_db, _ = await models.Ad.update_or_create(
-    #         {
-    #             "price": ad.price,
-    #             "amount": float(ad.quantity) * float(ad.price),
-    #             "min_fiat": ad.minAmount,
-    #             "max_fiat": ad.maxAmount,
-    #             "cond": cond,
-    #         },
-    #         exid=int(ad.id),
-    #         direction=dr
-    #         or await Direction.get(
-    #             sell=ad.side,
-    #             pairex__ex=self.ex_client.ex,
-    #             pairex__pair__coin__ticker=ad.tokenId,
-    #             pairex__pair__cur__ticker=ad.currency,
-    #         ),
-    #         maker=actor,
-    #     )
-    #     await ad_db.fetch_related("cond")
-    #     return ad_db, isnew
-
     async def actual_cond(self):
         self.all_conds = {
             c.id: (c.raw_txt, {str(a.maker.exid) for a in c.ads})
@@ -885,9 +847,12 @@ def listen(data: dict):
     print(data)
 
 
-async def get_creds(norms: list[str], ex: models.Ex) -> dict[models.Pmex, models.CredEx]:
+async def get_creds(norms: list[str], ex: models.Ex, cur: Cur) -> dict[models.Pmex, models.CredEx]:
     return {
-        await models.Pmex.get(ex=ex, pm__norm=n): await models.CredEx.get(ex=ex, cred__pmcur__pm__norm=n) for n in norms
+        await models.Pmex.get(ex=ex, pm__norm=n): await models.CredEx.get(
+            ex=ex, cred__pmcur__pm__norm=n, pmcur__cur=cur
+        )
+        for n in norms
     }
 
 
@@ -917,8 +882,12 @@ async def main():
         # await models.Direction.get(
         #     pairex__ex=cl.actor.ex, pairex__pair__coin__ticker="USDT", pairex__pair__cur__ticker="RUB", sell=True
         # )
+        cl.all_conds = {
+            c.id: (c.raw_txt, {str(a.maker.exid) for a in c.ads})
+            for c in await Cond.all().prefetch_related("ads__maker")
+        }
         # await cl.set_creds()
-        await cl.get_api_orders()
+        await cl.get_api_orders(16)
         # await cl.actual_cond()
         await gather(
             cl.battle(usdt, rub, False, ["volet"], 79.97),  # гонка в стакане покупки - мы продаем

{xync_client-0.0.57.dev11 → xync_client-0.0.57.dev13/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev11
+Version: 0.0.57.dev13
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client