xync-client 0.0.103.dev2__py3-none-any.whl → 0.0.105__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()
@@ -209,7 +215,7 @@ class BaseExClient(HttpClient):
         coinexs: dict[str, CoinEx] = await self.coins()
         coins_db: dict[int, models.Coin] = {
             c.exid: (
-                await models.Coin.update_or_create({"scale": c.scale} if c.scale is not None else {}, ticker=c.ticker)
+                await models.Coin.update_or_create({"scale": c.scale or self.coin_scales[c.ticker]}, ticker=c.ticker)
             )[0]
             for c in coinexs.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/Gate/ex.py

@@ -19,6 +19,8 @@ class ExClient(BaseExClient):
         "BTC": 8,
         "ETH": 8,
         "DOGE": 8,
+        "TON": 8,
+        "NOT": 8,
         "USDC": 2,
     }
 
@@ -94,6 +96,7 @@ async def main():
     async with FileClient(TOKEN) as b:
         cl = ExClient(gt, b)
         await cl.set_pairs()
+        pms = await cl.set_coins()
         pms = await cl.cur_pms_map()
         pms = await cl.set_pms()
         pms = await cl.set_coins()

{xync_client-0.0.103.dev2.dist-info → xync_client-0.0.105.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.103.dev2
+Version: 0.0.105
 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.103.dev2.dist-info → xync_client-0.0.105.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=m9Y7VpuKI68k1TMUTpZ8kKbK25baRaddos71M7A6dzY,12846
+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
@@ -43,7 +43,7 @@ xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
 xync_client/Bybit/etype/ad.py,sha256=HJOHi9KrbLQMpwEyd4oA8436QTNRqrd2HWFF-JNZGDo,8066
 xync_client/Bybit/etype/cred.py,sha256=dgFExLB4e5Wf6SqfU9SOdeooHQa84DRbTGm_OJhNw_o,1354
 xync_client/Bybit/etype/order.py,sha256=M9hxHCELTb2llz2c8q0QrfG-lCxuUb-Zwmag82ggXn0,8073
-xync_client/Gate/ex.py,sha256=uyLOL4siUz8p0qYEkCijttMC3R3La7dcZu2dwl-n1rU,3656
+xync_client/Gate/ex.py,sha256=1vSXctCOyZfYDojkHU6u4YSXwYTLg-e7BfAdGKvZ_UM,3727
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
 xync_client/Gate/etype/ad.py,sha256=-EwtFcOWWvtE6UjaOdsuXWDTCVjAIRK0kSEsqPP4Yls,1296
 xync_client/Gmail/__init__.py,sha256=6aXhqtiVS5lA6O_W1276kamnixlH5OmUFklqwbVG4RA,4647
@@ -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.103.dev2.dist-info/METADATA,sha256=5haGa4Z_WrMRl82piOvVKHKH_FhFMsFfPR050_2ZVek,969
-xync_client-0.0.103.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.103.dev2.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.103.dev2.dist-info/RECORD,,
+xync_client-0.0.105.dist-info/METADATA,sha256=M41YGcSXFZYPOq2QDYuWpHXsvM-S5RkWxuGX7iohS3w,964
+xync_client-0.0.105.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.105.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.105.dist-info/RECORD,,