xync-client 0.0.25.dev3__tar.gz → 0.0.25.dev4__tar.gz

{xync_client-0.0.25.dev3/xync_client.egg-info → xync_client-0.0.25.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev3
+Version: 0.0.25.dev4
 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.dev3 → xync_client-0.0.25.dev4}/tests/TestEx.py

@@ -1,16 +1,20 @@
 import logging
 
 import pytest
+from xync_schema.pydantic import PmPyd, BaseAd
+
 from xync_client.Abc.BaseTest import BaseTest
 from xync_schema.enums import ExStatus, ExType, ExAction
 from xync_schema.models import Ex, TestEx as ExTest
 
-from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict, MapOfIdsList
+from xync_client.Abc.Base import BaseClient, FlatDict, MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 
 
 @pytest.mark.asyncio(loop_scope="session")
 class TestEx(BaseTest):
+    ad: dict[str, BaseAd] = {}
+
     @pytest.fixture
     async def clients(self) -> list[BaseClient]:
         exs = await Ex.filter(status__gt=ExStatus.plan)
@@ -26,15 +30,16 @@ class TestEx(BaseTest):
             ok = self.is_flat_dict(curs)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.curs)
             assert t.ok, "No curs"
-            logging.info(f"{client.ex.name}:{ExAction.curs.name} - ok")
+            logging.info(f"{client.ex.name}: {ExAction.curs.name} - ok")
 
     # 20
     async def test_pms(self, clients: list[BaseExClient]):
         for client in clients:
-            pms: DictOfDicts = await client.pms()
-            t, _ = await ExTest.update_or_create({"ok": self.is_dict_of_dicts(pms)}, ex=client.ex, action=ExAction.pms)
+            pms: dict[int | str, PmPyd] = await client.pms()
+            ok = self.is_dict_of_objects(pms, PmPyd)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.pms)
             assert t.ok, "No pms"
-            logging.info(f"{client.ex.name}:{ExAction.pms.name} - ok")
+            logging.info(f"{client.ex.name}: {ExAction.pms.name} - ok")
 
     # 21
     async def test_cur_pms_map(self, clients: list[BaseExClient]):
@@ -43,7 +48,7 @@ class TestEx(BaseTest):
             ok = self.is_map_of_ids(cur_pms)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.cur_pms_map)
             assert t.ok, "No pms for cur"
-            logging.info(f"{client.ex.name}:{ExAction.cur_pms_map.name} - ok")
+            logging.info(f"{client.ex.name}: {ExAction.cur_pms_map.name} - ok")
 
     # 22
     async def test_coins(self, clients: list[BaseExClient]):
@@ -52,7 +57,7 @@ class TestEx(BaseTest):
             ok = self.is_flat_dict(coins)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.coins)
             assert t.ok, "No coins"
-            logging.info(f"{client.ex.name}:{ExAction.coins.name} - ok")
+            logging.info(f"{client.ex.name}: {ExAction.coins.name} - ok")
 
     # 23
     async def test_pairs(self, clients: list[BaseExClient]):
@@ -61,13 +66,23 @@ class TestEx(BaseTest):
             ok = self.is_map_of_ids(pairs)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.pairs)
             assert t.ok, "No coins"
-            logging.info(f"{client.ex.name}:{ExAction.pairs.name} - ok")
+            logging.info(f"{client.ex.name}: {ExAction.pairs.name} - ok")
 
     # 24
     async def test_ads(self, clients: list[BaseExClient]):
         for client in clients:
-            ads: FlatDict = await client.ads("USDT", "RUB", False)
-            ok = self.is_list_of_dicts(ads)
+            ads: list[BaseAd] = await client.ads("USDT", "RUB", False)
+            ok = self.is_list_of_objects(ads, BaseAd)
             t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.ads)
             assert t.ok, "No ads"
-            logging.info(f"{client.ex.name}:{ExAction.ads.name} - ok")
+            self.ad[client.ex.name] = ads[0]  # for further use in test_ad
+            logging.info(f"{client.ex.name}: {ExAction.ads.name} - ok")
+
+    # 42
+    async def test_ad(self, clients: list[BaseExClient]):
+        for client in clients:
+            ad: BaseAd = await client.ad(self.ad[client.ex.name].id)
+            ok = isinstance(ad, BaseAd)
+            t, _ = await ExTest.update_or_create({"ok": ok}, ex=client.ex, action=ExAction.ad)
+            assert t.ok, "No ad"
+            logging.info(f"{client.ex.name}: {ExAction.ad.name} - ok")

{xync_client-0.0.25.dev3 → xync_client-0.0.25.dev4}/xync_client/Abc/BaseTest.py

@@ -1,11 +1,8 @@
-from abc import abstractmethod
-
-# from asyncio import AbstractEventLoop
-from typing import TypeGuard
-
 import pytest
 
 # import uvloop
+from abc import abstractmethod
+from typing import TypeGuard
 from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 from xync_client.Abc.Base import BaseClient, DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList
@@ -16,11 +13,9 @@ from xync_client.loader import PG_DSN
 
 class BaseTest:
     # loop: AbstractEventLoop
-
     # @pytest.fixture(scope="session", autouse=True)
     # def event_loop_policy(self):
     #     return uvloop.EventLoopPolicy()
-
     @pytest.fixture(scope="session", autouse=True)
     async def cn(self) -> AsyncpgDBClient:
         cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
@@ -37,12 +32,24 @@ class BaseTest:
             return False
         return all(isinstance(k, int | str) and isinstance(v, dict) for k, v in dct.items())
 
+    @staticmethod
+    def is_dict_of_objects(dct: dict, typ: type, not_empty: bool = True) -> TypeGuard[dict]:  # todo: Generic
+        if not_empty and not len(dct):
+            return False
+        return all(isinstance(k, int | str) and isinstance(v, typ) for k, v in dct.items())
+
     @staticmethod
     def is_list_of_dicts(lst: ListOfDicts, not_empty: bool = True) -> TypeGuard[ListOfDicts]:
         if not_empty and not len(lst):
             return False
         return all(isinstance(el, dict) for el in lst)
 
+    @staticmethod
+    def is_list_of_objects(lst: list, typ: type, not_empty: bool = True) -> TypeGuard[list]:
+        if not_empty and not len(lst):
+            return False
+        return all(isinstance(el, typ) for el in lst)
+
     @staticmethod
     def is_flat_dict(dct: FlatDict, not_empty: bool = True) -> TypeGuard[FlatDict]:
         if not_empty and not len(dct):

{xync_client-0.0.25.dev3 → xync_client-0.0.25.dev4}/xync_client/Abc/Ex.py

@@ -2,11 +2,10 @@ import logging
 import re
 from abc import abstractmethod
 
-from xync_schema.pydantic import AdPydIn, PmPyd
-
+from xync_schema.pydantic import AdPydIn, PmPyd, BaseAd
 from xync_schema.models import Ex, Coin, Cur, Pm, Pmex, Curex, Pmcur, Pmcurex, Coinex, PmexBank, Ad
 
-from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict, ListOfDicts, MapOfIdsList
+from xync_client.Abc.Base import BaseClient, DictOfDicts, FlatDict, MapOfIdsList
 
 
 class BaseExClient(BaseClient):
@@ -55,9 +54,17 @@ class BaseExClient(BaseClient):
     @abstractmethod
     async def ads(
         self, coin_exid: str, cur_exid: str, is_sell: bool, pm_exids: list[str | int] = None, amount: int = None
-    ) -> ListOfDicts:  # {ad.id: ad}
+    ) -> list[BaseAd]:  # {ad.id: ad}
         ...
 
+    # 42: Объява по id
+    @abstractmethod
+    async def ad(self, ad_id: int) -> BaseAd: ...
+
+    # Преобразрование объекта объявления из формата биржи в формат xync
+    @abstractmethod
+    async def _ad_epyd2pydin(self, ad: BaseAd) -> AdPydIn: ...
+
     def _pmnorm(self, s: str) -> str:
         def get_and_remove_acro(title: str) -> str:
             acr = "".join(word[0] for word in title.split(" ") if len(word) > 1 and word.istitle())
@@ -191,8 +198,8 @@ class BaseExClient(BaseClient):
         await Coinex.bulk_create(coinexs, update_fields=["minimum"], on_conflict=["coin_id", "ex_id"])
 
     # Сохранение чужого объявления (с Pm-ами) в бд
-    @staticmethod
-    async def set_ad(ad: AdPydIn) -> Ad:
-        ad_db, _ = await Ad.update_or_create(ad.model_dump(exclude_none=True), id=ad.id)
-        await ad_db.pms.add(*ad.payMeths)
+    async def set_ad(self, ad: BaseAd) -> Ad:
+        adx = await self._ad_epyd2pydin(ad)
+        ad_db, _ = await Ad.update_or_create(adx.model_dump(exclude_none=True), id=adx.id)
+        await ad_db.pms.add(*adx.payMeths)
         return ad_db

{xync_client-0.0.25.dev3 → xync_client-0.0.25.dev4}/xync_client/TgWallet/ex.py

@@ -71,6 +71,7 @@ class ExClient(BaseExClient, AuthClient):
         pairs = {cur: set(coins.values()) for cur in curs.values()}
         return pairs
 
+    # 42: Объява по id
     async def ad(self, ad_id: int) -> AdFullEpyd:
         ad = await self._post("/p2p/public-api/v2/offer/get", {"offerId": ad_id})
         return AdFullEpyd(**ad["data"])
@@ -90,7 +91,7 @@ class ExClient(BaseExClient, AuthClient):
         ads = await self._post("/p2p/public-api/v2/offer/depth-of-market/", params, "data")
         return [AdEpyd(**ad) for ad in ads]
 
-    async def ad_epyd2xpyd(self, ad: AdEpyd | AdFullEpyd) -> AdPydIn:
+    async def _ad_epyd2pydin(self, ad: AdEpyd | AdFullEpyd) -> AdPydIn:
         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, ex=self.ex)
@@ -120,12 +121,10 @@ async def _test():
     await cl.set_coinexs()
     ads: list[AdEpyd] = await cl.ads("USDT", "RUB", False)
     ad: AdFullEpyd = await cl.ad(ads[0].id)
-    adx: AdPydIn = await cl.ad_epyd2xpyd(ad)
-    await cl.set_ad(adx)
+    await cl.set_ad(ad)
     ads: list[AdEpyd] = await cl.ads("USDT", "RUB", True)
     ad: AdEpyd = ads[1]
-    adx: AdPydIn = await cl.ad_epyd2xpyd(ad)
-    await cl.set_ad(adx)
+    await cl.set_ad(ad)
     await cl.close()
 
 

{xync_client-0.0.25.dev3 → xync_client-0.0.25.dev4}/xync_client/TgWallet/pyd.py

@@ -1,5 +1,6 @@
 from typing import Literal
 from pydantic import BaseModel
+from xync_schema.pydantic import BaseAd
 
 
 class UserStatistics(BaseModel):
@@ -135,8 +136,7 @@ class _PaymentMethodsTrait:
     paymentMethods: list[PmEpydRoot]
 
 
-class __BaseCommonAd(BaseModel):
-    id: int | None = None
+class __BaseCommonAd(BaseAd):
     type: Literal["PURCHASE", "SALE"]
     price: Price
 

{xync_client-0.0.25.dev3 → xync_client-0.0.25.dev4/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-client
-Version: 0.0.25.dev3
+Version: 0.0.25.dev4
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client