xync-client 0.0.155.dev2__tar.gz → 0.0.173__tar.gz

{xync_client-0.0.155.dev2/xync_client.egg-info → xync_client-0.0.173}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.155.dev2
+Version: 0.0.173
 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: blackboxprotobuf
 Requires-Dist: bs4
 Requires-Dist: bybit-p2p
 Requires-Dist: google-api-python-client

{xync_client-0.0.155.dev2 → xync_client-0.0.173}/README.md

@@ -1,3 +1,23 @@
+## Структура http-клиентов
+#### Абстрактные классы клиентов:
+**BaseClient** *[host: str]* - базовый http-клиент, с низкоуровнеными методами get, post, put и delete, сессией, и общими 
+для всех клиентов свойствами. *[В конструкторе принимает хост строкой]*
+
+**BaseExClient**(BaseClient) *[ex: Ex]* - клиент с публичными/анонимными методами конкретной биржи.
+*[В конструкторе принимает зависимость: экземпляр биржи]*
+
+**_BaseAuthClient**(BaseClient) *[agent: Agent]* - клиент реализующий логин (получение необходимых заголовков) конкретного
+юзера биржи. *[В конструкторе принимает зависимость: экземпляр агента]*
+
+**BaseInAgentTrait** - класс реализующий прием входящих событий от биржи. Если у биржи есть вебсокет канал, то по нему,
+если нет - то через поллинг каждые х секунд.
+
+**BaseAgentClient**(BaseAuthClient, BaseInAgentTrait) *[agent: Agent, ex_client: BaseExClient]* - клиент с приватными
+методами биржи от лица конкретного юзера биржи. *[В конструкторе принимает зависимости: экземпляр агента, и клиента биржи]*
+
+**BaseOrderClient** *[order: Order, agent_client: BaseExClient]* - методы для обработки конкретного ордера на бирже.
+*[В конструкторе принимает зависимости: экземпляр ордера, и клиента агента]*
+
 ## Order Flow:
 - 0: Получшение заявок за заданное время, в статусе, по валюте, монете, направлению: `get_orders(stauts=OrderStatus.active, coin='USDT', cur='RUB', is_sell=False) => [order]`
 

{xync_client-0.0.155.dev2 → xync_client-0.0.173}/pyproject.toml

@@ -8,6 +8,7 @@ dynamic = ["version"]
 
 dependencies = [
     "asynchuobi",
+    "blackboxprotobuf",
     "bs4",
     "bybit-p2p",
     "google-api-python-client",

{xync_client-0.0.155.dev2 → xync_client-0.0.173}/tests/TestAgent.py

@@ -9,7 +9,7 @@ from xync_schema.xtype import BaseAd
 from xync_client.Abc.BaseTest import BaseTest
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.Agent import BaseAgentClient
-from xync_client.Abc.xtype import CredExOut, BaseOrderReq, ListOfDicts
+from xync_client.Abc.xtype import BaseCredEx, BaseOrderReq, ListOfDicts
 
 
 @pytest.mark.asyncio(loop_scope="session")
@@ -44,8 +44,8 @@ class TestAgent(BaseTest):
     # 25
     async def test_my_creds(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            my_creds: list[CredExOut] = await taker.creds()
-            ok = self.is_list_of_objects(my_creds, CredExOut)
+            my_creds: list[BaseCredEx] = await taker.get_creds()
+            ok = self.is_list_of_objects(my_creds, BaseCredEx)
             t, _ = await ExStat.update_or_create({"ok": ok}, ex=taker.actor.ex, action=ExAction.my_creds)
             assert t.ok, "No my creds"
             logging.info(f"{taker.actor.ex.name}:{ExAction.my_creds.name} - ok")
@@ -53,7 +53,7 @@ class TestAgent(BaseTest):
     # 27
     async def test_cred_upd(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            credex = (await taker.creds())[0]
+            credex = (await taker.get_creds())[0]
             credex_db = await CredEx.get(exid=credex.id, ex=taker.actor.ex).prefetch_related("cred")
             credex_db.cred.name += "+Test!"
             cred_upd: CredEx = await taker.cred_upd(credex_db.cred, credex.id)
@@ -65,7 +65,7 @@ class TestAgent(BaseTest):
     # 28
     async def test_cred_del(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            credex = (await taker.creds())[0]
+            credex = (await taker.get_creds())[0]
             cred_del: int = await taker.cred_del(credex.id)
             ok = cred_del == credex.id
             t, _ = await ExStat.update_or_create({"ok": ok}, ex=taker.actor.ex, action=ExAction.cred_del)
@@ -111,7 +111,7 @@ class TestAgent(BaseTest):
             req = BaseOrderReq(
                 ad_id=ad.exid,
                 is_sell=ad.direction.sell,
-                fiat_amount=ad.min_fiat,
+                amount=ad.min_fiat,
                 cred_id=mutual_cred.id,
             )
             order_request: dict | bool = await taker.order_request(req)
@@ -123,7 +123,7 @@ class TestAgent(BaseTest):
     # 29
     async def test_my_ads(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            my_ads: list[BaseAd] = await maker.my_ads()
+            my_ads: list[BaseAd] = await maker.get_my_ads()
             ok = self.is_list_of_objects(my_ads, BaseAd)
             t, _ = await ExStat.update_or_create({"ok": ok}, ex=taker.actor.ex, action=ExAction.my_ads)
             assert t.ok, "Maker should has ads"
@@ -148,7 +148,7 @@ class TestAgent(BaseTest):
     # 31
     async def test_ad_upd(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            my_ads: ListOfDicts = await taker.my_ads()
+            my_ads: ListOfDicts = await taker.get_my_ads()
             ad_upd: Ad.pyd() = await taker.ad_upd(offer_id=my_ads[0]["id"], amount="11")
             ok = ad_upd["status"] == "SUCCESS"
             t, _ = await ExStat.update_or_create({"ok": ok}, ex=taker.actor.ex.name, action=ExAction.ad_upd)
@@ -158,7 +158,7 @@ class TestAgent(BaseTest):
     # 32
     async def test_ad_del(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            my_ads: ListOfDicts = await taker.my_ads()
+            my_ads: ListOfDicts = await taker.get_my_ads()
             ad_del: bool = await taker.ad_del(ad_id=my_ads[0]["id"])
             t, _ = await ExStat.update_or_create({"ok": ad_del}, ex=taker.actor.ex, action=ExAction.ad_del)
             assert t.ok, "No add new ad"
@@ -167,7 +167,7 @@ class TestAgent(BaseTest):
     # 33
     async def test_ad_switch(self, clients: list[tuple[BaseAgentClient, BaseAgentClient]]):
         for maker, taker in clients:
-            my_ads: ListOfDicts = await taker.my_ads()
+            my_ads: ListOfDicts = await taker.get_my_ads()
             new_status = not (my_ads[0]["status"] == "ACTIVE")
             ad_switch: bool = await taker.ad_switch(offer_id=my_ads[0]["id"], active=new_status)
             t, _ = await ExStat.update_or_create({"ok": ad_switch}, ex=taker.actor.ex, action=ExAction.ad_switch)

{xync_client-0.0.155.dev2 → xync_client-0.0.173}/tests/TestEx.py

@@ -4,12 +4,13 @@ import pytest
 from pyro_client.client.file import FileClient
 from x_client.aiohttp import Client as HttpClient
 from xync_schema.xtype import BaseAd
+from xync_schema.models import PmEx, ExStat
 
 from xync_client.Abc.BaseTest import BaseTest
 from xync_schema.enums import ExStatus, ExType, ExAction
 from xync_schema import models
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 
 
 @pytest.mark.asyncio(loop_scope="session")
@@ -18,7 +19,7 @@ class TestEx(BaseTest):
     async def clients(self) -> list[HttpClient]:
         exs = await models.Ex.filter(status__gt=ExStatus.plan).prefetch_related("pm_reps")
         [await ex for ex in exs if ex.typ == ExType.tg]
-        async with FileClient(TOKEN) as b:
+        async with FileClient(NET_TOKEN) as b:
             b: FileClient
             clients: list[BaseExClient] = [ex.client(b) for ex in exs]
             yield clients
@@ -66,14 +67,14 @@ class TestEx(BaseTest):
     #         logging.info(f"{client.ex.name}: {ExAction.curs.name} - ok")
     #
     # # 20
-    # async def test_pms(self, clients: list[BaseExClient]):
-    #     for client in clients:
-    #         pms: dict[int | str, PmEx] = await client.pms()
-    #         ok = self.is_dict_of_objects(pms, PmEx)
-    #         t, _ = await ExStat.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")
-    #
+    async def test_pms(self, clients: list[BaseExClient]):
+        for client in clients:
+            pms: dict[int | str, PmEx] = await client.pms()
+            ok = self.is_dict_of_objects(pms, PmEx)
+            t, _ = await ExStat.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")
+
     # # 21
     # async def test_cur_pms_map(self, clients: list[BaseExClient]):
     #     for client in clients:

xync_client-0.0.173/tests/TestOrder.py

@@ -0,0 +1,24 @@
+import pytest
+from xync_client.Abc.Order import BaseOrderClient
+from xync_schema.models import Agent, Ex
+
+from xync_client.Abc.Agent import BaseAgentClient
+
+from xync_client.Abc.BaseTest import BaseTest
+
+
+class AgentTest(BaseTest):
+    @pytest.fixture(scope="class")
+    async def cl(self) -> BaseAgentClient:
+        agent = await Agent.filter(auth__not_isnull=True, status__gt=0).prefetch_related("actor__ex").first()
+        ex: Ex = agent.actor.ex
+        acl: BaseAgentClient = agent.client(ex.client())
+        yield acl
+        await acl.close()
+
+    @pytest.fixture(scope="class")
+    async def cl1(self) -> BaseOrderClient:
+        agent = (await self.exq).agents.filter(auth__not_isnull=True).offset(1).first()
+        acl = BaseOrderClient(agent)
+        yield acl
+        await acl.close()

xync_client-0.0.173/xync_client/Abc/AdLoader.py

@@ -0,0 +1,5 @@
+from xync_schema import models
+
+
+class AdLoader:
+    ex: models.Ex