xync-client 0.0.25.dev51__tar.gz → 0.0.25.dev56__tar.gz

{xync_client-0.0.25.dev51/xync_client.egg-info → xync_client-0.0.25.dev56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev51
+Version: 0.0.25.dev56
 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.dev51 → xync_client-0.0.25.dev56}/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.dev51 → xync_client-0.0.25.dev56}/xync_client/KuCoin/ex.py

@@ -14,62 +14,69 @@ 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()
-    await cl.pms()
+    await cl.curs()
+    await cl.coins()
+    await cl.cur_pms_map()
+    await cl.pairs()
+    await cl.set_coinexs()
+    await cl.set_pmcurexs()
+    await cl.ads("USDT", "THB", False)
+    # pms = await cl.pms()
+    await cl.close()
 
 
 if __name__ == "__main__":
-    run(main())
+    run(main())

{xync_client-0.0.25.dev51 → xync_client-0.0.25.dev56}/xync_client/Okx/ex.py

@@ -18,13 +18,14 @@ 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) -> 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"]) for cur in curs["data"]
+            cur["displayName"]: types.CurEx(exid=cur["currencyId"], ticker=cur["displayName"], scale=cur["precision"])
+            for cur in curs["data"]
         }
 
     # 20: Список платежных методов
@@ -93,10 +94,10 @@ async def main():
     cl = ExClient(bg)
     # 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.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.dev51 → xync_client-0.0.25.dev56}/xync_client/pm_unifier.py

@@ -28,14 +28,15 @@ class PmUnifier:
     ]
     re_extra = [
         r"\(card\)$|\bpay$|\bmoney$|\bwallet$|\bcash$",
-        r"b\.s\.c\.|k\.s\.c|s\.a$| sv$| gt$",
+        r"b\.s\.c\.|k\.s\.c|s\.a\.a\.?$|s\.a\.?$| sv$| gt$",
     ]
     re_glut = [
         r"\.io$|\.com$",
-        r"l'|d’|d'",
+        r"l'|d’|d′|d'",
     ]
     i18n_map = {
-        # "  ": " ",
+        " - ": "-",
+        " & ": "&",
         "nationale": "national",
         "а": "a",
         "á": "a",
@@ -56,7 +57,7 @@ class PmUnifier:
         "ř": "r",
         "í": "i",
     }
-    rms = " -:`'’′"
+    rms = ":`'’′"
 
     def __init__(self, countries: list[str]):
         self.cts = countries
@@ -91,7 +92,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)
@@ -111,7 +112,7 @@ class PmUnifier:
             or self.pms[name].norm.startswith((acr + " ", acr + ":"))
             or self.pms[name].norm.endswith(" " + acr)
         ):
-            self.pms[name].norm = self.pms[name].norm.replace(acr, "", 1).replace("()", "", 1).strip()
+            self.pms[name].norm = self.pms[name].norm.replace(acr, "", 1)
             self.pms[name].acronym = acr
             self.clear(name)
 
@@ -124,7 +125,7 @@ class PmUnifier:
             self.pms[name].norm = self.pms[name].norm.replace(src, trgt)
 
     def clear(self, name: str):
-        self.pms[name].norm = self.pms[name].norm.replace("()", "").replace("  ", " ").strip(" -:")
+        self.pms[name].norm = self.pms[name].norm.replace("()", "").replace("  ", " ").strip(" -:.")
 
     def __call__(self, s: str) -> PmUni:
         # если в словаре замен есть текущее назвние - меняем, иначе берем строку до запятой
@@ -147,5 +148,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.dev51 → xync_client-0.0.25.dev56/xync_client.egg-info}/PKG-INFO

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