xync-client 0.0.57.dev14__tar.gz → 0.0.57.dev16__tar.gz

{xync_client-0.0.57.dev14/xync_client.egg-info → xync_client-0.0.57.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev14
+Version: 0.0.57.dev16
 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.57.dev14 → xync_client-0.0.57.dev16}/xync_client/Bybit/agent.py

@@ -405,13 +405,15 @@ class AgentClient(BaseAgentClient):  # Bybit client
             )
         except FailedRequestError as e:
             if e.status_code == 10000:
-                await sleep(1, await self.get_api_orders(page, begin_time, end_time, status, side, token_id))
+                await sleep(9)
+                await self.get_api_orders(page, begin_time, end_time, status, side, token_id)
         ords = {int(o["id"]): OrderItem.model_validate(o) for o in lst["result"]["items"]}
         for oid, o in ords.items():
             fo = self.api.get_order_details(orderId=oid)
             order = OrderFull.model_validate(fo["result"])
-            await sleep(0.5)
+            await sleep(1)
             ad = Ad(**self.api.get_ad_details(itemId=order.itemId)["result"])
+            await sleep(1)
             maker_name = o.buyerRealName, o.sellerRealName
             seller_person, _ = await Person.get_or_create(name=o.sellerRealName)
             im_maker = order.makerUserId == o.userId
@@ -452,7 +454,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                         crd = await models.Cred.create(
                             detail=ecredex.accountNo,
                             pmcur=pmcur,
-                            person=ad_db.maker.person,
+                            person=seller_person,
                             name=ecredex.realName,
                             extra=extr,
                         )
@@ -469,9 +471,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     "amount": o.amount,
                     "status": OrderStatus[Statuses(o.status).name],
                     "created_at": int(o.createDate[:-3]),
-                    "payed_at": order.transferDate != "0" and int(order.transferDate[:-3]),
-                    "confirmed_at": Statuses(o.status) == Statuses.completed and int(order.updateDate[:-3]),
-                    "appealed_at": o.status == 30 and int(order.updateDate[:-3]),
+                    "payed_at": order.transferDate != "0" and int(order.transferDate[:-3]) or None,
+                    "confirmed_at": Statuses(o.status) == Statuses.completed and int(order.updateDate[:-3]) or None,
+                    "appealed_at": o.status == 30 and int(order.updateDate[:-3]) or None,
                     "cred_id": ecredex.paymentType and credex.cred_id or None,
                     "taker": taker,
                 },
@@ -479,9 +481,9 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 ad=ad_db,
             )
             dmsgs = self.api.get_chat_messages(orderId=oid, size=200)["result"]["result"][::-1]
-            if ad.remark != dmsgs.pop(0)["message"]:
-                logging.exception(ad.remark)
             msgs = [Message.model_validate(m) for m in dmsgs if m["msgType"] in (1, 2, 7, 8)]
+            if ad.remark and ad.remark != (remark := msgs.pop(0).message):
+                logging.warning(f"Order{oid} Ad#{ad.id} Remark changed:\n{remark}\n|\nV\n{ad.remark}")
             msgs_db = [
                 models.Msg(
                     order=order_db,
@@ -611,7 +613,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                             _res = self.ad_upd(req)
                     else:
                         raise e
-                elif ExcCode(e.status_code) == ExcCode.InsufficientAmount:
+                elif ExcCode(e.status_code) == ExcCode.InsufficientBalance:
                     asset = await models.Asset.get(addr__actor=self.actor, addr__coin_id=coinex.coin_id)
                     req.quantity = round(asset.free - (asset.freeze or 0) - (asset.lock or 0), coinex.coin.scale)
                     _res = self.ad_upd(req)
@@ -750,7 +752,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                     await old_ad.fetch_related("cond")
                     return old_ad, False
                 # но это не она, значит у него есть другая объява с похожим, но чуть отличающимся текстом
-                logging.warning(f"ad#{ad.id}-cond#{old_cid} txt updated:\n{txt}\n|\n|\nV\n{cleaned}")
+                logging.warning(f"ad#{ad.id}-cond#{old_cid} txt updated:\n{txt}\n|\nV\n{cleaned}")
 
         new_cond = await Cond.create(raw_txt=cleaned)
         self.all_conds[new_cond.id] = new_cond.raw_txt, {ad.userId}
@@ -877,7 +879,7 @@ def listen(data: dict):
 class ExcCode(IntEnum):
     FixPriceLimit = 912120022
     RareLimit = 912120050
-    InsufficientAmount = 912120024
+    InsufficientBalance = 912120024
     Timestamp = 10002
     IP = 10010
     Quantity = 912300019
@@ -918,7 +920,7 @@ async def main():
             cl.battle(usdc, rub, True, ["volet"], 79),
             cl.take(usdt, rub, False, ceil=80.5, volume=360),
             cl.take(usdt, rub, True, ceil=80.5, volume=360),
-            cl.get_api_orders(1),
+            cl.get_api_orders(14),
         )
 
         bor = BaseOrderReq(

{xync_client-0.0.57.dev14 → xync_client-0.0.57.dev16/xync_client.egg-info}/PKG-INFO

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