xync-client 0.0.25.dev45__tar.gz → 0.0.25.dev46__tar.gz

{xync_client-0.0.25.dev45/xync_client.egg-info → xync_client-0.0.25.dev46}/PKG-INFO

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

@@ -3,7 +3,6 @@ from abc import abstractmethod
 
 import msgspec
 from msgspec import Struct
-from msgspec.structs import asdict
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
 from xync_schema import models
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
@@ -68,7 +67,9 @@ class BaseExClient(BaseClient):
             cur_pyd.exid: (await models.Cur.update_or_create({"rate": cur_pyd.rate}, ticker=tkr))[0]
             for tkr, cur_pyd in cur_pyds.items()
         }
-        curexs = [models.Curex(**asdict(c), cur=curs[c.exid], ex=self.ex) for c in cur_pyds.values()]
+        curexs = [
+            models.Curex(**c.model_dump(exclude_none=True), cur=curs[c.exid], ex=self.ex) for c in cur_pyds.values()
+        ]
         # Curex
         await models.Curex.bulk_create(
             curexs, update_fields=["minimum", "rounding_scale"], on_conflict=["cur_id", "ex_id"]
@@ -145,9 +146,9 @@ class BaseExClient(BaseClient):
                 # и добавляем.обновляем Pmex для него
                 await models.Pmex.update_or_create({"pm": pm_}, ex=self.ex, exid=k, name=pm.name)
             else:
-                pmin = PmIn(**{**asdict(pmu), "country": country, "typ": pm.typ, "logo": pm.logo})
+                pmin = PmIn(**{**pmu.model_dump(exclude_none=True), "country": country, "typ": pm.typ, "logo": pm.logo})
                 try:
-                    pms[k], _ = await models.Pm.update_or_create(**pmin.df_unq(("country",)))
+                    pms[k], _ = await models.Pm.update_or_create(**pmin.df_unq())
                 except (MultipleObjectsReturned, IntegrityError) as e:
                     raise e
             prev = k, pmu.norm, pm.name, pmu.country
@@ -191,8 +192,7 @@ class BaseExClient(BaseClient):
 
     # Сохранение чужого объявления (с Pm-ами) в бд
     async def ad_pydin2db(self, ad_pydin: BaseAdIn) -> models.Ad:
-        df, unq = ad_pydin.args()
-        ad_db, _ = await models.Ad.update_or_create(df, **unq)
+        ad_db, _ = await models.Ad.update_or_create(**ad_pydin.df_unq())
         if getattr(ad_pydin, "pms_", None):  # if it ListItem, not Full One # todo: remove?
             await ad_db.pms.add(*ad_pydin.pms_)
         return ad_db

xync_client-0.0.25.dev46/xync_client/Abc/types.py

@@ -0,0 +1,36 @@
+from pydantic import BaseModel
+from x_model.types import New
+from xync_schema.enums import PmType
+from xync_schema.models import Country, Pm, Ex
+from xync_schema.types import PmexBank
+
+from xync_client.pm_unifier import PmUni
+
+
+class PmTrait:
+    typ: PmType | None = None
+    logo: str | None = None
+    banks: list[PmexBank] | None = None
+
+
+class PmEx(BaseModel, PmTrait):
+    exid: int | str
+    name: str
+
+
+class PmIn(New, PmUni, PmTrait):
+    _unq = "norm", "country"
+    country: Country | None = None
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class PmExIn(BaseModel):
+    pm: Pm
+    ex: Ex
+    exid: int | str
+    name: str
+
+    class Config:
+        arbitrary_types_allowed = True

{xync_client-0.0.25.dev45 → xync_client-0.0.25.dev46}/xync_client/TgWallet/ex.py

@@ -117,7 +117,7 @@ class ExClient(BaseExClient, AuthClient):
         pairex, _ = await models.PairEx.get_or_create(pair=pair, ex=self.ex)
         dr, _ = await models.Direction.get_or_create(pairex=pairex, sell=ad.is_sell)
         return types.BaseAdIn(
-            exid=ad.id,
+            id=ad.exid,
             price=ad.price.value,
             min_fiat=ad.orderAmountLimits.min,
             max_fiat=ad.orderAmountLimits.max,
@@ -133,7 +133,8 @@ class ExClient(BaseExClient, AuthClient):
         adx.maker = actor
         pms = ad.paymentMethods if isinstance(ad, _PmsTrait) else [pd.paymentMethod for pd in ad.paymentDetails]
         return types.AdBuyIn(
-            **adx.model_dump(), pms_=await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=[p.code for p in pms])
+            **adx.model_dump(by_alias=True),
+            pms_=await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=[p.code for p in pms]),
         )
 
 
@@ -141,9 +142,10 @@ async def _test():
     await init_db(PG_DSN, models, True)
     tgex = await models.Ex.get(name="TgWallet")
     cl: ExClient = tgex.client()
-    await cl.pairs()
-    await cl.set_pmcurexs()
-    await cl.set_coinexs()
+    # await cl.pms()
+    # await cl.pairs()
+    # await cl.set_pmcurexs()
+    # await cl.set_coinexs()
 
     # # # SALE # # #
     # get ads list

{xync_client-0.0.25.dev45 → xync_client-0.0.25.dev46}/xync_client/pm_unifier.py

@@ -1,9 +1,8 @@
 import re
+from pydantic import BaseModel
 
-from msgspec import Struct
 
-
-class PmUni(Struct):
+class PmUni(BaseModel):
     norm: str
     acronym: str = None
     country: str = None

{xync_client-0.0.25.dev45 → xync_client-0.0.25.dev46/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev45
+Version: 0.0.25.dev46
 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.dev45/xync_client/Abc/types.py

@@ -1,32 +0,0 @@
-from msgspec import Struct
-from x_model.types import New
-from xync_schema.enums import PmType
-from xync_schema.models import Country, Pm, Ex
-from xync_schema.types import PmexBank
-
-from xync_client.pm_unifier import PmUni
-
-
-class PmEx(Struct):
-    exid: int | str
-    name: str
-    # todo: duplicates
-    typ: PmType = None
-    logo: str = None
-    banks: list[PmexBank] = None
-
-
-class PmIn(New, PmUni):
-    _unq = "norm", "country"
-    country: Country = None
-    # todo: duplicates
-    typ: PmType = None
-    logo: str = None
-    banks: list[PmexBank] = None
-
-
-class PmExIn(Struct):
-    pm = Pm
-    ex = Ex
-    exid = int | str
-    name = str

{xync_client-0.0.25.dev45 → xync_client-0.0.25.dev46}/xync_client/Htx/etype/ad.py

@@ -23,14 +23,10 @@ class Req(BaseModel):
     maxTradeLimit: float
     tradeCount: float
     password: str
-    securityToken: str | None = ""
     payTerm: int
     isFixed: Literal["off", "on"]
     premium: int
-    fixedPrice: str | None = ""
-    autoReplyContent: str | None = ""
     isAutoReply: Literal["off", "on"]
-    tradeRule: str | None = ""
     takerAcceptOrder: int
     isPayCode: Literal["off", "on"]
     isVerifyCapital: bool
@@ -43,6 +39,10 @@ class Req(BaseModel):
     apiVersion: int
     channel: str
     tradeRulesV2: list[TradeRule]
+    securityToken: str | None = ""
+    fixedPrice: str | None = ""
+    autoReplyContent: str | None = ""
+    tradeRule: str | None = ""
 
 
 class PayMethod(BaseModel):
@@ -69,10 +69,8 @@ class Resp(BaseAd):
     isOnline: bool
     isTrade: bool
     isVerifyCapital: bool
-    labelName: str | None = None
     maxTradeLimit: str
     merchantLevel: int
-    merchantTags: list[str] | None
     minTradeLimit: str
     orderCompleteRate: str
     payMethod: str
@@ -80,7 +78,6 @@ class Resp(BaseAd):
     payName: str  # list[PayName]  # приходит массив объектов внутри строки
     payTerm: int
     price: str
-    seaViewRoom: str | None = None
     takerAcceptAmount: str
     takerAcceptOrder: int
     takerLimit: int
@@ -91,3 +88,6 @@ class Resp(BaseAd):
     tradeType: int
     uid: int
     userName: str
+    merchantTags: list[str] | None
+    labelName: str | None = None
+    seaViewRoom: str | None = None

{xync_client-0.0.25.dev45 → xync_client-0.0.25.dev46}/xync_client/TgWallet/pyd.py

@@ -17,8 +17,8 @@ class User(BaseModel):
     avatarCode: str
     statistics: UserStatistics
     isVerified: bool
-    lastOnlineMinutesAgo: int | None = None
     onlineStatus: str
+    lastOnlineMinutesAgo: int | None = None
 
 
 class AvailableVolume(BaseModel):
@@ -69,13 +69,13 @@ class Fee(BaseModel):
 
 
 class KeyVal(BaseModel):
-    name: Literal["PAYMENT_DETAILS_NUMBER", "PHONE"] = "PAYMENT_DETAILS_NUMBER"
     value: str
+    name: Literal["PAYMENT_DETAILS_NUMBER", "PHONE"] = "PAYMENT_DETAILS_NUMBER"
 
 
 class BanksIn(BaseModel):
-    name: Literal["BANKS"] = "BANKS"
     value: list[str]
+    name: Literal["BANKS"] = "BANKS"
 
 
 class Bank(BaseModel):
@@ -89,8 +89,8 @@ class Banks(BanksIn):
 
 
 class Attrs(BaseModel):
-    version: Literal["V1"] = "V1"
     values: list[KeyVal]
+    version: Literal["V1"] = "V1"
 
 
 class AttrsV2In(BaseModel):
@@ -125,8 +125,8 @@ class CredEpyd(BaseModel):
     userId: int
     paymentMethod: PmEpydRoot
     currency: str
-    name: str = ""
     attributes: Attrs | AttrsV2
+    name: str = ""
 
 
 class InitVolume(BaseModel):
@@ -263,7 +263,6 @@ class OrderEpyd(BaseModel):
     buyer: User
     offerId: int
     offerType: AdType
-    offerComment: str = ""
     isExpress: bool
     price: Price
     paymentDetails: CredEpyd
@@ -278,6 +277,7 @@ class OrderEpyd(BaseModel):
     status: OrderStatus
     changeLog: ChangeLog
     isAutoAccept: bool
+    offerComment: str = ""
 
     @computed_field
     @property