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

xync_client/Mexc/etype/ad.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 from xync_schema.xtype import BaseAd
-from typing import Optional
+from typing import Optional, Literal
 
 
 class Merchant(BaseModel):
@@ -30,6 +30,23 @@ class MerchantStatistics(BaseModel):
     avgSellHandleTime: float
 
 
+class AdsReq(BaseModel):
+    coinId: str  # hex
+    currency: str  # hex
+    tradeType: Literal["SELL", "BUY"]
+
+    payMethod: str = ""  # int,int
+    amount: str = ""  # int
+    page: int = 1
+
+    blockTrade: str = "false"  # bool
+    # countryCode: str = ""
+    follow: str = "false"
+    haveTrade: str = "false"
+    adsType: int = 1
+    allowTrade: str = "false"
+
+
 class Ad(BaseAd):
     exid: str | None = Field(alias="id")
     price: float
@@ -57,3 +74,37 @@ class Ad(BaseAd):
     minRegisterDate: int
     blockTrade: bool
     tags: str
+
+
+class AdUpd(BaseAd):
+    id: str
+    price: float
+    coinId: str  # hex
+    currency: str
+    tradeType: Literal["SELL", "BUY"]
+    payment: str
+    minTradeLimit: float
+    quantity: float
+    maxTradeLimit: float
+    deviceId: str
+    autoResponse: str = ""  # quote("P1132998804")
+
+    tradeTerms: str = ""
+    priceType: int = 0
+
+    adsType: int = 1
+    allowSys: str = "true"  # bool
+    apiVersion: str = "1.0.0"
+    authVersion: str = "v2"
+    blockTrade: str = "false"
+    countryCode: str = "RU"
+    display: int = 1  # bool
+    exchangeCount: int = 0
+    expirationTime: int = 15
+    fiatCount: int = 0
+    fiatCountLess: int = 0
+    kycLevel: Literal["PRIMARY"] = "PRIMARY"
+    maxPayLimit: int = 0
+    minRegisterDate: int = 0
+    requireMobile: str = "false"  # bool
+    securityOrderPaymentInfo: str = ""

xync_client/Mexc/etype/order.py

@@ -0,0 +1,354 @@
+from enum import IntEnum
+from typing import Optional, Literal
+
+from pydantic import BaseModel, Field
+
+# ============ Enums ============
+Side = Literal["BUY", "SELL"]
+
+
+class AdvStatus(IntEnum):
+    CLOSE = 0
+    OPEN = 1
+    DELETE = 2
+    LOW_STOCK = 3
+
+
+class OrderDealState(IntEnum):
+    NOT_PAID = 0
+    PAID = 1
+    WAIT_PROCESS = 2
+    PROCESSING = 3
+    DONE = 4
+    CANCEL = 5
+    INVALID = 6
+    REFUSE = 7
+    TIMEOUT = 8
+
+
+class NotifyType(IntEnum):
+    SMS = 0
+    MAIL = 1
+    GA = 2
+
+
+# ============ Request Models ============
+class CreateUpdateAdRequest(BaseModel):
+    advNo: Optional[str] = None
+    payTimeLimit: int
+    initQuantity: float
+    supplyQuantity: Optional[float] = None
+    price: float
+    coinId: str
+    countryCode: Optional[str] = None
+    side: str
+    advStatus: Optional[str] = None
+    allowSys: Optional[bool] = None
+    fiatUnit: str
+    payMethod: str
+    autoReplyMsg: Optional[str] = None
+    tradeTerms: Optional[str] = None
+    minSingleTransAmount: float
+    maxSingleTransAmount: float
+    kycLevel: Optional[str] = None
+    requireMobile: Optional[bool] = None
+    userAllTradeCountMin: int
+    userAllTradeCountMax: int
+    exchangeCount: Optional[int] = None
+    maxPayLimit: Optional[int] = None
+    buyerRegDaysLimit: Optional[int] = None
+    creditAmount: Optional[float] = None
+    blockTrade: Optional[bool] = None
+    deviceId: Optional[str] = None
+
+
+class CreateOrderRequest(BaseModel):
+    advNo: str
+    amount: Optional[float] = None
+    tradableQuantity: Optional[float] = None
+    userConfirmPaymentId: int
+    userConfirmPayMethodId: Optional[int] = None
+    deviceId: Optional[str] = None
+
+
+class ConfirmPaidRequest(BaseModel):
+    advOrderNo: str
+    payId: int
+
+
+class ReleaseCoinRequest(BaseModel):
+    advOrderNo: str
+    notifyType: Optional[str] = None
+    notifyCode: Optional[str] = None
+
+
+class ServiceSwitchRequest(BaseModel):
+    open: bool
+
+
+# ============ Response Models ============
+class BaseResponse(BaseModel):
+    code: int
+    msg: str
+
+
+class PaymentInfo(BaseModel):
+    id: int
+    payMethod: int
+    bankName: str = None
+    account: str = None
+    bankAddress: str = None
+    payee: str = None
+    extend: str = None
+
+
+class MerchantInfo(BaseModel):
+    nickName: str
+    imId: str
+    memberId: str
+    registry: int
+    vipLevel: int
+    greenDiamond: bool
+    emailAuthentication: bool
+    smsAuthentication: bool
+    identityVerification: bool
+    lastOnlineTime: int
+    badge: str
+    merchantType: str
+
+
+class MerchantStatistics(BaseModel):
+    totalBuyCount: int
+    totalSellCount: int
+    doneLastMonthCount: int
+    avgBuyHandleTime: float
+    avgSellHandleTime: float
+    lastMonthCompleteRate: str
+    completeRate: str
+    avgHandleTime: float
+
+
+2
+
+
+class Advertisement(BaseModel):
+    advNo: str
+    payTimeLimit: int
+    quantity: int = None
+    price: float
+    initAmount: float = None
+    frozenQuantity: float = None
+    availableQuantity: float
+    coinId: str = None
+    coinName: str
+    countryCode: str
+    commissionRate: float = None
+    advStatus: str = None
+    side: str
+    createTime: int = None
+    updateTime: int
+    fiatUnit: str
+    feeType: int = None
+    autoReplyMsg: str
+    tradeTerms: str
+    payMethod: str
+    paymentInfo: list[PaymentInfo]
+    minSingleTransAmount: float
+    maxSingleTransAmount: float
+    kycLevel: Literal["PRIMARY", "ADVANCED"]
+    requireMobile: bool
+    userAllTradeCountMax: int
+    userAllTradeCountMin: int
+    exchangeCount: int
+    maxPayLimit: int
+    buyerRegDaysLimit: int
+    blockTrade: bool
+
+
+class MarketAdvertisement(Advertisement):
+    merchant: MerchantInfo
+    merchantStatistics: MerchantStatistics
+    orderPayCount: int
+    tags: str
+
+
+class PageInfo(BaseModel):
+    total: int
+    currPage: int
+    pageSize: int
+    totalPage: int
+
+
+class UserInfo(BaseModel):
+    nickName: str
+
+
+class Order(BaseModel):
+    advNo: str
+    advOrderNo: str
+    tradableQuantity: float
+    price: float
+    amount: float
+    coinName: str
+    state: Literal["DONE", "PAID", "NOT_PAID", "PROCESSING"]
+    payTimeLimit: int
+    side: Side
+    fiatUnit: str
+    createTime: int
+    updateTime: int
+    userInfo: UserInfo
+    complained: bool
+    blockUser: bool = None
+    unreadCount: int
+    complainId: Optional[str] = None
+
+
+class OrderDetail(Order):
+    paymentInfo: list[PaymentInfo]
+    allowComplainTime: int = None
+    confirmPaymentInfo: PaymentInfo
+    userInfo: dict
+    userFiatStatistics: dict = None
+    spotCount: int = None
+
+
+class CreateAdResponse(BaseResponse):
+    data: str  # advNo
+
+
+class AdListResponse(BaseResponse):
+    data: list[Advertisement]
+    page: PageInfo
+
+
+class MarketAdListResponse(BaseResponse):
+    data: list[MarketAdvertisement]
+    page: PageInfo
+
+
+class CreateOrderResponse(BaseResponse):
+    data: str  # advOrderNo
+
+
+class OrderListResponse(BaseResponse):
+    data: list[Order]
+    page: PageInfo
+
+
+class OrderDetailResponse(BaseResponse):
+    data: OrderDetail
+
+
+class ListenKeyResponse(BaseModel):
+    listenKey: str
+
+
+class ConversationResponse(BaseResponse):
+    data: dict
+
+
+class ChatMessage(BaseModel):
+    id: int
+    content: Optional[str] = None
+    createTime: str
+    fromNickName: str
+    fromUserId: str
+    type: int
+    imageUrl: Optional[str] = None
+    imageThumbUrl: Optional[str] = None
+    videoUrl: Optional[str] = None
+    fileUrl: Optional[str] = None
+    self_: bool = Field(alias="self")
+    conversationId: int
+
+
+class ChatMessagesResponse(BaseResponse):
+    data: dict
+
+
+class UploadFileResponse(BaseResponse):
+    data: dict
+
+
+# ============ WebSocket Message Models ============
+class ChatMessageType(IntEnum):
+    TEXT = 1
+    IMAGE = 2
+    VIDEO = 3
+    FILE = 4
+
+
+class WSMethod(str):
+    SUBSCRIPTION = "SUBSCRIPTION"
+    UNSUBSCRIPTION = "UNSUBSCRIPTION"
+    SEND_MESSAGE = "SEND_MESSAGE"
+    RECEIVE_MESSAGE = "RECEIVE_MESSAGE"
+    PING = "PING"
+
+
+class SendTextMessage(BaseModel):
+    """Отправка текстового сообщения"""
+
+    content: str
+    conversationId: int
+    type: int = ChatMessageType.TEXT
+
+
+class SendImageMessage(BaseModel):
+    """Отправка изображения"""
+
+    imageUrl: str
+    imageThumbUrl: str
+    conversationId: int
+    type: int = ChatMessageType.IMAGE
+
+
+class SendVideoMessage(BaseModel):
+    """Отправка видео"""
+
+    videoUrl: str
+    imageThumbUrl: str  # превью видео
+    conversationId: int
+    type: int = ChatMessageType.VIDEO
+
+
+class SendFileMessage(BaseModel):
+    """Отправка файла"""
+
+    fileUrl: str
+    conversationId: int
+    type: int = ChatMessageType.FILE
+
+
+class WSRequest(BaseModel):
+    """Базовая структура WebSocket запроса"""
+
+    method: str
+    params: dict | list[str] | None = None
+    id: int = None
+
+
+class WSBaseResponse(BaseModel):
+    """Базовый ответ WebSocket"""
+
+    success: bool
+    method: str
+    msg: str
+    data: Optional[str] = None
+
+
+class ReceivedChatMessage(BaseModel):
+    """Полученное сообщение из чата"""
+
+    id: int
+    content: Optional[str] = None
+    conversationId: int
+    type: int
+    imageUrl: Optional[str] = None
+    imageThumbUrl: Optional[str] = None
+    videoUrl: Optional[str] = None
+    fileUrl: Optional[str] = None
+    createTime: str
+    self_: bool = Field(alias="self")
+    fromUserId: str
+    fromNickName: str

xync_client/Mexc/ex.py

@@ -6,7 +6,7 @@ import requests
 from xync_client.loader import TORM, NET_TOKEN
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.xtype import PmEx, MapOfIdsList
+from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAds
 from xync_client.Mexc.etype import pm, ad
 
 from xync_schema import xtype
@@ -66,42 +66,54 @@ class ExClient(BaseExClient):
         p = {cur: {c for c in coins} for cur in curs}
         return p, p
 
+    async def x2e_pm(self, xid: int, cur_id: int = None) -> str:  # pmex.exid
+        if not self.pm_x2e.get(xid):
+            fltr = dict(pm_id=xid, ex=self.ex)
+            if cur_id:
+                cur = await models.Cur[cur_id]
+                pmexs = await models.PmEx.filter(**fltr)
+                self.pm_x2e[xid] = [pmex.exid for pmex in pmexs if pmex.name.endswith(f"({cur.ticker})")][0]
+            else:
+                self.pm_x2e[xid] = (await models.PmEx.get(**fltr)).exid
+        return self.pm_x2e[xid]
+
+    async def x2e_req_ads(self, xreq: GetAds) -> ad.AdsReq:
+        coin_id, _ = await self.x2e_coin(xreq.coin_id)
+        cur_id, _, __ = await self.x2e_cur(xreq.cur_id)
+        ereq = ad.AdsReq(
+            coinId=coin_id,
+            currency=cur_id,
+            tradeType="SELL" if xreq.is_sell else "BUY",
+            payMethod=",".join([await self.x2e_pm(pm_id, cur_id=xreq.cur_id) for pm_id in xreq.pm_ids]),
+        )
+        if xreq.amount:
+            ereq.amount = str(xreq.amount)
+        # todo: all kwargs
+        return ereq
+
     # 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
+    async def _ads(
+        self, req: ad.AdsReq, lim: int = None, vm_filter: bool = False, **kwargs
     ) -> list[ad.Ad]:  # {ad.id: ad}
-        params = {
-            "allowTrade": "false",
-            "amount": amount or "",
-            "blockTrade": "false",
-            "coinId": coin_exid,
-            "countryCode": "",
-            "currency": cur_exid,
-            "follow": "false",
-            "haveTrade": "false",
-            "page": "1",
-            "payMethod": pm_exids or "",
-            "tradeType": "SELL" if is_sell else "BUY",
-        }
-
-        ads = requests.get("https://p2p.mexc.com/api/market", params=params).json()
-        return [ad.Ad(**_ad) for _ad in ads["data"]]
+        resp = requests.get("https://p2p.mexc.com/api/market", params=req.model_dump())
+        return [ad.Ad(**_ad) for _ad in resp.json()["data"]]
 
 
 async def main():
     _ = await init_db(TORM)
     async with FileClient(NET_TOKEN) as b:
         ex = await Ex.get(name="Mexc")
-        cl = ex.client(b)
+        cl: ExClient = ex.client(b)
         # await ex.curexs.filter(cur__ticker="EUR")
         # await cl.set_pms()
         # await cl.set_coinexs()
-        _ads = await cl.ads("USDT", "EUR", True)
+        coinex = await models.CoinEx.get(ex=cl.ex, coin_id=1)
+        _ads = await cl.ads(coinex.exid, "RUB", True, ["5"])
         _cr = await cl.curs()
         _cn = await cl.coins()
         await cl.set_pairs()
         _pms = await cl.pms()
-        await cl.close()
+        await cl.stop()
 
 
 if __name__ == "__main__":

xync_client/Okx/1.py

@@ -0,0 +1,14 @@
+import requests
+
+
+headers = {
+    "authorization": "eyJraWQiOiIxMzYzODYiLCJhbGciOiJFUzI1NiJ9.eyJqdGkiOiJleDExMDE3NjUwMzE1NDY2MjE4NUU3RUJGMUYyRDFFRTE5MW1ka2IiLCJ1aWQiOiI2T3hmUi9aWGkrZkI0YlVUajRNLzh3PT0iLCJzdGEiOjAsIm1pZCI6IjZPeGZSL1pYaStmQjRiVVRqNE0vOHc9PSIsInBpZCI6IlBUeUE4VzA5ekZVSkJHSjZZUk5HWXc9PSIsIm5kZSI6MCwiaWF0IjoxNzY1MjA0NDE4LCJleHAiOjE3NjY0MTQwMTgsImJpZCI6MCwiZG9tIjoid3d3Lm9reC5jb20iLCJlaWQiOjE4LCJpc3MiOiJva2NvaW4iLCJkaWQiOiJ0OFlKbUFXMTNGeWZpMUZhUUhtQVFNSThNZElmYm44NnFPSnpNZFA3VVhhZFFDcFdQSkQ0NWs0ckMrMk1SWjJXIiwiZmlkIjoidDhZSm1BVzEzRnlmaTFGYVFIbUFRTUk4TWRJZmJuODZxT0p6TWRQN1VYYWRRQ3BXUEpENDVrNHJDKzJNUloyVyIsImxpZCI6IjZPeGZSL1pYaStmQjRiVVRqNE0vOHc9PSIsInVmYiI6IlBUeUE4VzA5ekZVSkJHSjZZUk5HWXc9PSIsInVwYiI6ImlCcmEyVmhOb2t5UmloeGlKLzN6RXc9PSIsImt5YyI6Miwia3lpIjoicHFHRVBYWHN6V1ZVNXhRR1NiNURYTGRUcENaS2c1LzZLbjFteGFpclpDbmovbGJBUGxqRlMwbU5qWGxlYXJ6Rjd5ZEYvWU5DR1FXLzV5aTRWQnpUM1E9PSIsImNwayI6ImhCdjNtSEZjb0lETG5TckZ6dEdTTlpMT29aU2s1bUE4SHBQcE9MOFE1TlVYamowc2w5OG9FK2dRWTRsSUdvbm5QUzJwZ0pQckw4ZGNyMlk4N3VEcjYyd0ExK1ZuRmUyUm10a2RCMFYzY3pVVEI2U09sMCtTQjdnQVJvbHdyeHMza1hvVEdua3BvWEVKamdsL2Q0bEN0aUxuUy9ydGRjY1pnZ0hpeEZhclBxWT0iLCJ2ZXIiOjEsImNsdCI6MiwidXVkIjoiV3VoZlhzRHRicG1GNXN3Q25pKzYrWVhUN2FodmJLWnRYZXZlUXNMVHI4az0iLCJzdWIiOiJBODI1QzI4OTI4QzZCRTNFMTlFREFFRUI1ODhEQTVEQiJ9.I1fFTnP7xYaK1s0jCU01NkjyBgk04dBMp7qFahIzmRUn3e34W6mSNDNSWmi-UIhxH2ORbqbhG2ErUSrrsvai3w",
+}
+
+response = requests.get("https://www.okx.com/v3/c2c/receiptAccounts", headers=headers)
+
+itm = {
+    el["type"]: next((field["value"] for field in el.get("fields") if field.get("key") == "accountNo"))
+    for el in response.json()["data"]
+}
+print(itm)

xync_client/Okx/agent.py

@@ -0,0 +1,39 @@
+from pyro_client.client.file import FileClient
+from xync_bot import XyncBot
+
+from xync_client.Abc.Agent import BaseAgentClient
+from asyncio import run
+from x_model import init_db
+from xync_schema.models import Agent, Ex
+
+from xync_client.Okx.ex import ExClient
+from xync_client.loader import NET_TOKEN, PAY_TOKEN
+
+
+class AgentClient(BaseAgentClient):
+    async def my_fiats(self):
+        response = await self._get("/v3/c2c/receiptAccounts")
+        fiats = response["data"]
+        return {
+            fiat["type"]: field["value"] for fiat in fiats for field in fiat["fields"] if field["key"] == "accountNo"
+        }
+
+
+async def main():
+    from xync_client.loader import TORM
+
+    cn = await init_db(TORM)
+    ex = await Ex.get(name="Okx")
+    agent = await Agent.get(actor__ex=ex).prefetch_related("actor__ex", "actor__person__user__gmail")
+    fbot = FileClient(NET_TOKEN)
+    ecl: ExClient = ex.client(fbot)
+    abot = XyncBot(PAY_TOKEN, cn)
+    cl = agent.client(ecl, fbot, abot)
+
+    _fiats = await cl.my_fiats()
+
+    await cl.stop()
+
+
+if __name__ == "__main__":
+    run(main())

xync_client/Okx/ex.py

@@ -1,7 +1,7 @@
 from asyncio import run
 
 from pyro_client.client.file import FileClient
-from pyro_client.loader import NET_TOKEN
+from xync_client.loader import NET_TOKEN
 from x_model import init_db
 
 from xync_client.Abc.Exception import NoPairOnEx
@@ -20,16 +20,16 @@ class ExClient(BaseExClient):
             "quoteCurrency": cur,
             "needField": "false",
         }
-        pms = await self._get("/v3/c2c/configs/receipt/templates", params=params)
+        pms = await self._get(url="/v3/c2c/configs/receipt/templates", params=params)
         return [pm.PmE(**_pm) for _pm in pms["data"] if _pm["paymentMethod"]]
 
     # 19: Список поддерживаемых валют тейкера
-    async def curs(self) -> dict[int, xtype.CurEx]:  # {cur.exid: cur.ticker}
-        curs = await self._get("/v3/users/common/list/currencies")
-        return {
-            cur["displayName"]: xtype.CurEx(exid=cur["displayName"], ticker=cur["displayName"], scale=cur["precision"])
-            for cur in curs["data"]
-        }
+    # async def curs(self) -> dict[int, xtype.CurEx]:  # {cur.exid: cur.ticker}
+    #     curs = await self._get("/v3/users/common/list/currencies")
+    #     return {
+    #         cur["displayName"]: xtype.CurEx(exid=cur["displayName"], ticker=cur["displayName"], scale=cur["precision"])
+    #         for cur in curs["data"]
+    #     }
 
     # 20: Список платежных методов
     async def pms(self, cur: models.Cur = None) -> dict[int | str, PmEx]:  # {pm.exid: pm}