xync-client 0.0.11.dev23__tar.gz → 0.0.11.dev26__tar.gz

{xync_client-0.0.11.dev23/xync_client.egg-info → xync_client-0.0.11.dev26}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev23
+Version: 0.0.11.dev26
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
 Requires-Python: >=3.12
 Requires-Dist: asynchuobi
+Requires-Dist: bs4
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pyrogram
 Requires-Dist: python-okx
 Requires-Dist: xn-client>=0.0.3dev3
+Requires-Dist: xn-auth
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/pyproject.toml

@@ -8,12 +8,14 @@ dynamic = ["version"]
 
 dependencies = [
     "asynchuobi",
+    "bs4",
     "python-binance",
     "pybit",
     "pyotp",
     "pyrogram",
     "python-okx",
     "xn-client>=0.0.3dev3",
+    "xn-auth",
     "xync-schema"
 ]
 

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/tests/TestEx.py

@@ -1,10 +1,10 @@
 import logging
 
 import pytest
+from xync_client.Abc.BaseTest import BaseTest
 from xync_schema.enums import ExStatus, ExType, ExAction
 from xync_schema.models import Ex, TestEx as ExTest
 
-from tests.Abc.BaseTest import BaseTest
 from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict, MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/xync_client/Abc/Ex.py

@@ -48,7 +48,7 @@ class BaseExClient(BaseClient):
     # 24: Список объяв по (buy/sell, cur, coin, pm)
     @abstractmethod
     async def ads(
-        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
     ) -> ListOfDicts:  # {ad.id: ad}
         ...
 

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/xync_client/Bybit/ex.py

@@ -1,8 +1,14 @@
 import json
+from asyncio import run
 from enum import IntEnum
 
+from x_model import init_db
+from xync_schema import models
+from xync_schema.models import Ex
+
 from xync_client.Abc.Base import ListOfDicts, MapOfIdsList, DictOfDicts, FlatDict
 from xync_client.Abc.Ex import BaseExClient
+from xync_client.loader import PG_DSN
 
 
 class AdsStatus(IntEnum):
@@ -32,7 +38,7 @@ class ExClient(BaseExClient):  # Bybit client
     # 21: Список поддерживаемых валют
     async def curs(self) -> FlatDict:
         config = await self._get_config()
-        return {c["id"]: c["currencyId"] for c in config["symbols"]}
+        return {c["currencyId"]: c["currencyId"] for c in config["currencies"]}
 
     # 22: Список платежных методов по каждой валюте
     async def cur_pms_map(self) -> MapOfIdsList:
@@ -41,10 +47,21 @@ class ExClient(BaseExClient):  # Bybit client
 
     # 23: Список торгуемых монет (с ограничениям по валютам, если есть)
     async def coins(self) -> FlatDict:
-        coins = await self._get("/spot/api/basic/symbol_list")
-        return coins
+        config = await self._get_config()
+        cc: set[str] = set()
+        for c in config["symbols"]:
+            cc.add(c["tokenId"])
+        return {c: c for c in cc}
+
+    # 24: Список торгуемых монет (с ограничениям по валютам, если есть)
+    async def pairs(self) -> FlatDict:
+        config = await self._get_config()
+        cc: dict[str, set[str]] = {}
+        for c in config["symbols"]:
+            cc[c["currencyId"]] = cc.get(c["currencyId"], set()) | {c["tokenId"]}
+        return cc
 
-    # 24: Список объяв по (buy/sell, cur, coin, pm)
+    # 25: Список объяв по (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:
@@ -62,3 +79,21 @@ class ExClient(BaseExClient):  # Bybit client
         }
         ads = await self._post("/fiat/otc/item/online/", data)
         return ads["result"]["items"]
+
+
+async def main():
+    _ = await init_db(PG_DSN, models, True)
+    bg = await Ex.get(name="Bybit")
+    cl = ExClient(bg)
+    # await cl.curs()
+    await cl.coins()
+    # await cl.ads("BTC", "RUB", True, [1, 289, 375])
+    # await cl.pms()
+    # await cl.cur_pms_map()
+    # await cl.set_pmcurexs()
+    # await cl.set_coinexs()
+    await cl.close()
+
+
+if __name__ == "__main__":
+    run(main())

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26/xync_client.egg-info}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev23
+Version: 0.0.11.dev26
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
 Requires-Python: >=3.12
 Requires-Dist: asynchuobi
+Requires-Dist: bs4
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pyrogram
 Requires-Dist: python-okx
 Requires-Dist: xn-client>=0.0.3dev3
+Requires-Dist: xn-auth
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/xync_client.egg-info/SOURCES.txt

@@ -5,7 +5,6 @@ README.md
 makefile
 pyproject.toml
 tests/AgentTest.py
-tests/BaseTest.py
 tests/OrderTest.py
 tests/TestEx.py
 tests/_todo_refact/__init__.py
@@ -27,6 +26,7 @@ xync_client.egg-info/top_level.txt
 xync_client/Abc/Agent.py
 xync_client/Abc/Auth.py
 xync_client/Abc/Base.py
+xync_client/Abc/BaseTest.py
 xync_client/Abc/Ex.py
 xync_client/Abc/Order.py
 xync_client/Binance/__init__.py

{xync_client-0.0.11.dev23 → xync_client-0.0.11.dev26}/xync_client.egg-info/requires.txt

@@ -1,10 +1,12 @@
 asynchuobi
+bs4
 python-binance
 pybit
 pyotp
 pyrogram
 python-okx
 xn-client>=0.0.3dev3
+xn-auth
 xync-schema
 
 [dev]