xync-client 0.0.141__py3-none-any.whl → 0.0.156.dev18__py3-none-any.whl

xync_client/Bybit/etype/ad.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 from typing import List, Optional, Any, Literal
-from pydantic import BaseModel, Field, field_serializer
-from xync_schema import xtype
+from pydantic import BaseModel, Field
+from xync_client.Bybit.etype.cred import MyPaymentTerm
 from xync_schema.xtype import BaseAd
 
 from xync_client.Abc.xtype import BaseAdUpdate
@@ -13,9 +13,21 @@ class AdStatus(StrEnum):
 
 
 class AdsReq(BaseModel):
-    tokenId: str
-    currencyId: str
-    side: Literal["0", "1"]  # 0 покупка, # 1 продажа
+    tokenId: str = Field(validation_alias="coin_id")
+    currencyId: str = Field(validation_alias="cur_id")
+    side: Literal["0", "1"] = Field(validation_alias="is_sell")  # 0 покупка, # 1 продажа
+    payment: list[str] = Field([], validation_alias="pm_ids")  # int
+    size: str = Field("20", validation_alias="limit")  # int
+    page: str = "1"  # int
+    amount: str = ""  # float
+    vaMaker: bool = Field(False, validation_alias="vm_only")
+    canTrade: bool = False
+    userId: str = ""  # int
+    verificationFilter: Literal[0, 1, 2] = 0
+    sortType: Literal["OVERALL_RANKING", "TRADE_VOLUME", "TRADE_COMPLETION_RATE", "TRADE_PRICE"] = "OVERALL_RANKING"
+    paymentPeriod: Literal[[], [15], [30], [60]] = []
+    itemRegion: int = 1
+    bulkMaker: bool = False
 
 
 class Currency(BaseModel):
@@ -79,7 +91,39 @@ class TradingPreferenceSet(BaseModel):
     registerTimeThreshold: int
 
 
+class AdPostRequest(BaseModel):
+    tokenId: str
+    currencyId: str
+    side: Literal[0, 1]  # 0 - покупка, 1 - продажа
+    priceType: Literal[0, 1]  # 0 - fix rate, 1 - floating
+    premium: str
+    price: str
+    minAmount: str
+    maxAmount: str
+    remark: str
+    tradingPreferenceSet: TradingPreferenceSet
+    paymentIds: list[str]  # list[int]
+    quantity: str  # float
+    paymentPeriod: int = 15
+    itemType: Literal["ORIGIN", "BULK"] = "ORIGIN"
+
+
+class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
+    actionType: Literal["MODIFY", "ACTIVE"] = "MODIFY"
+
+
 class Ad(BaseAd):
+    tokenId: str = None  # for initial actualize
+    currencyId: str = None  # for initial actualize
+    side: Literal[0, 1] = None  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
+    priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
+    premium: str = None  # for initial actualize
+    price: str = None  # for initial actualize
+    maxAmount: str = Field(serialization_alias="max_fiat")
+    minAmount: str = Field(serialization_alias="min_fiat")
+    remark: str = Field(serialization_alias="auto_msg")
+    tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
+
     accountId: str = None  # for initial actualize
     authStatus: int = None  # for initial actualize
     authTag: List[str] = None  # for initial actualize
@@ -87,7 +131,6 @@ class Ad(BaseAd):
     baned: bool = None  # for initial actualize
     blocked: str = None  # for initial actualize
     createDate: str = None  # for initial actualize
-    currencyId: str = None  # for initial actualize
     executedQuantity: str = None  # for initial actualize
     fee: str = None  # for initial actualize
     finishNum: int = None  # for initial actualize
@@ -98,27 +141,18 @@ class Ad(BaseAd):
     lastLogoutTime: str = None  # for initial actualize
     lastQuantity: str = Field(serialization_alias="quantity")
     makerContact: bool = None  # for initial actualize
-    maxAmount: str = Field(serialization_alias="max_fiat")
-    minAmount: str = Field(serialization_alias="min_fiat")
     nickName: str = None  # for initial actualize
     orderNum: int = None  # for initial actualize
     paymentPeriod: int = None  # for initial actualize
     payments: List[str] = None  # for initial actualize
-    premium: str = None  # for initial actualize
-    price: str = None  # for initial actualize
-    priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
     quantity: str = Field(serialization_alias="allQuantity")  # for initial actualize
     recentExecuteRate: int = None  # for initial actualize
     recentOrderNum: int = None  # for initial actualize
     recommend: bool = None  # for initial actualize
     recommendTag: str = None  # for initial actualize
-    remark: str = Field(serialization_alias="auto_msg")
-    side: Literal[0, 1] = None  # for initial actualize  # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
     symbolInfo: SymbolInfo = None  # for initial actualize
-    tokenId: str = None  # for initial actualize
     tokenName: str = None  # for initial actualize
-    tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
     userId: str
     userMaskId: str = None  # for initial actualize
     userType: str = None  # for initial actualize
@@ -126,77 +160,11 @@ class Ad(BaseAd):
     verificationOrderLabels: List[Any] = None  # for initial actualize
     verificationOrderSwitch: bool = None  # for initial actualize
     version: int = None  # for initial actualize
-    #
-    #
-    # class Ad(BaseAd):
-    #     accountId: str = None  # for initial actualize
-    #     authStatus: int = None  # for initial actualize
-    #     authTag: List[str] = None  # for initial actualize
-    #     ban: bool = None  # for initial actualize
-    #     baned: bool = None  # for initial actualize
-    #     blocked: str = None  # for initial actualize
-    #     createDate: str = None  # for initial actualize
-    #     currencyId: str = None  # for initial actualize
-    #     executedQuantity: str = None  # for initial actualize
-    #     fee: str = None  # for initial actualize
-    #     finishNum: int = None  # for initial actualize
-    #     frozenQuantity: str = None  # for initial actualize
-    #     exid: str = Field(serialization_alias="id")
-    #     isOnline: bool = None  # for initial actualize
-    #     itemType: str = None  # for initial actualize
-    #     lastLogoutTime: str = None  # for initial actualize
-    #     quantity: str = Field(serialization_alias="lastQuantity")
-    #     makerContact: bool = None  # for initial actualize
-    #     max_fiat: str = Field(serialization_alias="maxAmount")
-    #     min_fiat: str = Field(serialization_alias="minAmount")
-    #     nickName: str = None  # for initial actualize
-    #     orderNum: int = None  # for initial actualize
-    #     paymentPeriod: int = None  # for initial actualize
-    #     payments: List[str] = None  # for initial actualize
-    #     premium: str = None  # for initial actualize
-    #     price: str = None  # for initial actualize
-    #     priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
-    #     allQuantity: str = Field(serialization_alias="quantity")  # for initial actualize
-    #     recentExecuteRate: int = None  # for initial actualize
-    #     recentOrderNum: int = None  # for initial actualize
-    #     recommend: bool = None  # for initial actualize
-    #     recommendTag: str = None  # for initial actualize
-    #     auto_msg: str = Field(serialization_alias="remark")
-    #     is_sell: Literal[0, 1] = Field(serialization_alias="side")  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
-    #     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
-    #     symbolInfo: SymbolInfo = None  # for initial actualize
-    #     tokenId: str = None  # for initial actualize
-    #     tokenName: str = None  # for initial actualize
-    #     tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
-    #     userId: str = Field(serialization_alias="maker__exid")
-    #     userMaskId: str = None  # for initial actualize
-    #     userType: str = None  # for initial actualize
-    #     verificationOrderAmount: str = None  # for initial actualize
-    #     verificationOrderLabels: List[Any] = None  # for initial actualize
-    #     verificationOrderSwitch: bool = None  # for initial actualize
-    #     version: int = None  # for initial actualize
-
-    @field_serializer("status")
-    def status(self, status, _info) -> xtype.AdStatus:
-        return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
-
 
-class AdPostRequest(BaseModel):
-    tokenId: str
-    currencyId: str
-    side: Literal[0, 1]  # 0 - покупка, 1 - продажа
-    priceType: Literal[0, 1]  # 0 - fix rate, 1 - floating
-    premium: str
-    price: str
-    minAmount: str
-    maxAmount: str
-    remark: str
-    tradingPreferenceSet: TradingPreferenceSet
-    paymentIds: list[str]
-    quantity: str
-    paymentPeriod: int
-    itemType: str
+    # @field_serializer("status")
+    # def status(self, status, _info) -> xtype.AdStatus:
+    #     return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
 
 
-class AdUpdateRequest(AdPostRequest, BaseAdUpdate):
-    actionType: Literal["MODIFY", "ACTIVE"] = "MODIFY"
+class MyAd(Ad):
+    paymentTerms: List[MyPaymentTerm]

xync_client/Bybit/etype/cred.py

@@ -1,5 +1,3 @@
-from typing import Literal
-
 from pydantic import BaseModel
 
 from xync_client.Abc.xtype import CredExOut
@@ -15,18 +13,31 @@ class PaymentItem(BaseModel):
     required: bool
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
+class BasePaymentConf(BaseModel):
+    paymentType: int
+    paymentName: str
+
+
+class PaymentConfig(BasePaymentConf):
+    class PaymentTemplateItem(BaseModel):
+        labelDialect: str
+        placeholderDialect: str
+        fieldName: str
+
+    paymentDialect: str
+    paymentTemplateItem: list[PaymentTemplateItem]
+
+
+class PaymentConfigVo(BasePaymentConf):
     checkType: int
     sort: int
-    paymentName: str
     addTips: str
     itemTips: str
-    online: Literal[0, 1]  # Non-balance coin purchase (0 Offline), balance coin purchase (1 Online)
-    items: list[PaymentItem]
+    online: int
+    items: list[dict[str, str | bool]]
 
 
-class CredEpyd(CredExOut):
+class PaymentTerm(CredExOut):
     id: str  # int
     realName: str
     paymentType: int  # int
@@ -44,7 +55,7 @@ class CredEpyd(CredExOut):
     mobile: str
     businessName: str
     concept: str
-    online: str
+    online: str = None
     paymentExt1: str
     paymentExt2: str
     paymentExt3: str
@@ -54,6 +65,15 @@ class CredEpyd(CredExOut):
     paymentTemplateVersion: int
 
 
+class MyPaymentTerm(PaymentTerm):
+    paymentConfig: PaymentConfig
+    realNameVerified: bool
+
+
+class CredEpyd(PaymentTerm):
+    securityRiskToken: str = ""
+
+
 class MyCredEpyd(CredEpyd):  # todo: заменить везде где надо CredEpyd -> MyCredEpyd
     countNo: str
     hasPaymentTemplateChanged: bool

xync_client/Bybit/etype/order.py

@@ -1,10 +1,10 @@
-from datetime import datetime
 from enum import IntEnum
 from typing import Literal
 
 from pydantic import BaseModel
 
-from xync_client.Bybit.etype.cred import CredEpyd
+from xync_client.Abc.xtype import RemapBase
+from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo
 
 
 class Topic(IntEnum):
@@ -15,34 +15,31 @@ class Topic(IntEnum):
 
 
 class Status(IntEnum):
-    deleted = 40  # order canceled
-    created = 10
-    appealable = 20  # waiting for seller to release
-    canceled = 40
-    completed = 50  # order finished
-    appealed_by_buyer = 30  # appealing
-    appealed_by_seller = 30
-    buyer_appeal_disputed_by_seller = 30
-    paid = 50
-    rejected = 40
-    request_canceled = 40
-    seller_appeal_disputed_by_buyer = 30
-
-
-class StatusApi(IntEnum):
-    created = 1
-    _web3 = 5
-    wait_for_buyer = 10  # ws_canceled
-    wait_for_seller = 20
-    appealed = 30
-    canceled = 40
-    completed = 50
-    _paying_online = 60
-    _pay_fail_online = 70
-    hotswap_cancelled = 80
-    _buyer_sel_tokenId = 90
-    objectioning = 100
-    waiting_for_objection = 110
+    ws_new = 1
+    # chain = 5  # waiting for chain (only web3)
+    created = 10  # waiting for buyer to pay
+    paid = 20  # waiting for seller to release
+    appealed_by_seller = 30  # appealing
+    appealed_by_buyer = 30  # the same appealing
+    canceled = 40  # order cancelled
+    complete = 50  # order finished
+    # a = 60  # paying (only when paying online)
+    # a = 70  # pay fail (only when paying online)
+    # a = 80  # exception cancelled (the coin convert to other coin only hotswap)
+    # a = 90  # waiting for buyer to select tokenId
+    appeal_disputed = 100  # objectioning
+    appeal_dispute_disputed = 110  # waiting for the user to raise an objection
+
+
+class TakeAdReq(BaseModel):
+    ad_id: int | str
+    amount: float
+    is_sell: bool
+    pm_id: int
+    coin_id: int
+    cur_id: int
+    quantity: float | None = None
+    price: float | None = None
 
 
 class OrderRequest(BaseModel):
@@ -60,33 +57,46 @@ class OrderRequest(BaseModel):
     flag: Literal["amount", "quantity"]
     version: str = "1.0"
     securityRiskToken: str = ""
+    isFromAi: bool = False
+
+
+class OrderSellRequest(OrderRequest):
+    paymentId: str
+    paymentType: str
 
 
 class PreOrderResp(BaseModel):
-    price: str  # float
-    curPrice: str
-    totalAmount: float
-    minAmount: float
-    maxAmount: float
-    minQuantity: float
-    maxQuantity: float
-    payments: list[str]  # list[int]
-    status: Literal[10, 20]
-    paymentTerms: list
-    paymentPeriod: Literal[15]
-    lastQuantity: float
-    lastPrice: float
+    id: str  # bigint
+    price: str  # float .cur.scale
+    lastQuantity: str  # float .coin.scale
+    curPrice: str  # hex 32
+    lastPrice: str  # float .cur.scale # future
     isOnline: bool
-    lastLogoutTime: datetime
-    itemPriceAvailableTime: datetime
-    itemPriceValidTime: int  # 45000
+    lastLogoutTime: str  # timestamp(0)+0
+    payments: list[str]  # list[int]
+    status: Literal[10, 15, 20]
+    paymentTerms: list  # empty
+    paymentPeriod: Literal[15, 30, 60]
+    totalAmount: str  # float .cur.scale
+    minAmount: str  # float .cur.scale
+    maxAmount: str  # float .cur.scale
+    minQuantity: str  # float .coin.scale
+    maxQuantity: str  # float .coin.scale
+    itemPriceAvailableTime: str  # timestamp(0)+0
+    itemPriceValidTime: Literal["45000"]
     itemType: Literal["ORIGIN"]
+    shareItem: bool  # False
 
 
 class OrderResp(BaseModel):
     orderId: str
     isNeedConfirm: bool
+    confirmId: str = ""
     success: bool
+    securityRiskToken: str = ""
+    riskTokenType: Literal["challenge", ""] = ""
+    riskVersion: Literal["1", "2", ""] = ""
+    needSecurityRisk: bool
     isBulkOrder: bool
     confirmed: str = None
     delayTime: str
@@ -121,50 +131,28 @@ class AppraiseInfo(BaseModel):
     updateDate: str
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
-    checkType: int
-    sort: int
-    paymentName: str
-    addTips: str
-    itemTips: str
-    online: int
-    items: list[dict[str, str | bool]]
-
-
-class PaymentTerm(BaseModel):
-    id: str
-    realName: str
-    paymentType: int
-    bankName: str
-    branchName: str
-    accountNo: str
-    qrcode: str
-    visible: int
-    payMessage: str
-    firstName: str
-    lastName: str
-    secondLastName: str
-    clabe: str
-    debitCardNumber: str
-    mobile: str
-    businessName: str
-    concept: str
-    online: str
-    paymentExt1: str
-    paymentExt2: str
-    paymentExt3: str
-    paymentExt4: str
-    paymentExt5: str
-    paymentExt6: str
-    paymentTemplateVersion: int
+class PaymentTerm(CredPaymentTerm):
     paymentConfigVo: PaymentConfigVo
     ruPaymentPrompt: bool
 
 
-class OrderItem(BaseModel):
-    id: str
+class _BaseOrder(RemapBase):
+    _remap = {"status": {}}
+
+    id: int
+    userId: int
+    createDate: int
     side: Literal[0, 1]  # int: 0 покупка, 1 продажа (именно для меня - апи агента, и пох мейкер я или тейкер)
+    status: Literal[*[s.value for s in Status]]
+
+
+class _BaseChange(_BaseOrder):
+    makerUserId: int
+    appealedTimes: int
+    totalAppealedTimes: int
+
+
+class OrderItem(_BaseOrder):
     tokenId: str
     orderType: Literal[
         "ORIGIN", "SMALL_COIN", "WEB3"
@@ -177,14 +165,9 @@ class OrderItem(BaseModel):
     fee: str
     targetNickName: str
     targetUserId: str  # не я
-    status: Literal[
-        5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110
-    ]  # 5: waiting for chain (only web3), 10: waiting for buyer to pay, 20: waiting for seller to release, 30: appealing, 40: order cancelled, 50: order finished, 60: paying (only when paying online), 70: pay fail (only when paying online), 80: exception cancelled (the coin convert to other coin, only hotswap), 90: waiting for buyer to select tokenId, 100: objectioning, 110: waiting for the user to raise an objection
     selfUnreadMsgCount: str
-    createDate: str
     transferLastSeconds: str
     appealLastSeconds: str
-    userId: str  # я
     sellerRealName: str
     buyerRealName: str
     judgeInfo: JudgeInfo
@@ -194,7 +177,7 @@ class OrderItem(BaseModel):
 
 
 class OrderFull(OrderItem):
-    itemId: str
+    itemId: int
     makerUserId: str
     targetAccountId: str
     targetFirstName: str
@@ -297,17 +280,6 @@ class Message(BaseModel):
     onlyForCustomer: int | None = None
 
 
-class _BaseChange(BaseModel):
-    userId: int
-    makerUserId: int
-    id: str
-    createDate: int
-    side: int
-    appealedTimes: int
-    totalAppealedTimes: int
-    status: StatusApi | None = None
-
-
 class StatusChange(_BaseChange):
     appealVersion: int = None
 
@@ -336,7 +308,7 @@ class Receive(_BaseMsg):
 class Read(_BaseMsg):
     readAmount: int
     read: Literal["101", "110", "11", "111"]
-    orderStatus: StatusApi
+    orderStatus: Status
 
 
 class SellerCancelChange(BaseModel):

xync_client/Bybit/ex.py

@@ -2,26 +2,39 @@ import json
 from asyncio import run
 
 from pyro_client.client.file import FileClient
+from x_client import df_hdrs
 from x_model import init_db
 from xync_schema import models, xtype
+from xync_schema.enums import AdStatus, AgentStatus
 from xync_schema.models import Ex, Agent
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import NET_TOKEN
 from xync_client.Bybit.etype import ad
-from xync_client.Abc.xtype import PmEx, MapOfIdsList
+from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAds
 from xync_client.loader import TORM
 
 
 class ExClient(BaseExClient):  # Bybit client
-    headers = {"cookie": ";"}  # rewrite token for public methods
+    host = "api2.bybit.com"
+    headers = df_hdrs  # rewrite token for public methods
     agent: Agent = None
 
     async def _get_auth_cks(self) -> dict[str, str]:
         if not self.agent:
-            self.agent = await Agent.get(actor__ex=self.ex).prefetch_related("actor")
+            self.agent = (
+                await Agent.filter(actor__ex=self.ex, status__gt=AgentStatus.off).prefetch_related("actor").first()
+            )
         return self.agent.auth["cookies"]
 
+    @staticmethod
+    def ad_status(status: int) -> AdStatus:
+        return {
+            10: AdStatus.active,
+            20: AdStatus.defActive,
+            30: AdStatus.soldOut,
+        }[status]
+
     async def _get_config(self):
         resp = await self._get("/fiat/p2p/config/initial")
         return resp["result"]  # todo: tokens, pairs, ...
@@ -68,47 +81,20 @@ class ExClient(BaseExClient):  # Bybit client
         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,
-        lim: int = 50,
-        vm_filter: bool = False,
-    ) -> list[ad.Ad]:
-        data = {
-            "userId": "",
-            "tokenId": coin_exid,
-            "currencyId": cur_exid,
-            "payment": pm_exids or [],
-            "side": "0" if is_sell else "1",
-            "size": str(lim) if lim else "20",
-            "page": "1",
-            "amount": str(amount) if amount else "",
-            "vaMaker": vm_filter,
-            "bulkMaker": False,
-            "canTrade": False,
-            "verificationFilter": 0,
-            "sortType": "OVERALL_RANKING",
-            "paymentPeriod": [],
-            "itemRegion": 1,
-        }
-        # {
-        #     "userId": "",
-        #     "tokenId": coin_exid,
-        #     "currencyId": cur_exid,
-        #     "payment": pm_exids or [],
-        #     "side": "0" if is_sell else "1",
-        #     "size": lim and str(lim) or "200",
-        #     "page": "1",
-        #     "amount": str(amount) if amount else "",
-        #     "authMaker": False,
-        #     "canTrade": False,
-        # }
-        ads = await self._post("/fiat/otc/item/online/", data)
-        return [ad.Ad(**_ad) for _ad in ads["result"]["items"]]
+    async def _ads(self, req: ad.AdsReq, post_pmexs: set[models.PmEx] = None) -> list[ad.Ad]:
+        if post_pmexs:
+            req.payment = []
+            req.size = str(min(1000, int(req.size) * 25))
+        res = await self._post("/fiat/otc/item/online/", req.model_dump())
+        ads = [ad.Ad(**_ad) for _ad in res["result"]["items"]]
+        if post_pmexs:
+            post_pmexids = {p.exid for p in post_pmexs}
+            ads = [
+                ad
+                for ad in ads
+                if (set(ad.payments) & post_pmexids or [True for px in post_pmexs if px.pm.norm in ad.remark.lower()])
+            ]
+        return ads
 
 
 async def main():
@@ -117,10 +103,11 @@ async def main():
     bot: FileClient = FileClient(NET_TOKEN)
     # await bot.start()
     cl = ExClient(ex, bot)
-    await cl.set_pms()
-    await cl.set_coins()
-    await cl.set_pairs()
-    _ads = await cl.ads("USDT", "GEL", False)
+    # await cl.set_pms()
+    # await cl.set_coins()
+    # await cl.set_pairs()
+    x_ads_req = GetAds(coin_id=1, cur_id=1, is_sell=True, pm_ids=[330, 366, 1853], amount=1000)
+    _ads = await cl.ads(x_ads_req)
     # await bot.stop()
     await cl.close()