xync-client 0.0.104__py3-none-any.whl → 0.0.106__py3-none-any.whl

xync_client/Abc/Ex.py

@@ -91,9 +91,15 @@ class BaseExClient(HttpClient):
     async def set_curs(self, cookies: dict = None) -> bool:
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
+        old_curs = {c.ticker: c.id for c in await models.Cur.all()}
         curs: dict[int | str, models.Cur] = {
-            exid: (await models.Cur.update_or_create({"rate": cur_pyd.rate or 0}, ticker=cur_pyd.ticker))[0]
-            for exid, cur_pyd in cur_pyds.items()
+            exid: (
+                await models.Cur.update_or_create(
+                    {"rate": cur_pyd.rate or 0, "id": old_curs.get(cur_pyd.ticker, await models.Cur.all().count() + 1)},
+                    ticker=cur_pyd.ticker,
+                )
+            )[0]
+            for i, (exid, cur_pyd) in enumerate(cur_pyds.items())
         }
         curexs = [
             models.CurEx(**c.model_dump(exclude_none=True), cur=curs[c.exid], ex=self.ex) for c in cur_pyds.values()
@@ -236,13 +242,11 @@ class BaseExClient(HttpClient):
         }
         prs: tuple[dict, dict] = await self.pairs()
         for is_sell in (0, 1):
-            pss: list[models.PairSide] = []
             for cur, coinz in prs[is_sell].items():
                 for coin in coinz:
                     pair, _ = await models.Pair.get_or_create(coin=coins[coin], cur=curs[cur])
                     # pairex, _ = await models.PairEx.get_or_create(pair=pair, ex=self.ex)  # todo: разные ли комишки на покупку и продажу?
-                    pss += [models.PairSide(is_sell=is_sell, pair=pair)]
-            await models.PairSide.bulk_create(pss, ignore_conflicts=True)
+                    await models.PairSide.update_or_create(is_sell=is_sell, pair=pair)
         return True
 
     # Сохранение чужого объявления (с Pm-ами) в бд

xync_client/Bybit/agent.py

@@ -641,7 +641,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
             expiration = datetime.now(timezone.utc) - timedelta(minutes=15)
             if race.updated_at < expiration:
                 ceils, hp, vmf, zplace = await self.get_ceils(coinex, curex, pmexs, 0.001, True)
-                race.ceil = ceils[int(taker_side)] * 10**curex.scale
+                race.ceil = int(ceils[int(taker_side)] * 10**curex.scale)
                 await race.save()
                 # upd pair race
                 if prace := await models.Race.annotate(pms_count=Count("road__ad__pms")).get_or_none(
@@ -652,7 +652,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     road__ad__pms__id__in=pm_ids,
                     pms_count=len(pm_ids),
                 ):
-                    prace.ceil = ceils[int(not taker_side)] * 10**curex.scale
+                    prace.ceil = int(ceils[int(not taker_side)] * 10**curex.scale)
                     await prace.save()
 
             last_vol = volume
@@ -1207,7 +1207,7 @@ async def main():
         #     await s.curs.add(rub.cur)
 
         # пока порешали рейс-кондишн, очищаем сиротские условия при каждом запуске
-        [await c.delete() for c in await Cond.filter(ads__isnull=True)]
+        # [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")
         }

{xync_client-0.0.104.dist-info → xync_client-0.0.106.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.104
+Version: 0.0.106
 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.104.dist-info → xync_client-0.0.106.dist-info}/RECORD

@@ -5,7 +5,7 @@ xync_client/Abc/Agent.py,sha256=OJaJ1RIMDYAS4xeefeXxVIVI0EKnMczQtrO35MLzqr4,5390
 xync_client/Abc/Asset.py,sha256=hlgyFaU9byr2N2r8Heh-_ICx49SKuKxfRTUA4yQWmEw,454
 xync_client/Abc/Auth.py,sha256=OPQXN7_XYQZP9431ylFksd6JDusbKG8N_1g6CXTZ6yY,1495
 xync_client/Abc/BaseTest.py,sha256=vaAs5Z4HYV7k_C3zQz6JKO75s2hXtVbBI3-0Srkzv5Q,2388
-xync_client/Abc/Ex.py,sha256=vVsmbT78w92NUUYLYpKuzcNErpFjYkZgCq94dFOsCgA,12845
+xync_client/Abc/Ex.py,sha256=n41-XCjoIV-KpC_lK3jO049tQKbFmE0eDU3SDlgZTws,12986
 xync_client/Abc/Exception.py,sha256=Sts7RpP370NBdjaH_cyXDdHtjge8zXNUGWCrKw49Zyk,482
 xync_client/Abc/InAgent.py,sha256=svKGATUM0c9YIDDEVLc-NxpUNWqZoVr5PjxoxK64RKs,650
 xync_client/Abc/Order.py,sha256=7-FGIJu5z9aYi0A_eJV4F-cp_6Mz_izNpefexDQZvHw,2428
@@ -34,7 +34,7 @@ xync_client/BitGet/ex.py,sha256=nAexKRkguIhq4fYP1tkIaou6oBFjjV2xwlajlJ-9DAE,3757
 xync_client/BitGet/etype/ad.py,sha256=fysSW47wGYjSOPUqY864z857AJz4gjN-nOkI1Jxd27U,1838
 xync_client/BitPapa/ex.py,sha256=U-RRB_RSOtErfRgxOZYWegZ_td_uZO37YKo3Jxchf_w,912
 xync_client/Bybit/InAgent.py,sha256=WeBnc5etElWbAThdw7o8Oc9bmsj9nq7vrvgAGw2ASG8,20841
-xync_client/Bybit/agent.py,sha256=bB7Uk0d2bUy86uFKYVOA2mT-h0HC3rkco7EXjxOLYas,58789
+xync_client/Bybit/agent.py,sha256=ypo2MXLP5IAjJto1r0WXu1bLYgyON7mXE0XBL95LeDg,58801
 xync_client/Bybit/ex.py,sha256=DgPOmnjphcSCSsO4ZQjnIlWICNzdtKhNIpVsU93s99k,4707
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
@@ -94,7 +94,7 @@ xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ
 xync_client/TgWallet/pyd.py,sha256=Ys3E8b3RLuyQ26frWT0F0BorkNxVpxnd18tY4Gp9dik,5636
 xync_client/TgWallet/pyro.py,sha256=2K7QWdo48k4MbbgQt90gdz_HiPck69Njm4xaMjIVgoo,1440
 xync_client/TgWallet/web.py,sha256=kDcv9SKKQPe91mw1qJBpbuyKYCAmZdfdHJylHumLBVU,1608
-xync_client-0.0.104.dist-info/METADATA,sha256=cUCyEhCqDsCfCG0l0i-fIY3cayy35TcjGkIojnblf8A,964
-xync_client-0.0.104.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.104.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.104.dist-info/RECORD,,
+xync_client-0.0.106.dist-info/METADATA,sha256=TKDjFaA30YolM4mTiC7mK8XJ8PSwxRP9Jhqq9GHG1Lc,964
+xync_client-0.0.106.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.106.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.106.dist-info/RECORD,,