xync-client 0.0.114__py3-none-any.whl → 0.0.155__py3-none-any.whl

xync_client/Bybit/etype/ad.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 from typing import List, Optional, Any, Literal
-from pydantic import BaseModel, Field, field_serializer
-from xync_schema import xtype
+from pydantic import BaseModel, Field
+from xync_client.Bybit.etype.cred import MyPaymentTerm
 from xync_schema.xtype import BaseAd
 
 from xync_client.Abc.xtype import BaseAdUpdate
@@ -113,7 +113,7 @@ class Ad(BaseAd):
     recommend: bool = None  # for initial actualize
     recommendTag: str = None  # for initial actualize
     remark: str = Field(serialization_alias="auto_msg")
-    side: Literal[0, 1] = None  # for initial actualize  # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
+    side: Literal[0, 1] = None  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
     symbolInfo: SymbolInfo = None  # for initial actualize
     tokenId: str = None  # for initial actualize
@@ -126,59 +126,14 @@ class Ad(BaseAd):
     verificationOrderLabels: List[Any] = None  # for initial actualize
     verificationOrderSwitch: bool = None  # for initial actualize
     version: int = None  # for initial actualize
-    #
-    #
-    # class Ad(BaseAd):
-    #     accountId: str = None  # for initial actualize
-    #     authStatus: int = None  # for initial actualize
-    #     authTag: List[str] = None  # for initial actualize
-    #     ban: bool = None  # for initial actualize
-    #     baned: bool = None  # for initial actualize
-    #     blocked: str = None  # for initial actualize
-    #     createDate: str = None  # for initial actualize
-    #     currencyId: str = None  # for initial actualize
-    #     executedQuantity: str = None  # for initial actualize
-    #     fee: str = None  # for initial actualize
-    #     finishNum: int = None  # for initial actualize
-    #     frozenQuantity: str = None  # for initial actualize
-    #     exid: str = Field(serialization_alias="id")
-    #     isOnline: bool = None  # for initial actualize
-    #     itemType: str = None  # for initial actualize
-    #     lastLogoutTime: str = None  # for initial actualize
-    #     quantity: str = Field(serialization_alias="lastQuantity")
-    #     makerContact: bool = None  # for initial actualize
-    #     max_fiat: str = Field(serialization_alias="maxAmount")
-    #     min_fiat: str = Field(serialization_alias="minAmount")
-    #     nickName: str = None  # for initial actualize
-    #     orderNum: int = None  # for initial actualize
-    #     paymentPeriod: int = None  # for initial actualize
-    #     payments: List[str] = None  # for initial actualize
-    #     premium: str = None  # for initial actualize
-    #     price: str = None  # for initial actualize
-    #     priceType: Literal[0, 1] = None  # for initial actualize  # 0 - fix rate, 1 - floating
-    #     allQuantity: str = Field(serialization_alias="quantity")  # for initial actualize
-    #     recentExecuteRate: int = None  # for initial actualize
-    #     recentOrderNum: int = None  # for initial actualize
-    #     recommend: bool = None  # for initial actualize
-    #     recommendTag: str = None  # for initial actualize
-    #     auto_msg: str = Field(serialization_alias="remark")
-    #     is_sell: Literal[0, 1] = Field(serialization_alias="side")  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
-    #     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
-    #     symbolInfo: SymbolInfo = None  # for initial actualize
-    #     tokenId: str = None  # for initial actualize
-    #     tokenName: str = None  # for initial actualize
-    #     tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
-    #     userId: str = Field(serialization_alias="maker__exid")
-    #     userMaskId: str = None  # for initial actualize
-    #     userType: str = None  # for initial actualize
-    #     verificationOrderAmount: str = None  # for initial actualize
-    #     verificationOrderLabels: List[Any] = None  # for initial actualize
-    #     verificationOrderSwitch: bool = None  # for initial actualize
-    #     version: int = None  # for initial actualize
-
-    @field_serializer("status")
-    def status(self, status, _info) -> xtype.AdStatus:
-        return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
+
+    # @field_serializer("status")
+    # def status(self, status, _info) -> xtype.AdStatus:
+    #     return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
+
+
+class MyAd(Ad):
+    paymentTerms: List[MyPaymentTerm]
 
 
 class AdPostRequest(BaseModel):

xync_client/Bybit/etype/cred.py

@@ -1,5 +1,3 @@
-from typing import Literal
-
 from pydantic import BaseModel
 
 from xync_client.Abc.xtype import CredExOut
@@ -15,18 +13,31 @@ class PaymentItem(BaseModel):
     required: bool
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
+class BasePaymentConf(BaseModel):
+    paymentType: int
+    paymentName: str
+
+
+class PaymentConfig(BasePaymentConf):
+    class PaymentTemplateItem(BaseModel):
+        labelDialect: str
+        placeholderDialect: str
+        fieldName: str
+
+    paymentDialect: str
+    paymentTemplateItem: list[PaymentTemplateItem]
+
+
+class PaymentConfigVo(BasePaymentConf):
     checkType: int
     sort: int
-    paymentName: str
     addTips: str
     itemTips: str
-    online: Literal[0, 1]  # Non-balance coin purchase (0 Offline), balance coin purchase (1 Online)
-    items: list[PaymentItem]
+    online: int
+    items: list[dict[str, str | bool]]
 
 
-class CredEpyd(CredExOut):
+class PaymentTerm(CredExOut):
     id: str  # int
     realName: str
     paymentType: int  # int
@@ -44,7 +55,7 @@ class CredEpyd(CredExOut):
     mobile: str
     businessName: str
     concept: str
-    online: str
+    online: str = None
     paymentExt1: str
     paymentExt2: str
     paymentExt3: str
@@ -54,6 +65,15 @@ class CredEpyd(CredExOut):
     paymentTemplateVersion: int
 
 
+class MyPaymentTerm(PaymentTerm):
+    paymentConfig: PaymentConfig
+    realNameVerified: bool
+
+
+class CredEpyd(PaymentTerm):
+    securityRiskToken: str = ""
+
+
 class MyCredEpyd(CredEpyd):  # todo: заменить везде где надо CredEpyd -> MyCredEpyd
     countNo: str
     hasPaymentTemplateChanged: bool

xync_client/Bybit/etype/order.py

@@ -1,10 +1,9 @@
-from datetime import datetime
 from enum import IntEnum
 from typing import Literal
 
 from pydantic import BaseModel
 
-from xync_client.Bybit.etype.cred import CredEpyd
+from xync_client.Bybit.etype.cred import CredEpyd, PaymentTerm as CredPaymentTerm, PaymentConfigVo
 
 
 class Topic(IntEnum):
@@ -16,7 +15,7 @@ class Topic(IntEnum):
 
 class Status(IntEnum):
     deleted = 40  # order canceled
-    # created = 10  # waiting for buyer to pay
+    created = 10
     appealable = 20  # waiting for seller to release
     canceled = 40
     completed = 50  # order finished
@@ -26,17 +25,34 @@ class Status(IntEnum):
     paid = 50
     rejected = 40
     request_canceled = 40
-    requested = 10
     seller_appeal_disputed_by_buyer = 30
 
 
 class StatusApi(IntEnum):
     created = 1
+    _web3 = 5
     wait_for_buyer = 10  # ws_canceled
     wait_for_seller = 20
     appealed = 30
     canceled = 40
     completed = 50
+    _paying_online = 60
+    _pay_fail_online = 70
+    hotswap_cancelled = 80
+    _buyer_sel_tokenId = 90
+    objectioning = 100
+    waiting_for_objection = 110
+
+
+class TakeAdReq(BaseModel):
+    ad_id: int | str
+    amount: float
+    is_sell: bool
+    pm_id: int
+    coin_id: int
+    cur_id: int
+    quantity: float | None = None
+    price: float | None = None
 
 
 class OrderRequest(BaseModel):
@@ -54,33 +70,46 @@ class OrderRequest(BaseModel):
     flag: Literal["amount", "quantity"]
     version: str = "1.0"
     securityRiskToken: str = ""
+    isFromAi: bool = False
+
+
+class OrderSellRequest(OrderRequest):
+    paymentId: str
+    paymentType: str
 
 
 class PreOrderResp(BaseModel):
-    price: str  # float
-    curPrice: str
-    totalAmount: float
-    minAmount: float
-    maxAmount: float
-    minQuantity: float
-    maxQuantity: float
-    payments: list[str]  # list[int]
-    status: Literal[10, 20]
-    paymentTerms: list
-    paymentPeriod: Literal[15]
-    lastQuantity: float
-    lastPrice: float
+    id: str  # bigint
+    price: str  # float .cur.scale
+    lastQuantity: str  # float .coin.scale
+    curPrice: str  # hex 32
+    lastPrice: str  # float .cur.scale # future
     isOnline: bool
-    lastLogoutTime: datetime
-    itemPriceAvailableTime: datetime
-    itemPriceValidTime: int  # 45000
+    lastLogoutTime: str  # timestamp(0)+0
+    payments: list[str]  # list[int]
+    status: Literal[10, 15, 20]
+    paymentTerms: list  # empty
+    paymentPeriod: Literal[15, 30, 60]
+    totalAmount: str  # float .cur.scale
+    minAmount: str  # float .cur.scale
+    maxAmount: str  # float .cur.scale
+    minQuantity: str  # float .coin.scale
+    maxQuantity: str  # float .coin.scale
+    itemPriceAvailableTime: str  # timestamp(0)+0
+    itemPriceValidTime: Literal["45000"]
     itemType: Literal["ORIGIN"]
+    shareItem: bool  # False
 
 
 class OrderResp(BaseModel):
     orderId: str
     isNeedConfirm: bool
+    confirmId: str = ""
     success: bool
+    securityRiskToken: str = ""
+    riskTokenType: Literal["challenge", ""] = ""
+    riskVersion: Literal["1", "2", ""] = ""
+    needSecurityRisk: bool
     isBulkOrder: bool
     confirmed: str = None
     delayTime: str
@@ -115,43 +144,7 @@ class AppraiseInfo(BaseModel):
     updateDate: str
 
 
-class PaymentConfigVo(BaseModel):
-    paymentType: str
-    checkType: int
-    sort: int
-    paymentName: str
-    addTips: str
-    itemTips: str
-    online: int
-    items: list[dict[str, str | bool]]
-
-
-class PaymentTerm(BaseModel):
-    id: str
-    realName: str
-    paymentType: int
-    bankName: str
-    branchName: str
-    accountNo: str
-    qrcode: str
-    visible: int
-    payMessage: str
-    firstName: str
-    lastName: str
-    secondLastName: str
-    clabe: str
-    debitCardNumber: str
-    mobile: str
-    businessName: str
-    concept: str
-    online: str
-    paymentExt1: str
-    paymentExt2: str
-    paymentExt3: str
-    paymentExt4: str
-    paymentExt5: str
-    paymentExt6: str
-    paymentTemplateVersion: int
+class PaymentTerm(CredPaymentTerm):
     paymentConfigVo: PaymentConfigVo
     ruPaymentPrompt: bool
 
@@ -288,18 +281,18 @@ class Message(BaseModel):
     nickName: str
     read: Literal[0, 1]
     fileName: str
-    onlyForCustomer: int
+    onlyForCustomer: int | None = None
 
 
 class _BaseChange(BaseModel):
     userId: int
     makerUserId: int
     id: str
-    status: StatusApi
     createDate: int
     side: int
     appealedTimes: int
     totalAppealedTimes: int
+    status: StatusApi | None = None
 
 
 class StatusChange(_BaseChange):
@@ -318,18 +311,18 @@ class _BaseMsg(BaseModel):
     msgUuId: str
     createDate: str
     contentType: str
-    roleType: Literal["user", "sys", "alarm"]
+    roleType: Literal["user", "sys", "alarm", "customer_support"]
 
 
 class Receive(_BaseMsg):
     id: int
     msgCode: int
-    onlyForCustomer: int
+    onlyForCustomer: int | None = None
 
 
 class Read(_BaseMsg):
     readAmount: int
-    read: Literal["111", "101"]
+    read: Literal["101", "110", "11", "111"]
     orderStatus: StatusApi
 
 

xync_client/Bybit/ex.py

@@ -2,26 +2,39 @@ import json
 from asyncio import run
 
 from pyro_client.client.file import FileClient
+from x_client import df_hdrs
 from x_model import init_db
 from xync_schema import models, xtype
+from xync_schema.enums import AdStatus, AgentStatus
 from xync_schema.models import Ex, Agent
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 from xync_client.Bybit.etype import ad
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.loader import TORM
 
 
 class ExClient(BaseExClient):  # Bybit client
-    headers = {"cookie": ";"}  # rewrite token for public methods
+    host = "api2.bybit.com"
+    headers = df_hdrs  # rewrite token for public methods
     agent: Agent = None
 
     async def _get_auth_cks(self) -> dict[str, str]:
         if not self.agent:
-            self.agent = await Agent.get(actor__ex=self.ex).prefetch_related("actor")
+            self.agent = (
+                await Agent.filter(actor__ex=self.ex, status__gt=AgentStatus.off).prefetch_related("actor").first()
+            )
         return self.agent.auth["cookies"]
 
+    @staticmethod
+    def ad_status(status: int) -> AdStatus:
+        return {
+            10: AdStatus.active,
+            20: AdStatus.defActive,
+            30: AdStatus.soldOut,
+        }[status]
+
     async def _get_config(self):
         resp = await self._get("/fiat/p2p/config/initial")
         return resp["result"]  # todo: tokens, pairs, ...
@@ -114,7 +127,7 @@ class ExClient(BaseExClient):  # Bybit client
 async def main():
     _ = await init_db(TORM, True)
     ex = await Ex.get(name="Bybit")
-    bot: FileClient = FileClient(TOKEN)
+    bot: FileClient = FileClient(NET_TOKEN)
     # await bot.start()
     cl = ExClient(ex, bot)
     await cl.set_pms()

xync_client/Gate/ex.py

@@ -6,7 +6,7 @@ from xync_schema.models import Ex
 from xync_schema import xtype
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.loader import TOKEN, TORM
+from xync_client.loader import NET_TOKEN, TORM
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.Gate.etype import ad
 
@@ -93,7 +93,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     gt = await Ex.get(name="Gate")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         cl = ExClient(gt, b)
         await cl.set_pairs()
         pms = await cl.set_coins()

xync_client/Gmail/__init__.py

@@ -1,113 +1,134 @@
-from playwright.async_api import Page, Playwright
-from pyro_client.client.bot import BotClient
-from pyro_client.client.user import UserClient
+import logging
+import pickle
+import re
+from base64 import urlsafe_b64decode
+from datetime import datetime
+
+from google.auth.transport.requests import Request
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import Resource, build
+from requests import get
 from xync_schema.models import User, Gmail
 
-from xync_client.loader import TOKEN
+from xync_client.Abc.HasAbotUid import HasAbotUid
+from xync_client.loader import TORM
+
+# Область доступа
+SCOPES = ["https://www.googleapis.com/auth/gmail.readonly"]
+
+
+class GmClient(HasAbotUid):
+    service: Resource
+
+    def __init__(self, user: User):
+        """Авторизация и создание сервиса Gmail API"""
+        creds = None
+        # Файл token.pickle хранит токены доступа пользователя
+        if user.gmail.token:
+            creds = pickle.loads(user.gmail.token)
+
+        # Если нет валидных credentials, запрашиваем авторизацию
+        if not creds or not creds.valid:
+            if creds and creds.expired and creds.refresh_token:
+                creds.refresh(Request())
+            else:
+                flow = InstalledAppFlow.from_client_config(user.gmail.auth, SCOPES)
+                creds = flow.run_local_server(port=0)
 
+            # Сохраняем credentials для следующего запуска
+            user.gmail.token = pickle.dumps(creds)
 
-class GmClient:
-    uid: int
-    user: User
-    page: Page
-    bot: UserClient = None
-    HOME = "https://mail.google.com/mail/u/0/"
+        self.service = build("gmail", "v1", credentials=creds)
+        self.uid = user.username_id
 
-    def __init__(self, uid: int):
-        self.uid = uid
+    def _get_last_email(self, sender_email, subject_keyword=None):
+        """
+        Получить последнее письмо от определенного отправителя
 
-    async def start(self, pw: Playwright, headed: bool = False):
-        self.user = await User.get(username_id=self.uid).prefetch_related("gmail")
-        if not self.user.gmail:
-            self.user.gmail = await Gmail.create(
-                login=input(f"{self.user.last_name} gmail login:"), password=input("password:")
+        Args:
+            sender_email: email отправителя (например, 'example@gmail.com')
+            subject_keyword: ключевое слово в теме (опционально)
+        """
+
+        def _get_email_body(payload):
+            """Извлечь текст письма из payload"""
+            if "body" in payload and "data" in payload["body"]:
+                return urlsafe_b64decode(payload["body"]["data"]).decode("utf-8")
+            return ""
+
+        # Формируем поисковый запрос
+        query = f"from:{sender_email}"
+        if subject_keyword:
+            query += f" subject:{subject_keyword}"
+
+        # Ищем письма с этим запросом
+        results = (
+            self.service.users()
+            .messages()
+            .list(
+                userId="me",
+                q=query,
+                maxResults=1,  # Только последнее письмо
             )
-        browser = await pw.chromium.launch(
-            channel="chrome",
-            headless=not headed,
-            args=[
-                "--disable-blink-features=AutomationControlled",
-                "--no-sandbox",
-                "--disable-web-security",
-                "--disable-infobars",
-                "--disable-extensions",
-                "--start-maximized",
-            ],
+            .execute()
         )
-        context = await browser.new_context(storage_state=self.user.gmail.auth, locale="en")
-        self.page = await context.new_page()
-        # go home
-        await self.page.goto(self.HOME, timeout=62000)
-        if not self.page.url.startswith(self.HOME):
-            if await (  # ваще с 0 заходим
-                sgn_btn := self.page.locator(
-                    'header a[href^="https://accounts.google.com/AccountChooser/signinchooser"]:visible',
-                    has_text="sign",
-                )
-            ).count():
-                await sgn_btn.click()
-            if self.page.url.startswith("https://accounts.google.com/v3/signin/accountchooser"):  # надо выбрать акк
-                await self.page.locator("li").first.click()
-            # если предлагает залогиниться
-            elif await self.page.locator("h1#headingText", has_text="Sign In").count():
-                await self.page.fill("input[type=email]", self.user.gmail.login)
-                await self.page.locator("button", has_text="Next").click()
-            # осталось ввести пороль:
-            await self.page.fill("input[type=password]", self.user.gmail.password)
-            await self.page.locator("#passwordNext").click()
-            await self.page.wait_for_timeout(3000)
-            if self.page.url.startswith("https://accounts.google.com/v3/signin/challenge/dp"):
-                await self.load_bot()
-                await self.bot.receive("Аппрувни гмейл, у тебя 1.5 минуты", photo=await self.page.screenshot())
-        await self.page.wait_for_url(lambda u: u.startswith(self.HOME), timeout=90 * 1000)  # убеждаемся что мы в почте
-        self.user.gmail.auth = await self.page.context.storage_state()
-        await self.user.gmail.save()
-
-    async def mail_confirm(self):
-        lang = await self.page.get_attribute("html", "lang")
-        labs = {
-            "ru": "Оповещения",
-            "en-US": "Updates",
-        }
-        tab = self.page.get_by_role("heading").get_by_label(labs[lang]).last
-        await tab.click()
-        rows = self.page.locator("tbody>>nth=4 >> tr")
-        row = rows.get_by_text("Volet.com").and_(rows.get_by_text("Please Confirm Withdrawal"))
-        if not await row.count():
-            await self.bot.receive("А нет запросов от волета", photo=await self.page.screenshot())
-
-        await row.click()
-        await self.page.wait_for_load_state()
-        btn = self.page.locator('a[href^="https://account.volet.com/verify/"]', has_text="confirm").first
-        await btn.click()
-
-    async def load_bot(self):
-        if not self.bot:
-            bot = await BotClient(TOKEN)
-            self.bot = await UserClient(self.uid, bot)
-        if not self.bot.is_connected:
-            await self.bot.start()
-
-    async def stop(self):
-        if self.bot and self.bot.is_connected:  # todo: do not stop if
-            await self.bot.stop(False)
-        await self.page.context.close()
-        await self.page.context.browser.close()
+
+        if not (messages := results.get("messages", [])):
+            logging.warning("Письма не найдены")
+            return None
+
+        # Получаем полную информацию о письме
+        message_id = messages[0]["id"]
+        message = self.service.users().messages().get(userId="me", id=message_id, format="full").execute()
+
+        # Извлекаем заголовки
+        headers = message["payload"]["headers"]
+        subject = next((h["value"] for h in headers if h["name"] == "Subject"), "Нет темы")
+        from_email = next((h["value"] for h in headers if h["name"] == "From"), "Неизвестно")
+        date = next((h["value"] for h in headers if h["name"] == "Date"), "Неизвестно")
+
+        # Извлекаем текст письма
+        body = _get_email_body(message["payload"])
+
+        return {"id": message_id, "subject": subject, "from": from_email, "date": date, "body": body}
+
+    async def volet_confirm(self, amount: float, dt: datetime):
+        if email := self._get_last_email("noreply@volet.com", "Please Confirm Withdrawal"):  # "Volet.com"
+            date = datetime.strptime(email["date"].split(",")[1].split(" +")[0], "%d %b %Y %H:%M:%S")
+            if match := re.search(r"Amount: <b>([\d.]+) [A-Z]{3}</b>", email["body"]):
+                amt = float(match.group(1))
+            if match := re.search(r"https://account\.volet\.com/verify/([a-f0-9-]+)", email["body"]):
+                token = match.group(1)
+
+        if email and amount == amt and date > dt and token:
+            get(f"https://account.volet.com/verify/{token}")
+            return True
+
+        await self.receive("А нет запросов от волета")
+        return False
+
+    async def bybit_code(self, dt: datetime) -> str | None:
+        if email := self._get_last_email("Bybit", "[Bybit]Security Code for Your Bybit Account"):
+            date = datetime.strptime(email["date"].split(",")[1].split(" +")[0], "%d %b %Y %H:%M:%S")
+            if match := re.search(r'<span style="font-size:28pt;color:#ff9c2e">(\d{6})</span>', email["body"]):
+                code = match.group(1)
+
+        if email and date > dt and code:
+            get(f"https://account.volet.com/verify/{code}")
+            return code
+
+        await self.receive("А нет запросов от волета")
+        return None
 
 
 async def _test():
     from x_model import init_db
-    from xync_schema import TORM
-
-    _ = await init_db(TORM, True)
-    uid = 193017646
-    gmc = GmClient(uid)
-    try:
-        await gmc.start(True)
-    except TimeoutError as te:
-        raise te
-    finally:
-        await gmc.stop()
+
+    _ = await init_db(TORM)
+
+    gm = await Gmail.get(id=1).prefetch_related("user__username")
+    gmc = GmClient(gm)
+    await gmc.volet_confirm(amount=90, dt=datetime.now())
 
 
 if __name__ == "__main__":