xync-client 0.0.93.dev24__tar.gz → 0.0.93.dev26__tar.gz

{xync_client-0.0.93.dev24/xync_client.egg-info → xync_client-0.0.93.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.93.dev24
+Version: 0.0.93.dev26
 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.93.dev24 → xync_client-0.0.93.dev26}/tests/TestEx.py

@@ -129,13 +129,13 @@ class TestEx(BaseTest):
                 pmex_exids = await models.Pmex.filter(ex=client.ex, pm_id__in=pm_ids).values_list("exid", flat=True)
                 # получаем объявления по этому направлению
                 ads = await client.ads(coinex.exid, curex.exid, race.road.ad.pair_side.is_sell, pmex_exids)
+                # if race.vm_filter:
+                #     ads = [ad for ad in ads if "VA" in ad.authTag]
+                # client.overprice_filter(ads, race.ceil, k)  # обрезаем сверху все ads дороже нашего потолка
                 # определяем место нашего объявления в списке
                 places = [i for i, ad in enumerate(ads) if int(ad.userId) == race.road.ad.maker.exid]
                 if not places:
                     errors[race.id] = None
                 elif places[0] != race.target_place:
                     errors[race.id] = places[0]
-        if errors:
-            assert False, "Гонка " + ", ".join(f"#{rid} на {plc} месте" for rid, plc in errors.items())
-        else:
-            print("Успешно")
+        assert not errors, "Гонка " + ", ".join(f"#{rid} на {plc} месте" for rid, plc in errors.items())

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26}/xync_client/Abc/PmAgent.py

@@ -1,5 +1,4 @@
 from abc import abstractmethod, ABCMeta
-from asyncio import get_running_loop
 from decimal import Decimal
 from enum import StrEnum
 
@@ -50,8 +49,8 @@ class PmAgentClient(metaclass=ABCMeta):
         if not self.page.url.startswith(self.pages.SEND):  # Если в итоге не удалось попасть на отправку
             await self.bot.send(self.norm + " not logged in!", self.uid, photo=await self.page.screenshot())
             raise LoginFailedException(f"User {self.agent.user_id} has not logged in")
-        loop = get_running_loop()
-        loop.create_task(self._idle())  # Бесконечно пасёмся в фоне на странице отправки, что бы куки не протухли
+        # loop = get_running_loop()
+        # loop.create_task(self._idle())  # Бесконечно пасёмся в фоне на странице отправки, что бы куки не протухли
         self._is_started = True
         return self
 

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26}/xync_client/Bybit/InAgent.py

@@ -1,6 +1,7 @@
 import json
 import logging
-from datetime import datetime
+import re
+from datetime import datetime, timezone
 
 import websockets
 from asyncio import run
@@ -27,9 +28,6 @@ from xync_client.Abc.InAgent import BaseInAgentClient
 from xync_client.Bybit.agent import AgentClient
 
 
-done = set()
-
-
 class InAgentClient(BaseInAgentClient):
     agent_client: AgentClient
 
@@ -72,7 +70,7 @@ class InAgentClient(BaseInAgentClient):
             while resp := await websocket.recv():
                 if data := json.loads(resp):
                     upd, order_db = None, None
-                    logging.info(f"{datetime.now()} New update: {data.get('topic')}:{data.get('type')}")
+                    logging.info(f" {datetime.now().strftime('%H:%M:%S')} upd: {data.get('topic')}:{data.get('type')}")
                     match data.get("topic"):
                         case "OTC_ORDER_STATUS":
                             match data["type"]:
@@ -85,16 +83,32 @@ class InAgentClient(BaseInAgentClient):
                                     ) or await self.agent_client.create_order(order)
                                     match upd.status:
                                         case StatusApi.created:
-                                            # order_db = await self.agent_client.create_order(order)
                                             logging.info(f"Order {order.id} created at {order.createDate}")
+                                            if upd.side == 1:  # я покупатель - ждем мою оплату
+                                                dest = order.paymentTermList[0].accountNo
+                                                if not re.match(r"^P\d{8,10}$", dest):
+                                                    continue
+                                                await order_db.fetch_related("cred__pmcur__cur")
+                                                if order_db.status in (OrderStatus.created, OrderStatus.requested):
+                                                    await self.send_payment(order_db, dest)
+                                                ...
                                         case StatusApi.wait_for_buyer:
                                             if upd.side == 0:  # ждем когда покупатель оплатит
                                                 if not (pmacdx := await self.get_pma_by_cdex(order)):
                                                     continue
                                                 pma, cdx = pmacdx
                                                 am, tid = pma.check_in(Decimal(order.amount), cdx.cred.pmcur.cur.ticker)
-                                                if tid and tid not in done:
-                                                    done.add(tid)
+                                                if not tid:
+                                                    continue
+                                                t, is_new = await models.Transfer.update_or_create(
+                                                    dict(
+                                                        amount=int(float(order.amount)) * 100,
+                                                        accepted_at=datetime.now(timezone.utc),
+                                                    ),
+                                                    order=order_db,
+                                                    pmid=tid,
+                                                )
+                                                if is_new:
                                                     self.agent_client.api.release_assets(orderId=upd.id)
                                                     logging.info(
                                                         f"Order {order.id} created, paid before #{tid}:{am} at {order.createDate}, and RELEASED at {datetime.now()}"
@@ -104,14 +118,7 @@ class InAgentClient(BaseInAgentClient):
                                                         f"Order {order.id} created at {order.createDate} but no paid yet"
                                                     )
                                             elif upd.side == 1:  # я покупатель - ждем мою оплату
-                                                pma = self.pmacs.get(order.paymentTermList[0].paymentType)
-                                                int_am = int(Decimal(order.amount))
-                                                await pma.send(
-                                                    dest=order.paymentTermList[0].accountNo,
-                                                    amount=int_am,
-                                                    cur=cdx.cred.pmcur.cur.ticker,
-                                                )
-                                                logging.warning(f"Order {order.id} PAID at {datetime.now()}: {int_am}")
+                                                continue  # logging.warning(f"Order {order.id} PAID at {datetime.now()}: {int_am}")
                                             else:
                                                 ...
                                             # todo: check is always canceling
@@ -138,6 +145,8 @@ class InAgentClient(BaseInAgentClient):
                                             ).save()
                                             logging.info(f"Order {order.id} completed at {order_db.confirmed_at}")
                                         case StatusApi.wait_for_seller:
+                                            if order_db.status == OrderStatus.paid:
+                                                continue
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.paid,
@@ -155,7 +164,26 @@ class InAgentClient(BaseInAgentClient):
                             match data["type"]:
                                 case "RECEIVE":
                                     upd = Receive.model_validate(data["data"])
-
+                                    if order_db := await models.Order.get_or_none(
+                                        exid=upd.orderId, ad__maker__ex=self.agent_client.actor.ex
+                                    ).prefetch_related("ad__pair_side", "cred__pmcur__cur"):
+                                        im_taker = order_db.taker_id == self.agent_client.actor.id
+                                        im_buyer = order_db.ad.pair_side.is_sell == im_taker
+                                        if order_db.ad.auto_msg != upd.message and upd.roleType not in ("sys", "alarm"):
+                                            msg, _ = await models.Msg.update_or_create(
+                                                {
+                                                    "sent_at": int(float(upd.createDate) / 1000),
+                                                    "to_maker": upd.userId == self.agent_client.actor.exid and im_taker,
+                                                },
+                                                txt=upd.message,
+                                                order=order_db,
+                                            )
+                                            if not upd.message:
+                                                ...
+                                            if im_buyer and re.match(r"^P\d{8,10}$", upd.message):
+                                                if order_db.status in (OrderStatus.created, OrderStatus.requested):
+                                                    await self.send_payment(order_db, upd.message)
+                                                ...
                                 case "READ":
                                     upd = Read.model_validate(data["data"])
                                     # if upd.status not in (StatusWs.created, StatusWs.canceled, 10, StatusWs.completed):
@@ -166,7 +194,7 @@ class InAgentClient(BaseInAgentClient):
                                         order = OrderFull.model_validate(order)
 
                                 case "CLEAR":
-                                    pass
+                                    continue
                                 case _:
                                     self.listen(data)
                         case "OTC_USER_CHAT_MSG_V2":
@@ -192,6 +220,27 @@ class InAgentClient(BaseInAgentClient):
                     if not upd:
                         logging.warning(data, "NOT PROCESSED UPDATE")
 
+    async def send_payment(self, order_db: models.Order, dest) -> tuple[PmAgentClient, models.CredEx]:
+        int_am = int(float(order_db.amount))
+        pma, cur = await self.get_pma_by_pmex(order_db)
+        tid, img = await pma.send(dest=dest, amount=int_am, cur=cur)
+        t, is_new = await models.Transfer.update_or_create(
+            {"amount": int_am * 100},
+            order=order_db,
+            pmid=tid,
+        )
+        pmex = await models.Pmex.get(pm_id=order_db.cred.pmcur.pm_id, ex=self.agent_client.actor.ex)
+        credex = await models.CredEx.get(cred=order_db.cred, ex=self.agent_client.actor.ex)
+        self.agent_client.api.mark_as_paid(
+            orderId=str(order_db.exid),
+            paymentType=pmex.exid,  # pmex.exid
+            paymentId=str(credex.exid),  # credex.exid
+        )
+        order_db.status = OrderStatus.paid
+        order_db.payed_at = datetime.now(timezone.utc)
+        await order_db.save()
+        logging.warning(f"Order {order_db.exid} PAID at {datetime.now()}: {int_am}")
+
     async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient, models.CredEx]:
         cdxs = await models.CredEx.filter(
             ex=self.agent_client.ex_client.ex,
@@ -206,6 +255,12 @@ class InAgentClient(BaseInAgentClient):
         else:
             return pmas[0], cdxs[0]
 
+    async def get_pma_by_pmex(self, order_db: models.Order) -> tuple[PmAgentClient, str]:
+        pma = self.pmacs.get(order_db.cred.pmcur.pm_id)
+        if pma:
+            return pma, order_db.cred.pmcur.cur.ticker
+        logging.error(f"No pm_agents for {order_db.cred.pmcur.pm_id}")
+
     @staticmethod
     def listen(data: dict | None):
         # print(data)
@@ -235,7 +290,7 @@ async def main():
         # await cl.agent_client.export_my_ads()
         payeer_cl = Client(actor.person.user.username_id)
         for pma in actor.person.user.pm_agents:
-            cl.pmacs[pma.pm_id] = await payeer_cl.start(await async_playwright().start(), False)
+            cl.pmacs[pma.pm_id] = await payeer_cl.start(await async_playwright().start(), True)
 
         _ = await cl.start_listen()
         await cl.agent_client.close()

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26}/xync_client/Bybit/agent.py

@@ -635,7 +635,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
             # если гонка дольше Х минут не обновлялась, обновляем ее (и ее пары) потолок
             expiration = datetime.now(timezone.utc) - timedelta(minutes=15)
             if not race.ceil or race.updated_at < expiration:
-                ceils, hp, vmf, zplace = await self.get_ceils(coinex, curex, pmexs, 0.0025, True)
+                ceils, hp, vmf, zplace = await self.get_ceils(coinex, curex, pmexs, 0.001, True)
                 race.ceil = ceils[int(taker_side)]
                 await race.save()
                 # upd pair race

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26}/xync_client/Bybit/etype/ad.py

@@ -126,6 +126,55 @@ 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:

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26}/xync_client/Pms/Payeer/__init__.py

@@ -35,7 +35,7 @@ class Client(PmAgentClient):
             await self.page.context.add_cookies([cookie])
         await self.page.goto(self.pages.SEND)
 
-    async def send(self, dest: str, amount: int, cur: str):
+    async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes]:
         page = self.page
         if not page.url.startswith(self.pages.SEND):
             try:

{xync_client-0.0.93.dev24 → xync_client-0.0.93.dev26/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.93.dev24
+Version: 0.0.93.dev26
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client