xync-client 0.0.46.dev2__tar.gz → 0.0.48.dev1__tar.gz

{xync_client-0.0.46.dev2/xync_client.egg-info → xync_client-0.0.48.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.46.dev2
+Version: 0.0.48.dev1
 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.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Abc/Agent.py

@@ -1,20 +1,20 @@
 from abc import abstractmethod
 
 from pydantic import BaseModel
+from x_client.aiohttp import Client as HttpClient
 from xync_schema import models
 from xync_schema.models import OrderStatus, Coin, Cur, Ad, AdStatus, Actor
 from xync_schema.types import BaseAd
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.Base import BaseClient
 from xync_client.Abc.types import CredExOut, BaseOrderReq, BaseAdUpdate
 
 
-class BaseAgentClient(BaseClient):
+class BaseAgentClient(HttpClient):
     def __init__(self, actor: Actor, headers: dict[str, str] = None, cookies: dict[str, str] = None):
         self.actor: Actor = actor
-        super().__init__(actor.ex, "host_p2p", headers, cookies)
-        self.ex_client: BaseExClient = self.ex.client(actor)
+        super().__init__(actor.ex.host_p2p, headers, cookies)
+        self.ex_client: BaseExClient = self.actor.ex.client(actor)
 
     # 0: Получшение ордеров в статусе status, по монете coin, в валюте coin, в направлении is_sell: bool
     @abstractmethod

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Abc/Auth.py

@@ -3,12 +3,11 @@ from abc import abstractmethod
 
 from aiohttp import ClientResponse
 from aiohttp.http_exceptions import HttpProcessingError
+from x_client.aiohttp import Client as HttpClient
 from xync_schema.models import Actor
 
-from xync_client.Abc.Base import BaseClient
 
-
-class BaseAuthClient(BaseClient):
+class BaseAuthClient(HttpClient):
     actor: Actor = None
 
     @abstractmethod

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Abc/Ex.py

@@ -3,29 +3,37 @@ from abc import abstractmethod
 from asyncio import sleep
 
 import msgspec
-from aiohttp import ClientSession
+from aiohttp import ClientSession, ClientResponse
 from msgspec import Struct
 from pyro_client.client.file import FileClient
-from pyro_client.loader import API_ID, API_HASH
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
+from x_client.aiohttp import Client as HttpClient
 from xync_schema import models
 from xync_schema.enums import FileType, df_curs
 from xync_schema.types import CurEx, CoinEx, BaseAd, BaseAdIn
 
-from xync_client.Abc.Base import BaseClient, MapOfIdsList
-from xync_client.Abc.types import PmEx
-from xync_client.loader import TOKEN
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.pm_unifier import PmUnifier, PmUni
 
 
-class BaseExClient(BaseClient):
+class BaseExClient(HttpClient):
     cur_map: dict[int, str] = {}
     unifier_class: type = PmUnifier
-    logo_map = {
-        "Binance": "bin.bnbstatic.com",
-        "Gate": "www.gate.io",
-        "Mexc": "www.mexc.com/api/file/download",
-    }
+    logo_pre_url: str
+    ex: models.Ex
+
+    def __init__(
+        self,
+        ex: models.Ex,
+        bot: FileClient,
+        attr: str = "host_p2p",
+        headers: dict[str, str] = None,
+        cookies: dict[str, str] = None,
+        proxy: models.Proxy = None,
+    ):
+        self.ex = ex
+        self.bot = bot
+        super().__init__(getattr(ex, attr), headers, cookies, proxy and proxy.str())
 
     @abstractmethod
     def pm_type_map(self, typ: models.Pmex) -> str: ...
@@ -176,8 +184,6 @@ class BaseExClient(BaseClient):
         )
 
         # Pmexs
-        pbot = FileClient(API_ID, API_HASH, TOKEN)
-        await pbot.start()
         async with ClientSession(headers=getattr(self, "logo_headers", None)) as ss:
             pmexs = [
                 models.Pmex(
@@ -186,11 +192,10 @@ class BaseExClient(BaseClient):
                     ex=self.ex,
                     pm=pm,
                     name=pmexs_epyds[k].name,
-                    logo=await self.logo_save(pmexs_epyds[k].logo, pbot, ss),
+                    logo=await self.logo_save(pmexs_epyds[k].logo, ss),
                 )
                 for k, pm in pms.items()
             ]
-        await pbot.stop()
 
         await models.Pmex.bulk_create(pmexs, on_conflict=["ex_id", "exid"], update_fields=["pm_id", "logo_id", "name"])
         # Pmex banks
@@ -215,17 +220,17 @@ class BaseExClient(BaseClient):
         # pmcurexs = [Pmcurex(pmcur=pmcur, ex=self.ex) for pmcur in pmcurs]
         # await Pmcurex.bulk_create(pmcurexs)
 
-    async def logo_save(self, url: str | None, pbot: FileClient, ss: ClientSession) -> models.File | None:
+    async def logo_save(self, url: str | None, ss: ClientSession) -> models.File | None:
         if url or (file := None):
             if not url.startswith("https:"):
                 if not url.startswith("/"):
                     url = "/" + url
-                url = "https://" + self.logo_map[self.ex.name] + url
+                url = "https://" + self.logo_pre_url + url
             if not (file := await models.File.get_or_none(name=url)):
                 resp = await ss.get(url)
                 if resp.ok:
                     byts = await resp.read()
-                    upf, ref = await pbot.save_doc(byts, resp.content_type)
+                    upf, ref = await self.bot.save_doc(byts, resp.content_type)
                     await sleep(0.34)
                     typ = FileType[resp.content_type.split("/")[-1]]
                     file, _ = await models.File.update_or_create({"ref": ref, "size": len(byts), "typ": typ}, name=url)
@@ -271,3 +276,12 @@ class BaseExClient(BaseClient):
         await ad_db.credexs.add(*getattr(ad_pydin, "credexs_", []))
         await ad_db.pmexs.add(*getattr(ad_pydin, "pmexs_", []))
         return ad_db
+
+    async def _proc(self, resp: ClientResponse, data_key: str = None, body: dict | str = None) -> dict | str:
+        if resp.status in (401, 403):
+            proxy = await models.Proxy.filter(valid=True, country__short__not="US").order_by("-updated_at").first()
+            self.session = ClientSession(
+                self.session._base_url, headers=self.session.headers, cookies=self.session.cookie_jar, proxy=proxy
+            )
+            return await self.METHS[resp.method](self, resp.url.path, body, data_key=data_key)
+        return await super()._proc(resp, data_key)

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Abc/types.py

@@ -8,6 +8,11 @@ from xync_schema.types import PmexBank
 
 from xync_client.pm_unifier import PmUni
 
+DictOfDicts = dict[int | str, dict]
+ListOfDicts = list[dict]
+FlatDict = dict[int | str, str]
+MapOfIdsList = dict[int | str, list[int | str]]
+
 
 class PmTrait:
     typ: PmType | None = None

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Binance/ex.py

@@ -21,6 +21,7 @@ class ExClient(BaseExClient):
             "Viettel Money": "ViettelPay",
         }
 
+    logo_pre_url = "bin.bnbstatic.com"
     unifier_class = BinanceUnifier
 
     async def _pms(self, cur) -> list[pm.PmE]:

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Gate/ex.py

@@ -28,6 +28,7 @@ class ExClient(BaseExClient):
             "Local Card (Red)": "Alfa-bank",
         }
 
+    logo_pre_url = "www.gate.io"
     unifier_class = GateUnifier
 
     # Данные для р2р из html Gate.io

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Htx/ex.py

@@ -7,9 +7,8 @@ from xync_schema import models, types
 from xync_schema.models import Ex, Cur
 from xync_schema.enums import PmType
 
-from xync_client.Abc.Base import MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.types import PmEx
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.Htx.etype import pm, Country, ad
 from xync_client.loader import PG_DSN
 from xync_client.pm_unifier import PmUnifier
@@ -40,7 +39,8 @@ class ExClient(BaseExClient):
             res = (await self._get(f"/-/x/otc/v1/trade/fast/config/list?side={side}&tradeMode=c2c_simple"))["data"]
             for coin in res:
                 for cur in coin["quoteAsset"]:
-                    pair[rcurs[cur["name"]]] += [rcoins[coin["cryptoAsset"]["name"]]]
+                    if coen := rcoins.get(coin["cryptoAsset"]["name"]):
+                        pair[rcurs[cur["name"]]] += [coen]
         return tuple(pairs.values())
 
     async def ads(

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1}/xync_client/Mexc/ex.py

@@ -15,6 +15,14 @@ from xync_schema.models import Ex
 
 
 class ExClient(BaseExClient):
+    class MexcUnifier(PmUnifier):
+        pm_map = {
+            "Philippine National Bank (PNB)": "Philippines National Bank (PNB)",
+            "Al-Rajhi Bank": "Al Rajhi Bank",
+            "SBP - Fast Bank Transfer": "SBP",
+            "Touch 'n Go": "Touch n Go",
+        }
+
     logo_headers = {
         "accept-language": "ru,en;q=0.9",
         "priority": "u=0, i",
@@ -24,15 +32,7 @@ class ExClient(BaseExClient):
         "sec-fetch-site": "none",  # work from CURL, not work from aiohttp with no this header
         "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
     }
-
-    class MexcUnifier(PmUnifier):
-        pm_map = {
-            "Philippine National Bank (PNB)": "Philippines National Bank (PNB)",
-            "Al-Rajhi Bank": "Al Rajhi Bank",
-            "SBP - Fast Bank Transfer": "SBP",
-            "Touch 'n Go": "Touch n Go",
-        }
-
+    logo_pre_url = "www.mexc.com/api/file/download"
     unifier_class = MexcUnifier
 
     async def _pms(self, cur) -> list[pm.PmE]:

{xync_client-0.0.46.dev2 → xync_client-0.0.48.dev1/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.46.dev2
+Version: 0.0.48.dev1
 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.46.dev2 → xync_client-0.0.48.dev1}/xync_client.egg-info/SOURCES.txt

@@ -28,7 +28,6 @@ xync_client.egg-info/top_level.txt
 xync_client/Abc/Agent.py
 xync_client/Abc/Asset.py
 xync_client/Abc/Auth.py
-xync_client/Abc/Base.py
 xync_client/Abc/BaseTest.py
 xync_client/Abc/Ex.py
 xync_client/Abc/InAgent.py

xync_client-0.0.46.dev2/xync_client/Abc/Base.py

@@ -1,17 +0,0 @@
-from x_client.aiohttp import Client
-from xync_schema.models import Ex
-
-DictOfDicts = dict[int | str, dict]
-ListOfDicts = list[dict]
-FlatDict = dict[int | str, str]
-MapOfIdsList = dict[int | str, list[int | str]]
-
-
-class BaseClient(Client):
-    ex: Ex
-
-    def __init__(
-        self, ex: Ex, attr: str = "host_p2p", headers: dict[str, str] = None, cookies: dict[str, str] = None, **kwargs
-    ):
-        self.ex = ex
-        super().__init__(getattr(ex, attr), headers, cookies)