xync-client 0.0.25.dev88__tar.gz → 0.0.25.dev90__tar.gz

{xync_client-0.0.25.dev88/xync_client.egg-info → xync_client-0.0.25.dev90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.25.dev88
+Version: 0.0.25.dev90
 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.dev88 → xync_client-0.0.25.dev90}/xync_client/Abc/Ex.py

@@ -167,15 +167,13 @@ class BaseExClient(BaseClient):
         pmcurs = set()
         for cur_id, exids in cur2pms.items():
             for exid in exids:
-                pmcurs.add(
-                    (
-                        await models.Pmcur.update_or_create(
-                            cur=curs[cur_id],
-                            pm=pms.get(exid)
-                            or (await models.Pmex.get(ex=self.ex, exid=exid).prefetch_related("pm")).pm,
-                        )
-                    )[0]
-                )
+                if not (pm_id := pms.get(exid) and pms[exid].id):
+                    if pmex := await models.Pmex.get_or_none(ex=self.ex, exid=exid):
+                        pm_id = pmex.pm_id
+                    else:
+                        logging.critical(f"For cur {cur_id} not found pm#{exid}")
+                        continue
+                pmcurs.add((await models.Pmcur.update_or_create(cur=curs[cur_id], pm_id=pm_id))[0])
         # pmcurexs = [Pmcurex(pmcur=pmcur, ex=self.ex) for pmcur in pmcurs]
         # await Pmcurex.bulk_create(pmcurexs)
 

xync_client-0.0.25.dev90/xync_client/Bybit/etype/ad.py

@@ -0,0 +1,108 @@
+from typing import List, Optional, Dict, Any
+from pydantic import BaseModel
+from xync_schema.types import BaseAd
+
+class Currency(BaseModel):
+    currencyId: str
+    exchangeId: str
+    id: str
+    orgId: str
+    scale: int
+
+class Token(BaseModel):
+    exchangeId: str
+    id: str
+    orgId: str
+    scale: int
+    sequence: int
+    tokenId: str
+
+class SymbolInfo(BaseModel):
+    buyAd: Optional[Any]
+    buyFeeRate: str
+    currency: Currency
+    currencyId: str
+    currencyLowerMaxQuote: str
+    currencyMaxQuote: str
+    currencyMinQuote: str
+    exchangeId: str
+    id: str
+    itemDownRange: str
+    itemSideLimit: int
+    itemUpRange: str
+    kycCurrencyLimit: str
+    lowerLimitAlarm: int
+    orderAutoCancelMinute: int
+    orderFinishMinute: int
+    orgId: str
+    sellAd: Optional[Any]
+    sellFeeRate: str
+    status: int
+    token: Token
+    tokenId: str
+    tokenMaxQuote: str
+    tokenMinQuote: str
+    tradeSide: int
+    upperLimitAlarm: int
+
+class TradingPreferenceSet(BaseModel):
+    completeRateDay30: str
+    hasCompleteRateDay30: int
+    hasNationalLimit: int
+    hasOrderFinishNumberDay30: int
+    hasRegisterTime: int
+    hasUnPostAd: int
+    isEmail: int
+    isKyc: int
+    isMobile: int
+    nationalLimit: str
+    orderFinishNumberDay30: int
+    registerTimeThreshold: int
+
+class Ad(BaseAd):
+    accountId: str
+    authStatus: int
+    authTag: List[str]
+    ban: bool
+    baned: bool
+    blocked: str
+    createDate: str
+    currencyId: str
+    executedQuantity: str
+    fee: str
+    finishNum: int
+    frozenQuantity: str
+    id: str
+    isOnline: bool
+    itemType: str
+    lastLogoutTime: str
+    lastQuantity: str
+    makerContact: bool
+    maxAmount: str
+    minAmount: str
+    nickName: str
+    orderNum: int
+    paymentPeriod: int
+    payments: List[str]
+    premium: str
+    price: str
+    priceType: int
+    quantity: str
+    recentExecuteRate: int
+    recentOrderNum: int
+    recommend: bool
+    recommendTag: str
+    remark: str
+    side: int
+    status: int
+    symbolInfo: SymbolInfo
+    tokenId: str
+    tokenName: str
+    tradingPreferenceSet: TradingPreferenceSet
+    userId: str
+    userMaskId: str
+    userType: str
+    verificationOrderAmount: str
+    verificationOrderLabels: List[Any]
+    verificationOrderSwitch: bool
+    version: int

{xync_client-0.0.25.dev88 → xync_client-0.0.25.dev90}/xync_client/Bybit/ex.py

@@ -1,15 +1,16 @@
 import json
-from enum import IntEnum
-from xync_schema.models import Cur
+from asyncio import run
+from x_model import init_db
+from xync_schema import types
+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.Base import MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.pm_unifier import PmUnifier
-
-
-class AdsStatus(IntEnum):
-    REST = 0
-    WORKING = 1
+from xync_client.loader import PG_DSN
+from xync_client.Bybit.etype import ad
+from xync_client.Abc.types import PmEx
 
 
 class ExClient(BaseExClient):  # Bybit client
@@ -22,6 +23,7 @@ class ExClient(BaseExClient):  # Bybit client
             "Local Card M-redTS": "MTS-bank",
             "Local Card-Green": "Sberbank",
             "Local Card-Yellow": "T-Bank",
+            "Banque de développement local (BDL)": "Banque de développement local (BDL)",
         }
 
     host = "api2.bybit.com"
@@ -33,15 +35,17 @@ class ExClient(BaseExClient):  # Bybit client
         return resp["result"]  # todo: tokens, pairs, ...
 
     # 19: Список поддерживаемых валют тейкера
-    async def curs(self) -> FlatDict:
+    async def curs(self) -> dict[types.CurEx]:
         config = await self._get_config()
-        return {c["currencyId"]: c["currencyId"] for c in config["currencies"]}
+        return {
+            c["currencyId"]: types.CurEx(exid=c["currencyId"], ticker=c["currencyId"]) for c in config["currencies"]
+        }
 
     # 20: Список платежных методов
-    async def pms(self, _: Cur = None) -> DictOfDicts:
+    async def pms(self, cur: models.Cur = None) -> dict[int | str, PmEx]:
         pms = await self._post("/fiat/otc/configuration/queryAllPaymentList/")
         pms = pms["result"]["paymentConfigVo"]
-        return {pm["paymentType"]: {"name": pm["paymentName"]} for pm in pms}
+        return {pm["paymentType"]: PmEx(exid=pm["paymentType"], name=pm["paymentName"]) for pm in pms}
 
     # 21: Список платежных методов по каждой валюте
     async def cur_pms_map(self) -> MapOfIdsList:
@@ -49,25 +53,25 @@ class ExClient(BaseExClient):  # Bybit client
         return json.loads(pms["result"]["currencyPaymentIdMap"])
 
     # 22: Список торгуемых монет (с ограничениям по валютам, если есть)
-    async def coins(self) -> FlatDict:
+    async def coins(self) -> dict[types.CoinEx]:
         config = await self._get_config()
-        cc: set[str] = set()
+        all_pms = {}  # c["tokenId"]
         for c in config["symbols"]:
-            cc.add(c["tokenId"])
-        return {c: c for c in cc}
+            all_pms[c["tokenId"]] = types.CoinEx(exid=c["tokenId"], ticker=c["tokenId"])
+        return all_pms
 
     # 23: Список пар валюта/монет
-    async def pairs(self) -> MapOfIdsList:
+    async def pairs(self) -> tuple[MapOfIdsList, MapOfIdsList]:
         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
+        return cc, 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:
+    ) -> list[ad.Ad]:
         data = {
             "userId": "",
             "tokenId": coin_exid,
@@ -81,4 +85,22 @@ class ExClient(BaseExClient):  # Bybit client
             "canTrade": False,
         }
         ads = await self._post("/fiat/otc/item/online/", data)
-        return ads["result"]["items"]
+        return [ad.Ad(**_ad) for _ad in ads["result"]["items"]]
+
+
+async def main():
+    _ = await init_db(PG_DSN, models, True)
+    ex = await Ex.get(name="Bybit")
+    cl = ExClient(ex)
+    _ads = await cl.ads("USDT", "GEL", False)
+    await cl.set_pmcurexs()
+    await cl.set_coinexs()
+    _cr = await cl.curs()
+    _cn = await cl.coins()
+    await cl.set_pairs()
+    _pms = await cl.pms()
+    await cl.close()
+
+
+if __name__ == "__main__":
+    run(main())

{xync_client-0.0.25.dev88 → xync_client-0.0.25.dev90/xync_client.egg-info}/PKG-INFO

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

@@ -60,6 +60,7 @@ xync_client/Bybit/agent.py
 xync_client/Bybit/ex.py
 xync_client/Bybit/web_earn.py
 xync_client/Bybit/web_p2p.py
+xync_client/Bybit/etype/ad.py
 xync_client/Gate/ex.py
 xync_client/Gate/premarket.py
 xync_client/Gate/etype/ad.py