xync-client 0.0.218.dev9__tar.gz → 0.0.218.dev10__tar.gz

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.218.dev9
+Version: 0.0.218.dev10
 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.218.dev9 → xync_client-0.0.218.dev10}/tests/TestOrder.py

@@ -31,7 +31,7 @@ class TestOrder(BaseTest):
 
     # async def test_cancel_accept(self, clients: BaseOrderClient):
     #     res = await clients.cancel_accept()
-    #     assert res, f"cancel_accept failed: {res}"
+    #     assert not res[0], f"cancel_accept failed: {res}"
     #
     # async def test_appeal_accept(self, clients: BaseOrderClient):
     #     res = await clients.appeal_accept()

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/xync_client/Abc/Agent.py

@@ -209,9 +209,10 @@ class BaseAgentClient(HttpClient, BaseInAgentClient):  # , metaclass=ABCMeta
                 order_db = await self.order_save(order)
             elif order_db.status in {OrderStatus.created, OrderStatus.paid}:
                 if order_db.hot_id:
-                    await order_db.hot_process()  # todo: без увед в тг
+                    await order_db.hot_process()
             elif order_db.status in {OrderStatus.canceled}:
-                await order_db.cancel_request()
+                ocl = order_db.client(self)
+                await ocl.cancel_request()
             self.orders[order_exid] = order_db, order
         return self.orders[order_exid]
 

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/xync_client/Abc/Ex.py

@@ -463,6 +463,7 @@ class BaseExClient(HttpClient, AdLoader):
         _, cur_scale, _cur_min = await self.x2e_cur(await self.e2x_cur(base_ad.curex_exid))
         _, coin_scale = await self.x2e_coin(await self.e2x_coin(base_ad.coinex_exid))
         badd = base_ad.model_dump()
+        pms = await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=base_ad.pmex_exids)
         badd.update(
             amount=int((base_ad.amount or base_ad.quantity * base_ad.price) * 10**cur_scale),
             max_fiat=int(base_ad.max_fiat * 10**cur_scale),
@@ -473,7 +474,7 @@ class BaseExClient(HttpClient, AdLoader):
             maker_id=(await self.e2x_actor(base_ad.maker)).id,
             cond_id=cond and cond.id,
             pair_side_id=await self.e2x_pair(base_ad.coinex_exid, base_ad.curex_exid, bool(base_ad.side.value)),
-            pms=await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=base_ad.pmex_exids),
+            pm_ids=[pm.id for pm in pms],
         )
         ad = xtype.BaseAd.model_validate(badd)
         ad_upd = models.Ad.validate(ad.model_dump(), with_pk=False)
@@ -482,7 +483,7 @@ class BaseExClient(HttpClient, AdLoader):
         except OperationalError as e:
             raise e
         await ad_db.pms.clear()
-        await ad_db.pms.add(*ad.pms)
+        await ad_db.pms.add(*pms)
         return ad_db
 
     async def load_cond(self, txt: str, maker_exid: int) -> models.Cond | None:

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/xync_client/Abc/Order.py

@@ -1,6 +1,7 @@
 import logging
 from abc import abstractmethod
 
+
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_schema.models import Order, PmEx, CredEx, PairSide, Cred
 
@@ -37,13 +38,8 @@ class BaseOrderClient:
 
     # 6: Одобрение запроса на отмену (оплаченная мной покупка)
     async def cancel_accept(self):
-        if len(await self.order.transfers):
-            txt = f"{'buyer' if self.im_seller else 'seller'} started appeal for order: {self.order.exid}"
-            txt += f"but it's already paid by transfers:{[p.pmid or p.id for p in self.order.transfers]}"
-            logging.warning(txt)
-            return  # todo: уведомляем себя
         try:
-            await self._cancel_accept()
+            return await self._cancel_accept()
         except Exception as e:
             o = await self.agent_client.get_order_full(self.order.exid)
             logging.error(f"ORDER STATUS NOW: {o.status}")

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/xync_client/Bybit/order.py

@@ -52,10 +52,10 @@ class OrderClient(BaseOrderClient):
             "cancelRemark": "",
             "voucherPictures": "",
         }
-        res = await self.agent_client._post("/x-api/fiat/otc/order/cancel", data)
+        res = await self.agent_client._post("/x-api/fiat/otc/order/cancel", data, hdrs=self.hdrs)
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     # 6: Запрос отмены (оплаченная контрагентом продажа)
     async def cancel_request(self) -> bool: ...
@@ -68,7 +68,7 @@ class OrderClient(BaseOrderClient):
         )
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     # 9, 10: Подать аппеляцию cо скриншотом/видео/файлом
     async def start_appeal(self, file: bytes = None) -> bool:
@@ -85,7 +85,7 @@ class OrderClient(BaseOrderClient):
         res = await self.agent_client._post("/x-api/fiat/otc/order/appealwithconsult", data)
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     # 9, 10: Подать аппеляцию cо скриншотом/видео/файлом
     async def start_completed_order_appeal(self, file: bytes = None) -> bool:
@@ -99,7 +99,7 @@ class OrderClient(BaseOrderClient):
         res = await self.agent_client._post("/x-api/fiat/otc/completeOrder/appeal", data)
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     # 11, 12: Встречное оспаривание полученной аппеляции cо скриншотом/видео/файлом
     async def dispute_appeal(self, file) -> bool: ...
@@ -114,7 +114,7 @@ class OrderClient(BaseOrderClient):
         res = await self.agent_client._post("/x-api/fiat/otc/completeOrder/cancel_appeal", data)
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     async def appeal_accept(self) -> bool:
         data = {"orderId": str(self.order.exid)}
@@ -122,7 +122,7 @@ class OrderClient(BaseOrderClient):
         res = await self.agent_client._post("/x-api/fiat/otc/order/cancelAfterCustomerNegotiation", data)
         if res["ret_code"]:
             logging.error(res, self.order.exid)
-        return res["ret_code"] == 0
+        return res["ret_code"]
 
     # 16: Отправка сообщения юзеру в чат по ордеру с приложенным файлом
     async def send_order_msg(self, msg: str, file=None):

{xync_client-0.0.218.dev9 → xync_client-0.0.218.dev10}/xync_client.egg-info/PKG-INFO

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