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

{xync_client-0.0.57.dev12/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.dev12
+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.dev12 → 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
@@ -408,6 +409,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
         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
@@ -418,7 +420,16 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 ...
             if (cred := order.confirmedPayTerm).paymentType:
                 if not (credex := await models.CredEx.get_or_none(exid=cred.id, ex=self.ex_client.ex)):
-                    pmcur = await Pmcur.get(pm__pmexs__exid=cred.paymentType, cur__ticker=ad.currencyId)
+                    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
+                    )
                     if not (
                         crd := await models.Cred.get_or_none(
                             pmcur=pmcur, person=ad_db.maker.person, detail=cred.accountNo
@@ -434,9 +445,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
                         )
                     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,
@@ -523,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
@@ -612,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:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
@@ -673,7 +687,11 @@ class AgentClient(BaseAgentClient):  # Bybit client
         # если точно такое условие уже есть в бд, ниче делать не надо
         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) or await self.ad_create(ad, cid, rname, dr), False
+                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"):
@@ -723,14 +741,11 @@ 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}
-        ad_db = await self.ad_create(ad, new_cond.id)
-
         # если нашелся похожий текст у другого юзера, добавим связь с % похожести
         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 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 = {}
@@ -739,7 +754,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
         if rname:
             act_df |= {"person": (await Person.get_or_create(name=rname))[0]}
         actor, _ = await Actor.update_or_create(act_df, exid=ad.userId, ex=self.ex_client.ex)
-        return await models.Ad.create(
+        ad_db = await models.Ad.create(
             price=ad.price,
             amount=float(ad.quantity) * float(ad.price),
             min_fiat=ad.minAmount,
@@ -755,6 +770,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
             ),
             maker=actor,
         )
+        await ad_db.fetch_related("cond", "maker__person")
+        return ad_db
 
     async def sim_new(self, new_cid: int, sim: int, old_cid: int):
         if not sim:
@@ -830,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
     }
 
 
@@ -867,7 +887,7 @@ async def main():
             for c in await Cond.all().prefetch_related("ads__maker")
         }
         # await cl.set_creds()
-        await cl.get_api_orders(2)
+        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.dev12 → 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.dev12
+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