xync-client 0.0.25.dev38__tar.gz → 0.0.25.dev39__tar.gz

{xync_client-0.0.25.dev38/xync_client.egg-info → xync_client-0.0.25.dev39}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev38
+Version: 0.0.25.dev39
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
 Requires-Python: >=3.11
 Requires-Dist: asynchuobi
 Requires-Dist: bs4
+Requires-Dist: msgspec
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
@@ -14,7 +15,6 @@ Requires-Dist: pyrogram
 Requires-Dist: python-dotenv
 Requires-Dist: python-okx
 Requires-Dist: xn-client>=0.0.3dev3
-Requires-Dist: xn-auth
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/pyproject.toml

@@ -9,6 +9,7 @@ dynamic = ["version"]
 dependencies = [
     "asynchuobi",
     "bs4",
+    "msgspec",
     "python-binance",
     "pybit",
     "pyotp",
@@ -17,7 +18,6 @@ dependencies = [
     "python-okx",
 #    "tgcrypto",
     "xn-client>=0.0.3dev3",
-    "xn-auth",
     "xync-schema"
 ]
 

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/BingX/pyd.py

@@ -1,6 +1,7 @@
 from pydantic import BaseModel
 from typing import List
-from xync_schema.pydantic import BaseAd
+from xync_schema.types import BaseAd
+
 
 class User(BaseModel):
     nickname: str
@@ -32,6 +33,7 @@ class PmEpyd(BaseModel):
     icon: str
     number: int
 
+
 class UserPaymentMethod(BaseModel):
     id: int
     paymentMethodId: int
@@ -39,6 +41,7 @@ class UserPaymentMethod(BaseModel):
     paymentMethodIcon: str
     mainColor: str
 
+
 class PaymentMethod(BaseModel):
     id: int
     name: str
@@ -46,6 +49,7 @@ class PaymentMethod(BaseModel):
     mainColor: str
     userPaymentMethodList: List[UserPaymentMethod]
 
+
 class Ad(BaseAd):
     orderNo: str
     tradeRecent: int
@@ -87,4 +91,4 @@ class Ad(BaseAd):
     merchantKycType: int
     merchantVerificationType: int
     isUserMatchCondition: bool
-    notMatchConditionReason: str
+    notMatchConditionReason: str

{xync_client-0.0.25.dev38/xync_client/Htx/pyd → xync_client-0.0.25.dev39/xync_client/Htx/etype}/cred.py

@@ -6,15 +6,10 @@ field_ids = {
     926496571879587801: "payee",
     926496571879587802: "bank",
     926496571879587803: "sub_bank",
-    926496571879587804: "pay_account"
+    926496571879587804: "pay_account",
 }
 
-field_types = {
-    "payee": "cred__name",
-    "bank": "pm__name",
-    "sub_bank": None,
-    "pay_account": "cred__detail"
-}
+field_types = {"payee": "cred__name", "bank": "pm__name", "sub_bank": None, "pay_account": "cred__detail"}
 
 
 class Cred(BaseModel):

xync_client-0.0.25.dev39/xync_client/Htx/etype/pm.py

@@ -0,0 +1,23 @@
+from enum import IntEnum
+
+from msgspec import Struct
+
+
+class PmEType(IntEnum):
+    credit_card = 0
+    bank = 1
+    cash = 2
+    web_wallet = 3
+    web_wallet1 = 4
+    IFSC = 5
+
+
+class Resp(Struct):
+    payMethodId: int
+    name: str
+    template: int
+    bankType: int
+    color: str
+    bankImage: str | None
+    bankImageWeb: str | None
+    defaultName: str | None = None

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/Htx/ex.py

@@ -1,12 +1,13 @@
 from asyncio import run
 
+from msgspec import convert
 from x_model import init_db
 from xync_schema import models, types
 from xync_schema.models import Ex, Cur
 from xync_schema.enums import PmType
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Htx.pyd.types import Country
+from xync_client.Htx.etype import pm, Country
 from xync_client.loader import PG_DSN
 
 
@@ -22,16 +23,16 @@ class ExClient(BaseExClient):
             5: PmType.IFSC,
         }
 
-        pms = (await self._coin_curs_pms())["payMethod"]
+        pms: list[pm.Resp] = [convert(p, pm.Resp) for p in (await self._coin_curs_pms())["payMethod"]]
 
         pmsd = {
-            pm["payMethodId"]: types.Pm(
-                id=pm["payMethodId"],
-                name=pm["name"],
-                type_=dist.get(pm["template"], pm["template"]),
-                logo=pm.get("bankImage", pm["bankImageWeb"]),
+            p.payMethodId: types.Pm(
+                id=p.payMethodId,
+                name=p.name,
+                type_=dist.get(p.template),
+                logo=p.bankImage or p.bankImageWeb,
             )
-            for pm in pms
+            for p in pms
         }
 
         return pmsd

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/TgWallet/agent.py

@@ -192,10 +192,11 @@ class AgentClient(BaseAgentClient, AuthClient):
             raise HTTPException(
                 FailReason.body, f"No Pmcur with cur#{fiat.currency} and pm#{fiat.paymentMethod.code}", 404
             )
+        ch = self.agent.actor.ch_id
         cred_pin = CredPydIn(
             exid=fiat.id,
             pmcur=pmcur,
-            actor=self.agent.actor,
+            ch=ch,
             name=fiat.name,
         )
         for val in fiat.attributes.values:
@@ -311,7 +312,7 @@ class AgentClient(BaseAgentClient, AuthClient):
     ) -> AdMakerNewSale | AdMakerNewBuy:
         coinex = await Coinex.get(coin=coin, ex=self.ex)
         curex = await Curex.get(ex=self.ex, cur=cur)
-        creds = await Cred.filter(actor__agent__user_id=self.agent.user_id, pmcur__cur=cur).limit(5)
+        creds = await Cred.filter(ch__actor__agent__user_id=self.agent.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",
@@ -431,11 +432,11 @@ async def main():
     )
     mcl: AgentClient = maker.client()
     tcl: AgentClient = taker.client()
-    # fiats = await tcl.set_fiats()
-    # fiats = await mcl.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]
+    await tcl.set_fiats()
+    await mcl.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]
 
     coin = await Coin.get(ticker="USDT")
     cur = await Cur.get(ticker="RUB")

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/TgWallet/auth.py

@@ -9,7 +9,11 @@ from xync_client.TgWallet.pyro import PyroClient
 class AuthClient(BaseAuthTrait, BaseClient):
     async def _get_auth_hdrs(self) -> dict[str, str]:
         if not self.agent:
-            self.agent = await Agent.filter(actor__ex=self.ex, auth__isnull=False).prefetch_related("actor").first()
+            self.agent = (
+                await Agent.filter(actor__ex=self.ex, auth__isnull=False)
+                .prefetch_related("actor__person__user")
+                .first()
+            )
         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.dev38 → xync_client-0.0.25.dev39}/xync_client/TgWallet/ex.py

@@ -1,10 +1,8 @@
 from asyncio import run
 
 from x_model import init_db
-from xync_schema.pydantic import PmPyd, PmexBankPyd, CurEpyd, CoinEpyd, BaseAdPydIn, AdBuyPydIn
-
+from xync_schema import types
 from xync_schema import models
-from xync_schema.models import Ex, Direction, Pair, Coin, Cur, Pm, Actor, PairEx
 
 from xync_client.TgWallet.pyd import (
     PmEpydRoot,
@@ -22,10 +20,10 @@ from xync_client.TgWallet.auth import AuthClient
 
 
 class ExClient(BaseExClient, AuthClient):
-    def __init__(self, ex: Ex):
+    def __init__(self, ex: models.Ex):
         super().__init__(ex)  # BaseExClient
 
-    def pm_type_map(self, pm: Pm) -> str:
+    def pm_type_map(self, pm: models.Pm) -> str:
         return "V2" if pm.name.startswith("SBP") else "V1"
 
     # 00: todo: min-max for cur and coin ad amount, order, fee ..
@@ -34,13 +32,13 @@ class ExClient(BaseExClient, AuthClient):
         return settings["data"]
 
     # 19: Список поддерживаемых валют тейкера
-    async def curs(self) -> list[CurEpyd]:
+    async def curs(self) -> list[types.CurE]:
         coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
         stg = await self._settings()
         roundings: dict[str, int] = stg["offerSettings"]["roundingScaleByFiatCurrency"]
         minimums: dict[str, str] = stg["offerSettings"]["minOrderAmountByCurrencyCode"]
         return [
-            CurEpyd(
+            types.CurE(
                 exid=c["code"], ticker=c["code"], rounding_scale=roundings.get(c["code"]), minimum=minimums[c["code"]]
             )
             for c in coins_curs["data"]["fiat"]
@@ -51,7 +49,7 @@ class ExClient(BaseExClient, AuthClient):
         return {pm["code"]: PmEpydRoot(**pm) for pm in pms["data"]}
 
     # 20: Список платежных методов. todo: refact to pmexs?
-    async def pms(self, cur: str = None) -> dict[str, PmPyd]:
+    async def pms(self, cur: str = None) -> dict[str, types.Pm]:
         pms: dict[str:PmEpydRoot] = {}
         if cur:
             pms = await self._pms(cur)
@@ -59,7 +57,11 @@ class ExClient(BaseExClient, AuthClient):
             for cur in await self.curs():
                 pms |= await self._pms(cur.exid)
         return {
-            k: PmPyd(name=pm.nameEng, banks=[PmexBankPyd(exid=b.code, name=b.name) for b in pm.banks or []])
+            k: types.Pm(
+                identifier=pm.code,
+                name=pm.nameEng,
+                banks=[types.PmexBank(exid=b.code, name=b.name) for b in pm.banks or []],
+            )
             for k, pm in pms.items()
         }
 
@@ -68,13 +70,14 @@ class ExClient(BaseExClient, AuthClient):
         return {cur.exid: list(await self._pms(cur.exid)) for cur in await self.curs()}
 
     # 22: Список торгуемых монет (с ограничениям по валютам, если есть)
-    async def coins(self) -> list[CoinEpyd]:
+    async def coins(self) -> list[types.CoinE]:
         coins_curs = await self._post("/p2p/public-api/v2/currency/all-supported")
         stg = await self._settings()
         lims = list(stg["offerSettings"]["offerVolumeLimitsPerMarket"].values())
         coins = {k: max(float(v[k]["minInclusive"]) for v in lims) for k, v in lims[0].items()}
         return [
-            CoinEpyd(exid=c["code"], ticker=c["code"], minimum=coins[c["code"]]) for c in coins_curs["data"]["crypto"]
+            types.CoinE(exid=c["code"], ticker=c["code"], minimum=coins[c["code"]])
+            for c in coins_curs["data"]["crypto"]
         ]
 
     # 23: Список пар валюта/монет
@@ -106,13 +109,13 @@ class ExClient(BaseExClient, AuthClient):
         ads = await self._post("/p2p/public-api/v2/offer/depth-of-market/", params, "data")
         return [AdTakerSaleBuy(**ad) for ad in ads]
 
-    async def ad_common_epyd2pydin(self, ad: _BaseAd) -> BaseAdPydIn:
-        coin = await Coin.get_or_create_by_name(ad.price.baseCurrencyCode)
-        cur = await Cur.get_or_create_by_name(ad.price.quoteCurrencyCode)
-        pair, _ = await Pair.get_or_create(coin=coin, cur=cur)
-        pairex, _ = await PairEx.get_or_create(pair=pair, ex=self.ex)
-        dr, _ = await Direction.get_or_create(pairex=pairex, sell=ad.is_sell)
-        return BaseAdPydIn(
+    async def ad_common_epyd2pydin(self, ad: _BaseAd) -> types.BaseAdIn:
+        coin = await models.Coin.get_or_create_by_name(ad.price.baseCurrencyCode)
+        cur = await models.Cur.get_or_create_by_name(ad.price.quoteCurrencyCode)
+        pair, _ = await models.Pair.get_or_create(coin=coin, cur=cur)
+        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,
             price=ad.price.value,
             min_fiat=ad.orderAmountLimits.min,
@@ -121,28 +124,30 @@ class ExClient(BaseExClient, AuthClient):
             detail=getattr(ad, "comment", None),
         )
 
-    async def ad_taker_epyd2pydin(self, ad: _TakerOne) -> AdBuyPydIn:
-        adx: BaseAdPydIn = await self.ad_common_epyd2pydin(ad)
-        adx.maker = (await Actor.update_or_create({"name": ad.user.nickname}, ex=self.ex, exid=ad.user.userId))[0]
+    async def ad_taker_epyd2pydin(self, ad: _TakerOne) -> types.AdBuyIn:
+        adx: types.BaseAdIn = await self.ad_common_epyd2pydin(ad)
+        adx.maker = (await models.Actor.update_or_create({"name": ad.user.nickname}, ex=self.ex, exid=ad.user.userId))[
+            0
+        ]
         pms = ad.paymentMethods if isinstance(ad, _PmsTrait) else [pd.paymentMethod for pd in ad.paymentDetails]
-        return AdBuyPydIn(
-            **adx.model_dump(), pms_=await Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=[p.code for p in pms])
+        return types.AdBuyIn(
+            **adx.model_dump(), pms_=await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=[p.code for p in pms])
         )
 
 
 async def _test():
     await init_db(PG_DSN, models, True)
-    tgex = await Ex.get(name="TgWallet")
+    tgex = await models.Ex.get(name="TgWallet")
     cl: ExClient = tgex.client()
-
-    # await cl.set_pmcurexs()
-    # await cl.set_coinexs()
+    await cl.pairs()
+    await cl.set_pmcurexs()
+    await cl.set_coinexs()
 
     # # # SALE # # #
     # get ads list
     ads: list[AdTakerSaleBuy] = await cl.ads("TON", "RUB", True)
     # prepare ad list items for saving
-    ads_pydin: list[BaseAdPydIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads]
+    ads_pydin: list[types.BaseAdIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads]
     # list items save
     _ads_db = [await cl.ad_pydin2db(adi) for adi in ads_pydin]
 
@@ -157,7 +162,7 @@ async def _test():
     # get ads list
     ads: list[AdTakerSaleBuy] = await cl.ads("TON", "RUB", False)
     # prepare ad list items for saving
-    ads_pydin: list[BaseAdPydIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads]
+    ads_pydin: list[types.BaseAdIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads]
     # list items save
     _ads_db = [await cl.ad_pydin2db(adi) for adi in ads_pydin]
 

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/TgWallet/pyd.py

@@ -1,6 +1,6 @@
 from typing import Literal
 from pydantic import BaseModel, computed_field
-from xync_schema.pydantic import BaseAd, BaseOrder
+from xync_schema.types import BaseAd, BaseOrder
 
 
 # Модели для вложенных структур

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client/TgWallet/pyro.py

@@ -2,16 +2,17 @@ from asyncio import run
 from urllib.parse import parse_qs
 from pyrogram import Client
 from pyrogram.raw import functions
-from src.loader import PG_DSN
 from x_model import init_db
-from xync_client.loader import TG_API_ID, TG_API_HASH
+from xync_client.loader import TG_API_ID, TG_API_HASH, PG_DSN
 from xync_schema import models
 from xync_schema.models import Agent
 
 
 class PyroClient:
     def __init__(self, agent: Agent):
-        self.app: Client = Client(str(agent.user_id), TG_API_ID, TG_API_HASH, session_string=agent.auth["sess"])
+        self.app: Client = Client(
+            str(agent.actor.person.user.id), TG_API_ID, TG_API_HASH, session_string=agent.auth["sess"]
+        )
 
     async def get_init_data(self) -> dict:
         async with self.app as app:
@@ -44,7 +45,7 @@ async def main():
     _ = await init_db(PG_DSN, models, True)
     agent: Agent = await Agent.filter(auth__isnull=False, ex__name="TgWallet").prefetch_related("ex").first()
     pcl = PyroClient(agent)
-    await pcl.create_orders_forum(agent.user_id)
+    await pcl.create_orders_forum(agent.actor.user_id)
 
 
 if __name__ == "__main__":

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39/xync_client.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev38
+Version: 0.0.25.dev39
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
 Requires-Python: >=3.11
 Requires-Dist: asynchuobi
 Requires-Dist: bs4
+Requires-Dist: msgspec
 Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
@@ -14,7 +15,6 @@ Requires-Dist: pyrogram
 Requires-Dist: python-dotenv
 Requires-Dist: python-okx
 Requires-Dist: xn-client>=0.0.3dev3
-Requires-Dist: xn-auth
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client.egg-info/SOURCES.txt

@@ -61,11 +61,10 @@ xync_client/Gate/premarket.py
 xync_client/Htx/agent.py
 xync_client/Htx/earn.py
 xync_client/Htx/ex.py
-xync_client/Htx/pyd/actor.py
-xync_client/Htx/pyd/ad.py
-xync_client/Htx/pyd/cred.py
-xync_client/Htx/pyd/pm.py
-xync_client/Htx/pyd/types.py
+xync_client/Htx/etype/__init__.py
+xync_client/Htx/etype/ad.py
+xync_client/Htx/etype/cred.py
+xync_client/Htx/etype/pm.py
 xync_client/KuCoin/pub.py
 xync_client/KuCoin/web.py
 xync_client/Okx/ex.py

{xync_client-0.0.25.dev38 → xync_client-0.0.25.dev39}/xync_client.egg-info/requires.txt

@@ -1,5 +1,6 @@
 asynchuobi
 bs4
+msgspec
 python-binance
 pybit
 pyotp
@@ -7,7 +8,6 @@ pyrogram
 python-dotenv
 python-okx
 xn-client>=0.0.3dev3
-xn-auth
 xync-schema
 
 [dev]

xync_client-0.0.25.dev38/xync_client/Htx/pyd/actor.py

@@ -1,4 +0,0 @@
-from pydantic import BaseModel
-
-
-class Resp(BaseModel):

xync_client-0.0.25.dev38/xync_client/Htx/pyd/pm.py

@@ -1,12 +0,0 @@
-from pydantic import BaseModel, HttpUrl
-
-
-class Resp(BaseModel):
-    payMethodId: int
-    name: str
-    defaultName: str | None = None
-    template: int
-    bankImage: HttpUrl
-    bankImageWeb: HttpUrl
-    bankType: int
-    color: str