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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev12
+Version: 0.0.11.dev15
 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.dev12 → xync_client-0.0.11.dev15}/README.md

@@ -159,3 +159,5 @@ classDef red stroke:#f00
 - 36N: Получение сообщения от юзера `get_user_msg => (msg:str, file=None)`
 - 37N: Получение уведомления о (раз)блокировке юзером `got_blocked => is_blocked:bool`
 - 38N: Получение уведомления о полученном отзыве `got_rated => (user_id:int, order_id:int)`
+
+- 39: Получить балансы моих монет: `my_assets() => list[Asset]`

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/pyproject.toml

@@ -44,4 +44,4 @@ line-length = 120
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "class"  # , "session", "module", "package", "function"
+asyncio_default_fixture_loop_scope = "session"  # , "class", "module", "package", "function"

xync_client-0.0.11.dev15/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.dev15/tests/Abc/BaseTest.py

@@ -0,0 +1,56 @@
+from abc import abstractmethod
+
+# from asyncio import AbstractEventLoop
+from typing import TypeGuard
+
+import pytest
+
+# import uvloop
+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="session", autouse=True)
+    # def event_loop_policy(self):
+    #     return uvloop.EventLoopPolicy()
+
+    @pytest.fixture(scope="session", 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="session")
+    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.dev15/tests/TestEx.py

@@ -0,0 +1,45 @@
+import logging
+
+import pytest
+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
+from xync_client.Abc.Ex import BaseExClient
+
+
+@pytest.mark.asyncio(loop_scope="session")
+class TestEx(BaseTest):
+    @pytest.fixture
+    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 ExTest.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 ExTest.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 ExTest.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.dev12 → xync_client-0.0.11.dev15}/xync_client/Abc/Agent.py

@@ -1,7 +1,8 @@
 from abc import abstractmethod
 
+from xync_client.Abc.Base import ListOfDicts
+
 from xync_client.Abc.Auth import BaseAuthClient
-from xync_schema.enums import PmType
 from xync_schema.models import OrderStatus, Coin, Cur, Order, Pm, Ad, AdStatus, Fiat
 from xync_schema.pydantic import FiatNew
 
@@ -10,7 +11,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
@@ -23,7 +24,7 @@ class BaseAgentClient(BaseAuthClient):
     # # # Fiat
     # 25: Список реквизитов моих платежных методов
     @abstractmethod
-    async def my_fiats(self, cur: Cur = None) -> list[dict]: ...
+    async def my_fiats(self, cur: Cur = None) -> ListOfDicts: ...
 
     # 26: Создание
     @abstractmethod
@@ -31,7 +32,7 @@ class BaseAgentClient(BaseAuthClient):
 
     # 27: Редактирование
     @abstractmethod
-    async def fiat_upd(self, detail: str = None, type_: PmType = None) -> bool: ...
+    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> bool: ...
 
     # 28: Удаление
     @abstractmethod
@@ -99,3 +100,7 @@ class BaseAgentClient(BaseAuthClient):
     # 38: Поставить отзыв юзеру
     @abstractmethod
     async def rate_user(self, positive: bool) -> bool: ...
+
+    # 39: Балансы моих монет
+    @abstractmethod
+    async def my_assets(self) -> dict: ...

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/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.dev12 → xync_client-0.0.11.dev15}/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.dev12 → xync_client-0.0.11.dev15}/xync_client/BingX/base.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from datetime import datetime
 from json import dumps
@@ -11,7 +12,8 @@ class BaseBingXClient(BaseClient):
         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", "req.mjs", now, traceid, payload], stdout=subprocess.PIPE)
+        pref = "../xync_client/BingX/" if os.getcwd().split("/")[-1] == "tests" else ""
+        p = subprocess.Popen(["node", pref + "req.mjs", now, traceid, payload], stdout=subprocess.PIPE)
         sign = p.stdout.read().decode().strip()
         return {
             "sign": sign,

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

@@ -10,7 +10,7 @@ from xync_client.BingX.base import BaseBingXClient
 from xync_client.loader import PG_DSN
 
 
-class Client(BaseExClient, BaseBingXClient):
+class ExClient(BaseExClient, BaseBingXClient):
     headers: dict[str, str] = {
         "app_version": "9.0.5",
         "device_id": "ccfb6d50-b63b-11ef-b31f-ef1f76f67c4e",
@@ -53,9 +53,10 @@ class Client(BaseExClient, BaseBingXClient):
 async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BingX")
-    cl = Client(bg)
+    cl = ExClient(bg)
     await cl.pms()
     await cl.close()
 
 
-run(main())
+if __name__ == "__main__":
+    run(main())

xync_client-0.0.11.dev15/xync_client/BingX/test/main.py

@@ -0,0 +1,22 @@
+import requests
+
+headers = {
+    "app_version": "8.10.0",
+    "device_id": "64a8c630-acc2-11ef-aa5e-9f6ee3baa1a5",
+    "lang": "ru-RU",
+    "platformid": "30",
+    "sign": "5679FBAAF1D0A199E6B0975616B44807220C5FC8824D41F0DE21D2261F2D8E18",
+    "timestamp": "1733496004073",
+    "traceid": "8557cddbfe574e07b36c3014b5773358",
+}
+
+params = {
+    "coinName": "USDT",
+    "tradeCoinName": "USD",
+    "type": "1",
+    "amount": "500",
+}
+
+response = requests.get("https://api-app.qq-os.com/api/fiat/v1/rapid-buy-integration", params=params, headers=headers)
+
+print([i.get("paymentMethod")["name"] for i in response.json()["data"]["matchOptimalAdvertListVo"]["optimals"]])

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/xync_client/BitGet/agent.py

@@ -19,7 +19,7 @@ class Client(BaseAgentClient):
         super().__init__(agent)
 
     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]:
         pass
 

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/xync_client/BitGet/ex.py

@@ -1,4 +1,5 @@
 import json
+import os
 import subprocess
 from asyncio import run
 
@@ -7,12 +8,16 @@ from xync_client.Abc.Base import DictOfDicts
 from xync_schema import models
 from xync_schema.models import Cur, Ex
 
-from xync_client.Abc.Ex import BaseClient
+from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
 
-class Client(BaseClient):
-    headers = {"accept-language": "ru,en;q=0.9"}
+class ExClient(BaseExClient):
+    headers = {
+        "accept-language": "ru,en;q=0.9",
+        "content-type": "application/json;charset=UTF-8",
+        "deviceid": "883e1394d8a2278418b6f02804df16c4",
+    }
 
     async def curs(self) -> dict[str, str]:
         curs = (await self._post("/v1/p2p/pub/currency/queryAllCoinAndFiat"))["data"]["fiatInfoRespList"]
@@ -23,14 +28,23 @@ class Client(BaseClient):
         return {coin["coinCode"]: coin["coinCode"] for coin in coins}
 
     async def pms(self) -> DictOfDicts:  # {pm.exid: pm}
-        # curs = (await self._post("pub/currency/queryAllCoinAndFiat"))["data"]["fiatInfoRespList"]
-        p = subprocess.Popen(
-            ["node", "req.mjs", "user/queryPaymethods", '{"languageType":6}', self.headers], stdout=subprocess.PIPE
-        )
-        out = p.stdout.read().decode()
-        curs: list[dict] = json.loads(out)
+        for id_, cur in (await self.curs()).items():
+            pref = "../xync_client/BitGet/" if os.getcwd().split("/")[-1] == "tests" else ""
+            data = {"fiatCode": cur, "languageType": 6}
+            p = subprocess.Popen(
+                [
+                    "node",
+                    pref + "req.mjs",
+                    "pub/currency/query-popular-paymethod",
+                    json.dumps(data, separators=(",", ":")),
+                    json.dumps(self.headers, separators=(",", ":")),
+                ],
+                stdout=subprocess.PIPE,
+            )
+            out = p.stdout.read().decode()
+            pms: list[dict] = json.loads(out)
 
-        pmcurs = {cur["fiatCode"]: cur["paymethodInfo"] for cur in curs}
+        pmcurs = {pm["fiatCode"]: pm["paymethodInfo"] for pm in pms}
         pp = {}
         [
             [pp.update({int(p["paymethodId"]): {"name": p["paymethodName"], "logo": p.get("iconUrl")}}) for p in ps]
@@ -76,7 +90,7 @@ class Client(BaseClient):
 async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="BitGet")
-    cl = Client(bg)
+    cl = ExClient(bg)
     # await cl.curs()
     # await cl.coins()
     # await cl.ads("BTC", "RUB", True, [1, 289, 375])
@@ -87,4 +101,5 @@ async def main():
     await cl.close()
 
 
-run(main())
+if __name__ == "__main__":
+    run(main())

xync_client-0.0.11.dev12/xync_client/Bybit/ex.py → xync_client-0.0.11.dev15/xync_client/Bybit/agent.py

@@ -2,8 +2,10 @@ from enum import IntEnum
 from time import sleep
 
 import pyotp
-from x_client.http import Client
+from xync_client.Abc.Base import FlatDict
+from xync_schema.models import Cur
 
+from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.loader import BYT2FA
 
 
@@ -16,10 +18,9 @@ class AdsStatus(IntEnum):
     WORKING = 1
 
 
-class BybitP2P(Client):  # Bybit client
+class ExClient(BaseAgentClient):  # Bybit client
     host = "api2.bybit.com"
-
-    pub_header = {"cookie": ";"}  # rewrite token for public methods
+    headers = {"cookie": ";"}  # rewrite token for public methods
 
     last_ad_id: list[str] = []
     create_ad_body = {
@@ -79,49 +80,15 @@ class BybitP2P(Client):  # Bybit client
         "securityRiskToken": "",
     }
 
-    """ PUBLIC METHS """
-
-    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 = self._post("/fiat/otc/item/online/", data, self.pub_header)
-        return ads["result"]["items"]
-
-    def get_config(self):
-        resp = self._get("/fiat/p2p/config/initial", self.pub_header)
-        return resp["result"]  # todo: tokens, pairs, ...
-
-    def get_currencies(self):
-        config = self.get_config()
-        return config["symbols"]
-
-    def get_coins(self):
-        coins = self._get("/spot/api/basic/symbol_list", self.pub_header)
-        return coins
-
-    def get_payment_methods(self):
-        pms = self._post("/fiat/otc/configuration/queryAllPaymentList/", headers=self.pub_header)
-        return pms
-
     """ Private METHs"""
 
-    def create_payment_method(self, payment_type: int, real_name: str, account_number: str) -> dict:
+    def fiat_new(self, payment_type: int, real_name: str, account_number: str) -> FlatDict:
         method1 = self._post(
             "/fiat/otc/user/payment/new_create",
             {"paymentType": payment_type, "realName": real_name, "accountNo": account_number, "securityRiskToken": ""},
         )
         if srt := method1["result"]["securityRiskToken"]:
-            self.check_2fa(srt)
+            self._check_2fa(srt)
             method2 = self._post(
                 "/fiat/otc/user/payment/new_create",
                 {
@@ -142,24 +109,26 @@ class BybitP2P(Client):  # Bybit client
             return fiat
         return list_methods[1]
 
-    def update_payment_method(self, real_name: str, account_number: str, fiat_id: int = None) -> dict:
+    # 27
+    def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> dict:
         fiat = self.get_payment_method(fiat_id)
-        fiat["realName"] = real_name
-        fiat["accountNo"] = account_number
-        result = self._post("/fiat/otc/user/payment/new_update", fiat)
+        fiat["realName"] = name
+        fiat["accountNo"] = detail
+        result = await self._post("/fiat/otc/user/payment/new_update", fiat)
         srt = result["result"]["securityRiskToken"]
-        self.check_2fa(srt)
+        self._check_2fa(srt)
         fiat["securityRiskToken"] = srt
-        result2 = self._post("/fiat/otc/user/payment/new_update", fiat)
+        result2 = await self._post("/fiat/otc/user/payment/new_update", fiat)
         return result2
 
-    def delete_payment_method(self, ids: str) -> dict:
-        data = {"id": ids, "securityRiskToken": ""}
-        method = self._post("/fiat/otc/user/payment/new_delete", data)
+    # 28
+    def fiat_del(self, fiat_id: int) -> dict:
+        data = {"id": fiat_id, "securityRiskToken": ""}
+        method = await self._post("/fiat/otc/user/payment/new_delete", data)
         srt = method["result"]["securityRiskToken"]
-        self.check_2fa(srt)
+        self._check_2fa(srt)
         data["securityRiskToken"] = srt
-        delete = self._post("/fiat/otc/user/payment/new_delete", data)
+        delete = await self._post("/fiat/otc/user/payment/new_delete", data)
         return delete
 
     def switch_ads(self, new_status: AdsStatus) -> dict:
@@ -176,8 +145,8 @@ class BybitP2P(Client):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    def get_user_pay_methods(self):
-        upm = self._post("/fiat/otc/user/payment/list")
+    def my_fiats(self, cur: Cur = None):
+        upm = await self._post("/fiat/otc/user/payment/list")
         return upm["result"]
 
     def get_user_ads(self, active: bool = True) -> list:
@@ -191,7 +160,7 @@ class BybitP2P(Client):  # Bybit client
         security_risk_token = data["result"]["securityRiskToken"]
         return security_risk_token
 
-    def check_2fa(self, risk_token):
+    def _check_2fa(self, risk_token):
         # 2fa code
         bybit_secret = BYT2FA
         totp = pyotp.TOTP(bybit_secret)
@@ -203,7 +172,7 @@ class BybitP2P(Client):  # Bybit client
         if res["ret_msg"] != "success":
             print("Wrong 2fa, wait 5 secs and retry..")
             sleep(5)
-            self.check_2fa(risk_token)
+            self._check_2fa(risk_token)
         return res
 
     def post_ad(self, risk_token: str):
@@ -213,8 +182,8 @@ class BybitP2P(Client):  # Bybit client
 
     # создание объявлений
     def post_create_ad(self, token: str):
-        result_check_2fa = self.check_2fa(token)
-        assert result_check_2fa["ret_msg"] == "success", "2FA code wrong"
+        result__check_2fa = self._check_2fa(token)
+        assert result__check_2fa["ret_msg"] == "success", "2FA code wrong"
 
         result_add_ad = self._post_ad(token)
         if result_add_ad["ret_msg"] != "SUCCESS":
@@ -230,8 +199,8 @@ class BybitP2P(Client):  # Bybit client
         return security_risk_token
 
     def post_update_ad(self, token):
-        result_check_2fa = self.check_2fa(token)
-        assert result_check_2fa["ret_msg"] == "success", "2FA code wrong"
+        result__check_2fa = self._check_2fa(token)
+        assert result__check_2fa["ret_msg"] == "success", "2FA code wrong"
 
         result_update_ad = self.update_ad(token)
         if result_update_ad["ret_msg"] != "SUCCESS":

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

@@ -0,0 +1,58 @@
+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

xync_client-0.0.11.dev12/xync_client/Gate/pub.py → xync_client-0.0.11.dev15/xync_client/Gate/ex.py

@@ -12,7 +12,7 @@ from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
 
-class PublicClient(BaseExClient):
+class ExClient(BaseExClient):
     async def cur_pms_map(self) -> MapOfIdsList:
         pass
 
@@ -60,10 +60,11 @@ class PublicClient(BaseExClient):
 async def main():
     _ = await init_db(PG_DSN, models, True)
     bg = await Ex.get(name="Gate")
-    cl = PublicClient(bg)
+    cl = ExClient(bg)
     # await cl.curs()
     # await cl.coins()
     await cl.pms()
 
 
-run(main())
+if __name__ == "__main__":
+    run(main())

xync_client-0.0.11.dev15/xync_client/Htx/agent.py

@@ -0,0 +1,115 @@
+from x_client.aiohttp import Client
+from xync_schema.enums import AdStatus, PmType, OrderStatus
+from xync_schema.models import Pm, Coin, Cur, Ad, Fiat, Order
+from xync_schema.pydantic import FiatNew
+
+from xync_client.Abc.Agent import BaseAgentClient
+
+url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
+url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
+url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
+url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
+url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
+url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"
+
+
+class Public(Client):
+    url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
+
+
+class Private(BaseAgentClient):
+    # 0
+    async def get_orders(
+        self, stauts: OrderStatus = OrderStatus.created, coin: Coin = None, cur: Cur = None, is_sell: bool = None
+    ) -> list[Order]:
+        pass
+
+    async def order_request(self, ad_id: int, amount: float) -> dict:
+        pass
+
+    async def my_fiats(self, cur: Cur = None) -> list[dict]:
+        pass
+
+    async def fiat_new(self, fiat: FiatNew) -> Fiat.pyd():
+        pass
+
+    async def fiat_upd(self, detail: str = None, type_: PmType = None) -> bool:
+        pass
+
+    async def fiat_del(self, fiat_id: int) -> bool:
+        pass
+
+    async def my_ads(self) -> list[dict]:
+        res = await self._get(url_my_ads)
+        ads: [] = res["data"]
+        if (pages := res["totalPage"]) > 1:
+            for p in range(2, pages + 1):
+                ads += (await self._get(url_my_ads, {"currPage": p})).get("data", False)
+        return ads
+
+    async def ad_new(
+        self,
+        coin: Coin,
+        cur: Cur,
+        is_sell: bool,
+        pms: list[Pm],
+        price: float,
+        is_float: bool = True,
+        min_fiat: int = None,
+        details: str = None,
+        autoreply: str = None,
+        status: AdStatus = AdStatus.active,
+    ) -> Ad:
+        pass
+
+    async def ad_upd(
+        self,
+        pms: [Pm] = None,
+        price: float = None,
+        is_float: bool = None,
+        min_fiat: int = None,
+        details: str = None,
+        autoreply: str = None,
+        status: AdStatus = None,
+    ) -> bool:
+        pass
+
+    async def ad_del(self) -> bool:
+        pass
+
+    async def ad_switch(self) -> bool:
+        pass
+
+    async def ads_switch(self) -> bool:
+        pass
+
+    async def get_user(self, user_id) -> dict:
+        pass
+
+    async def send_user_msg(self, msg: str, file=None) -> bool:
+        pass
+
+    async def block_user(self, is_blocked: bool = True) -> bool:
+        pass
+
+    async def rate_user(self, positive: bool) -> bool:
+        pass
+
+    # 39
+    async def my_assets(self) -> dict:
+        assets = await self._get(url_my_bals)
+        return {c["coinId"]: c["total"] for c in assets["data"] if c["total"]}
+
+    async def _get_auth_hdrs(self) -> dict[str, str]:
+        pass
+
+    base_url = ""
+    middle_url = ""
+
+    htok: str = "Ev5lFfAvxDU2MA9BJ-Mc4U6zZG3Wb6qsp3Tx2fz6GIoY-uOP2m0-gvjE57ad1qDF"
+
+    url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
+    url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
+    url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
+    url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
+    url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"

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

@@ -5,11 +5,11 @@ from xync_schema import models
 from xync_schema.models import Ex, Coin, Cur, Pm, Ad
 from xync_schema.enums import PmType
 
-from xync_client.Abc.Ex import ExClient
+from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 
 
-class Client(ExClient):
+class ExClient(BaseExClient):
     # 20: Get all pms
     async def pms(self) -> dict[int, dict]:
         dist = {
@@ -47,10 +47,12 @@ class Client(ExClient):
         wrong_pms = {4, 34, 498, 548, 20009, 20010}  # , 212, 239, 363  # these ids not exist in pms
         return {c["currencyId"]: set(c["supportPayments"]) - wrong_pms for c in res["currency"] if c["supportPayments"]}
 
+    # 23: Список торгуемых монет
     async def coins(self) -> dict[int, str]:
         coins: list[dict] = (await self._coin_curs_pms())["coin"]
         return {c["coinId"]: c["coinCode"] for c in coins if c["coinType"] == 2}
 
+    # 24: Список объяв
     async def ads(self, coin: Coin, cur: Cur, is_sell: bool, pms: list[Pm] = None) -> list[Ad]:
         res = await self._coin_curs_pms()
         return res["country"]
@@ -64,10 +66,11 @@ class Client(ExClient):
 async def main():
     _ = await init_db(PG_DSN, models, True)
     ex = await Ex.get(name="Htx")
-    cl = Client(ex)
+    cl = ExClient(ex)
     await cl.set_pmcurexs()
     await cl.set_coinexs()
     await cl.close()
 
 
-run(main())
+if __name__ == "__main__":
+    run(main())

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/xync_client/TgWallet/agent.py

@@ -1,38 +1,31 @@
-from enum import StrEnum, IntEnum
+from enum import StrEnum
 from typing import Literal
 
-from x_client.http import Client as HttpClient
+from xync_client.TgWallet.auth import AuthClient
 from xync_schema.models import User, Cur, Order, Coin, OrderStatus, Pmex
 from xync_schema.pydantic import FiatNew
 
 from xync_client.Abc.Agent import BaseAgentClient
-from xync_client.TgWallet.pyro import PyroClient
 
 
 class Exceptions(StrEnum):
     PM_KYC = "OFFER_FIAT_COUNTRY_NOT_SUPPORTED_BY_USER_KYC_COUNTRY"
 
 
-class Status(IntEnum):
-    ALL_ACTIVE = OrderStatus.active
+# class Status(IntEnum):
+#     ALL_ACTIVE = OrderStatus.active
 
 
-class AgentClient(BaseAgentClient):
+class AgentClient(BaseAgentClient, AuthClient):
     async def order_request(self, ad_id: int, amount: float) -> Order:
         pass
 
-    async def _get_auth_hdrs(self) -> dict[str, str]:
-        pyro = PyroClient(self.agent)
-        init_data = await pyro.get_init_data()
-        tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
-        return {"Wallet-Authorization": tokens["jwt"], "Authorization": "Bearer " + tokens["value"]}
-
     async def get_orders(
         self, stauts: OrderStatus = OrderStatus.active, coin: Coin = None, cur: Cur = None, is_sell: bool = None
     ) -> list[Order]:
         orders = await self._post(
             "/p2p/public-api/v2/offer/order/history/get-by-user-id",
-            {"offset": 0, "limit": 100, "filter": {"status": Status(stauts)}},  # "limit": 20
+            {"offset": 0, "limit": 100, "filter": {"status": "ALL_ACTIVE"}},  # "limit": 20
         )
         return orders
 

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/xync_client/TgWallet/auth.py

@@ -9,4 +9,6 @@ class AuthClient(BaseAuthClient):
         pyro = PyroClient(self.agent)
         init_data = await pyro.get_init_data()
         tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
+        self.agent.exid = tokens["user_id"]
+        await self.agent.save()
         return {"Wallet-Authorization": tokens["jwt"], "Authorization": "Bearer " + tokens["value"]}

{xync_client-0.0.11.dev12 → xync_client-0.0.11.dev15}/xync_client/TgWallet/ex.py

@@ -1,10 +1,11 @@
-from xync_client.Abc.Auth import BaseAuthClient
+from xync_client.TgWallet.auth import AuthClient
+
 from xync_schema.models import Pm
 
 from xync_client.Abc.Ex import BaseExClient
 
 
-class ExClient(BaseExClient, BaseAuthClient):
+class ExClient(BaseExClient, AuthClient):
     async def curs(self) -> dict[str, str]:
         coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
         return {c["code"]: c["code"] for c in coins_curs["data"]["fiat"]}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev12
+Version: 0.0.11.dev15
 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.dev12 → xync_client-0.0.11.dev15}/xync_client.egg-info/SOURCES.txt

@@ -4,8 +4,12 @@
 README.md
 makefile
 pyproject.toml
+tests/TestEx.py
 tests/__init__.py
-tests/test_ex.py
+tests/_test_ex.py
+tests/Abc/AgentTest.py
+tests/Abc/BaseTest.py
+tests/Abc/OrderTest.py
 tests/Binance/test_binance.py
 tests/Bybit/test_bybit.py
 tests/Bybit/test_bybit_p2p.py
@@ -23,10 +27,6 @@ xync_client/Abc/Auth.py
 xync_client/Abc/Base.py
 xync_client/Abc/Ex.py
 xync_client/Abc/Order.py
-xync_client/AbcTest/AgentTest.py
-xync_client/AbcTest/BaseTest.py
-xync_client/AbcTest/ExTest.py
-xync_client/AbcTest/OrderTest.py
 xync_client/Binance/__init__.py
 xync_client/Binance/binance_async.py
 xync_client/Binance/earn_api.py
@@ -34,6 +34,7 @@ xync_client/Binance/ex.py
 xync_client/Binance/exceptions.py
 xync_client/Binance/sapi.py
 xync_client/Binance/web_c2c.py
+xync_client/BingX/__init__.py
 xync_client/BingX/base.py
 xync_client/BingX/ex.py
 xync_client/BingX/req.mjs
@@ -43,11 +44,12 @@ xync_client/BitGet/__init__.py
 xync_client/BitGet/agent.py
 xync_client/BitGet/ex.py
 xync_client/BitGet/req.mjs
+xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py
 xync_client/Bybit/web_p2p.py
+xync_client/Gate/ex.py
 xync_client/Gate/premarket.py
-xync_client/Gate/pub.py
 xync_client/Htx/agent.py
 xync_client/Htx/earn.py
 xync_client/Htx/ex.py

xync_client-0.0.11.dev12/xync_client/AbcTest/AgentTest.py

@@ -1,13 +0,0 @@
-import pytest
-
-from xync_client.Abc.Base import BaseClient
-from xync_client.Abc.BaseTest import BaseTest
-
-
-class AgentTest(BaseTest):
-    @pytest.fixture(scope="class", autouse=True)
-    async def cl(self) -> BaseClient:
-        agent = (await self.exq).agents.filter(auth__not_isnull=True).first()
-        acl = BaseClient(agent)
-        yield acl
-        await acl.close()

xync_client-0.0.11.dev12/xync_client/AbcTest/BaseTest.py

@@ -1,42 +0,0 @@
-import pytest
-from typing import TypeGuard
-from src.loader import PG_DSN
-from tortoise.backends.asyncpg import AsyncpgDBClient
-from x_model import init_db
-from xync_schema import models
-from xync_schema.models import Ex
-
-from xync_client.Abc.Base import DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList, BaseClient
-
-
-class BaseTest:
-    def __init__(self, ex_name: str):
-        self.exq = Ex.get(name=ex_name)
-
-    @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()
-
-    @pytest.fixture(scope="class", autouse=True)
-    async def cl(self) -> BaseClient:
-        bcl = BaseClient(await self.exq)
-        yield bcl
-        await bcl.close()
-
-    @staticmethod
-    def is_dict_of_dicts(dct: DictOfDicts) -> TypeGuard[DictOfDicts]:
-        return all(isinstance(k, int | str) and isinstance(v, dict) for k, v in dct.items())
-
-    @staticmethod
-    def is_list_of_dicts(lst: ListOfDicts) -> TypeGuard[ListOfDicts]:
-        return all(isinstance(el, dict) for el in lst)
-
-    @staticmethod
-    def is_flat_dict(dct: FlatDict) -> TypeGuard[FlatDict]:
-        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())
-
-    @staticmethod
-    def is_map_of_ids(dct: MapOfIdsList) -> TypeGuard[MapOfIdsList]:
-        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())

xync_client-0.0.11.dev12/xync_client/AbcTest/ExTest.py

@@ -1,12 +0,0 @@
-import pytest
-
-from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.BaseTest import BaseTest
-
-
-class ExTest(BaseTest):
-    @pytest.fixture(scope="class", autouse=True)
-    async def cl(self) -> BaseExClient:
-        ecl = BaseExClient(await self.exq)
-        yield ecl
-        await ecl.close()

xync_client-0.0.11.dev12/xync_client/BingX/test/main.py

@@ -1,39 +0,0 @@
-import requests
-
-headers = {
-    "accept": "application/json, text/plain, */*",
-    "accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
-    "app_version": "9.0.0",
-    "appid": "30004",
-    "appsiteid": "0",
-    "channel": "official",
-    "device_brand": "Linux_Chrome_131.0.0.0",
-    "device_id": "64a8c630-acc2-11ef-aa5e-9f6ee3baa1a5",
-    "lang": "ru-RU",
-    "mainappid": "10009",
-    "origin": "https://bingx.paycat.com",
-    "platformid": "30",
-    "priority": "u=1, i",
-    "referer": "https://bingx.paycat.com/",
-    "reg_channel": "official",
-    "sec-ch-ua": '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
-    "sec-ch-ua-mobile": "?0",
-    "sec-ch-ua-platform": '"Linux"',
-    "sec-fetch-dest": "empty",
-    "sec-fetch-mode": "cors",
-    "sec-fetch-site": "cross-site",
-    "sign": "C2F082935161A29256CDD98F2E33FBE3C9B2C0864A6FBCB1881013CBE6272AC8",
-    "timestamp": "1734637010958",
-    "timezone": "3",
-    "traceid": "3e38538d69fb43c9a009ea1fc00a9b8f",
-    "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
-    "x-requested-with": "XMLHttpRequest",
-}
-
-params = {
-    "fiat": "RUB",
-}
-
-response = requests.get("https://api-app.we-api.com/api/c2c/v1/advert/payment/list", params=params, headers=headers)
-
-print(i for i in response.json()["data"]["paymentMethodList"])

xync_client-0.0.11.dev12/xync_client/Htx/agent.py

@@ -1,18 +0,0 @@
-from x_client.aiohttp import Client
-
-
-class Public(Client):
-    url_ads_web = "https://www.huobi.com/en-us/fiat-crypto/trade/"
-
-
-class Private(Client):
-    base_url = ""
-    middle_url = ""
-
-    htok: str = "Ev5lFfAvxDU2MA9BJ-Mc4U6zZG3Wb6qsp3Tx2fz6GIoY-uOP2m0-gvjE57ad1qDF"
-
-    url_ads_req = "https://otc-cf.huobi.com/v1/data/trade-market"
-    url_my_ads = "https://otc-api.trygofast.com/v1/data/trade-list?pageSize=50"
-    url_my_ad = "https://www.huobi.com/-/x/otc/v1/otc/trade/"  # + id
-    url_my_bals = "https://www.huobi.com/-/x/otc/v1/capital/balance"
-    url_paccs = "https://www.huobi.com/-/x/otc/v1/user/receipt-account"