xync-client 0.0.57.dev15__tar.gz → 0.0.57.dev19__tar.gz

{xync_client-0.0.57.dev15/xync_client.egg-info → xync_client-0.0.57.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.57.dev15
+Version: 0.0.57.dev19
 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.dev15 → xync_client-0.0.57.dev19}/pyproject.toml

@@ -43,7 +43,7 @@ Repository = "https://gitlab.com/XyncNet/client"
 packages = ["xync_client"]
 
 [build-system]
-requires = ["setuptools>=72", "setuptools-scm[toml]>=8"]
+requires = ["setuptools<81", "setuptools-scm[toml]>=8"]
 build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMVER_MINOR++ else SEMVER_PATCH++

{xync_client-0.0.57.dev15 → xync_client-0.0.57.dev19}/xync_client/Bybit/agent.py

@@ -19,7 +19,7 @@ from x_model import init_db
 from xync_schema import models
 from xync_schema.enums import OrderStatus
 
-from xync_schema.models import Cur, Actor, Cond, Direction, CondSim, Person, Pmcur
+from xync_schema.models import Actor, Cond, Direction, CondSim, Pmcur
 
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Abc.xtype import BaseOrderReq, FlatDict
@@ -89,14 +89,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
     """ Private METHs"""
 
-    def fiat_new(self, payment_type: int, real_name: str, account_number: str) -> FlatDict:
-        method1 = self._post(
+    async def fiat_new(self, payment_type: int, real_name: str, account_number: str) -> FlatDict | None:
+        method1 = await self._post(
             "/fiat/otc/user/payment/new_create",
             {"paymentType": payment_type, "realName": real_name, "accountNo": account_number, "securityRiskToken": ""},
         )
         if srt := method1["result"]["securityRiskToken"]:
-            self._check_2fa(srt)
-            method2 = self._post(
+            await self._check_2fa(srt)
+            method2 = await self._post(
                 "/fiat/otc/user/payment/new_create",
                 {
                     "paymentType": payment_type,
@@ -107,20 +107,20 @@ class AgentClient(BaseAgentClient):  # Bybit client
             )
             return method2
         else:
-            print(method1)
+            return logging.exception(method1)
 
-    def get_payment_method(self, fiat_id: int = None) -> dict:
-        list_methods = self.get_user_pay_methods()
+    async def get_payment_method(self, fiat_id: int = None) -> dict:
+        list_methods = self.creds()
         if fiat_id:
             fiat = [m for m in list_methods if m["id"] == fiat_id][0]
             return fiat
         return list_methods[1]
 
-    def creds(self) -> list[CredEpyd]:
+    def creds(self) -> dict[int, CredEpyd]:
         data = self.api.get_user_payment_types()
         if data["ret_code"] > 0:
             return data
-        return [CredEpyd.model_validate(credex) for credex in data["result"]]
+        return {credex.id: CredEpyd.model_validate(credex) for credex in data["result"]}
 
     async def cred_epyd2db(self, ecdx: CredEpyd, pers_id: int = None, cur_id: int = None) -> models.CredEx | None:
         if ecdx.paymentType in (416,):
@@ -216,10 +216,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
         return float(ads[0]["price"])
 
-    async def my_fiats(self, cur: Cur = None):
-        upm = await self._post("/fiat/otc/user/payment/list")
-        return upm["result"]
-
     def get_user_ads(self, active: bool = True) -> list:
         uo = self._post("/fiat/otc/item/personal/list", {"page": "1", "size": "10", "status": "2" if active else "0"})
         return uo["result"]["items"]
@@ -405,18 +401,26 @@ 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
-            taker_id = (o.userId, o.targetUserId)[int(im_maker)]
-            taker_nick = (self.actor.name, o.targetNickName)[int(im_maker)]
+            im_maker = int(order.makerUserId == o.userId)
+            taker_id = (o.userId, o.targetUserId)[im_maker]
+            taker_person = await self.person_upsert(maker_name[::-1][ad.side], taker_id)
+            im_seller = o.side == im_maker
+            if not im_maker:
+                ...
+            seller_person = (
+                self.actor.person if im_seller else await self.person_upsert(o.sellerRealName, int(o.targetUserId))
+            )
+            taker_nick = (self.actor.name, o.targetNickName)[im_maker]  # todo: check
             ad_db, cond_isnew = await self.cond_upsert(ad, maker_name[ad.side], force=True)
             if not ad_db:
                 ...
@@ -457,7 +461,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
                             extra=extr,
                         )
                     credex = await models.CredEx.create(exid=ecredex.id, ex=self.ex_client.ex, cred=crd)
-            taker_person, _ = await Person.get_or_create(name=maker_name[::-1][ad.side])
             try:
                 taker, _ = await Actor.get_or_create(
                     {"name": taker_nick, "person": taker_person}, ex=self.ex_client.ex, exid=taker_id
@@ -469,9 +472,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 +482,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:
+                msgs.pop(0)
             msgs_db = [
                 models.Msg(
                     order=order_db,
@@ -611,7 +614,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 +753,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}
@@ -760,12 +763,20 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
         return await self.ad_create(ad, new_cond.id), True
 
+    async def person_upsert(self, name: str, exid: int) -> models.Person:
+        if actor := await models.Actor.get_or_none(exid=exid, ex=self.ex_client.ex).prefetch_related("person"):
+            if not actor.person:
+                actor.person = await models.Person.create(name=name)
+                await actor.save()
+            return actor.person
+        return await models.Person.create(name=name)
+
     async def ad_create(self, ad: Ad, cid: int, rname: str = None, dr: Direction = None) -> models.Ad:
         act_df = {}
         if int(ad.userId) != self.actor.exid:
             act_df |= {"name": ad.nickName}
         if rname:
-            act_df |= {"person": (await Person.get_or_create(name=rname))[0]}
+            act_df |= {"person": await self.person_upsert(rname, int(ad.userId))}
         actor, _ = await Actor.update_or_create(act_df, exid=ad.userId, ex=self.ex_client.ex)
         ad_db = await models.Ad.create(
             price=ad.price,
@@ -877,7 +888,7 @@ def listen(data: dict):
 class ExcCode(IntEnum):
     FixPriceLimit = 912120022
     RareLimit = 912120050
-    InsufficientAmount = 912120024
+    InsufficientBalance = 912120024
     Timestamp = 10002
     IP = 10010
     Quantity = 912300019
@@ -918,7 +929,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(48),
         )
 
         bor = BaseOrderReq(

{xync_client-0.0.57.dev15 → xync_client-0.0.57.dev19}/xync_client/Bybit/etype/order.py

@@ -154,7 +154,7 @@ class OrderItem(BaseModel):
     notifyTokenId: str
     fee: str
     targetNickName: str
-    targetUserId: str
+    targetUserId: str  # не я
     status: Literal[
         5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110
     ]  # 5: waiting for chain (only web3), 10: waiting for buyer to pay, 20: waiting for seller to release, 30: appealing, 40: order cancelled, 50: order finished, 60: paying (only when paying online), 70: pay fail (only when paying online), 80: exception cancelled (the coin convert to other coin, only hotswap), 90: waiting for buyer to select tokenId, 100: objectioning, 110: waiting for the user to raise an objection
@@ -162,7 +162,7 @@ class OrderItem(BaseModel):
     createDate: str
     transferLastSeconds: str
     appealLastSeconds: str
-    userId: str
+    userId: str  # я
     sellerRealName: str
     buyerRealName: str
     judgeInfo: JudgeInfo

{xync_client-0.0.57.dev15 → xync_client-0.0.57.dev19/xync_client.egg-info}/PKG-INFO

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