xync-client 0.0.137__py3-none-any.whl → 0.0.138__py3-none-any.whl

xync_client/Bybit/InAgent.py

@@ -98,7 +98,7 @@ class InAgentClient(BaseInAgentClient):
                                             await self.money_upd(order_db)
                                             if upd.side:  # я покупатель - ждем мою оплату
                                                 dest = order.paymentTermList[0].accountNo
-                                                if not re.match(r"^([Pp])\d{8,10}$", dest):
+                                                if not re.match(r"^([PpРр])\d{7,10}\b", dest):
                                                     continue
                                                 await order_db.fetch_related("ad__pair_side__pair", "cred__pmcur__cur")
                                                 await self.send_payment(order_db, dest)
@@ -234,7 +234,7 @@ class InAgentClient(BaseInAgentClient):
                                     ).prefetch_related("ad__pair_side__pair", "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"):
+                                        if order_db.ad.auto_msg != upd.message and upd.roleType == "user":
                                             msg, _ = await models.Msg.update_or_create(
                                                 {
                                                     "to_maker": upd.userId == self.agent_client.actor.exid and im_taker,
@@ -245,8 +245,8 @@ class InAgentClient(BaseInAgentClient):
                                             )
                                             if not upd.message:
                                                 ...
-                                            if im_buyer and re.match(r"^P\d{8,10}$", upd.message):
-                                                await self.send_payment(order_db, upd.message)
+                                            if im_buyer and (g := re.match(r"^[PpРр]\d{7,10}\b", upd.message)):
+                                                await self.send_payment(order_db, g.group())
                                 case "READ":
                                     upd = Read.model_validate(data["data"])
                                     # if upd.status not in (StatusWs.created, StatusWs.canceled, 10, StatusWs.completed):

xync_client/Bybit/agent.py

@@ -7,12 +7,14 @@ from datetime import datetime, timedelta, timezone
 from difflib import SequenceMatcher
 from enum import IntEnum
 from http.client import HTTPException
+from math import floor
 from typing import Literal
 
 import pyotp
 from asyncpg import ConnectionDoesNotExistError
 from bybit_p2p import P2P
 from bybit_p2p._exceptions import FailedRequestError
+from payeer_api import PayeerAPI
 from pyro_client.client.file import FileClient
 from tortoise import BaseDBAsyncClient
 from tortoise.exceptions import IntegrityError
@@ -88,6 +90,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
     def __init__(self, actor: Actor, bot: FileClient, **kwargs):
         super().__init__(actor, bot, **kwargs)
         self.api = P2P(testnet=False, api_key=actor.agent.auth["key"], api_secret=actor.agent.auth["sec"])
+        self.hist: dict = None
+        self.completed_orders: list[int] = None
 
     """ Private METHs"""
 
@@ -448,9 +452,28 @@ class AgentClient(BaseAgentClient):  # Bybit client
         if not ad_db:
             ...
         ecredex: CredEpyd = order.confirmedPayTerm
+
         if ecredex.paymentType == 0 and im_maker and order.side:
             ecredex = order.paymentTermList[0]
         if ecredex.paymentType:
+            if ecredex.paymentType == 51:
+                ecredex.accountNo = ecredex.accountNo.replace("p", "P").replace("р", "P").replace("Р", "P")
+                if not re.match(r"^([Pp])\d{7,10}$", ecredex.accountNo):
+                    msgs = self.api.get_chat_messages(orderId=order.id, size=100)["result"]["result"]
+                    msgs = [m["message"] for m in msgs if m["roleType"] == "user" and m["userId"] == order.targetUserId]
+                    msgs = [g.group() for m in msgs if (g := re.match(r"([PpРр])\d{7,10}\b", m))]
+                    crd = await models.Cred.get_or_none(
+                        detail=ecredex.accountNo, credexs__exid=ecredex.id, credexs__ex=self.ex_client.ex
+                    )
+                    if not msgs and re.match(r"^\d{7,10}$", ecredex.accountNo):
+                        ecredex.accountNo = "P" + ecredex.accountNo
+                    elif msgs:
+                        ecredex.accountNo = msgs[-1]
+                    else:
+                        ...
+                    if crd:
+                        crd.detail = ecredex.accountNo
+                        await crd.save(update_fields=["detail"])
             if not (credex := await models.CredEx.get_or_none(exid=ecredex.id, ex=self.ex_client.ex)):
                 # cur_id = await Cur.get(ticker=ad.currencyId).values_list('id', flat=True)
                 # await self.cred_epyd2db(ecredex, ad_db.maker.person_id, cur_id)
@@ -504,16 +527,55 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 "amount": float(order.amount) * 10**cur_scale,
                 "quantity": float(order.quantity) * 10**coin_scale,
                 "status": OrderStatus[Status(order.status).name],
-                "created_at": int(order.createDate[:-3]),
-                "payed_at": order.transferDate != "0" and int(order.transferDate[:-3]) or None,
-                "confirmed_at": Status(order.status) == Status.completed and int(order.updateDate[:-3]) or None,
-                "appealed_at": order.status == 30 and int(order.updateDate[:-3]) or None,
+                "created_at": ms2utc(order.createDate),
+                "payed_at": order.transferDate != "0" and ms2utc(order.transferDate) or None,
+                "confirmed_at": Status(order.status) == Status.completed and ms2utc(order.transferDate) or None,
+                "appealed_at": order.status == 30 and ms2utc(order.transferDate) or None,
                 "cred_id": ecredex.paymentType and credex.cred_id or None,
                 "taker": taker,
                 "ad": ad_db,
             },
             exid=order.id,
         )
+        if order.status == Status.completed and ecredex.paymentType == 51:
+            await odb.fetch_related("cred", "transfer")
+            if odb.cred.detail != ecredex.accountNo:
+                ...
+            frm = (odb.created_at + timedelta(minutes=180 - 1)).isoformat(sep=" ").split("+")[0]
+            to = ((odb.payed_at or odb.created_at) + timedelta(minutes=180 + 30)).isoformat(sep=" ").split("+")[0]
+            tsa = [
+                t
+                for tid, t in self.hist.items()
+                if (ecredex.accountNo == t["to"] and t["from"] != "@merchant" and frm < t["date"] < to)
+            ]
+            buyer_person = (
+                self.actor.person
+                if not order.side
+                else await self.person_upsert(order.buyerRealName, int(order.targetUserId))
+            )
+            ts = [t for t in tsa if floor(fa := float(order.amount)) <= float(t["creditedAmount"]) <= round(fa)]
+            if len(ts) != 1:
+                if len(tsa) > 1:
+                    summ = sum(float(t["creditedAmount"]) for t in tsa)
+                    if floor(fa) <= summ <= round(fa):
+                        for tr in tsa:
+                            am = int(float(tr["creditedAmount"]) * 100)
+                            await models.Transfer.create(
+                                pmid=tr["id"], order=odb, amount=am, sender_acc=tr["from"], created_at=tr["date"]
+                            )
+            else:
+                bcred, _ = await models.Cred.get_or_create(
+                    {"detail": ts[0]["from"]}, person=buyer_person, pmcur_id=odb.cred.pmcur_id
+                )
+                am = int(float(ts[0]["creditedAmount"]) * 100)
+                try:
+                    await models.Transfer.create(
+                        pmid=ts[0]["id"], order=odb, amount=am, sender_acc=ts[0]["from"], created_at=ts[0]["date"]
+                    )
+                except IntegrityError as e:
+                    logging.error(e)
+            ...
+
         await odb.fetch_related("ad")
         return odb
 
@@ -531,8 +593,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 page=page,
                 # status=status,  # 50 - завершено
                 # tokenId=token_id,
-                beginTime=begin_time,
-                endTime=end_time,
+                # beginTime=begin_time,
+                # endTime=end_time,
                 # side=side, # 1 - продажа, 0 - покупка
                 size=30,
             )
@@ -542,6 +604,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 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():
+            if o.status != Status.completed.value or oid in self.completed_orders:
+                continue
             fo = self.api.get_order_details(orderId=o.id)
             order = OrderFull.model_validate(fo["result"])
             order_db = await self.create_order(order)
@@ -565,6 +629,10 @@ class AgentClient(BaseAgentClient):  # Bybit client
         if len(ords) == 30:
             await self.get_api_orders(page + 1, begin_time, end_time, status, side, token_id)
 
+    # async def order_stat(self, papi: PayeerAPI):
+    #     for t in papi.history():
+    #         os = self.api.get_orders(page=1, size=30)
+
     async def mad_upd(self, mad: Ad, attrs: dict, cxids: list[str]):
         if not [setattr(mad, k, v) for k, v in attrs.items() if getattr(mad, k) != v]:
             print(end="v" if mad.side else "^", flush=True)
@@ -1117,6 +1185,10 @@ class AgentClient(BaseAgentClient):  # Bybit client
         self.tree = tree
 
 
+def ms2utc(msk_ts_str: str):
+    return datetime.fromtimestamp(int(msk_ts_str) / 1000, timezone(timedelta(hours=3), name="MSK"))
+
+
 def get_sim(s1, s2) -> int:
     sim = int((SequenceMatcher(None, s1, s2).ratio() - 0.6) * 10_000)
     return sim if sim > 0 else 0
@@ -1236,7 +1308,17 @@ async def main():
     if ct := set(cl.tree.keys()) & a:
         logging.exception(f"cycle cids: {ct}")
 
-    # await cl.get_api_orders(43, 1741294800000, 1749157199999)
+    pauth = (await models.PmAgent[1]).auth
+    papi = PayeerAPI(pauth["email"], pauth["api_id"], pauth["api_sec"])
+    hist: dict = papi.history(count=1000)
+    hist |= papi.history(count=1000, append=list(hist.keys())[-1])
+    hist |= papi.history(count=1000, append=list(hist.keys())[-1])
+    cl.hist = hist
+
+    cl.completed_orders = await models.Order.filter(status=OrderStatus.completed, transfer__isnull=False).values_list(
+        "exid", flat=True
+    )
+    await cl.get_api_orders()  # 43, 1741294800000, 1749157199999)
 
     races = await models.Race.filter(started=True).prefetch_related(
         "road__ad__pair_side__pair__cur",

xync_client/Pms/Payeer/__init__.py

@@ -81,7 +81,7 @@ class Client(PmAgentClient):
     def form_redirect(topup: TopUp) -> tuple[str, dict | None]:
         m_shop = str(topup.topupable.auth["id"])
         m_orderid = str(topup.id)
-        m_amount = str(topup.amount * 0.01)
+        m_amount = "{0:.2f}".format(topup.amount * 0.01)
         m_curr = topup.cur.ticker
         m_desc = b64encode(b"XyncPay top up").decode()
         m_key = topup.topupable.auth["sec"]

{xync_client-0.0.137.dist-info → xync_client-0.0.138.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.137
+Version: 0.0.138
 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.137.dist-info → xync_client-0.0.138.dist-info}/RECORD

@@ -34,8 +34,8 @@ xync_client/BitGet/agent.py,sha256=YVs3bDY0OcEJGU7m2A8chzO6PFhWDnQQrA-E6MVkBBg,3
 xync_client/BitGet/ex.py,sha256=nAexKRkguIhq4fYP1tkIaou6oBFjjV2xwlajlJ-9DAE,3757
 xync_client/BitGet/etype/ad.py,sha256=fysSW47wGYjSOPUqY864z857AJz4gjN-nOkI1Jxd27U,1838
 xync_client/BitPapa/ex.py,sha256=U-RRB_RSOtErfRgxOZYWegZ_td_uZO37YKo3Jxchf_w,912
-xync_client/Bybit/InAgent.py,sha256=qinC4f5Zk2FsL-EluRkEOSyEU22r4AIMjw93QxUFOjo,25290
-xync_client/Bybit/agent.py,sha256=VGPW7ibNMbO6OLyl68uYw6MJmRFr-FZdkB-GizQwUg8,57605
+xync_client/Bybit/InAgent.py,sha256=EzxMwbSVPv5CKGWzILSwKMEvuIzIl4wtdaPNbkhrln0,25294
+xync_client/Bybit/agent.py,sha256=wpFGareRojeG0nW1mBrtxU9HJlQjStsexdTRMm_3s_w,61753
 xync_client/Bybit/ex.py,sha256=DgPOmnjphcSCSsO4ZQjnIlWICNzdtKhNIpVsU93s99k,4707
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
@@ -72,7 +72,7 @@ xync_client/Pms/Alfa/state.json,sha256=MKE6vl-JsJO9PNCVqoQgBgYZTgYkHCas7USwl8QFt
 xync_client/Pms/MTS/__init__.py,sha256=P_E7W46IZEk8RsEgl7H1xV3JplMT5l9vYQYTYyNbyQ8,2101
 xync_client/Pms/Ozon/__init__.py,sha256=EvQZDSPv0fOT2hNCTP44nXHOIEQvP5bQf_7HVLiZc2I,4123
 xync_client/Pms/Payeer/.gitignore,sha256=sWORdRp8ROppV2CsMEDJ3M_SokrNWCf8b1hlaNs64hg,12
-xync_client/Pms/Payeer/__init__.py,sha256=mhApHXUgeBQIEYgIAafMRGMEV_eFtXcnj9FAVQKp7Jo,8873
+xync_client/Pms/Payeer/__init__.py,sha256=3Uzb4A_q34vPUOlSk1HoNVQWtPqq1ncRH7MK4BGQei0,8886
 xync_client/Pms/Payeer/api.py,sha256=bb8qrlPYyWafel1VR-2nate6xBeRZAVciFJblHygfAs,549
 xync_client/Pms/Payeer/login.py,sha256=W5FAA0reW5x2hSh8sBIWmR38VcYhwvrn1R64IAtWHVw,2921
 xync_client/Pms/Sber/__init__.py,sha256=dxQfd9ZPhFTc_C4xrwaxrV6p0SijDCLNzBeUv3oQG38,4926
@@ -95,7 +95,7 @@ xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ
 xync_client/TgWallet/pyd.py,sha256=Ys3E8b3RLuyQ26frWT0F0BorkNxVpxnd18tY4Gp9dik,5636
 xync_client/TgWallet/pyro.py,sha256=2K7QWdo48k4MbbgQt90gdz_HiPck69Njm4xaMjIVgoo,1440
 xync_client/TgWallet/web.py,sha256=kDcv9SKKQPe91mw1qJBpbuyKYCAmZdfdHJylHumLBVU,1608
-xync_client-0.0.137.dist-info/METADATA,sha256=Sw7C8Y1D5Ybec8SN-eDa2jSkXM0gEOUCeOR8zK_3uJY,1037
-xync_client-0.0.137.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.137.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.137.dist-info/RECORD,,
+xync_client-0.0.138.dist-info/METADATA,sha256=hj6obh0V9c8OVO4E87R_KRryDQez2HU1IWgdU1hEIfg,1037
+xync_client-0.0.138.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.138.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.138.dist-info/RECORD,,