xync-client 0.0.145__py3-none-any.whl → 0.0.148__py3-none-any.whl

xync_client/Bybit/etype/ad.py

@@ -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

xync_client/Bybit/etype/cred.py

@@ -52,6 +52,7 @@ class CredEpyd(CredExOut):
     paymentExt5: str
     paymentExt6: str
     paymentTemplateVersion: int
+    securityRiskToken: str = ""
 
 
 class MyCredEpyd(CredEpyd):  # todo: заменить везде где надо CredEpyd -> MyCredEpyd

xync_client/Bybit/etype/order.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 from enum import IntEnum
 from typing import Literal
 
@@ -45,6 +44,12 @@ class StatusApi(IntEnum):
     waiting_for_objection = 110
 
 
+class TakeAdReq(BaseModel):
+    ad_id: int | str
+    amount: float
+    pm_id: int = None
+
+
 class OrderRequest(BaseModel):
     class Side(IntEnum):
         BUY = 0
@@ -60,33 +65,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
+    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: str  # timestamp(0)+0
     payments: list[str]  # list[int]
     status: Literal[10, 20]
-    paymentTerms: list
-    paymentPeriod: Literal[15]
-    lastQuantity: float
-    lastPrice: float
-    isOnline: bool
-    lastLogoutTime: datetime
-    itemPriceAvailableTime: datetime
-    itemPriceValidTime: int  # 45000
+    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"] = None
+    riskVersion: Literal["1", "2"] = None
+    needSecurityRisk: bool
     isBulkOrder: bool
     confirmed: str = None
     delayTime: str

xync_client/Gmail/__init__.py

@@ -92,8 +92,8 @@ class GmClient(HasAbotUid):
 
         return {"id": message_id, "subject": subject, "from": from_email, "date": date, "body": body}
 
-    async def mail_confirm(self, amount: float, dt: datetime):
-        if email := self._get_last_email("Volet.com", "Please Confirm Withdrawal"):
+    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))
@@ -107,6 +107,19 @@ class GmClient(HasAbotUid):
         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
@@ -115,7 +128,7 @@ async def _test():
 
     gm = await Gmail.get(id=1).prefetch_related("user__username")
     gmc = GmClient(gm)
-    await gmc.mail_confirm(amount=90, dt=datetime.now())
+    await gmc.volet_confirm(amount=90, dt=datetime.now())
 
 
 if __name__ == "__main__":

xync_client/Pms/Payeer/__init__.py

@@ -22,6 +22,7 @@ from playwright.async_api import async_playwright, Playwright, Error
 
 # noinspection PyProtectedMember
 from playwright._impl._errors import TimeoutError
+from tortoise.timezone import now
 from xync_bot import XyncBot
 from xync_schema.models import TopUp, TopUpAble, PmAgent, Transfer
 
@@ -139,7 +140,7 @@ class Client(PmAgentClient):
     async def send(self, t: Transfer) -> tuple[str, bytes] | float:
         dest, cur = t.order.cred.detail, t.order.cred.pmcur.cur.ticker
         amount = round(t.order.amount * 10**-t.order.cred.pmcur.cur.scale, t.order.cred.pmcur.cur.scale)
-        self.last_active = datetime.now()
+        self.last_active = now()
         page = self.page
         if not page.url.startswith(self.pages.SEND):
             try:
@@ -181,7 +182,7 @@ class Client(PmAgentClient):
                 await page.click(f".history-id-{trans_num} a.link")
                 sleep(1)
                 receipt = await page.query_selector(".ui-dialog.ui-corner-all")
-                return trans_num, await receipt.screenshot(path=f"tmp/{trans_num}.png")
+                return trans_num, receipt and await receipt.screenshot(path=f"tmp/{trans_num}.png")
             else:
                 await self.receive("Payeer хз", photo=await self.page.screenshot())
                 return -1
@@ -192,10 +193,10 @@ class Client(PmAgentClient):
             )
             return has_amount
 
-    def check_in(
+    async def check_in(
         self, amount: Decimal | int | float, cur: str, dt: datetime = None, tid: str | int = None
     ) -> tuple[Decimal | None, int | None]:
-        history = self.api.history(type="incoming", append=tid, count=3)
+        history = self.api.history(type="incoming", count=10)
         if tid:
             return (t := history.get(tid)) and Decimal(t["creditedAmount"])
         ts: list[dict] = [
@@ -204,7 +205,8 @@ class Client(PmAgentClient):
             if (
                 amount <= Decimal(h["creditedAmount"]) <= ceil(amount)
                 and h["creditedCurrency"] == cur
-                and datetime.fromisoformat(h["date"]) > dt - timedelta(minutes=1)
+                # todo: wrong tz
+                and datetime.fromisoformat(h["date"]) > dt - timedelta(minutes=3)  # +180(tz)-5
             )
         ]
         if not (t := ts and ts[0]):

xync_client/Pms/Volet/__init__.py

@@ -174,7 +174,7 @@ class Client(PmAgentClient):
         elif self.agent.user.username.session:
             if not (code := await self.wait_for_code(volet_bot_id, topic, hg)):
                 if 1:  # todo: Is mail_confirm required?
-                    if _mcr := await self.gmail.mail_confirm(amount, t.updated_at):
+                    if _mcr := await self.gmail.volet_confirm(amount, t.updated_at):
                         ...
                         # todo: click Continue
                     if not (code := await self.wait_for_code(volet_bot_id, topic, hg)):

{xync_client-0.0.145.dist-info → xync_client-0.0.148.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.145
+Version: 0.0.148
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -8,6 +8,9 @@ Requires-Python: >=3.11
 Requires-Dist: asynchuobi
 Requires-Dist: bs4
 Requires-Dist: bybit-p2p
+Requires-Dist: google-api-python-client
+Requires-Dist: google-auth-httplib2
+Requires-Dist: google-auth-oauthlib
 Requires-Dist: requests-toolbelt
 Requires-Dist: msgspec
 Requires-Dist: python-binance

{xync_client-0.0.145.dist-info → xync_client-0.0.148.dist-info}/RECORD

@@ -2,17 +2,18 @@ xync_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/details.py,sha256=21itVPCgAtaYRR1H9J9oYudj95gafcFjExUN6QL17OI,1330
 xync_client/loader.py,sha256=hxf8ob50DO7r_qjr2qBoO7IyjkXeHHzVQ63YjXerjoU,600
 xync_client/pm_unifier.py,sha256=T2Xh-tvcu114P2YBI6RK_XDiaIhyq6ABMrXDuXPlx7A,6541
-xync_client/Abc/Agent.py,sha256=S2f8VEejC3LHT7oUJhilZCYuhcQVREX-3uzfc06ZyO4,5633
+xync_client/Abc/AdLoader.py,sha256=-9UpLgFdIKcpQ2Z6PLCin7c0JmlUQ66WMouNUTWyEHg,13362
+xync_client/Abc/Agent.py,sha256=FmKT4EefJn2oNc9icIgxDqoJoRe33FGgaNwBw5P5B4A,5727
 xync_client/Abc/Asset.py,sha256=hlgyFaU9byr2N2r8Heh-_ICx49SKuKxfRTUA4yQWmEw,454
 xync_client/Abc/Auth.py,sha256=OPQXN7_XYQZP9431ylFksd6JDusbKG8N_1g6CXTZ6yY,1495
 xync_client/Abc/BaseTest.py,sha256=vaAs5Z4HYV7k_C3zQz6JKO75s2hXtVbBI3-0Srkzv5Q,2388
-xync_client/Abc/Ex.py,sha256=n41-XCjoIV-KpC_lK3jO049tQKbFmE0eDU3SDlgZTws,12986
+xync_client/Abc/Ex.py,sha256=6i78hduLVULyaTYlKbu7hsSrCIWVGrFB0HMll0TeSxM,13091
 xync_client/Abc/Exception.py,sha256=Sts7RpP370NBdjaH_cyXDdHtjge8zXNUGWCrKw49Zyk,482
 xync_client/Abc/HasAbotUid.py,sha256=LsTHHjMHBauCwJoqgDa9Lx4R6xsDOHfsN4jM539Bpqg,279
 xync_client/Abc/InAgent.py,sha256=XLf5czbxxEimsIIe653buoP7OsWZD6mc2w37q4TkNd0,703
 xync_client/Abc/Order.py,sha256=7-FGIJu5z9aYi0A_eJV4F-cp_6Mz_izNpefexDQZvHw,2428
-xync_client/Abc/PmAgent.py,sha256=5ihM_TY40SzHT4lZ_BDYtO1lqQoVAO3aXy_W8hRICHs,4359
-xync_client/Abc/xtype.py,sha256=o1JEzWmEXCPddtlqWZ6HRTZTKX6SAnvsztbASj21zOQ,2584
+xync_client/Abc/PmAgent.py,sha256=8ozQDxriAwtU2cNsJleuWcZ2ZdNeZPhgwO6l6jvi0MY,4350
+xync_client/Abc/xtype.py,sha256=FRvYm_VeQiCNOzjw2Ey1iwl9PC8hfjcAqKEEpU5_7Fc,2607
 xync_client/Binance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/Binance/binance_async.py,sha256=LP2DZaHwkfsp_4Tjvetb-1ntjQtJfODF0OgZpoPx4KU,2688
 xync_client/Binance/earn_api.py,sha256=hvk0MaVTLszIglQXVhbUjGcaHfbF9Ul7FFXmy94U2so,4411
@@ -35,20 +36,20 @@ xync_client/BitGet/agent.py,sha256=YVs3bDY0OcEJGU7m2A8chzO6PFhWDnQQrA-E6MVkBBg,3
 xync_client/BitGet/ex.py,sha256=uEvvXuLaJv8o8BFi0bMA3XyBuTfVDWagAjLOHZl-xlE,3765
 xync_client/BitGet/etype/ad.py,sha256=fysSW47wGYjSOPUqY864z857AJz4gjN-nOkI1Jxd27U,1838
 xync_client/BitPapa/ex.py,sha256=U-RRB_RSOtErfRgxOZYWegZ_td_uZO37YKo3Jxchf_w,912
-xync_client/Bybit/InAgent.py,sha256=50c9LGJuxe2T3qOL_2qNWIesJHmlmaj-oSx8dDnk9sY,26002
-xync_client/Bybit/agent.py,sha256=wGYzvHGuKomNfEvFmosXQVscx9VXlzexc1Ic8sm-wA4,61894
+xync_client/Bybit/InAgent.py,sha256=1Y4ZyxqAY8xbAflku48fJjjlSs4pOz2mFFJSO9iWg8w,26405
+xync_client/Bybit/agent.py,sha256=VftYukdo0nYysxUMFMwVpKH6xmeP4LVfnvoT3SIWCFo,51978
 xync_client/Bybit/ex.py,sha256=3oARvReBoDs90FzQY31-L-q_YU-TIRbvWB7z4lwESsA,4715
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
 xync_client/Bybit/web_p2p.py,sha256=sAXzK03t6jwDnz4rrvP2IzI0KxfKa7C_5GuzH1HwLuA,11768
 xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
-xync_client/Bybit/etype/ad.py,sha256=HJOHi9KrbLQMpwEyd4oA8436QTNRqrd2HWFF-JNZGDo,8066
-xync_client/Bybit/etype/cred.py,sha256=dgFExLB4e5Wf6SqfU9SOdeooHQa84DRbTGm_OJhNw_o,1354
-xync_client/Bybit/etype/order.py,sha256=rPXw9eHJW3afVPQDRiooUkHfQhmqJ5fTdZ4vKdO6uHQ,8273
+xync_client/Bybit/etype/ad.py,sha256=pCD0I9SL4Paaegs85fHGtvZ-7Cm917AQXYel0k1MbY0,8065
+xync_client/Bybit/etype/cred.py,sha256=qDQUsMqLV4XtXKYWZV4f805kLDf7AdcPYscHRA-IMBo,1386
+xync_client/Bybit/etype/order.py,sha256=668UJdCNEnvnalmbtTQ9Tw50arJtgpV_09GHu0iyaRU,8870
 xync_client/Gate/ex.py,sha256=QbhB3u7TWnvVGD-AknB2nay6KZjEXQ-1JT9UacX4sWI,3735
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
 xync_client/Gate/etype/ad.py,sha256=-EwtFcOWWvtE6UjaOdsuXWDTCVjAIRK0kSEsqPP4Yls,1296
-xync_client/Gmail/__init__.py,sha256=wNEUA1L9lvLtYoIv2fHEsb6msO9oB9QTF2OkzuCPMcM,4778
+xync_client/Gmail/__init__.py,sha256=9JGT8PyzJaOTVvaFV0Gki3Fdo6Bp6m6DnWOPGZJ-eAA,5436
 xync_client/Htx/agent.py,sha256=rOURgTeY9TsA-IzT78l5-Ze91i0x1PY683mrX38MSgs,7356
 xync_client/Htx/earn.py,sha256=jL6eRwytZEMRom_3bFm1DYthi_GFg-E1Mm3ZDXENHSg,2386
 xync_client/Htx/ex.py,sha256=GuWK5lA_MvtSd-0DhKf2MAstKvZMHhc3BIiZSgdwZv4,6074
@@ -73,13 +74,13 @@ xync_client/Pms/Alfa/state.json,sha256=MKE6vl-JsJO9PNCVqoQgBgYZTgYkHCas7USwl8QFt
 xync_client/Pms/MTS/__init__.py,sha256=P_E7W46IZEk8RsEgl7H1xV3JplMT5l9vYQYTYyNbyQ8,2101
 xync_client/Pms/Ozon/__init__.py,sha256=EvQZDSPv0fOT2hNCTP44nXHOIEQvP5bQf_7HVLiZc2I,4123
 xync_client/Pms/Payeer/.gitignore,sha256=sWORdRp8ROppV2CsMEDJ3M_SokrNWCf8b1hlaNs64hg,12
-xync_client/Pms/Payeer/__init__.py,sha256=fxYbRHq1x1pCKQuo-blydZBWrYMSebuYZjRrD6k-e-E,9905
+xync_client/Pms/Payeer/__init__.py,sha256=0cE2NBaf_XA1j4XBFjd0FhhCVNaPxwDTAvUTsdmiQes,9984
 xync_client/Pms/Payeer/api.py,sha256=bb8qrlPYyWafel1VR-2nate6xBeRZAVciFJblHygfAs,549
 xync_client/Pms/Payeer/login.py,sha256=GyNwB-GKE_1nlkbZJ0KNI-EnCT0j_S9ogFdn-ufb-zU,3053
 xync_client/Pms/Sber/__init__.py,sha256=dxQfd9ZPhFTc_C4xrwaxrV6p0SijDCLNzBeUv3oQG38,4926
 xync_client/Pms/Sber/utils.py,sha256=gIeJspwvoBbOBt-fjxwW4WDHPoL2Evs8LVufsjrFOfo,1870
 xync_client/Pms/Tinkoff/__init__.py,sha256=ZyLvBEUn-vh-85oPUUDS586AHgvx3c-mkQE3yBQtbw8,5580
-xync_client/Pms/Volet/__init__.py,sha256=Zn15NJRZH9pwwVjiR1Ao77MN6mTaA45B42fr0NJweno,12047
+xync_client/Pms/Volet/__init__.py,sha256=JGd1QDn_H-tqck932cbARGLSOCHmnHKIns05Ll8dowA,12048
 xync_client/Pms/Volet/api.py,sha256=6_dH2rzmyyvha3PeoiZdSltiAzKDWn8roSUJOAErX4M,3673
 xync_client/Pms/Volet/pl.py,sha256=l7lvUrpjFoObXPHaseOIAcSbkNqJdpy6OLDutxYJH3U,2451
 xync_client/Pms/Volet/_todo_req/req.mjs,sha256=ut3Jw37rL5lY7SskjZ9f1l0VE33tuP-PZEYUTcJMc2I,817
@@ -96,7 +97,7 @@ xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ
 xync_client/TgWallet/pyd.py,sha256=Ys3E8b3RLuyQ26frWT0F0BorkNxVpxnd18tY4Gp9dik,5636
 xync_client/TgWallet/pyro.py,sha256=2K7QWdo48k4MbbgQt90gdz_HiPck69Njm4xaMjIVgoo,1440
 xync_client/TgWallet/web.py,sha256=kDcv9SKKQPe91mw1qJBpbuyKYCAmZdfdHJylHumLBVU,1608
-xync_client-0.0.145.dist-info/METADATA,sha256=Czpg727G7V7cQcbZ7mDkx0Egv3bf3xtoSgH5K1Y8QgU,1037
-xync_client-0.0.145.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.145.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.145.dist-info/RECORD,,
+xync_client-0.0.148.dist-info/METADATA,sha256=v2HPGq4q5LhjcUCezyrU7_37urzKs6je3wy5XSWmTKM,1149
+xync_client-0.0.148.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.148.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.148.dist-info/RECORD,,