xync-client 0.0.25.dev105__tar.gz → 0.0.25.dev110__tar.gz

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/.env.sample

@@ -1,3 +1,4 @@
+TOKEN=your:bottoken
 POSTGRES_HOST=127.0.0.1
 POSTGRES_PORT=5433
 POSTGRES_USER=xync

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/.gitignore

@@ -7,4 +7,5 @@ __pycache__
 /*.egg-info
 /build
 .vscode
-/xync_client/Gate/res.js
+/xync_client/Gate/res.js
+/tests/res.js

{xync_client-0.0.25.dev105/xync_client.egg-info → xync_client-0.0.25.dev110}/PKG-INFO

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

@@ -2,11 +2,12 @@ from abc import abstractmethod
 
 from pydantic import BaseModel
 from xync_schema import models
-from xync_schema.models import OrderStatus, Coin, Cur, Ad, AdStatus, Agent, Cred, PmexBank
+from xync_schema.models import OrderStatus, Coin, Cur, Ad, AdStatus, Agent, Cred
 from xync_schema.types import BaseAd, AdSaleIn, AdBuyIn, BaseOrder
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.Base import BaseClient
+from xync_client.Abc.types import CredExOut
 
 
 class BaseAgentClient(BaseClient):
@@ -48,24 +49,24 @@ class BaseAgentClient(BaseClient):
 
     # 25: Список реквизитов моих платежных методов
     @abstractmethod
-    async def creds(self) -> list: ...  # {fiat.exid: {fiat}}
+    async def creds(self) -> list: ...  # {credex.exid: {cred}}
 
     # Создание реквизита на бирже
-    async def fiat_new(self, cred: models.Cred) -> models.Cred:
-        await models.Actor.get_or_create({"name": cred.exid}, ex=self.ex_client.ex, exid=self.agent.actor.exid)
-        CredIn()
-        fiat_db: Cred = (await self.fiat_pyd2db(fiat, self.agent.user_id))[0]
-        if not (fiatex := models.CredEx.get_or_none(fiat=fiat_db, ex=self.agent.ex)):
-            fiatex, _ = models.CredEx.update_or_create({}, fiat=fiat_db, ex=self.agent.ex)
-        return fiatex
+    async def cred_new(self, cred: models.Cred) -> CredExOut: ...
+
+    # await models.Actor.get_or_create({"name": cred.exid}, ex=self.ex_client.ex, exid=self.agent.actor.exid)
+    # cred_db: Cred = (await self.cred_pyd2db(cred, self.agent.user_id))[0]
+    # if not (credex := models.CredEx.get_or_none(cred=cred_db, ex=self.agent.ex)):
+    #     credex, _ = models.CredEx.update_or_create({}, cred=cred_db, ex=self.agent.ex)
+    # return credex
 
     # 27: Редактирование реквизита моего платежного метода
     @abstractmethod
-    async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> Cred: ...
+    async def cred_upd(self, cred: models.Cred, exid: int) -> CredExOut: ...
 
     # 28: Удаление реквизита моего платежного метода
     @abstractmethod
-    async def fiat_del(self, fiat_id: int) -> bool: ...
+    async def cred_del(self, exid: int) -> int: ...
 
     # # # Ad
     # 29: Список моих объявлений
@@ -82,7 +83,7 @@ class BaseAgentClient(BaseClient):
         self,
         offer_id: int,
         amount: int,
-        fiats: list[Cred] = None,
+        creds: list[Cred] = None,
         price: float = None,
         is_float: bool = None,
         min_fiat: int = None,
@@ -130,15 +131,11 @@ class BaseAgentClient(BaseClient):
         await ad_db.creds.add(*getattr(ad_pydin, "creds_", []))
         return ad_db
 
-    @staticmethod
-    async def cred_pydin2db(cred: CredIn) -> Cred:
-        df, unq = cred.args()
-        cred_db, _ = await Cred.update_or_create(df, **unq)
-        if cred.banks:
-            await cred_db.banks.add(*[await PmexBank.get(exid=b) for b in cred.banks])
-        return cred_db
-
-    @staticmethod
-    async def fiat_cred2db(cred: Cred) -> Cred:
-        fiat, _ = await Cred.get_or_create(cred=cred)
-        return fiat
+    # @staticmethod
+    # async def cred_e2db(cred_in: BaseUpd, banks: list[str] = None) -> bool:
+    #     cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
+    #     credex_in = models.CredEx.validate({"exid": cred_in.id, "cred_id": cred_db.id})
+    #     credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
+    #     if banks:  # only for SBP
+    #         await cred_db.banks.add(*[await PmexBank.get(exid=b) for b in banks])
+    #     return True

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Abc/AuthTrait.py

@@ -18,10 +18,11 @@ class BaseAuthTrait(Client):
         # noinspection PyUnresolvedReferences
         self.session.headers.update(auth_hdrs)
 
-    async def _post(self, url: str, data: dict = None, data_key: str = None):
+    async def _post(self, url: str, data: dict = None, data_key: str = None, headers: dict = None):
         dt = {"json" if isinstance(data, dict) else "data": data}
         # noinspection PyUnresolvedReferences
-        resp = await self.session.post(url, **dt, headers=self._prehook(data))
+        hdrs = {**self._prehook(data), **(headers or {})}
+        resp = await self.session.post(url, **dt, headers=hdrs)
         return await self._proc(resp, data_key, data)
 
     async def _proc(self, resp: ClientResponse, data_key: str = None, body: dict | str = None) -> dict | str:

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Abc/Ex.py

@@ -1,13 +1,10 @@
 import logging
 from abc import abstractmethod
-from asyncio import sleep
 
 import msgspec
-from aiohttp import ClientSession
 from msgspec import Struct
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
 from xync_schema import models
-from xync_schema.enums import FileType
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
 
 from xync_client.Abc.Base import BaseClient, MapOfIdsList
@@ -69,7 +66,7 @@ class BaseExClient(BaseClient):
 
     # Импорт Pm-ов (с Pmcur-, Pmex- и Pmcurex-ами) и валют (с Curex-ами) с биржи в бд
     async def set_pmcurexs(self):
-        pyro = PyroClient(bot)
+        PyroClient(bot)
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
         curs: dict[int | str, models.Cur] = {
@@ -157,25 +154,25 @@ class BaseExClient(BaseClient):
                 await models.Pmex.update_or_create({"pm": pm_}, ex=self.ex, exid=k, name=pm.name)
             else:
                 pmin = models.Pm.validate({**pmu.model_dump(), "country_id": country_id, "typ": pm.typ})
-                # logo
-                if pm.logo and not await models.File.exists(name=pm.logo):
-                    if not pm.logo.startswith("https:"):
-                        if not pm.logo.startswith("/"):
-                            pm.logo = "/" + pm.logo
-                        pm.logo = "https://" + pm.logo
-                    async with ClientSession() as ss:
-                        resp = await ss.get(pm.logo)
-                        if resp.ok:
-                            byts = await resp.read()
-                            upf, ref = await pyro.save_file(byts, resp.content_type)
-                            await sleep(1)
-                            typ = FileType[resp.content_type.split("/")[-1]]
-                            file, _ = await models.File.update_or_create(
-                                {"ref": ref, "size": len(byts), "typ": typ}, name=pm.logo
-                            )
-                            # fil = await pyro.get_file(file.ref)  # check
-                            pmin.logo_id = file.id
-                # /logo
+                # # logo
+                # if pm.logo and not await models.File.exists(name=pm.logo):
+                #     if not pm.logo.startswith("https:"):
+                #         if not pm.logo.startswith("/"):
+                #             pm.logo = "/" + pm.logo
+                #         pm.logo = "https://" + pm.logo
+                #     async with ClientSession() as ss:
+                #         resp = await ss.get(pm.logo)
+                #         if resp.ok:
+                #             byts = await resp.read()
+                #             upf, ref = await pyro.save_file(byts, resp.content_type)
+                #             await sleep(1)
+                #             typ = FileType[resp.content_type.split("/")[-1]]
+                #             file, _ = await models.File.update_or_create(
+                #                 {"ref": ref, "size": len(byts), "typ": typ}, name=pm.logo
+                #             )
+                #             # fil = await pyro.get_file(file.ref)  # check
+                #             pmin.logo_id = file.id
+                # # /logo
                 try:
                     pms[k], _ = await models.Pm.update_or_create(**pmin.df_unq())
                 except (MultipleObjectsReturned, IntegrityError) as e:

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Abc/types.py

@@ -34,3 +34,7 @@ class PmExIn(BaseModel):
 
     class Config:
         arbitrary_types_allowed = True
+
+
+class CredExOut(BaseModel):
+    id: int

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Binance/etype/ad.py

@@ -16,6 +16,7 @@ class TradeMethod(BaseModel):
     tradeMethodName: str
     tradeMethodShortName: Optional[str] = None
 
+
 class Adv(BaseModel):
     abnormalStatusList: Optional[List[str]] = None
     adAdditionalKycVerifyItems: Optional[List[Any]] = None
@@ -91,6 +92,7 @@ class Adv(BaseModel):
     userTradeVolumeMax: Optional[str] = None
     userTradeVolumeMin: Optional[str] = None
 
+
 class Advertiser(BaseModel):
     activeTimeInSecond: int
     advConfirmTime: Optional[str] = None
@@ -115,8 +117,9 @@ class Advertiser(BaseModel):
     userType: str
     vipLevel: Optional[int] = None
 
+
 class Ad(BaseAd):
     adv: Adv
     advertiser: Advertiser
     privilegeDesc: Optional[str] = None
-    privilegeType: int
+    privilegeType: int | None = None

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Gate/ex.py

@@ -15,9 +15,17 @@ from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 from xync_client.Abc.types import PmEx
 from xync_client.Gate.etype import ad
+from xync_client.pm_unifier import PmUnifier
 
 
 class ExClient(BaseExClient):
+    class GateUnifier(PmUnifier):
+        pm_map = {
+            "SBP - Fast Bank Transfer": "SBP"
+        }
+
+    unifier_class = GateUnifier
+
     # Данные для р2р из html Gate.io
     async def c2c_data(self) -> dict:
         await sleep(1)

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/Okx/ex.py

@@ -9,9 +9,17 @@ from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 from xync_client.Okx.etype import ad, pm
 from xync_client.Abc.types import PmEx
+from xync_client.pm_unifier import PmUnifier
 
 
 class ExClient(BaseExClient):
+    class OkxUnifier(PmUnifier):
+        pm_map = {
+            "SBP Fast Bank Transfer": "SBP"
+        }
+
+    unifier_class = OkxUnifier
+
     async def _pms(self, cur) -> list[pm.PmE]:
         params = {
             "quoteCurrency": cur,

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/TgWallet/agent.py

@@ -4,6 +4,7 @@ from enum import StrEnum
 from http.client import HTTPException
 
 from x_model import init_db
+
 from xync_client.TgWallet.ex import ExClient
 from xync_schema import models
 
@@ -17,13 +18,14 @@ from xync_client.TgWallet.pyd import (
     AdMakerSale,
     AdMakerNewSale,
     _AdNew,
-    FiatEpydIn,
     _PmsTrait,
     OneAdTakerBuy,
     OrderEpyd,
     AdMakerNewBuy,
     OrderEpydIn,
     AvailableVolume,
+    CredEpydNew,
+    CredEpydUpd,
 )
 from xync_client.loader import PG_DSN
 from xync_schema.enums import AdStatus, UserStatus, OrderStatus
@@ -176,7 +178,7 @@ class AgentClient(BaseAgentClient, AuthClient):
         resp = await self._post("/p2p/public-api/v3/payment-details/get/by-user-id")
         return [CredEpyd(**cred) for cred in resp["data"]]
 
-    async def cred_epyd2pydin(self, cred: CredEpyd):  # models.Cred.in_type():
+    async def cred_epyd2db(self, cred: CredEpyd) -> models.CredEx:
         if not (pmex := await models.Pmex.get_or_none(exid=cred.paymentMethod.code, ex=self.ex_client.ex)):
             raise HTTPException(f"No Pmex {cred.paymentMethod.code} on ex#{self.ex_client.ex.name}", 404)
         if not (pmcur := await models.Pmcur.get_or_none(cur__ticker=cred.currency, pm_id=pmex.pm_id)):
@@ -184,90 +186,96 @@ class AgentClient(BaseAgentClient, AuthClient):
         if not (person := await models.Person.get_or_none(actors__exid=cred.userId)):
             raise HTTPException(f"No Pmcur with cur#{cred.currency} and pm#{cred.paymentMethod.code}", 404)
         dct = {"pmcur_id": pmcur.id, "name": cred.name, "person_id": person.id}
+        banks: list[str] | None = None
         for val in cred.attributes.values:
             if val.name == "BANKS":
-                dct["banks"] = [b.code for b in val.value]
+                banks = [b.code for b in val.value]
             else:
                 dct["detail"] = val.value
-        cred_in = models.Cred.in_type().validate(dct)
-
-        # todo: move to common base
-        models.Cred.in_type().validate(
-            {
-                "exid": cred.id,
-                "cred_id": cred.name,
-            }
-        )
-        return cred_in
+        cred_in = models.Cred.validate(dct, False)
+        cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
+        credex_in = models.CredEx.validate({"exid": cred.id, "cred_id": cred_db.id, "ex_id": self.ex.id})
+        if banks:  # only for SBP
+            await cred_db.banks.add(*[await models.PmexBank.get(exid=b) for b in banks])
+        credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
+        return credex_db
 
     # 25: Список реквизитов моих платежных методов
-    async def set_fiats(self) -> list[models.Cred]:
+    async def set_fiats(self) -> list[models.CredEx]:
         creds_epyd: list[CredEpyd] = await self.creds()
-        creds_pyd_in: list[CredIn] = [await self.cred_epyd2pydin(f) for f in creds_epyd]
-        creds_db = [await self.cred_pydin2db(crd) for crd in creds_pyd_in]
-        fiats_db = [await self.fiat_cred2db(cd) for cd in creds_db]
-        return fiats_db
+        credexs: list[models.CredEx] = [await self.cred_epyd2db(f) for f in creds_epyd]
+        return credexs
+
+    async def challenge(self, name: str, payload: dict):
+        req = {
+            "deviceSerial": self.agent.auth["ds"],
+            "passcode": "0909",
+            "language": "en",
+            "operation": {"name": name, "payload": payload},
+        }
+        return await self._post("/v2api/challenges", req)
 
     # 26: Создание реквизита моего платежного метода
-    async def cred_new(self, cred: CredIn) -> models.Cred:
-        pmex = await models.Pmex.get(pm_id=cred.pm_id, ex=self.ex_client.ex).prefetch_related("pm")
-        cur = await models.Cur[cred.cur_id]
+    async def cred_new(self, cred: models.Cred) -> models.CredEx:
+        pmcur: models.Pmcur = await cred.pmcur
+        exid = await models.Pmex.get(pm_id=pmcur.pm_id, ex=self.ex_client.ex).values_list("exid", flat=True)
+        cur = await models.Cur[pmcur.cur_id]
         vals = (
-            [{"name": "PAYMENT_DETAILS_NUMBER", "value": cred.detail}]
-            if cred.banks
-            else [{"name": "PHONE", "value": cred.detail}, {"name": "BANKS", "value": cred.banks}]
+            [
+                {"name": "PHONE", "value": cred.detail.replace(" ", "")},
+                {"name": "BANKS", "value": [b.exid for b in banks]},
+            ]
+            if (banks := await cred.banks)
+            else [{"name": "PAYMENT_DETAILS_NUMBER", "value": cred.detail}]
         )
-        cred_in = FiatEpydIn(
-            paymentMethodCode=pmex.exid,
+        cred_new = CredEpydNew(
+            paymentMethodCode=exid,
             currencyCode=cur.ticker,
             name=cred.name,
-            attributes={"values": vals},
-        )
-        add_cred = await self._post("/p2p/public-api/v3/payment-details/create", cred_in.model_dump())
-        CredEpyd(**add_cred["data"])
-        cred, _ = await models.Cred.update_or_create(
-            {"name": cred.name, "detail": cred.detail}, ex=self.ex_client.ex, exid=add_cred["data"]["id"]
-        )
-        cred_db, _ = await models.Cred.update_or_create({"amount": cred.amount, "target": cred.target}, cred=cred)
-
-        pmex = await models.Pmex.get(exid=add_cred["data"]["paymentMethod"]["code"], ex=self.ex_client.ex)
-        cur = await models.Cur.get(ticker=add_cred["data"]["currency"])
-        pmcur, _ = await models.Pmcur.get_or_create(cur=cur, pm_id=pmex.pm_id)
-        attrs = {a["name"]: a["value"] for a in add_cred["data"]["attributes"]["values"]}
-        f, _ = await models.Cred.update_or_create(
-            {"detail": attrs["PAYMENT_DETAILS_NUMBER"]}, pmcur=pmcur, user_id=self.agent.user_id
-        )
-        return f
+            attributes={"version": "V2" if banks else "V1", "values": vals},
+        ).model_dump()
+        challenge = await self.challenge("p2p/create-payment-details", cred_new)
+        hdrs = {
+            "x-wallet-operation-token": challenge["operationToken"],
+            "x-wallet-device-serial": self.agent.auth["ds"],
+        }
+        add_cred = await self._post("/p2p/public-api/v3/payment-details/create", cred_new, headers=hdrs)
+        cred_epyd = CredEpyd(**add_cred["data"])
+        return await self.cred_epyd2db(cred_epyd)
 
     # 27: Редактирование реквизита моего платежного метода
-    async def cred_upd(self, cred_id: int, detail: str, name: str = None) -> models.Cred:
-        cred = await models.Cred.get(credexs__exid=cred_id, credexs__ex=self.ex_client.ex).prefetch_related("pmcur")
-        pmex = await models.Pmex.get(pm_id=cred.pmcur.pm_id, ex=self.ex_client.ex)
-        cur = await models.Cur[cred.pmcur.cur_id]
-        edit_cred = await self._post(
-            "/p2p/public-api/v3/payment-details/edit",
-            {
-                "id": cred_id,
-                "paymentMethodCode": pmex.exid,
-                "currencyCode": cur.ticker,
-                "name": name,
-                "attributes": {"version": "V1", "values": [{"name": "PAYMENT_DETAILS_NUMBER", "value": detail}]},
-            },
-        )
-        pmex = await models.Pmex.get(exid=edit_cred["data"]["paymentMethod"]["code"], ex=self.ex_client.ex)
-        cur = await models.Cur.get(ticker=edit_cred["data"]["currency"])
-        pmcur, _ = await models.Pmcur.get_or_create(cur=cur, pm_id=pmex.pm_id)
-        attrs = {a["name"]: a["value"] for a in edit_cred["data"]["attributes"]["values"]}
-        f, _ = await models.Cred.update_or_create(
-            {"detail": attrs["PAYMENT_DETAILS_NUMBER"]}, pmcur=pmcur, user_id=self.agent.user_id
+    async def cred_upd(self, cred: models.Cred, exid: int) -> models.CredEx:
+        pmcur: models.Pmcur = await cred.pmcur
+        pmex = await models.Pmex.get(pm_id=pmcur.pm_id, ex=self.ex_client.ex)
+        cur = await models.Cur[pmcur.cur_id]
+        vals = (
+            [{"name": "PHONE", "value": cred.detail}, {"name": "BANKS", "value": [b.exid for b in banks]}]
+            if (banks := await cred.banks)
+            else [{"name": "PAYMENT_DETAILS_NUMBER", "value": cred.detail}]
         )
-        await models.Cred.update_or_create({"exid": edit_cred["data"]["id"]}, ex=self.ex_client.ex, cred=f)
-        return f
+        cred_upd = CredEpydUpd(
+            id=exid,
+            paymentMethodCode=pmex.exid,
+            currencyCode=cur.ticker,
+            name=cred.name,
+            attributes={"version": "V2" if banks else "V1", "values": vals},
+        ).model_dump()
+        challenge = await self.challenge("p2p/edit-payment-details", cred_upd)
+        hdrs = {
+            "x-wallet-operation-token": challenge["operationToken"],
+            "x-wallet-device-serial": self.agent.auth["ds"],
+        }
+        edit_cred = await self._post("/p2p/public-api/v3/payment-details/edit", cred_upd, headers=hdrs)
+        cred_epyd = CredEpyd(**edit_cred["data"])
+        return await self.cred_epyd2db(cred_epyd)
 
     # 28: Удаление реквизита моего платежного метода
-    async def cred_del(self, cred_id: int) -> bool:
-        del_cred = await self._post("/p2p/public-api/v3/payment-details/delete", {"id": cred_id})
-        return del_cred
+    async def cred_del(self, cred_id: int) -> int:  # exid
+        res: dict = await self._post("/p2p/public-api/v3/payment-details/delete", {"id": cred_id})
+        if res.get("status") == "SUCCESS":
+            return res["data"]["id"]
+        else:
+            logging.error(res)
 
     async def ad_epyd2pydin(self, ad_: OneAdTakerMakerSale | OneAdMakerBuy | OneAdTakerBuy) -> AdBuyIn | AdSaleIn:
         ad_in: BaseAdIn = await self.ex_client.ad_common_epyd2pydin(ad_)
@@ -279,7 +287,7 @@ class AgentClient(BaseAgentClient, AuthClient):
                     pmexs__ex=self.ex_client.ex, pmexs__exid__in=[p.code for p in ad_.paymentMethods]
                 ),
             )
-        creds_pin: list[CredIn] = [await self.cred_epyd2pydin(c) for c in ad_.paymentDetails]
+        creds_pin: list[models.Cred.in_type()] = [await self.cred_epyd2db(c) for c in ad_.paymentDetails]
         creds_ = [(await models.Cred.update_or_create((a := cp.args())[0], **a[1]))[0] for cp in creds_pin]
         return AdSaleIn(**ad_in.model_dump(), creds_=creds_)
 
@@ -308,7 +316,7 @@ class AgentClient(BaseAgentClient, AuthClient):
     ) -> AdMakerNewSale | AdMakerNewBuy:
         coinex = await models.Coinex.get(coin=coin, ex=self.ex)
         curex = await models.Curex.get(ex=self.ex, cur=cur)
-        creds = await models.Cred.filter(ch__actor__agent__user_id=self.agent.user_id, pmcur__cur=cur).limit(5)
+        creds = await models.Cred.filter(ch__actor__agent__user_id=self.agent.ac.user_id, pmcur__cur=cur).limit(5)
         # todo: ordering and filtering by fiat.amount-target
         ad_ein = _AdNew(
             type="SALE" if is_sell else "PURCHASE",
@@ -437,8 +445,8 @@ async def main():
     )
     mcl: AgentClient = maker.client()
     tcl: AgentClient = taker.client()
-    await tcl.set_fiats()
     await mcl.set_fiats()
+    await tcl.set_fiats()
     my_ads = await mcl.my_ads()
     my_ads_in = [await mcl.ad_epyd2pydin(ma) for ma in my_ads]
     _my_ads_db = [await mcl.ad_pydin2db(ma) for ma in my_ads_in]

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/TgWallet/auth.py

@@ -1,5 +1,5 @@
 from x_client.http import Client as HttpClient
-from xync_schema.models import Agent
+from xync_schema.models import Agent, User, Person
 
 from xync_client.Abc.AuthTrait import BaseAuthTrait
 from xync_client.Abc.Base import BaseClient
@@ -14,6 +14,8 @@ class AuthClient(BaseAuthTrait, BaseClient):
                 .prefetch_related("actor__person__user")
                 .first()
             )
+        elif not isinstance(self.agent.actor.person, Person) or not isinstance(self.agent.actor.person.user, User):
+            await self.agent.fetch_related("actor__person__user")
         pyro = PyroClient(self.agent)
         init_data = await pyro.get_init_data()
         tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110}/xync_client/TgWallet/pyd.py

@@ -2,6 +2,8 @@ from typing import Literal
 from pydantic import BaseModel, computed_field
 from xync_schema.types import BaseAd, BaseOrder
 
+from xync_client.Abc.types import CredExOut
+
 
 # Модели для вложенных структур
 class UserStatistics(BaseModel):
@@ -113,14 +115,18 @@ class PmEpydRoot(PmEpyd):
     banks: list[PmEpyd] | None = None
 
 
-class FiatEpydIn(BaseModel):
+class CredEpydNew(BaseModel):
     paymentMethodCode: str
     currencyCode: str
     name: str
     attributes: Attrs | AttrsV2In
 
 
-class CredEpyd(BaseModel):
+class CredEpydUpd(CredEpydNew):
+    id: int
+
+
+class CredEpyd(CredExOut):
     id: int
     userId: int
     paymentMethod: PmEpydRoot

{xync_client-0.0.25.dev105 → xync_client-0.0.25.dev110/xync_client.egg-info}/PKG-INFO

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

@@ -8,7 +8,6 @@ tests/TestAgent.py
 tests/TestAsset.py
 tests/TestEx.py
 tests/TestOrder.py
-tests/res.js
 tests/_todo_refact/__init__.py
 tests/_todo_refact/_test_ex.py
 tests/_todo_refact/Binance/test_binance.py