xync-client 0.0.50.dev2__tar.gz → 0.0.51.dev1__tar.gz

{xync_client-0.0.50.dev2/xync_client.egg-info → xync_client-0.0.51.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.50.dev2
+Version: 0.0.51.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.50.dev2 → xync_client-0.0.51.dev1}/tests/TestEx.py

@@ -21,7 +21,7 @@ class TestEx(BaseTest):
     async def clients(self) -> list[HttpClient]:
         exs = await Ex.filter(status__gt=ExStatus.plan)
         [await ex for ex in exs if ex.type_ == ExType.tg]
-        async with await FileClient(TOKEN) as b:
+        async with FileClient(TOKEN) as b:
             b: FileClient
             clients: list[BaseExClient] = [ex.client(b) for ex in exs]
             yield clients

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Abc/BaseTest.py

@@ -7,9 +7,7 @@ from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_client.aiohttp import Client as HttpClient
 from x_model import init_db
 from xync_client.Abc.types import DictOfDicts, ListOfDicts, FlatDict, MapOfIdsList
-from xync_schema import models
-
-from xync_client.loader import PG_DSN
+from xync_client.loader import TORM
 
 
 class BaseTest:
@@ -19,7 +17,7 @@ class BaseTest:
     #     return uvloop.EventLoopPolicy()
     @pytest.fixture(scope="session", autouse=True)
     async def cn(self) -> AsyncpgDBClient:
-        cn: AsyncpgDBClient = await init_db(PG_DSN, models, True)
+        cn: AsyncpgDBClient = await init_db(TORM, True)
         yield cn
         await cn.close()
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Abc/Ex.py

@@ -3,7 +3,7 @@ from abc import abstractmethod
 from asyncio import sleep
 
 import msgspec
-from aiohttp import ClientSession, ClientResponse
+from aiohttp import ClientSession
 from msgspec import Struct
 from pyro_client.client.file import FileClient
 from tortoise.exceptions import MultipleObjectsReturned, IntegrityError
@@ -247,8 +247,9 @@ class BaseExClient(HttpClient):
     async def set_coinexs(self):
         coins: dict[str, CoinEx] = await self.coins()
         coins_db: dict[int, models.Coin] = {
-            c.exid: (await models.Coin.update_or_create({"scale": c.scale or 0}, ticker=c.ticker))[0]
-            for c in coins.values()
+            c.exid: (await models.Coin.update_or_create(
+                {"scale": c.scale} if c.scale is not None else {}, ticker=c.ticker)
+            )[0] for c in coins.values()
         }
         coinexs: list[models.Coinex] = [
             models.Coinex(coin=coins_db[c.exid], ex=self.ex, exid=c.exid, minimum=c.minimum) for c in coins.values()
@@ -283,11 +284,12 @@ class BaseExClient(HttpClient):
         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)
+    # 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()
+    #         cookies = self.session.cookie_jar.filter_cookies(self.session._base_url)
+    #         self.session = ClientSession(
+    #             self.session._base_url, headers=self.session.headers, cookies=cookies or None  # , 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.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Binance/ex.py

@@ -4,8 +4,7 @@ from x_model import init_db
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Binance.etype import pm, ad
-from xync_client.Abc.types import PmEx
-from xync_client.Abc.Base import MapOfIdsList
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.loader import PG_DSN
 from xync_client.pm_unifier import PmUnifier
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/BitPapa/ex.py

@@ -1,12 +1,9 @@
 from asyncio import run
-import json
 from x_model import init_db
 
 from bs4 import BeautifulSoup
 from xync_client.loader import PG_DSN
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.Base import MapOfIdsList
-from xync_client.Abc.types import PmEx
 # from xync_client.Mexc.etype import pm, ad
 
 from xync_schema import types

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Bybit/agent.py

@@ -22,7 +22,7 @@ from xync_client.Abc.types import BaseOrderReq, FlatDict
 from xync_client.Bybit.etype.ad import AdPostRequest, AdUpdateRequest, AdDeleteRequest, Ad
 from xync_client.Bybit.etype.cred import CredEpyd
 from xync_client.Bybit.etype.order import OrderRequest, PreOrderResp, OrderResp, CancelOrderReq
-from xync_client.loader import PG_DSN
+from xync_client.loader import TORM
 
 
 class NoMakerException(Exception):
@@ -649,8 +649,8 @@ class ExcCode(IntEnum):
 
 
 async def main():
-    _ = await init_db(PG_DSN, models, True)
     logging.basicConfig(level=logging.INFO)
+    _ = await init_db(TORM)
     actor = (
         await models.Actor.filter(ex_id=9, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
@@ -669,7 +669,7 @@ async def main():
     # await actual_cond()
     await gather(
         cl.battle(usdt, rub, False, ["volet"], 79.97),  # гонка в стакане покупки - мы продаем
-        cl.battle(usdt, rub, True, ["volet"], 79.11),  # гонка в стакане продажи - мы покупаем
+        cl.battle(usdt, rub, True, ["volet"], 79.51),  # гонка в стакане продажи - мы покупаем
         cl.battle(eth, rub, False, ["volet"], 206_000),
         cl.battle(eth, rub, True, ["volet"], 200_000),
         cl.battle(btc, rub, False, ["volet"], 8_500_000),

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Gate/ex.py

@@ -10,10 +10,9 @@ from xync_schema import models
 from xync_schema.models import Ex
 from xync_schema import types
 
-from xync_client.Abc.Base import MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
-from xync_client.Abc.types import PmEx
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.Gate.etype import ad
 from xync_client.pm_unifier import PmUnifier
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Htx/ex.py

@@ -158,7 +158,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(PG_DSN, models, True)
     ex = await Ex.get(name="Htx")
-    async with await FileClient(TOKEN) as b:
+    async with FileClient(TOKEN) as b:
         b: FileClient
         cl = ExClient(ex, b)
         await cl.set_pmcurexs()

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/KuCoin/ex.py

@@ -4,11 +4,10 @@ from x_model import init_db
 from xync_schema import models
 from xync_schema import types
 
-from xync_client.Abc.Base import MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 from xync_client.KuCoin.etype import pm, ad
-from xync_client.Abc.types import PmEx
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.pm_unifier import PmUnifier
 
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Mexc/ex.py

@@ -4,8 +4,7 @@ import requests
 
 from xync_client.loader import PG_DSN
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.Abc.Base import MapOfIdsList
-from xync_client.Abc.types import PmEx
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.Mexc.etype import pm, ad
 from xync_client.pm_unifier import PmUnifier
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Okx/ex.py

@@ -4,11 +4,10 @@ from x_model import init_db
 from xync_schema import models
 from xync_schema import types
 
-from xync_client.Abc.Base import MapOfIdsList
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import PG_DSN
 from xync_client.Okx.etype import ad, pm
-from xync_client.Abc.types import PmEx
+from xync_client.Abc.types import PmEx, MapOfIdsList
 from xync_client.pm_unifier import PmUnifier
 
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Pms/Ozon/__init__.py

@@ -1,23 +1,23 @@
-from asyncio import run
+from asyncio import run, sleep
 from x_model import init_db
 from xync_schema import models
 from xync_client.loader import PG_DSN
 import undetected_chromedriver as uc
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.action_chains import ActionChains
-import time
 
 
-async def loggin(driver, agent) -> None:
+def login(driver, agent) -> None:
     driver.get("https://finance.ozon.ru")
     for cookie in agent.state:
         driver.add_cookie(cookie)
     driver.get("https://finance.ozon.ru/lk")
-    pin = agent.auth.get("code")
-    actions = ActionChains(driver)
-    for char in pin:
-        actions.send_keys(char)
-    actions.perform()
+    if 1:  # todo: только если просит ввести пин-код
+        pin = agent.auth.get("code")
+        actions = ActionChains(driver)
+        for char in pin:
+            actions.send_keys(char)
+        actions.perform()
 
 
 async def send_cred(driver, amount, payment, cred):
@@ -31,24 +31,24 @@ async def main():
     chrome_options.add_argument("--disable-gpu")
     chrome_options.add_argument("--no-sandbox")
     driver = uc.Chrome(options=chrome_options)
+    driver.implicitly_wait(15)
 
     try:
-        if agent.state:
-            await loggin(driver, agent)
-            time.sleep(1000)
-        else:
+        if not agent.state:
             driver.get("https://ozon.ru/ozonid-lite")
-            driver.implicitly_wait(3)
             driver.find_element(By.NAME, "autocomplete").send_keys(agent.auth.get("phone"))
             driver.find_element(By.CLASS_NAME, "b201-a").click()
+            # todo: здесь не всегда просит код, иногда вход по QR или подтверждению из почты
             sms_code = input("Введите 6-ти значный код: ")
-            driver.implicitly_wait(3)
             driver.find_element(By.CLASS_NAME, "d01-a.d01-a5").send_keys(sms_code)
-            driver.implicitly_wait(5)
-            agent.state = driver.get_cookies()  # Получаем все куки
-            await agent.save()
+        # elif 0:  # todo: проверка на залогиненность
+        login(driver, agent)
+        # todo: здесь дальше отправка исходящего платежа и проверка входящего
+        await sleep(5)
 
     finally:
+        agent.state = driver.get_cookies()  # Получаем все куки
+        await agent.save()
         driver.quit()
 
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/TgWallet/auth.py

@@ -12,7 +12,7 @@ class AuthClient(BaseAuthClient):
     async def _get_auth_hdrs(self) -> dict[str, str]:
         if not self.tg_session:
             self.tg_session = await Session.filter(user__user__person__actors__ex=self.ex).order_by("-date").first()
-        pyro = WalletAuthClient(str(self.tg_session.user_id))
+        pyro = WalletAuthClient(self.tg_session.user_id)
         init_data = await pyro.get_init_data()
         tokens = HttpClient("walletbot.me")._post("/api/v1/users/auth/", init_data)
         # todo: refact actor.exid actualize

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/TgWallet/ex.py

@@ -1,5 +1,6 @@
 from asyncio import run, sleep
 
+from pyro_client.client.file import FileClient
 from x_model import init_db
 from xync_schema import types
 from xync_schema import models
@@ -15,7 +16,7 @@ from xync_client.TgWallet.pyd import (
     _PmsTrait,
     _BaseAd,
 )
-from xync_client.loader import PG_DSN
+from xync_client.loader import PG_DSN, TOKEN
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.types import MapOfIdsList
 from xync_client.TgWallet.auth import AuthClient
@@ -28,10 +29,10 @@ class ExClient(BaseExClient, AuthClient):
 
     unifier_class = TgWalletUnifier
 
-    def __init__(self, ex: models.Ex, actor: models.Actor = None):
+    def __init__(self, ex: models.Ex, bot: FileClient, actor: models.Actor = None):
         if actor:
             self.actor = actor
-        super().__init__(ex)  # BaseExClient
+        super().__init__(ex, bot)  # BaseExClient
 
     def pm_type_map(self, pm: models.Pm) -> str:
         # todo: no pm.name
@@ -153,43 +154,44 @@ class ExClient(BaseExClient, AuthClient):
 async def _test():
     await init_db(PG_DSN, models, True)
     tgex = await models.Ex.get(name="TgWallet")
-    cl: ExClient = tgex.client()
-    await cl.pms()
-    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[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]
-
-    # get ad fulls
-    ads_pyd: list[_TakerOne] = [await cl.ad(ad.exid) for ad in ads]
-    # prepare ad fulls for saving
-    ads_pydin: list[AdBuyIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads_pyd]
-    # full ones save
-    _ads_db = [await sleep(0.1, await cl.ad_pydin2db(adi)) for adi in ads_pydin]
-
-    # # # BUY # # #
-    # get ads list
-    ads: list[AdTakerSaleBuy] = await cl.ads("TON", "RUB", False)
-    # prepare ad list items for saving
-    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]
-
-    # get ad fulls
-    ads_pyd = [await cl.ad(ad.exid) for ad in ads]
-    # prepare ad fulls for saving
-    ads_pydin: list[AdBuyIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads_pyd]
-    # full ones save
-    _ads_db = [await cl.ad_pydin2db(adi) for adi in ads_pydin]
-
-    await cl.close()
+    async with FileClient(TOKEN) as b:
+        cl: ExClient = tgex.client(b)
+        await cl.pms()
+        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[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]
+
+        # get ad fulls
+        ads_pyd: list[_TakerOne] = [await cl.ad(ad.exid) for ad in ads]
+        # prepare ad fulls for saving
+        ads_pydin: list[AdBuyIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads_pyd]
+        # full ones save
+        _ads_db = [await sleep(0.1, await cl.ad_pydin2db(adi)) for adi in ads_pydin]
+
+        # # # BUY # # #
+        # get ads list
+        ads: list[AdTakerSaleBuy] = await cl.ads("TON", "RUB", False)
+        # prepare ad list items for saving
+        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]
+
+        # get ad fulls
+        ads_pyd = [await cl.ad(ad.exid) for ad in ads]
+        # prepare ad fulls for saving
+        ads_pydin: list[AdBuyIn] = [await cl.ad_taker_epyd2pydin(adp) for adp in ads_pyd]
+        # full ones save
+        _ads_db = [await cl.ad_pydin2db(adi) for adi in ads_pydin]
+
+        await cl.close()
 
 
 if __name__ == "__main__":

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/TgWallet/pyro.py

@@ -1,7 +1,7 @@
 from asyncio import run
 from urllib.parse import parse_qs
 
-from pyro_client.client.base import BaseClient
+from pyro_client.client.user import UserClient
 from pyrogram.raw import functions
 from pyrogram.raw.types import InputPeerSelf
 from x_model import init_db
@@ -11,11 +11,11 @@ from xync_schema import models
 from xync_schema.models import Actor
 
 
-class WalletAuthClient(BaseClient):
+class WalletAuthClient(UserClient):
     async def get_init_data(self) -> dict:
-        async with self as app:
-            bot = await app.resolve_peer("wallet")
-            res = await app.invoke(functions.messages.RequestWebView(peer=InputPeerSelf(), bot=bot, platform="ios"))
+        async with self:
+            bot = await self.resolve_peer("wallet")
+            res = await self.invoke(functions.messages.RequestWebView(peer=InputPeerSelf(), bot=bot, platform="ios"))
             raw = parse_qs(res.url)["tgWebAppUserId"][0].split("#tgWebAppData=")[1]
             j = parse_qs(raw)
             return {

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/loader.py

@@ -1,15 +1,18 @@
 from dotenv import load_dotenv
 from os import getenv as env
+from aerich import models as amodels
+from xync_schema import models as xmodels
 
 load_dotenv()
 
-if not (TOKEN := env("TOKEN")):
-    import logging
-
-    load_dotenv("/api/.env")
-    logging.info(TOKEN := env("TOKEN"))
-
+TOKEN = env("TOKEN")
 PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'xyncdbs')}:{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
+TORM = {
+    "connections": {"default": PG_DSN},
+    "apps": {"models": {"models": [xmodels, amodels]}},
+    "use_tz": False,
+    "timezone": "UTC",
+}
 TG_API_ID = env("TG_API_ID")
 TG_API_HASH = env("TG_API_HASH")
 WSToken = env("WST")

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1}/xync_client/pm_unifier.py

@@ -60,7 +60,7 @@ class PmUnifier:
     }
     rms = ":`'’′"
 
-    def __init__(self, countries: list[str]):
+    def __init__(self, countries: list[tuple[str, str]]):
         self.pm_map = self.base_pm_map | self.pm_map
         self.cts = countries
 

{xync_client-0.0.50.dev2 → xync_client-0.0.51.dev1/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.50.dev2
+Version: 0.0.51.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.50.dev2 → xync_client-0.0.51.dev1}/xync_client/Bybit/ex.py

@@ -113,8 +113,8 @@ async def main():
     await bot.start()
     cl = ExClient(ex, bot)
     _ads = await cl.ads("USDT", "GEL", False)
-    await cl.set_pmcurexs()
     await cl.set_coinexs()
+    await cl.set_pmcurexs()
     # _cr = await cl.curs()
     # _cn = await cl.coins()
     await cl.set_pairs()