xync-client 0.0.11.dev15__tar.gz → 0.0.11.dev18__tar.gz

{xync_client-0.0.11.dev15/xync_client.egg-info → xync_client-0.0.11.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev15
+Version: 0.0.11.dev18
 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.11.dev15 → xync_client-0.0.11.dev18}/tests/TestEx.py

@@ -31,7 +31,8 @@ class TestEx(BaseTest):
     async def test_curs(self, clients: list[BaseExClient]):
         for client in clients:
             curs: FlatDict = await client.curs()
-            t, _ = await ExTest.update_or_create({"ok": self.is_flat_dict(curs)}, ex=client.ex, action=ExAction.curs)
+            ok = self.is_flat_dict(curs)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.curs)
             assert t.ok, "No curs"
             logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
 

{xync_client-0.0.11.dev15 → xync_client-0.0.11.dev18}/xync_client/BingX/ex.py

@@ -54,7 +54,8 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BingX")
     cl = ExClient(bg)
-    await cl.pms()
+    await cl.curs()
+    # pms = await cl.pms()
     await cl.close()
 
 

xync_client-0.0.11.dev18/xync_client/Bybit/ex.py

@@ -0,0 +1,64 @@
+import json
+from enum import IntEnum
+
+from xync_client.Abc.Base import ListOfDicts, MapOfIdsList, DictOfDicts, FlatDict
+from xync_client.Abc.Ex import BaseExClient
+
+
+class AdsStatus(IntEnum):
+    REST = 0
+    WORKING = 1
+
+
+class ExClient(BaseExClient):  # Bybit client
+    host = "api2.bybit.com"
+    headers = {"cookie": ";"}  # rewrite token for public methods
+
+    async def _get_config(self):
+        resp = await self._get("/fiat/p2p/config/initial")
+        return resp["result"]  # todo: tokens, pairs, ...
+
+    # 20: Список всех платежных методов на бирже
+    async def pms(self) -> DictOfDicts:
+        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        pms = pms["result"]["paymentConfigVo"]
+        return {
+            pm["paymentType"]: {
+                "name": pm["paymentName"],
+            }
+            for pm in pms
+        }
+
+    # 21: Список поддерживаемых валют
+    async def curs(self) -> FlatDict:
+        config = await self._get_config()
+        return {c["id"]: c["currencyId"] for c in config["symbols"]}
+
+    # 22: Список платежных методов по каждой валюте
+    async def cur_pms_map(self) -> MapOfIdsList:
+        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
+        return json.loads(pms["result"]["currencyPaymentIdMap"])
+
+    # 23: Список торгуемых монет (с ограничениям по валютам, если есть)
+    async def coins(self) -> FlatDict:
+        coins = await self._get("/spot/api/basic/symbol_list")
+        return coins
+
+    # 24: Список объяв по (buy/sell, cur, coin, pm)
+    async def ads(
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+    ) -> ListOfDicts:
+        data = {
+            "userId": "",
+            "tokenId": coin_exid,
+            "currencyId": cur_exid,
+            "payment": pm_exids or [],
+            "side": "0" if is_sell else "1",
+            "size": "10",
+            "page": "1",
+            "amount": str(amount) if amount else "",
+            "authMaker": False,
+            "canTrade": False,
+        }
+        ads = await self._post("/fiat/otc/item/online/", data)
+        return ads["result"]["items"]

{xync_client-0.0.11.dev15 → xync_client-0.0.11.dev18}/xync_client/Gate/ex.py

@@ -1,13 +1,13 @@
 import re
-from asyncio import run
+from asyncio import run, sleep
 from json import JSONDecoder
 
 from bs4 import BeautifulSoup, Script
 from x_model import init_db
 from xync_schema import models
-from xync_schema.models import Coin, Cur, Pm, Ad, Ex, Curex
+from xync_schema.models import Coin, Cur, Pm, Ad, Ex
 
-from xync_client.Abc.Base import MapOfIdsList
+from xync_client.Abc.Base import MapOfIdsList, DictOfDicts, FlatDict
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
@@ -16,19 +16,19 @@ class ExClient(BaseExClient):
     async def cur_pms_map(self) -> MapOfIdsList:
         pass
 
-    async def curs(self) -> list[Cur]:
+    async def curs(self) -> FlatDict:
         curs = await self._post("/json_svr/buy_crypto_fiat_setting")
-        curs = [cur["fiat"] for cur in curs if cur["p2p"]]
-        curexs = [Curex(cur=c, ex=self.ex) for c in curs]
-        await Curex.bulk_create(curexs, ignore_conflicts=True)
+        curs = {cur["fiat"]: cur["fiat"] for cur in curs["datas"] if cur["p2p"]}
         return curs
 
     async def coins(self, cur: Cur = None) -> list[Coin]: ...
 
-    async def pms(self, cur: Cur = None) -> list[Pm]:
+    async def pms(self, cur: Cur = None) -> DictOfDicts:
+        await sleep(1)
         doc = await self._get("/p2p")
+        await sleep(1)
         soup = BeautifulSoup(doc, "html.parser")
-        script: Script = soup.body.find_all("script")[14]
+        script: Script = soup.body.find_all("script")[17]  # 17-th not stable
         strng = (
             script.get_text(strip=True)
             .replace("\n", "")
@@ -43,15 +43,19 @@ class ExClient(BaseExClient):
         pattern = r"payment_settings:\s{1}(\{.*?\}),paymentIdMap:"
         match = re.search(pattern, strng.replace(",}", "}").replace(",]", "]"), re.DOTALL)
         res = match.group(1)
-        _ = JSONDecoder(strict=False).decode(res)
-        pmcurs = {
-            cur.ticker: (await self._get("/v3/c2c/configs/receipt/templates", {"quoteCurrency": cur.ticker}))["data"]
-            for cur in await self.curs()
+        pms = JSONDecoder(strict=False).decode(res)
+        return {
+            pm["index"]: {"name": pm["pay_name"], "logo": pm["image"], "identifier": idf, "type_": pm["base_type"]}
+            for idf, pm in pms.items()
         }
-        pp = {}
-        [[pp.update({p["paymentMethod"]: p["paymentMethodDescription"]}) for p in ps] for ps in pmcurs.values()]
-        pp = {k: v for k, v in sorted(pp.items(), key=lambda x: x[0])}
-        return pp
+        # pmcurs = {
+        #     cur.ticker: (await self._get("/v3/c2c/configs/receipt/templates", {"quoteCurrency": cur.ticker}))["data"]
+        #     for cur in await self.curs()
+        # }
+        # pp = {}
+        # [[pp.update({p["paymentMethod"]: p["paymentMethodDescription"]}) for p in ps] for ps in pmcurs.values()]
+        # pp = {k: v for k, v in sorted(pp.items(), key=lambda x: x[0])}
+        # return pp
 
     async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> list[Ad]:
         pass
@@ -61,9 +65,10 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="Gate")
     cl = ExClient(bg)
-    # await cl.curs()
+    await cl.curs()
     # await cl.coins()
-    await cl.pms()
+    pms = await cl.pms()
+    print(pms)
 
 
 if __name__ == "__main__":

{xync_client-0.0.11.dev15 → xync_client-0.0.11.dev18}/xync_client/Htx/ex.py

@@ -67,6 +67,7 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     ex = await Ex.get(name="Htx")
     cl = ExClient(ex)
+    await cl.curs()
     await cl.set_pmcurexs()
     await cl.set_coinexs()
     await cl.close()

{xync_client-0.0.11.dev15 → xync_client-0.0.11.dev18/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev15
+Version: 0.0.11.dev18
 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.11.dev15/xync_client/Bybit/ex.py

@@ -1,58 +0,0 @@
-from enum import IntEnum
-
-from xync_client.Abc.Base import ListOfDicts, MapOfIdsList
-from xync_client.Abc.Ex import BaseExClient
-
-
-class AdsStatus(IntEnum):
-    REST = 0
-    WORKING = 1
-
-
-class ExClient(BaseExClient):  # Bybit client
-    host = "api2.bybit.com"
-    headers = {"cookie": ";"}  # rewrite token for public methods
-
-    """ PUBLIC METHS """
-
-    async def get_ads(
-        self, coin: str, cur: str, sell: bool = False, amount: int = None, payment: list[str] = None
-    ) -> list:
-        data = {
-            "userId": "",
-            "tokenId": coin,
-            "currencyId": cur,
-            "payment": payment or [],
-            "side": "0" if sell else "1",
-            "size": "10",
-            "page": "1",
-            "amount": str(amount) if amount else "",
-            "authMaker": False,
-            "canTrade": False,
-        }
-        ads = await self._post("/fiat/otc/item/online/", data)
-        return ads["result"]["items"]
-
-    async def get_config(self):
-        resp = await self._get("/fiat/p2p/config/initial")
-        return resp["result"]  # todo: tokens, pairs, ...
-
-    async def curs(self):
-        config = await self.get_config()
-        return config["symbols"]
-
-    async def coins(self):
-        coins = await self._get("/spot/api/basic/symbol_list")
-        return coins
-
-    async def pms(self):
-        pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
-        return pms
-
-    """ Private METHs"""
-
-    async def cur_pms_map(self) -> MapOfIdsList:
-        pass
-
-    async def ads(self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None) -> ListOfDicts:
-        pass