xync-client 0.0.162__py3-none-any.whl → 0.0.172__py3-none-any.whl

xync_client/Abc/Order.py

@@ -1,8 +1,7 @@
 from abc import abstractmethod
 
-from xync_schema.models import Order
-
-from xync_client.Bybit.agent import AgentClient
+from xync_client.Abc.Agent import BaseAgentClient
+from xync_schema.models import Order, PmEx, CredEx
 
 
 class BaseOrderClient:
@@ -10,32 +9,32 @@ class BaseOrderClient:
     im_maker: bool
     im_seller: bool
 
-    def __init__(self, order: Order, agent_client: AgentClient):
+    def __init__(self, order: Order, agent_client: BaseAgentClient):
         self.order = order
         self.im_maker = order.taker_id != agent_client.actor.id  # or order.ad.agent_id == agent.id
         self.im_seller = order.ad.pair_side.is_sell and self.im_maker
         self.agent_client = agent_client
 
-    # 2: [T] Отмена запроса на сделку
-    @abstractmethod
-    async def cancel_request(self) -> Order: ...
-
-    # 3: [M] Одобрить запрос на сделку
-    @abstractmethod
-    async def accept_request(self) -> bool: ...
-
-    # 4: [M] Отклонить запрос на сделку
-    @abstractmethod
-    async def reject_request(self) -> bool: ...
-
     # 5: [B] Перевод сделки в состояние "оплачено", c отправкой чека
+    async def mark_payed(self, cred_id: int = None, receipt: bytes = None):
+        cred_id = cred_id or self.order.cred_id
+        pmex = await PmEx.get(pm__pmcurs__id=self.order.cred.pmcur_id, ex=self.agent_client.ex_client.ex)
+        credex = await CredEx.get(cred_id=cred_id, ex=self.agent_client.ex_client.ex)
+        await self._mark_payed(credex.exid, pmex.exid, receipt)
+
     @abstractmethod
-    async def mark_payed(self, receipt: bytes = None): ...
+    async def _mark_payed(self, credex_exid: int = None, pmex_exid: int | str = None, receipt: bytes = None): ...
 
     # 6: [B] Отмена сделки
     @abstractmethod
     async def cancel_order(self) -> bool: ...
 
+    # 6: Запрос отмены (оплаченная контрагентом продажа)
+    async def cancel_request(self) -> bool: ...
+
+    # 6: Одобрение запроса на отмену (оплаченная мной покупка)
+    async def cancel_accept(self): ...
+
     # 7: [S] Подтвердить получение оплаты
     @abstractmethod
     async def confirm(self) -> bool: ...

xync_client/Abc/xtype.py

@@ -1,9 +1,14 @@
+import re
 from typing import Literal, ClassVar
 
-from pydantic import BaseModel, model_validator, model_serializer
+from pydantic import BaseModel, model_validator, model_serializer, Field
+from pydantic_core.core_schema import SerializationInfo
+from tortoise.expressions import Q
+from tortoise.functions import Count
+from x_model.func import ArrayAgg
 from x_model.types import BaseUpd
-from xync_schema.enums import PmType
-from xync_schema.models import Country, Pm, Ex, CredEx
+from xync_schema.enums import PmType, Side, AdStatus, OrderStatus
+from xync_schema.models import Country, Pm, Ex, CredEx, Cur
 from xync_schema.xtype import PmExBank
 
 from xync_client.pm_unifier import PmUni
@@ -27,12 +32,13 @@ class RemapBase(BaseModel):
         return data
 
     @model_serializer
-    def _map_out(self):
-        data = self.__dict__.copy()
-        for field, mapping in self._remap.items():
-            reverse = {v: k for k, v in mapping.items()}
-            if field in data:
-                data[field] = reverse.get(data[field], data[field])
+    def _map_out(self, srlz_info: SerializationInfo):
+        data = dict(self)
+        if srlz_info.by_alias:
+            for field, mapping in self._remap.items():
+                reverse = {v: k for k, v in mapping.items()}
+                if field in data:
+                    data[field] = reverse.get(data[field], data[field])
         return data
 
 
@@ -65,74 +71,80 @@ class PmExIn(BaseModel):
         arbitrary_types_allowed = True
 
 
-class CredExOut(BaseModel):
-    id: int
-
-
-class BaseOrderReq(BaseModel):
-    ad_id: int | str
-
-    asset_amount: float | None = None
-    fiat_amount: float | None = None
-
-    pmex_exid: str = None  # int
-
-    # todo: mv from base to special ex class
-    amount_is_fiat: bool = True
-    is_sell: bool = None
-    cur_exid: int | str = None
-    coin_exid: int | str = None
-    coin_scale: int = None
+class BaseActor(BaseModel):
+    exid: int | str
+    nick: str | None = None
 
-    @model_validator(mode="after")
-    def check_a_or_b(self):
-        if self.amount_is_fiat and not self.fiat_amount:
-            raise ValueError("fiat_amount is required if amount_is_fiat")
-        if not self.amount_is_fiat and not self.asset_amount:
-            raise ValueError("asset_amount is required if not amount_is_fiat")
-        if not self.asset_amount and not self.fiat_amount:
-            raise ValueError("either fiat_amount or asset_amount is required")
-        return self
 
+class BaseCounteragent(BaseActor):
+    name: str
 
-class BaseOrderPaidReq(BaseModel):
-    ad_id: int | str
 
-    cred_id: int | None = None
-    pm_id: int | None = None  # or pmcur_id?
+class BaseCredEx(BaseModel):
+    detail: str
+    exid: int | str = Field(alias="id")
+    extra: str | None = None
+    name: str
+    pmex_exid: int | str
+    curex_exid: int | str = None  # fills on outer BaseOrderFull validation hook
+    seller: BaseCounteragent = None  # fills on outer BaseOrderFull validation hook
+
+    async def guess_cur(self, curs: list[Cur] = None):
+        curs = {c.ticker: c.id for c in curs or await Cur.all()}
+        for cur, cid in curs.items():
+            if re.search(re.compile(rf"\({cur}\)"), self.extra + self.detail):
+                return cid
+        lower_extras = [mb.lower() for mb in self.extra.split(" | ")]
+        if (
+            pms := await Pm.filter(Q(join_type="OR", pmexs__name__in=lower_extras, norm__in=self.extra.split(" | ")))
+            .group_by("pmcurs__cur_id", "pmcurs__cur__ticker")
+            .annotate(ccnt=Count("id"), names=ArrayAgg("norm"))
+            .order_by("-ccnt", "pmcurs__cur__ticker")
+            .values("pmcurs__cur_id", "names", "ccnt")
+        ):
+            return pms[0]["pmcurs__cur_id"]
+        return None
+
+
+class BaseAd(BaseModel):
+    amount: float | None = None
+    auto_msg: str | None = None
+    cond_txt: str
+    created_at: int  # utc(0) seconds
+    coinex_exid: int | str
+    curex_exid: int | str
+    exid: int | str = Field(alias="id")
+    maker_exid: int | str
+    maker_name: str
+    maker: BaseActor = None
+    max_fiat: int
+    min_fiat: int
+    # paymentPeriod: int
+    pmex_exids: list[int | str]
+    premium: float
+    price: float
+    quantity: float | None = None
+    # recentOrderNum: int
+    side: Literal[Side.BUY, Side.SALE]
+    status: Literal[AdStatus.active, AdStatus.defActive, AdStatus.soldOut]  # 10: online; 20: offline; 30: completed
 
     @model_validator(mode="after")
-    def check_a_or_b(self):
-        if not self.cred_id and not self.pm_id:
-            raise ValueError("either cred_id or pm_id is required")
+    def amount_or_quantity_required(self):
+        if not self.amount and not self.quantity:
+            raise ValueError("either amount or quantity is required")
+        self.maker = BaseActor(exid=self.maker_exid, nick=self.maker_name and self.maker_name)
         return self
 
 
-class BaseAdUpdate(BaseModel):
-    id: int | str
+class BaseCredexsExidsTrait:
+    credex_exids: list[int]
 
 
-class BaseCad(BaseAdUpdate):
-    id: str
-    createDate: str
-    currencyId: str
-    maxAmount: str
-    minAmount: str
-    nickName: str
-    paymentPeriod: int
-    payments: list[str]
-    premium: str
-    price: str
-    priceType: Literal[0, 1]  # 0 - fix rate, 1 - floating
-    quantity: str
-    recentOrderNum: int
-    remark: str
-    side: Literal[0, 1]  # 0 - покупка, 1 - продажа
-    tokenId: str
-    userId: str
+class BaseCredexsTrait:
+    credex_exids: list[BaseCredEx]
 
 
-class GetAds(BaseModel):
+class GetAdsReq(BaseModel):
     coin_id: int | str
     cur_id: int | str
     is_sell: bool
@@ -148,7 +160,7 @@ class GetAds(BaseModel):
     kwargs: dict = {}
 
 
-class AdUpd(BaseAdUpdate, GetAds):
+class AdUpdReq(BaseAd, GetAdsReq):
     price: float
     pm_ids: list[int | str]
     amount: float
@@ -160,3 +172,65 @@ class AdUpd(BaseAdUpdate, GetAds):
 
     class Config:
         arbitrary_types_allowed = True
+
+
+class BaseOrder(BaseModel):
+    ad__pair_side__is_sell: bool  # int: 0 покупка, 1 продажа (именно для меня - апи агента, и пох мейкер я или тейкер)
+    created_at: int
+    exid: int = Field(alias="id")
+    my_exid: int | None = None  # апи агент юзер
+    status: OrderStatus
+
+
+class BaseOrderItem(BaseOrder):
+    amount: float | None = None
+    pmex_exid: int | str = None  # int
+    quantity: float | None = None
+    ctr_exid: int | None = None  # контрагент
+    ctr_nick: str | None = None
+    taker_exid: int | None = None  # в байбите нету
+    curex_exid: int | str = None
+    coinex_exid: int | str = None
+    seller_name: str
+    buyer_name: str
+
+    @model_validator(mode="after")
+    def amount_or_quantity_required(self):
+        if not self.amount and not self.quantity:
+            raise ValueError("either amount or quantity is required")
+        return self
+
+
+class BaseOrderFull(BaseOrderItem):
+    ad_id: int | str
+    ad__maker_exid: int | None = None
+    credex: BaseCredEx
+    my_nick: str = Field(alias="nickName")
+    taker: BaseCounteragent = None  # fills on validation hook
+
+
+class BaseOrderReq(BaseModel):
+    ad_id: int | str
+
+    quantity: float | None = None
+    amount: float | None = None
+
+    pmex_exid: str = None  # int
+
+    is_sell: bool = None
+    cur_exid: int | str = None
+    coin_exid: int | str = None
+    coin_scale: int = None
+
+
+class BaseOrderPaidReq(BaseModel):
+    ad_id: int | str
+
+    cred_id: int | None = None
+    pm_id: int | None = None  # or pmcur_id?
+
+    @model_validator(mode="after")
+    def check_a_or_b(self):
+        if not self.cred_id and not self.pm_id:
+            raise ValueError("either cred_id or pm_id is required")
+        return self

xync_client/BingX/agent.py

@@ -90,7 +90,7 @@ class AgentClient(BaseAgentClient):
         pass
 
     # 29: Список моих объявлений
-    async def my_ads(self):
+    async def get_my_ads(self):
         pass
 
     # 30: Создание объявления

xync_client/BitGet/agent.py

@@ -2,13 +2,11 @@ import json
 import subprocess
 from asyncio import run
 from x_model import init_db
-from xync_schema import models
 from xync_schema.enums import AdStatus, PmType, OrderStatus
 from xync_schema.models import User, Pm, Coin, Cur, Ad, Fiat, Order, Agent
 from xync_schema.pydantic import FiatNew
 
 from xync_client.Abc.Agent import BaseAgentClient
-from xync_client.loader import PG_DSN
 
 
 class Client(BaseAgentClient):
@@ -50,7 +48,7 @@ class Client(BaseAgentClient):
     async def fiat_del(self, fiat_id: int) -> bool:
         pass
 
-    async def my_ads(self) -> list[Ad]:
+    async def get_my_ads(self) -> list[Ad]:
         pass
 
     async def ad_new(