xync-client 0.0.25.dev50__tar.gz → 0.0.25.dev55__tar.gz

{xync_client-0.0.25.dev50/xync_client.egg-info → xync_client-0.0.25.dev55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev50
+Version: 0.0.25.dev55
 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.25.dev50 → xync_client-0.0.25.dev55}/xync_client/Abc/Ex.py

@@ -125,7 +125,7 @@ class BaseExClient(BaseClient):
             k: v for k, v in sorted((await self.pms()).items(), key=lambda x: x[1].name)
         }  # sort by name
         pms: dict[int | str, models.Pm] = dict({})
-        prev = 0, "", ""  # id, normd-name, orig-name
+        prev = 0, "", "", None  # id, normd-name, orig-name
         cntrs = [c.lower() for c in await models.Country.all().values_list("name", flat=True)]
         uni = self.unifier_class(cntrs)
         for k, pm in pms_epyds.items():

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55}/xync_client/BingX/ex.py

@@ -55,7 +55,7 @@ class ExClient(BaseExClient, BaseBingXClient):
             "coinType": "2",
         }
         curs = await self._get("/api/c2c/v1/common/supportCoins", params=params)
-        return {cur["name"]: types.CurEx(exid=cur["id"], ticker=cur["name"]) for cur in curs["data"]["coins"]}
+        return {cur["name"]: types.CurEx(exid=cur["name"], ticker=cur["name"]) for cur in curs["data"]["coins"]}
 
     # 21: cur_pms_map на BingX
     async def cur_pms_map(self) -> MapOfIdsList:
@@ -63,7 +63,7 @@ class ExClient(BaseExClient, BaseBingXClient):
 
     # 22: Монеты на BingX
     async def coins(self) -> list[types.CoinEx]:
-        return {"USDT": types.CoinEx(exid="1", ticker="USDT")}
+        return {"USDT": types.CoinEx(exid="USDT", ticker="USDT")}
 
     # 23: Список пар валюта/монет
     async def pairs(self) -> MapOfIdsList:
@@ -87,7 +87,7 @@ class ExClient(BaseExClient, BaseBingXClient):
         }
 
         ads = await self._get("/api/c2c/v1/advert/list", params=params)
-        return [ad.Ad(**ad) for ad in ads["data"]["dataList"]]
+        return [ad.Ad(**_ad) for _ad in ads["data"]["dataList"]]
 
 
 async def main():

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55}/xync_client/KuCoin/ex.py

@@ -14,57 +14,58 @@ from xync_client.Abc.types import PmEx
 class ExClient(BaseExClient):
     async def _pms(self, cur) -> list[pm.PmE]:
         params = {
-            'legal': cur,
-            'lang': 'ru_RU',
+            "legal": cur,
+            "lang": "ru_RU",
         }
         pms = await self._get("/_api/otc/legal/payTypes", params=params)
         return [pm.PmE(**_pm) for _pm in pms["data"]]
 
     async def curs(self) -> list[types.CurEx]:
         curs = (await self._get("/_api/otc/dictionary/getData", {"type": "LEGAL"}))["data"]
-        return {
-            cur["typeCode"]:types.CurEx(exid=cur["id"], ticker=cur["typeCode"]) for cur in curs
-        }
+        return {cur["typeCode"]: types.CurEx(exid=cur["typeCode"], ticker=cur["typeCode"]) for cur in curs}
 
     async def pms(self, cur: models.Cur = None) -> dict[int | str, PmEx]:
         all_pms = {}
         for cur_obj in (await self.curs()).values():
             pms = await self._pms(cur_obj.ticker)
-            for pm in pms:
-                all_pms[pm.payTypeId] = PmEx(exid=pm.payTypeId, name=pm.payTypeName)
+            for p in pms:
+                all_pms[p.payTypeCode] = PmEx(exid=p.payTypeCode, name=p.payTypeName)
         return all_pms
 
     async def cur_pms_map(self) -> MapOfIdsList:
-        return {cur.exid: [pm.payTypeId for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()}
+        return {
+            cur.exid: [pm.payTypeCode for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()
+        }
 
     async def coins(self) -> list[types.CoinEx]:
         all_coins = {}
         for cur in (await self.curs()).keys():
             params = {
-                'legal': cur,
-                'lang': 'ru_RU',
+                "legal": cur,
+                "lang": "ru_RU",
             }
             coins = await self._get("/_api/otc/symbol/support", params=params)
             for coin in coins["data"]:
-                all_coins[coin["currency"]] = types.CoinEx(exid=coin["currencyPrecision"] ,ticker=coin["currency"])
+                all_coins[coin["currency"]] = types.CoinEx(
+                    exid=coin["currency"], ticker=coin["currency"], scale=coin["currencyPrecision"]
+                )
         return all_coins
 
     async def pairs(self) -> MapOfIdsList:
         coins = (await self.coins()).keys()
         curs = (await self.curs()).keys()
-        b = {cur: {c for c in coins} for cur in curs}
         s = {cur: {c for c in coins} for cur in curs}
-        return s, b
+        return s, s
 
     async def ads(
-            self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
     ) -> list[ad.Ad]:
         pass
 
 
 async def main():
     _ = await init_db(PG_DSN, models, True)
-    bg = await Ex.get(name="KuCoin")
+    bg = await models.Ex.get(name="KuCoin")
     cl = ExClient(bg)
     # await cl.curs()
     # await cl.coins()
@@ -72,4 +73,4 @@ async def main():
 
 
 if __name__ == "__main__":
-    run(main())
+    run(main())

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55}/xync_client/Okx/etype/pm.py

@@ -9,4 +9,4 @@ class PmE(BaseModel):
     needVerification: bool
     paymentMethod: str
     paymentMethodDescription: str
-    transferSpeed: int
+    transferSpeed: int

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55}/xync_client/Okx/ex.py

@@ -10,6 +10,7 @@ from xync_client.loader import PG_DSN
 from xync_client.Okx.etype import ad, pm
 from xync_client.Abc.types import PmEx
 
+
 class ExClient(BaseExClient):
     async def _pms(self, cur) -> list[pm.PmE]:
         params = {
@@ -17,13 +18,13 @@ class ExClient(BaseExClient):
             "needField": "false",
         }
         pms = await self._get("/v3/c2c/configs/receipt/templates", params=params)
-        return [pm.PmE(**_pm) for _pm in pms["data"]]
+        return [pm.PmE(**_pm) for _pm in pms["data"] if _pm["paymentMethod"]]
 
     # 19: Список поддерживаемых валют тейкера
-    async def curs(self) -> list[types.CurEx]:  # {cur.exid: cur.ticker}
+    async def curs(self) -> dict[int, types.CurEx]:  # {cur.exid: cur.ticker}
         curs = await self._get("/v3/users/common/list/currencies")
         return {
-            cur["displayName"]: types.CurEx(exid=cur["currencyId"],ticker=cur["displayName"])
+            cur["displayName"]: types.CurEx(exid=cur["currencyId"], ticker=cur["displayName"], scale=cur["precision"])
             for cur in curs["data"]
         }
 
@@ -32,32 +33,31 @@ class ExClient(BaseExClient):
         all_pms = {}
         for cur_obj in (await self.curs()).values():
             pms = await self._pms(cur_obj.ticker)
-            for pm in pms:
-                all_pms[pm.transferSpeed] = PmEx(exid=pm.transferSpeed, name=pm.paymentMethod)
+            for p in pms:
+                all_pms[p.paymentMethod] = PmEx(exid=p.paymentMethod, name=p.paymentMethod)
         return all_pms
 
     # 21: Список платежных методов по каждой валюте
     async def cur_pms_map(self) -> MapOfIdsList:  # {cur.exid: [pm.exid]}
-        return {cur.exid: [pm.paymentMethod for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()}
+        return {
+            cur.exid: [pm.paymentMethod for pm in await self._pms(cur.ticker)] for cur in (await self.curs()).values()
+        }
 
     # 22: Список торгуемых монет (с ограничениям по валютам, если есть)
-    async def coins(self) -> list[types.CoinEx]: # {coin.exid: coin.ticker}
+    async def coins(self) -> dict[int, types.CoinEx]:  # {coin.exid: coin.ticker}
         for cur in (await self.curs()).keys():
-            params = {
-                'type': '1',
-                'quote': cur,
-                'side': 'buy'
+            coins = await self._get("/v3/c2c/currency/pairs", {"type": 2, "quote": cur})
+            return {
+                coin["baseCurrency"]: types.CoinEx(exid=coin["baseCurrencyId"], ticker=coin["baseCurrency"])
+                for coin in coins["data"]
             }
-            coins = await self._get("/v3/c2c/currency/pairs", params=params)
-            return {coin["baseCurrency"]: types.CoinEx(exid=coin["baseCurrencyId"], ticker=coin["baseCurrency"]) for coin in coins["data"]}
 
     # 23: Список пар валюта/монет
     async def pairs(self) -> MapOfIdsList:
         coins = (await self.coins()).keys()
         curs = (await self.curs()).keys()
-        b = {cur: {c for c in coins} for cur in curs}
-        s = {cur: {c for c in coins} for cur in curs}
-        return s, b
+        p = {cur: {c for c in coins} for cur in curs}
+        return p, p
 
     # 24: Список объяв по (buy/sell, cur, coin, pm)
     async def ads(
@@ -92,9 +92,14 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await models.Ex.get(name="Okx")
     cl = ExClient(bg)
-    await cl.curs()
-    # await cl.coins()
+    # curs = await cl.curs()
+    # coins = await cl.coins()
     # await cl.pms()
+    # await cl.cur_pms_map()
+    # await cl.pairs()
+    # await cl.set_coinexs()
+    await cl.set_pmcurexs()
+    await cl.ads("USDT", "THB", False)
     await cl.close()
 
 

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55}/xync_client/pm_unifier.py

@@ -91,7 +91,7 @@ class PmUnifier:
 
     def bank(self, name: str):
         for r in self.re_bank:
-            if match := re.search(r, self.pms[name].norm):
+            if (match := re.search(r, self.pms[name].norm)) and match.group() != self.pms[name].norm:
                 self.pms[name].norm = self.pms[name].norm.replace(match.group(), "")
                 self.pms[name].bank = True
                 self.clear(name)
@@ -147,5 +147,8 @@ class PmUnifier:
         self.extra(s)
         # вырезаем каждый символ rms
         [self.pms[s].norm.replace(rm, "") for rm in self.rms]
+        #
+        if not self.pms[s].norm and self.pms[s].bank:
+            self.pms[s].norm = "bank"
 
         return self.pms[s]

{xync_client-0.0.25.dev50 → xync_client-0.0.25.dev55/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev50
+Version: 0.0.25.dev55
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client