xync-client 0.0.25.dev69__tar.gz → 0.0.25.dev73__tar.gz

{xync_client-0.0.25.dev69/xync_client.egg-info → xync_client-0.0.25.dev73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev69
+Version: 0.0.25.dev73
 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.25.dev73/xync_client/BitGet/etype/ad.py

@@ -0,0 +1,79 @@
+from typing import List, Optional
+from pydantic import BaseModel, Field
+from xync_schema.types import BaseAd
+
+
+class PaymethodDetail(BaseModel):
+    name: str
+    required: int
+    type: str
+
+
+class PaymethodInfo(BaseModel):
+    colorValue: str
+    iconUrl: str
+    isModifyKyc: int
+    paymethodId: str
+    paymethodInfo: List[PaymethodDetail]
+    paymethodName: str
+    paymethodNameHandle: bool
+
+
+class Ad(BaseAd):
+    exid: int | str | None = Field(alias="id")
+    adEditorTime: str
+    adNo: str
+    adType: int
+    advImages: List[str]
+    advertiseIsEvent: int
+    allowMerchantPlace: int
+    allowPlace: int
+    amount: str
+    avgTime: int
+    businessCertifiedList: List
+    businessCertifiedResp: Optional[None]
+    cancellPlaceOrderTime: int
+    certifiedMerchant: int
+    coinCode: str
+    coinPrecision: int
+    countryList: List
+    createTime: str
+    customizeState: int
+    delAdv: int
+    editAmount: str
+    encryptUserId: str
+    fiatCode: str
+    fiatPrecision: int
+    fiatSymbol: str
+    floatValue: str
+    fundState: bool
+    goodEvaluationRate: str
+    headColor: str
+    hideFlag: int
+    iconUrl: str
+    lastAmount: str
+    limitPrice: str
+    maxAmount: str
+    maxCompleteDefault: int
+    minAmount: str
+    minCompleteDefault: int
+    nickName: str
+    orderMode: str
+    payDuration: int
+    paymethodInfo: List[PaymethodInfo]
+    positionNum: str
+    price: str
+    priceType: int
+    priceValue: float
+    recentOnlineText: str
+    showOnline: bool
+    soldAmount: str
+    state: int
+    taxAmount: str
+    thirtyCompletionRate: str
+    thirtyTunoverNum: str
+    transactionTermsRespList: List
+    turnoverNum: str
+    turnoverRate: str
+    turnoverRateNum: float  # Changed from int to float
+    userId: str

xync_client-0.0.25.dev73/xync_client/BitGet/ex.py

@@ -0,0 +1,115 @@
+import json
+import subprocess
+from asyncio import run, sleep
+from os.path import dirname
+
+from x_model import init_db
+from xync_schema import models
+from xync_schema.models import Ex
+from xync_schema import types
+
+from xync_client.Abc.Ex import BaseExClient
+from xync_client.loader import PG_DSN
+from xync_client.Abc.Base import MapOfIdsList
+from xync_client.Abc.types import PmEx
+from xync_client.BitGet.etype import ad
+
+
+class ExClient(BaseExClient):
+    headers = {
+        "accept-language": "ru,en;q=0.9",
+        "content-type": "application/json;charset=UTF-8",
+        "deviceid": "883e1394d8a2278418b6f02804df16c4",
+    }
+
+    async def _coin_cur_pms(self) -> dict:
+        # curs = (await self._post("/v1/p2p/pub/currency/queryAllCoinAndFiat"))["data"]["fiatInfoRespList"]
+        p = subprocess.Popen(
+            [
+                "node",
+                dirname(__file__) + "/req.mjs",
+                "pub/currency/queryAllCoinAndFiat",
+                "{}",
+                json.dumps(self.headers, separators=(",", ":")),
+            ],
+            stdout=subprocess.PIPE,
+        )
+        out = p.stdout.read().decode()
+        if not out:
+            await sleep(1.6)
+            return await self.curs()
+        return json.loads(out)
+
+    async def curs(self) -> dict[str, types.CurEx]:
+        curs: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]
+        return {cur["fiatCode"]: types.CurEx(exid=cur["fiatCode"], ticker=cur["fiatCode"]) for cur in curs}
+
+    async def coins(self) -> dict[str, types.CoinEx]:
+        coins: list[dict] = (await self._coin_cur_pms())["coinInfoRespList"]
+        return {
+            coin["coinCode"]: types.CoinEx(exid=coin["coinCode"], ticker=coin["coinCode"], scale=coin["coinPrecision"])
+            for coin in coins
+        }
+
+    async def pairs(self) -> MapOfIdsList:
+        coins = (await self.coins()).keys()
+        curs = (await self.curs()).keys()
+        p = {cur: {c for c in coins} for cur in curs}
+        return p, p
+
+    async def pms(self, cur: str = None) -> dict[int | str, PmEx]:  # {pm.exid: pm}
+        pp = {}
+        pms: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]
+        for pm in pms:
+            for p in pm["paymethodInfo"]:
+                pp[p["paymethodId"]] = PmEx(exid=p["paymethodId"], name=p["paymethodName"])
+        return pp
+
+    async def ads(
+        self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
+    ) -> list[ad.Ad]:
+        request_data = {
+            "side": 1 if is_sell else 2,
+            "pageNo": 1,
+            "pageSize": 10,
+            "coinCode": coin_exid,
+            "fiatCode": cur_exid,
+            "paymethodId": pm_exids or "",
+            "languageType": 6,
+        }
+        request_json = json.dumps(request_data, separators=(",", ":"))
+        p = subprocess.Popen(
+            [
+                "node",
+                dirname(__file__) + "/req.mjs",
+                "pub/adv/queryAdvList",
+                request_json,
+                json.dumps(self.headers, separators=(",", ":")),
+            ],
+            stdout=subprocess.PIPE,
+        )
+        out = p.stdout.read().decode()
+        ads = json.loads(out)
+        return [ad.Ad(id=_ad["encryptUserId"], **_ad) for _ad in ads["dataList"]]
+
+    async def cur_pms_map(self) -> dict[str, list[int]]:
+        cur_pms_map: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]
+        return {item["fiatCode"]: [pms["paymethodId"] for pms in item["paymethodInfo"]] for item in cur_pms_map}
+
+
+async def main():
+    _ = await init_db(PG_DSN, models, True)
+    bg = await Ex.get(name="BitGet")
+    cl = ExClient(bg)
+    await cl.curs()
+    # await cl.coins()
+    _ads = 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.25.dev69 → xync_client-0.0.25.dev73/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev69
+Version: 0.0.25.dev73
 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.25.dev69 → xync_client-0.0.25.dev73}/xync_client.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ xync_client/BitGet/__init__.py
 xync_client/BitGet/agent.py
 xync_client/BitGet/ex.py
 xync_client/BitGet/req.mjs
+xync_client/BitGet/etype/ad.py
 xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py

xync_client-0.0.25.dev69/xync_client/BitGet/ex.py

@@ -1,105 +0,0 @@
-import json
-import subprocess
-from asyncio import run, sleep
-from os.path import dirname
-
-from x_model import init_db
-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 BaseExClient
-from xync_client.loader import PG_DSN
-
-
-class ExClient(BaseExClient):
-    headers = {
-        "accept-language": "ru,en;q=0.9",
-        "content-type": "application/json;charset=UTF-8",
-        "deviceid": "883e1394d8a2278418b6f02804df16c4",
-    }
-
-    async def _coin_cur_pms(self) -> dict:
-        # curs = (await self._post("/v1/p2p/pub/currency/queryAllCoinAndFiat"))["data"]["fiatInfoRespList"]
-        p = subprocess.Popen(
-            [
-                "node",
-                dirname(__file__) + "/req.mjs",
-                "pub/currency/queryAllCoinAndFiat",
-                "{}",
-                json.dumps(self.headers, separators=(",", ":")),
-            ],
-            stdout=subprocess.PIPE,
-        )
-        out = p.stdout.read().decode()
-        if not out:
-            await sleep(1.6)
-            return await self.curs()
-        return json.loads(out)
-
-    async def curs(self) -> dict[str, dict]:
-        curs: list[dict] = (await self._coin_cur_pms())["fiatInfoRespList"]
-        return {cur["fiatCode"]: cur for cur in curs}
-
-    async def coins(self, cur: Cur = None) -> dict[str, str]:
-        coins: list[dict] = (await self._coin_cur_pms())["coinInfoRespList"]
-        return {coin["coinCode"]: coin["coinCode"] for coin in coins}
-
-    async def pms(self) -> DictOfDicts:  # {pm.exid: pm}
-        pp = {}
-        for id_, cur in (await self.curs()).items():
-            [
-                pp.update({int(p["paymethodId"]): {"name": p["paymethodName"], "logo": p.get("iconUrl")}})
-                for p in cur["paymethodInfo"]
-            ]
-        return pp
-
-    async def ads(self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[int] = None) -> list[dict]:
-        slots = (
-            await self._post(
-                "/v1/p2p/pub/adv/queryAdvList",
-                data={
-                    "side": 2 if is_sell else 1,
-                    "pageNo": 1,
-                    "pageSize": 3,
-                    "coinCode": coin_exid,
-                    "fiatCode": cur_exid,
-                    "languageType": 6,
-                    "paymethodId": pm_exids[0] if pm_exids else None,
-                },
-            )
-        )["data"]["dataList"]
-        result = []
-        for slot in slots:
-            result.append(
-                {
-                    "price": float(slot["priceValue"]),
-                    "min_fiat": float(slot["minAmount"]),
-                    "max_fiat": float(min(slot["maxAmount"], slot["amount"])),
-                    "user": int(slot["userId"]) if slot["userId"] else None,
-                    "pms": [int(pay_method["paymethodId"]) for pay_method in slot["paymethodInfo"]],
-                }
-            )
-        return result
-
-    async def cur_pms_map(self) -> dict[str, list[int]]:
-        curs = await self.curs()
-        return {k: [int(pay_method["paymethodId"]) for pay_method in cur["paymethodInfo"]] for k, cur in curs.items()}
-
-
-async def main():
-    _ = await init_db(PG_DSN, models, True)
-    bg = await Ex.get(name="BitGet")
-    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())