xync-client 0.0.93.dev27__tar.gz → 0.0.93.dev29__tar.gz

{xync_client-0.0.93.dev27 → xync_client-0.0.93.dev29}/.gitignore

@@ -9,4 +9,5 @@ __pycache__
 .vscode
 /xync_client/Gate/res.js
 /tests/res.js
-*.session*
+*.session*
+tmp/

{xync_client-0.0.93.dev27/xync_client.egg-info → xync_client-0.0.93.dev29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.93.dev27
+Version: 0.0.93.dev29
 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.dev27 → xync_client-0.0.93.dev29}/xync_client/Bybit/InAgent.py

@@ -2,6 +2,7 @@ import json
 import logging
 import re
 from datetime import datetime, timezone
+# from uuid import uuid4
 
 import websockets
 from asyncio import run
@@ -129,7 +130,9 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.appealed_by_seller,
-                                                    "appealed_at": int(float(order.updateDate) / 1000),
+                                                    "appealed_at": datetime.fromtimestamp(
+                                                        float(order.updateDate) / 1000
+                                                    ),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} appealed at {order_db.appealed_at}")
@@ -140,7 +143,9 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.completed,
-                                                    "confirmed_at": int(float(order.updateDate) / 1000),
+                                                    "confirmed_at": datetime.fromtimestamp(
+                                                        float(order.updateDate) / 1000
+                                                    ),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} completed at {order_db.confirmed_at}")
@@ -150,7 +155,9 @@ class InAgentClient(BaseInAgentClient):
                                             await order_db.update_from_dict(
                                                 {
                                                     "status": OrderStatus.paid,
-                                                    "payed_at": int(float(order.transferDate) / 1000),
+                                                    "payed_at": datetime.fromtimestamp(
+                                                        float(order.transferDate) / 1000
+                                                    ),
                                                 }
                                             ).save()
                                             logging.info(f"Order {order.id} payed at {order_db.payed_at}")
@@ -172,9 +179,9 @@ class InAgentClient(BaseInAgentClient):
                                         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,
                                                 },
+                                                sent_at=datetime.fromtimestamp(float(upd.createDate) / 1000),
                                                 txt=upd.message,
                                                 order=order_db,
                                             )
@@ -239,6 +246,11 @@ class InAgentClient(BaseInAgentClient):
         order_db.status = OrderStatus.paid
         order_db.payed_at = datetime.now(timezone.utc)
         await order_db.save()
+        # models.Fiat.get()
+        # if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{dest}.png").get('result'):
+        #     self.agent_client.api.send_chat_message(
+        #         orderId=str(order_db.exid), contentType="pic", message=res['url'], msgUuid=uuid4().hex
+        #     )
         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]:

{xync_client-0.0.93.dev27 → xync_client-0.0.93.dev29}/xync_client/Bybit/agent.py

@@ -590,6 +590,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
         # чью цену будем обгонять, предыдущей или слещующей объявы?
         # cad: Ad = ads[place] if cur_plc > place else ads[cur_plc]
         # переделал пока на жесткую установку целевого места, даже если текущее выше:
+        if len(ads) <= target_place:
+            logging.error(f"target place {target_place} not found in ads list {ads}")
         cad: Ad = ads[target_place]
         # а цена обгоняемой объявы не выше нашего потолка?
         if (Decimal(cad.price) - ceil) * k <= 0:
@@ -634,7 +636,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 continue
             # если гонка дольше Х минут не обновлялась, обновляем ее (и ее пары) потолок
             expiration = datetime.now(timezone.utc) - timedelta(minutes=15)
-            if not race.ceil or race.updated_at < expiration:
+            if race.updated_at < expiration:
                 ceils, hp, vmf, zplace = await self.get_ceils(coinex, curex, pmexs, 0.001, True)
                 race.ceil = ceils[int(taker_side)]
                 await race.save()

{xync_client-0.0.93.dev27 → xync_client-0.0.93.dev29}/xync_client/Pms/Payeer/__init__.py

@@ -51,15 +51,17 @@ class Client(PmAgentClient):
         if float(amount) <= float(fiat_accounts[0].replace(",", "").strip()):
             await page.locator('input[name="param_ACCOUNT_NUMBER"]').fill(dest)
             await page.locator("select[name=curr_receive]").select_option(value=cur)
+            sleep(0.9)
             await page.locator('input[name="sum_receive"]').fill(str(amount))
+            sleep(0.1)
             await page.click(".btn.n-form--btn.n-form--btn-mod")
             sleep(0.5)
             await page.click(".btn.n-form--btn.n-form--btn-mod")
-            sleep(1)
+            sleep(1.2)
             if await page.locator(".input4").count():
                 await page.locator(".input4").fill(self.agent.auth.get("master_key"))
                 await page.click(".ok.button_green2")
-            sleep(0.5)
+            sleep(0.1)
             await page.locator(".note_txt").wait_for(state="visible")
             if await page.locator('.note_txt:has-text("successfully completed")').count():
                 transaction = await page.locator(".note_txt").all_text_contents()
@@ -68,7 +70,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()
+                return trans_num, await receipt.screenshot(path=f"tmp/{dest}.png")
             else:
                 await self.bot.send("Payeer хз", self.uid, photo=await self.page.screenshot())
                 return -1
@@ -115,6 +117,8 @@ async def main(uid: int):
         dest, amount, cur = "P1132982965", 2, "RUB"
         res = await pyr.send(dest, amount, cur)
         res = await pyr.send(dest, amount, cur)
+        res = await pyr.send(dest, amount, cur)
+        res = await pyr.send(dest, amount, cur)
         if len(res) > 1 and isinstance(res[1], bytes):
             await pyr.bot.send(f"Transaction #{res[0]}", uid, photo=res[1])
         elif res[0] > 0:

{xync_client-0.0.93.dev27 → xync_client-0.0.93.dev29/xync_client.egg-info}/PKG-INFO

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