xync-client 0.0.93.dev17__tar.gz → 0.0.93.dev23__tar.gz

{xync_client-0.0.93.dev17/xync_client.egg-info → xync_client-0.0.93.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.93.dev17
+Version: 0.0.93.dev23
 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.93.dev17 → xync_client-0.0.93.dev23}/tests/TestEx.py

@@ -7,7 +7,6 @@ from xync_schema.xtype import BaseAd
 
 from xync_client.Abc.BaseTest import BaseTest
 from xync_schema.enums import ExStatus, ExType, ExAction
-# from xync_schema.models import Ex, ExStat, Curex, Coinex, Race, Ad
 from xync_schema import models
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import TOKEN
@@ -17,7 +16,7 @@ from xync_client.loader import TOKEN
 class TestEx(BaseTest):
     @pytest.fixture
     async def clients(self) -> list[HttpClient]:
-        exs = await Ex.filter(status__gt=ExStatus.plan).prefetch_related("pm_reps")
+        exs = await models.Ex.filter(status__gt=ExStatus.plan).prefetch_related("pm_reps")
         [await ex for ex in exs if ex.type_ == ExType.tg]
         async with FileClient(TOKEN) as b:
             b: FileClient
@@ -113,16 +112,28 @@ class TestEx(BaseTest):
             assert t.ok, "No ads"
             logging.info(f"{client.ex.name}: {ExAction.ads.name} - ok")
 
-    async def test_race(self):
-        races = await models.Race.all().prefetch_related("road__ad")
-
-
-
-        # price_dict = {race.id: race.road.ad.price for race in races}
-        # print(price_dict)
-        # sorted_dict = dict(sorted(price_dict.items(), key=lambda x: x[1]))
-        # print(sorted_dict)
-        # for race in races:
-        #     print(f"{race.id}: {race.road.ad.price}")
-        # for race in races:
-        #     print(race.id)
+    async def test_race(self, clients: list[BaseExClient]):
+        races: list[models.Race] = await models.Race.filter(started=True).prefetch_related(
+            "road__ad__pair_side__pair", "road__ad__maker", "road__ad__pms"
+        )
+        ex_ids: set = {race.road.ad.maker.ex_id for race in races}
+        errors: dict[int, int] = {}
+        for client in clients:
+            if client.ex.id not in ex_ids:
+                continue
+            for race in races:
+                # получаем данные направления текущей гонки
+                coinex = await models.Coinex.get(ex=client.ex, coin_id=race.road.ad.pair_side.pair.coin_id)
+                curex = await models.Curex.get(ex=client.ex, cur_id=race.road.ad.pair_side.pair.cur_id)
+                pm_ids = [pm.id for pm in race.road.ad.pms]
+                pmex_exids = await models.Pmex.filter(ex=client.ex, pm_id__in=pm_ids).values_list("exid", flat=True)
+                # получаем объявления по этому направлению
+                ads = await client.ads(coinex.exid, curex.exid, race.road.ad.pair_side.is_sell, pmex_exids)
+                # определяем место нашего объявления в списке
+                place = [i for i, ad in enumerate(ads) if int(ad.userId) == race.road.ad.maker.exid][0]
+                if place != race.target_place:
+                    errors[race.id] = place
+        if errors:
+            assert False, "Гонка " + ", ".join(f"#{rid} на {plc} месте" for rid, plc in errors.items())
+        else:
+            print("Успешно")

{xync_client-0.0.93.dev17 → xync_client-0.0.93.dev23}/xync_client/Bybit/InAgent.py

@@ -72,7 +72,7 @@ class InAgentClient(BaseInAgentClient):
             while resp := await websocket.recv():
                 if data := json.loads(resp):
                     upd, order_db = None, None
-                    logging.info("New update:")
+                    logging.info(f"{datetime.now()} New update: {data.get('topic')}:{data.get('type')}")
                     match data.get("topic"):
                         case "OTC_ORDER_STATUS":
                             match data["type"]:
@@ -89,7 +89,9 @@ class InAgentClient(BaseInAgentClient):
                                             logging.info(f"Order {order.id} created at {order.createDate}")
                                         case StatusApi.wait_for_buyer:
                                             if upd.side == 0:  # ждем когда покупатель оплатит
-                                                pma, cdx = await self.get_pma_by_cdex(order)
+                                                if not (pmacdx := await self.get_pma_by_cdex(order)):
+                                                    continue
+                                                pma, cdx = pmacdx
                                                 am, tid = pma.check_in(Decimal(order.amount), cdx.cred.pmcur.cur.ticker)
                                                 if tid and tid not in done:
                                                     done.add(tid)
@@ -113,14 +115,14 @@ class InAgentClient(BaseInAgentClient):
                                             else:
                                                 ...
                                             # todo: check is always canceling
-                                            await order_db.update_from_dict({"status": OrderStatus.canceled}).save()
-                                            logging.info(f"Order {order.id} canceled at {datetime.now()}")
+                                            # await order_db.update_from_dict({"status": OrderStatus.canceled}).save()
+                                            # logging.info(f"Order {order.id} canceled at {datetime.now()}")
                                         case StatusApi.appealed:
                                             # todo: appealed by WHO? щас наугад стоит by_seller
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.appealed_by_seller,
-                                                    "appealed_at": round(float(order.updateDate), 3),
+                                                    "appealed_at": int(float(order.updateDate) / 1000),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} appealed at {order_db.appealed_at}")
@@ -131,7 +133,7 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.completed,
-                                                    "confirmed_at": round(float(order.updateDate), 3),
+                                                    "confirmed_at": int(float(order.updateDate) / 1000),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} completed at {order_db.confirmed_at}")
@@ -139,7 +141,7 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.paid,
-                                                    "payed_at": round(float(order.transferDate), 3),
+                                                    "payed_at": int(float(order.transferDate) / 1000),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} payed at {order_db.payed_at}")
@@ -158,7 +160,7 @@ class InAgentClient(BaseInAgentClient):
                                     upd = Read.model_validate(data["data"])
                                     # if upd.status not in (StatusWs.created, StatusWs.canceled, 10, StatusWs.completed):
                                     if upd.orderStatus in (
-                                        StatusApi.wait_for_buyer_pay,
+                                        StatusApi.wait_for_buyer,
                                     ):  # todo: тут приходит ордер.статус=10, хотя покупатель еще не нажал оплачено
                                         order = self.agent_client.api.get_order_details(orderId=upd.orderId)["result"]
                                         order = OrderFull.model_validate(order)
@@ -188,7 +190,7 @@ class InAgentClient(BaseInAgentClient):
                         case _:
                             logging.warning(data, "UNKNOWN TOPIC")
                     if not upd:
-                        logging.error(data, "NOT PROCESSED UPDATE")
+                        logging.warning(data, "NOT PROCESSED UPDATE")
 
     async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient, models.CredEx]:
         cdxs = await models.CredEx.filter(
@@ -198,10 +200,11 @@ class InAgentClient(BaseInAgentClient):
         ).prefetch_related("cred__pmcur__cur")
         pmas = [pma for cdx in cdxs if (pma := self.pmacs.get(cdx.cred.pmcur.pm_id))]
         if not len(pmas):
-            logging.error(order.paymentTermList, "No pm_agents")
-        if len(pmas) > 1:
-            logging.error(order.paymentTermList, ">1 pm_agents")
-        return pmas[0], cdxs[0]
+            logging.error(order.paymentTermList, f"No pm_agents for {order.paymentTermList[0].paymentType}")
+        elif len(pmas) > 1:
+            logging.error(order.paymentTermList, f">1 pm_agents for {cdxs[0].cred.pmcur.pm_id}")
+        else:
+            return pmas[0], cdxs[0]
 
     @staticmethod
     def listen(data: dict | None):

{xync_client-0.0.93.dev17 → xync_client-0.0.93.dev23/xync_client.egg-info}/PKG-INFO

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