xync-client 0.0.11.dev10__tar.gz → 0.0.11.dev14__tar.gz

{xync_client-0.0.11.dev10/xync_client.egg-info → xync_client-0.0.11.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev10
+Version: 0.0.11.dev14
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -11,7 +11,7 @@ Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pyrogram
 Requires-Dist: python-okx
-Requires-Dist: xn-client>=0.0.3dev2
+Requires-Dist: xn-client>=0.0.3dev3
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.11.dev10 → xync_client-0.0.11.dev14}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "pyotp",
     "pyrogram",
     "python-okx",
-    "xn-client>=0.0.3dev2",
+    "xn-client>=0.0.3dev3",
     "xync-schema"
 ]
 

xync_client-0.0.11.dev14/tests/Abc/AgentTest.py

@@ -0,0 +1,17 @@
+import pytest
+
+from tests.Abc.BaseTest import BaseTest
+from xync_client.Abc.Agent import BaseAgentClient
+from xync_client.Abc.Base import BaseClient
+
+
+class AgentTest(BaseTest):
+    async def clients(self) -> list[BaseClient]:
+        pass
+
+    @pytest.fixture(scope="class", autouse=True)
+    async def cl(self) -> BaseAgentClient:
+        agent = (await self.ex).agents.filter(auth__not_isnull=True).first()
+        acl = BaseClient(agent)
+        yield acl
+        await acl.close()

xync_client-0.0.11.dev14/tests/Abc/BaseTest.py

@@ -0,0 +1,53 @@
+from abc import abstractmethod
+from asyncio import AbstractEventLoop
+from typing import TypeGuard
+
+import pytest
+from tortoise.backends.asyncpg import AsyncpgDBClient
+from x_model import init_db
+from xync_client.Abc.Base import BaseClient, DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList
+from xync_schema import models
+
+from xync_client.loader import PG_DSN
+
+
+class BaseTest:
+    loop: AbstractEventLoop
+
+    # @pytest.fixture(scope="class", autouse=True)
+    # def event_loop_policy(self):
+    #     return uvloop.EventLoopPolicy()
+
+    @pytest.fixture(scope="class", autouse=True)
+    async def cn(self) -> AsyncpgDBClient:
+        cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
+        yield cn
+        await cn.close()
+
+    @abstractmethod
+    @pytest.fixture(scope="class")
+    async def clients(self) -> list[BaseClient]: ...
+
+    @staticmethod
+    def is_dict_of_dicts(dct: DictOfDicts, not_empty: bool = True) -> TypeGuard[DictOfDicts]:
+        if not_empty and not len(dct):
+            return False
+        return all(isinstance(k, int | str) and isinstance(v, dict) for k, v in dct.items())
+
+    @staticmethod
+    def is_list_of_dicts(lst: ListOfDicts, not_empty: bool = True) -> TypeGuard[ListOfDicts]:
+        if not_empty and not len(lst):
+            return False
+        return all(isinstance(el, dict) for el in lst)
+
+    @staticmethod
+    def is_flat_dict(dct: FlatDict, not_empty: bool = True) -> TypeGuard[FlatDict]:
+        if not_empty and not len(dct):
+            return False
+        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())
+
+    @staticmethod
+    def is_map_of_ids(dct: MapOfIdsList, not_empty: bool = True) -> TypeGuard[MapOfIdsList]:
+        if not_empty and not len(dct):
+            return False
+        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())

xync_client-0.0.11.dev14/tests/TestEx.py

@@ -0,0 +1,44 @@
+import logging
+
+import pytest
+from xync_schema.enums import ExStatus, ExType, ExAction
+from xync_schema.models import Ex, TestEx as TestExs
+
+from tests.Abc.BaseTest import BaseTest
+from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict
+from xync_client.Abc.Ex import BaseExClient
+
+
+class TestEx(BaseTest):
+    @pytest.fixture(scope="class")
+    async def clients(self) -> list[BaseClient]:
+        exs = await Ex.filter(status__gt=ExStatus.plan)
+        [await ex.fetch_related("agents") for ex in exs if ex.type_ == ExType.tg]
+        clients: list[BaseExClient] = [ex.client() for ex in exs]
+        yield clients
+        [await cl.close() for cl in clients]
+
+    # 20
+    async def test_pms(self, clients: list[BaseExClient]):
+        for client in clients:
+            pms: DictOfDicts = await client.pms()
+            t, _ = await TestExs.update_or_create({"ok": self.is_dict_of_dicts(pms)}, ex=client.ex, action=ExAction.pms)
+            assert t.ok, "No pms"
+            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
+
+    # 21
+    async def test_curs(self, clients: list[BaseExClient]):
+        for client in clients:
+            curs: FlatDict = await client.curs()
+            t, _ = await TestExs.update_or_create({"ok": self.is_flat_dict(curs)}, ex=client.ex, action=ExAction.curs)
+            assert t.ok, "No curs"
+            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
+
+    # 22
+    async def test_cur_pms_map(self, clients: list[BaseExClient]):
+        for client in clients:
+            cur_pms: DictOfDicts = await client.cur_pms_map()
+            ok = self.is_dict_of_dicts(cur_pms)
+            t, _ = await TestExs.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.cur_pms_map)
+            assert t.ok, "No pms for cur"
+            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")

{xync_client-0.0.11.dev10 → xync_client-0.0.11.dev14}/xync_client/Abc/Agent.py

@@ -10,7 +10,7 @@ class BaseAgentClient(BaseAuthClient):
     # 0: Получшение ордеров в статусе status, по монете coin, в валюте coin, в направлении is_sell: bool
     @abstractmethod
     async def get_orders(
-        self, stauts: OrderStatus = OrderStatus.active, coin: Coin = None, cur: Cur = None, is_sell: bool = None
+        self, stauts: OrderStatus = OrderStatus.created, coin: Coin = None, cur: Cur = None, is_sell: bool = None
     ) -> list[Order]: ...
 
     # 1: [T] Получшение ордеров в статусе status, по монете coin, в валюте coin, в направлении is_sell: bool

{xync_client-0.0.11.dev10 → xync_client-0.0.11.dev14}/xync_client/Abc/Auth.py

@@ -3,21 +3,23 @@ from abc import abstractmethod
 
 from aiohttp import ClientResponse
 from aiohttp.http_exceptions import HttpProcessingError
-from xync_schema.models import Agent
+from xync_schema.models import Agent, Ex
 
 from xync_client.Abc.Base import BaseClient
 
 
 class BaseAuthClient(BaseClient):
-    def __init__(self, agent: Agent):
-        self.headers.update(agent.auth)
-        self.agent = agent
+    def __init__(self, agent: Agent | Ex):
+        # dirty hack for multi-inheritance
+        self.agent = agent if isinstance(agent, Agent) else agent.agents[0]
+        ex = agent if isinstance(agent, Ex) else agent.ex
+        self.headers.update(self.agent.auth)
         self.meth = {
             "GET": self._get,
             "POST": self._post,
             "DELETE": self._delete,
         }
-        super().__init__(agent.ex)
+        super().__init__(ex)
 
     @abstractmethod
     async def _get_auth_hdrs(self) -> dict[str, str]: ...

{xync_client-0.0.11.dev10 → xync_client-0.0.11.dev14}/xync_client/Binance/ex.py

@@ -1,13 +1,12 @@
 from xync_schema.enums import PmType
 
-from xync_client.Abc.Ex import BaseClient
-from xync_client.Binance.sapi import Sapi
+from xync_client.Abc.Ex import BaseExClient
 from xync_schema.models import Ex
 
 
-class Client(BaseClient):
-    def __init__(self, ex: Ex, bkeys):
-        self.sapi = Sapi(*bkeys)
+class ExClient(BaseExClient):
+    def __init__(self, ex: Ex):
+        # self.sapi = Sapi(*bkeys)
         super().__init__(ex)
 
     async def curs(self) -> dict:

xync_client-0.0.11.dev14/xync_client/BingX/base.py

@@ -0,0 +1,20 @@
+import subprocess
+from datetime import datetime
+from json import dumps
+from uuid import uuid4
+
+from xync_client.Abc.Base import BaseClient
+
+
+class BaseBingXClient(BaseClient):
+    def _prehook(self, _payload: dict = None):
+        traceid = str(uuid4()).replace("-", "")
+        now = str(int(datetime.now().timestamp() * 1000))
+        payload = dumps(_payload, separators=(",", ":"), sort_keys=True) if _payload else "{}"
+        p = subprocess.Popen(["node", "../xync_client/BingX/req.mjs", now, traceid, payload], stdout=subprocess.PIPE)
+        sign = p.stdout.read().decode().strip()
+        return {
+            "sign": sign,
+            "timestamp": now,
+            "traceid": traceid,
+        }

xync_client-0.0.11.dev14/xync_client/BingX/ex.py

@@ -0,0 +1,62 @@
+from asyncio import run
+
+from x_model import init_db
+from xync_client.Abc.Base import DictOfDicts, FlatDict
+from xync_schema import models
+from xync_schema.models import Ex
+
+from xync_client.Abc.Ex import BaseExClient
+from xync_client.BingX.base import BaseBingXClient
+from xync_client.loader import PG_DSN
+
+
+class ExClient(BaseExClient, BaseBingXClient):
+    headers: dict[str, str] = {
+        "app_version": "9.0.5",
+        "device_id": "ccfb6d50-b63b-11ef-b31f-ef1f76f67c4e",
+        "lang": "ru-RU",
+        "platformid": "30",
+    }
+
+    # 20: Список всех платежных методов на бирже
+    async def pms(self) -> DictOfDicts:  # {pm.exid: pm}
+        curs = await self.curs()
+        pp = {}
+        for _id, cur in curs.items():
+            pms = await self._get("/api/c2c/v1/advert/payment/list", params={"fiat": cur})
+            [pp.update({p["id"]: {"name": p["name"], "logo": p["icon"]}}) for p in pms["data"]["paymentMethodList"]]
+        return pp
+
+    # 21: Список поддерживаемых валют
+    async def curs(self) -> FlatDict:  # {cur.exid: cur.ticker}
+        params = {
+            "type": "1",
+            "asset": "USDT",
+            "coinType": "2",
+        }
+        curs = await self._get("/api/c2c/v1/common/supportCoins", params=params)
+        return {cur["id"]: cur["name"] for cur in curs["data"]["coins"]}
+
+    # 22: cur_pms_map
+    async def cur_pms_map(self):
+        pass
+
+    # 23: coins
+    async def coins(self):
+        pass
+
+    # 24: ads
+    async def ads(self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None):
+        pass
+
+
+async def main():
+    _ = await init_db(PG_DSN, models, True)
+    bg = await Ex.get(name="BingX")
+    cl = ExClient(bg)
+    await cl.pms()
+    await cl.close()
+
+
+if __name__ == "__main__":
+    run(main())

xync_client-0.0.11.dev14/xync_client/BingX/req.mjs

@@ -0,0 +1,14 @@
+import cC from './sign.js'
+
+const [_, __, now, trace, payload] = process.argv
+const e = {
+  timestamp: now,
+  traceId: trace,
+  deviceId: "ccfb6d50-b63b-11ef-b31f-ef1f76f67c4e",
+  platformId: "30",
+  appVersion: "9.0.5",
+  requestPayload: JSON.parse(payload)
+};
+
+const sgn = cC(e).sign;
+console.log(sgn);