xync-client 0.0.11.dev8__tar.gz → 0.0.11.dev10__tar.gz

{xync_client-0.0.11.dev8/xync_client.egg-info → xync_client-0.0.11.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev8
+Version: 0.0.11.dev10
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -11,7 +11,7 @@ Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pyrogram
 Requires-Dist: python-okx
-Requires-Dist: xn-client
+Requires-Dist: xn-client>=0.0.3dev2
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.11.dev8 → xync_client-0.0.11.dev10}/pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     "pyotp",
     "pyrogram",
     "python-okx",
-    "xn-client",
+    "xn-client>=0.0.3dev2",
     "xync-schema"
 ]
 

{xync_client-0.0.11.dev8 → xync_client-0.0.11.dev10}/tests/test_ex.py

@@ -1,14 +1,8 @@
-from asyncio import AbstractEventLoop, get_running_loop
+from asyncio import AbstractEventLoop
 
 import pytest
 import uvloop
-from tortoise.backends.asyncpg import AsyncpgDBClient
-from x_model import init_db
-from xync_client.Abc.Ex import BaseExClient
-from xync_schema import models
-from xync_schema.models import Agent, ExAction, TestEx
-
-from xync_client.loader import PG_DSN
+from xync_schema.models import ExAction, TestEx
 
 
 @pytest.mark.asyncio(loop_scope="class")
@@ -19,20 +13,6 @@ class TestWallet:
     def event_loop_policy(self):
         return uvloop.EventLoopPolicy()
 
-    @pytest.fixture(scope="class")
-    async def cn(self) -> AsyncpgDBClient:
-        TestWallet.loop = get_running_loop()
-        cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
-        yield cn
-        await cn.close()
-
-    @pytest.fixture(scope="class")
-    async def cl(self, cn) -> BaseExClient:
-        agent = await Agent.get(user_id=1038938370).prefetch_related("ex")
-        tg = BaseExClient(agent)
-        yield tg
-        await tg.close()
-
     # 20 - all_pms
     async def test_all_pms(self, cl):
         pms = await cl.pms()

xync_client-0.0.11.dev8/xync_client/TgWallet/auth.py → xync_client-0.0.11.dev10/xync_client/Abc/Auth.py

@@ -1,28 +1,26 @@
 import logging
+from abc import abstractmethod
 
 from aiohttp import ClientResponse
 from aiohttp.http_exceptions import HttpProcessingError
-from x_client.http import Client as HttpClient
-from xync_client.Abc.Auth import BaseAuthClient
 from xync_schema.models import Agent
 
-from xync_client.TgWallet.pyro import PyroClient
+from xync_client.Abc.Base import BaseClient
 
 
-class AuthClient(BaseAuthClient):
+class BaseAuthClient(BaseClient):
     def __init__(self, agent: Agent):
+        self.headers.update(agent.auth)
+        self.agent = agent
         self.meth = {
             "GET": self._get,
             "POST": self._post,
             "DELETE": self._delete,
         }
-        super().__init__(agent)
+        super().__init__(agent.ex)
 
-    async def _get_auth_hdrs(self) -> dict[str, str]:
-        pyro = PyroClient(self.agent)
-        init_data = await pyro.get_init_data()
-        tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
-        return {"Wallet-Authorization": tokens["jwt"], "Authorization": "Bearer " + tokens["value"]}
+    @abstractmethod
+    async def _get_auth_hdrs(self) -> dict[str, str]: ...
 
     async def login(self) -> None:
         auth_hdrs: dict[str, str] = await self._get_auth_hdrs()

xync_client-0.0.11.dev10/xync_client/AbcTest/AgentTest.py

@@ -0,0 +1,13 @@
+import pytest
+
+from xync_client.Abc.Base import BaseClient
+from xync_client.Abc.BaseTest import BaseTest
+
+
+class AgentTest(BaseTest):
+    @pytest.fixture(scope="class", autouse=True)
+    async def cl(self) -> BaseClient:
+        agent = (await self.exq).agents.filter(auth__not_isnull=True).first()
+        acl = BaseClient(agent)
+        yield acl
+        await acl.close()

xync_client-0.0.11.dev10/xync_client/AbcTest/BaseTest.py

@@ -0,0 +1,42 @@
+import pytest
+from typing import TypeGuard
+from src.loader import PG_DSN
+from tortoise.backends.asyncpg import AsyncpgDBClient
+from x_model import init_db
+from xync_schema import models
+from xync_schema.models import Ex
+
+from xync_client.Abc.Base import DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList, BaseClient
+
+
+class BaseTest:
+    def __init__(self, ex_name: str):
+        self.exq = Ex.get(name=ex_name)
+
+    @pytest.fixture(scope="class", autouse=True)
+    async def cn(self) -> AsyncpgDBClient:
+        cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
+        yield cn
+        await cn.close()
+
+    @pytest.fixture(scope="class", autouse=True)
+    async def cl(self) -> BaseClient:
+        bcl = BaseClient(await self.exq)
+        yield bcl
+        await bcl.close()
+
+    @staticmethod
+    def is_dict_of_dicts(dct: DictOfDicts) -> TypeGuard[DictOfDicts]:
+        return all(isinstance(k, int | str) and isinstance(v, dict) for k, v in dct.items())
+
+    @staticmethod
+    def is_list_of_dicts(lst: ListOfDicts) -> TypeGuard[ListOfDicts]:
+        return all(isinstance(el, dict) for el in lst)
+
+    @staticmethod
+    def is_flat_dict(dct: FlatDict) -> TypeGuard[FlatDict]:
+        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())
+
+    @staticmethod
+    def is_map_of_ids(dct: MapOfIdsList) -> TypeGuard[MapOfIdsList]:
+        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())

xync_client-0.0.11.dev10/xync_client/AbcTest/ExTest.py

@@ -0,0 +1,12 @@
+import pytest
+
+from xync_client.Abc.Ex import BaseExClient
+from xync_client.Abc.BaseTest import BaseTest
+
+
+class ExTest(BaseTest):
+    @pytest.fixture(scope="class", autouse=True)
+    async def cl(self) -> BaseExClient:
+        ecl = BaseExClient(await self.exq)
+        yield ecl
+        await ecl.close()

xync_client-0.0.11.dev10/xync_client/AbcTest/OrderTest.py

@@ -0,0 +1,20 @@
+import pytest
+
+from xync_client.Abc.Base import BaseClient
+from xync_client.AbcTest.BaseTest import BaseTest
+
+
+class AgentTest(BaseTest):
+    @pytest.fixture(scope="class")
+    async def cl(self) -> BaseClient:
+        agent = (await self.exq).agents.filter(auth__not_isnull=True).first()
+        acl = BaseClient(agent)
+        yield acl
+        await acl.close()
+
+    @pytest.fixture(scope="class")
+    async def cl1(self) -> BaseClient:
+        agent = (await self.exq).agents.filter(auth__not_isnull=True).offset(1).first()
+        acl = BaseClient(agent)
+        yield acl
+        await acl.close()

xync_client-0.0.11.dev10/xync_client/TgWallet/auth.py

@@ -0,0 +1,12 @@
+from x_client.http import Client as HttpClient
+from xync_client.Abc.Auth import BaseAuthClient
+
+from xync_client.TgWallet.pyro import PyroClient
+
+
+class AuthClient(BaseAuthClient):
+    async def _get_auth_hdrs(self) -> dict[str, str]:
+        pyro = PyroClient(self.agent)
+        init_data = await pyro.get_init_data()
+        tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
+        return {"Wallet-Authorization": tokens["jwt"], "Authorization": "Bearer " + tokens["value"]}

{xync_client-0.0.11.dev8 → xync_client-0.0.11.dev10/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-client
-Version: 0.0.11.dev8
+Version: 0.0.11.dev10
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -11,7 +11,7 @@ Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: pyrogram
 Requires-Dist: python-okx
-Requires-Dist: xn-client
+Requires-Dist: xn-client>=0.0.3dev2
 Requires-Dist: xync-schema
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"

{xync_client-0.0.11.dev8 → xync_client-0.0.11.dev10}/xync_client.egg-info/SOURCES.txt

@@ -23,7 +23,10 @@ xync_client/Abc/Auth.py
 xync_client/Abc/Base.py
 xync_client/Abc/Ex.py
 xync_client/Abc/Order.py
-xync_client/Abc/Test.py
+xync_client/AbcTest/AgentTest.py
+xync_client/AbcTest/BaseTest.py
+xync_client/AbcTest/ExTest.py
+xync_client/AbcTest/OrderTest.py
 xync_client/Binance/__init__.py
 xync_client/Binance/binance_async.py
 xync_client/Binance/earn_api.py

{xync_client-0.0.11.dev8 → xync_client-0.0.11.dev10}/xync_client.egg-info/requires.txt

@@ -4,7 +4,7 @@ pybit
 pyotp
 pyrogram
 python-okx
-xn-client
+xn-client>=0.0.3dev2
 xync-schema
 
 [dev]

xync_client-0.0.11.dev8/xync_client/Abc/Auth.py

@@ -1,9 +0,0 @@
-from xync_client.Abc.Base import BaseClient
-from xync_schema.models import Agent
-
-
-class BaseAuthClient(BaseClient):
-    def __init__(self, agent: Agent):
-        self.headers.update(agent.auth)
-        self.agent = agent
-        super().__init__(agent.ex)

xync_client-0.0.11.dev8/xync_client/Abc/Test.py

@@ -1,21 +0,0 @@
-from typing import TypeGuard
-
-from xync_client.Abc.Base import DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList
-
-
-class BaseTest:
-    @staticmethod
-    def is_dod(dct: DictOfDicts) -> TypeGuard[DictOfDicts]:
-        return all(isinstance(k, int | str) and isinstance(v, dict) for k, v in dct.items())
-
-    @staticmethod
-    def is_lod(lst: ListOfDicts) -> TypeGuard[ListOfDicts]:
-        return all(isinstance(el, dict) for el in lst)
-
-    @staticmethod
-    def is_fd(dct: FlatDict) -> TypeGuard[FlatDict]:
-        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())
-
-    @staticmethod
-    def is_moil(dct: MapOfIdsList) -> TypeGuard[MapOfIdsList]:
-        return all(isinstance(k, int | str) and isinstance(v, str) for k, v in dct.items())