xync-client 0.0.11.dev30__tar.gz → 0.0.11.dev33__tar.gz

{xync_client-0.0.11.dev30/xync_client.egg-info → xync_client-0.0.11.dev33}/PKG-INFO

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

@@ -55,6 +55,13 @@ class TestEx(BaseTest):
             logging.info(f"{client.ex.name}:{ExAction.coins.name} - ok")
 
     # 23
+    async def test_pairs(self, clients: list[BaseExClient]):
+        for client in clients:
+            pairs: MapOfIdsList = await client.pairs()
+            ok = self.is_map_of_ids(pairs)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.pairs)
+            assert t.ok, "No coins"
+            logging.info(f"{client.ex.name}:{ExAction.pairs.name} - ok")
 
     # 24
     async def test_ads(self, clients: list[BaseExClient]):

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33}/xync_client/Abc/Agent.py

@@ -32,7 +32,7 @@ class BaseAgentClient(BaseAuthClient):
 
     # 27: Редактирование
     @abstractmethod
-    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> bool: ...
+    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> Fiat.pyd(): ...
 
     # 28: Удаление
     @abstractmethod
@@ -41,7 +41,7 @@ class BaseAgentClient(BaseAuthClient):
     # # # Ad
     # 29: Список моих ad
     @abstractmethod
-    async def my_ads(self) -> list[dict]: ...
+    async def my_ads(self) -> ListOfDicts: ...
 
     # 30: Создание ad:
     @abstractmethod
@@ -57,7 +57,7 @@ class BaseAgentClient(BaseAuthClient):
         details: str = None,
         autoreply: str = None,
         status: AdStatus = AdStatus.active,
-    ) -> Ad: ...
+    ) -> Ad.pyd(): ...
 
     # 31: Редактирование
     @abstractmethod
@@ -70,7 +70,7 @@ class BaseAgentClient(BaseAuthClient):
         details: str = None,
         autoreply: str = None,
         status: AdStatus = None,
-    ) -> bool: ...
+    ) -> Ad.pyd(): ...
 
     # 32: Удаление
     @abstractmethod

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33}/xync_client/Abc/Auth.py

@@ -28,12 +28,17 @@ class BaseAuthClient(BaseClient):
         auth_hdrs: dict[str, str] = await self._get_auth_hdrs()
         self.session.headers.update(auth_hdrs)
 
-    async def _proc(self, resp: ClientResponse, data: dict = None) -> dict | str:
+    async def _post(self, url: str, data: dict = None, data_key: str = None):
+        dt = {"json" if isinstance(data, dict) else "data": data}
+        resp = await self.session.post(url, **dt, headers=self._prehook(data))
+        return await self._proc(resp, data_key, data)
+
+    async def _proc(self, resp: ClientResponse, data_key: str = None, body: dict | str = None) -> dict | str:
         try:
-            return await super()._proc(resp)
+            return await super()._proc(resp, data_key)
         except HttpProcessingError as e:
             if e.code == 401:
                 logging.warning(e)
                 await self.login()
-                res = await self.meth[resp.method](resp.url.path, data)
+                res = await self.meth[resp.method](resp.url.path, body, data_key=data_key)
                 return res

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33}/xync_client/Abc/Ex.py

@@ -47,7 +47,7 @@ class BaseExClient(BaseClient):
 
     # 23: Список пар валюта/монет
     @abstractmethod
-    async def pairs(self) -> FlatDict: ...
+    async def pairs(self) -> DictOfDicts: ...
 
     # 24: Список объяв по (buy/sell, cur, coin, pm)
     @abstractmethod

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33}/xync_client/Bybit/ex.py

@@ -49,7 +49,7 @@ class ExClient(BaseExClient):  # Bybit client
         return {c: c for c in cc}
 
     # 23: Список пар валюта/монет
-    async def pairs(self) -> FlatDict:
+    async def pairs(self) -> MapOfIdsList:
         config = await self._get_config()
         cc: dict[str, set[str]] = {}
         for c in config["symbols"]:
@@ -57,9 +57,7 @@ class ExClient(BaseExClient):  # Bybit client
         return cc
 
     # 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:
+    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,

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33}/xync_client/TgWallet/ex.py

@@ -1,4 +1,4 @@
-from xync_client.Abc.Base import FlatDict
+from xync_client.Abc.Base import FlatDict, DictOfDicts, MapOfIdsList, ListOfDicts
 from xync_client.TgWallet.auth import AuthClient
 
 from xync_schema.models import Pm
@@ -7,37 +7,48 @@ from xync_client.Abc.Ex import BaseExClient
 
 
 class ExClient(BaseExClient, AuthClient):
-    async def curs(self) -> dict[str, str]:
+    # 19: Список поддерживаемых валют тейкера
+    async def curs(self) -> FlatDict:
         coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
         return {c["code"]: c["code"] for c in coins_curs["data"]["fiat"]}
 
-    # 23: Список торгуемых монет (с ограничениям по валютам, если есть)
-    async def coins(self) -> FlatDict:
-        coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
-        return {c["code"]: c["code"] for c in coins_curs["data"]["crypto"]}
-
-    async def _pms(self, cur: str = "RUB") -> dict[str, dict]:
+    async def _pms(self, cur: str) -> dict[str, dict]:
         pms = await self._post("/p2p/public-api/v3/payment-details/get-methods/by-currency-code", {"currencyCode": cur})
         return {pm["code"]: {"name": pm["nameEng"]} for pm in pms["data"]}
 
-    async def pms(self) -> dict[str, dict]:
+    # 20: Список платежных методов
+    async def pms(self, _cur: str = None) -> DictOfDicts:
         pms = {}
         for cur in await self.curs():
             for k, pm in (await self._pms(cur)).items():
                 pms.update({k: pm})
         return pms
 
-    async def cur_pms_map(self) -> dict[str, list[str]]:
+    # 21: Список платежных методов по каждой валюте
+    async def cur_pms_map(self) -> MapOfIdsList:
         return {cur: list(await self._pms(cur)) for cur in await self.curs()}
 
-    async def ads(self, coin: str, cur: str, is_sell: bool, pms: list[Pm] = None) -> list[dict]:
+    # 22: Список торгуемых монет (с ограничениям по валютам, если есть)
+    async def coins(self) -> FlatDict:
+        coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
+        return {c["code"]: c["code"] for c in coins_curs["data"]["crypto"]}
+
+    # 23: Список пар валюта/монет
+    async def pairs(self) -> MapOfIdsList:
+        coins = await self.coins()
+        curs = await self.curs()
+        pairs = {cur: set(coins.values()) for cur in curs.values()}
+        return pairs
+
+    # 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:
         params = {
-            "baseCurrencyCode": coin,
-            "quoteCurrencyCode": cur,
+            "baseCurrencyCode": coin_exid,
+            "quoteCurrencyCode": cur_exid,
             "offerType": "SALE" if is_sell else "PURCHASE",
             "offset": 0,
-            "limit": 10,
-            # ,"merchantVerified":"TRUSTED"
+            "limit": 100,
+            # "merchantVerified": "TRUSTED"
         }
-        ads = await self._post("/p2p/public-api/v2/offer/depth-of-market/", params)
+        ads = await self._post("/p2p/public-api/v2/offer/depth-of-market/", params, 'data')
         return ads

{xync_client-0.0.11.dev30 → xync_client-0.0.11.dev33/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev30
+Version: 0.0.11.dev33
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client