xync-client 0.0.155__tar.gz → 0.0.155.dev2__tar.gz

{xync_client-0.0.155/xync_client.egg-info → xync_client-0.0.155.dev2}/PKG-INFO

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

@@ -97,7 +97,7 @@ class AgentClient(BaseAgentClient, InAgentClient):  # Bybit client
     def __init__(self, agent: Agent, ex_client: ExClient, fbot: FileClient, bbot: XyncBot, **kwargs):
         super().__init__(agent, ex_client, fbot, bbot, **kwargs)
         self.sec_hdrs = {
-            "accept-language": "ru,en;q=0.9",
+            "accept-language": "ru-RU,ru;q=0.9,en-US;q=0.8,en;q=0.7",
             "gdfp": agent.auth["Risktoken"],
             "tx-id": agent.auth["Risktoken"],
         }
@@ -1052,21 +1052,21 @@ class AgentClient(BaseAgentClient, InAgentClient):  # Bybit client
         i = 0
         while True:
             try:
-                ss = await self.ads(coinex, curex, True, None, None, 1000, False, post_pmexs)
-                ss = [s for s in ss if float(s.price) > 90.42 or int(s.userId) in mcs.keys()]
-                if ss:
-                    ad: Ad = ss[0]
+                bs = await self.ads(coinex, curex, False, None, None, 1000, False, post_pmexs)
+                bs = [b for b in bs if float(b.price) < 89.56 or int(b.userId) in mcs.keys()]
+                if bs:
+                    ad: Ad = bs[0]
                     await self.bbot.send(
                         193017646,
                         f"price: {ad.price}\nnick: {ad.nickName}\nprice: {ad.price}"
                         f"\nqty: {ad.quantity} [{ad.minAmount}-{ad.maxAmount}]",
                     )
-                    am = min(float(ad.maxAmount), max(1000 + i, float(ad.minAmount)))
+                    am = min(float(ad.maxAmount), max(700 + i, float(ad.minAmount)))
                     req = TakeAdReq(
                         ad_id=ad.id,
                         amount=am,
-                        pm_id=14,
-                        is_sell=True,
+                        pm_id=40,
+                        is_sell=False,
                         coin_id=1,
                         cur_id=1,
                     )
@@ -1074,33 +1074,33 @@ class AgentClient(BaseAgentClient, InAgentClient):  # Bybit client
                     # order: OrderFull = OrderFull(**self.api.get_order_details(orderId=ord_resp.orderId)["result"])
                     order: OrderFull = await self.get_order_info(ord_resp.orderId)
                     odb = await self.create_order(order)
-                    # t = await models.Transfer(order=odb, amount=odb.amount, updated_at=now())
-                    # await t.fetch_related("order__cred__pmcur__cur")
-                    # res = await self.pm_clients[366].check_in(t)
+                    t = await models.Transfer(order=odb, amount=odb.amount, updated_at=now())
+                    await t.fetch_related("order__cred__pmcur__cur")
+                    # res = await self.pm_clients[366].send(t)
+                    self.api.mark_as_paid(
+                        orderId=str(odb.exid),
+                        paymentType=ad.payments[0],  # pmex.exid
+                        paymentId=order.paymentTermList[0].id,  # credex.exid
+                    )
                     if int(ad.userId) in mcs:
-                        mcs[int(ad.userId)].api.mark_as_paid(
-                            orderId=str(odb.exid),
-                            paymentType=ad.payments[0],  # pmex.exid
-                            paymentId=order.paymentTermList[0].id,  # credex.exid
-                        )
-                    self.api.release_assets(orderId=order.id)
+                        mcs[int(ad.userId)].api.release_assets(orderId=order.id)
+                    await sleep(1)
                 ...
-
-                bs = await self.ads(coinex, curex, False, None, None, 1000, False, post_pmexs)
-                bs = [b for b in bs if float(b.price) < 89.56 or int(b.userId) in mcs.keys()]
-                if bs:
-                    ad: Ad = bs[0]
+                ss = await self.ads(coinex, curex, True, None, None, 1000, False, post_pmexs)
+                ss = [s for s in ss if float(s.price) > 90.42 or int(s.userId) in mcs.keys()]
+                if ss:
+                    ad: Ad = ss[0]
                     await self.bbot.send(
                         193017646,
                         f"price: {ad.price}\nnick: {ad.nickName}\nprice: {ad.price}"
                         f"\nqty: {ad.quantity} [{ad.minAmount}-{ad.maxAmount}]",
                     )
-                    am = min(float(ad.maxAmount), max(600 + i, float(ad.minAmount)))
+                    am = min(float(ad.maxAmount), max(3000 + i, float(ad.minAmount)))
                     req = TakeAdReq(
                         ad_id=ad.id,
                         amount=am,
-                        pm_id=14,
-                        is_sell=False,
+                        pm_id=40,
+                        is_sell=True,
                         coin_id=1,
                         cur_id=1,
                     )
@@ -1108,17 +1108,16 @@ class AgentClient(BaseAgentClient, InAgentClient):  # Bybit client
                     # order: OrderFull = OrderFull(**self.api.get_order_details(orderId=ord_resp.orderId)["result"])
                     order: OrderFull = await self.get_order_info(ord_resp.orderId)
                     odb = await self.create_order(order)
-                    t = await models.Transfer(order=odb, amount=odb.amount, updated_at=now())
-                    await t.fetch_related("order__cred__pmcur__cur")
-                    # res = await self.pm_clients[366].send(t)
-                    self.api.mark_as_paid(
-                        orderId=str(odb.exid),
-                        paymentType=ad.payments[0],  # pmex.exid
-                        paymentId=order.paymentTermList[0].id,  # credex.exid
-                    )
+                    # t = await models.Transfer(order=odb, amount=odb.amount, updated_at=now())
+                    # await t.fetch_related("order__cred__pmcur__cur")
+                    # res = await self.pm_clients[366].check_in(t)
                     if int(ad.userId) in mcs:
-                        mcs[int(ad.userId)].api.release_assets(orderId=order.id)
-                    await sleep(1)
+                        mcs[int(ad.userId)].api.mark_as_paid(
+                            orderId=str(odb.exid),
+                            paymentType=ad.payments[0],  # pmex.exid
+                            paymentId=order.paymentTermList[0].id,  # credex.exid
+                        )
+                    self.api.release_assets(orderId=order.id)
                 ...
             except Exception as e:
                 logging.exception(e)
@@ -1209,7 +1208,7 @@ async def main():
     cn = await init_db(TORM)
 
     agent = (
-        await models.Agent.filter(actor__ex_id=4, auth__isnull=False, status__gt=AgentStatus.off, id=8)
+        await models.Agent.filter(actor__ex_id=4, auth__isnull=False, status__gt=AgentStatus.off, actor__person_id=1)
         .prefetch_related(
             "actor__ex",
             "actor__person__user__gmail",
@@ -1240,7 +1239,7 @@ async def main():
     # await cl.export_my_ads()
 
     ms = await models.Agent.filter(
-        actor__ex_id=4, auth__isnull=False, status__gt=AgentStatus.off, actor__person__user__id__in=[2]
+        actor__ex_id=4, auth__isnull=False, status__gt=AgentStatus.off, actor__person__user__id__in=[]
     ).prefetch_related(
         "actor__ex",
         "actor__person__user__gmail",

{xync_client-0.0.155 → xync_client-0.0.155.dev2}/xync_client/Htx/agent.py

@@ -44,7 +44,6 @@ class AgentClient(BaseAgentClient):
             if resp["success"]:
                 self.agent.auth["headers"]["Token"] = resp["data"]
                 await self.agent.save(update_fields=["auth"])
-                self.session.headers["Token"] = resp["data"]
 
     async def creds(self) -> list[test.CredEpyd]:
         resp = await self._get("/-/x/otc/v1/user/receipt-account")
@@ -300,45 +299,33 @@ async def _test():
     # _ = await cl.cred_new(cred)
     # _creds = await cl.creds()
     # _ = await cl.cred_del(16984748)
-
-    while True:
-        breq = GetAds(coin_id=1, cur_id=1, is_sell=False, pm_ids=[366])
-        sreq = GetAds(coin_id=1, cur_id=1, is_sell=True, pm_ids=[366])
-        breq_upd = AdUpd(id=1185713, price=87.01, **{**breq.model_dump(), "amount": 80001})
-        sreq_upd = AdUpd(id=1188929, price=92.99, **{**sreq.model_dump(), "amount": 65001})
-
-        bads: list[ad.Resp] = await cl.ex_client.ads(breq)
-        sads: list[ad.Resp] = await cl.ex_client.ads(sreq)
-
-        if bads:
-            if bads[0].uid == cl.actor.exid:
-                if round(bads[0].price - bads[1].price, 2) > 0.01:
-                    breq_upd.price = bads[1].price + 0.01
-                    await cl.ad_upd(breq_upd)
-                    print(end="!", flush=True)
-            elif bads[0].price < 89:
-                breq_upd.price = bads[0].price + 0.01
-                await cl.ad_upd(breq_upd)
-                print(end="!", flush=True)
-
-        if sads:
-            if sads[0].uid == cl.actor.exid:
-                if round(sads[1].price - sads[0].price, 2) > 0.01:
-                    sreq_upd.price = sads[1].price - 0.01
-                    await cl.ad_upd(sreq_upd)
-                    print(end="!", flush=True)
-            elif sads[0].price > 91:
-                sreq_upd.price = sads[0].price - 0.01
-                await cl.ad_upd(sreq_upd)
-                print(end="!", flush=True)
-
-        print(end=".", flush=True)
-        await sleep(15)
+    breq = GetAds(coin_id=1, cur_id=1, is_sell=False, pm_ids=[366])
+    sreq = GetAds(coin_id=1, cur_id=1, is_sell=True, pm_ids=[366])
+    breq_upd = AdUpd(id=1185713, price=87.01, **{**breq.model_dump(), "amount": 80001})
+    sreq_upd = AdUpd(id=1188929, price=92.99, **{**sreq.model_dump(), "amount": 5001})
+    bads: list[ad.Resp] = await cl.ex_client.ads(breq)
+    sads: list[ad.Resp] = await cl.ex_client.ads(sreq)
+
+    if bads[0].uid == cl.actor.exid:
+        if round(bads[0].price - bads[1].price, 2) > 0.01:
+            breq_upd.price = bads[1].price + 0.01
+            await cl.ad_upd(breq_upd)
+    elif bads[0].price < 89:
+        breq_upd.price = bads[0].price + 0.01
+        await cl.ad_upd(breq_upd)
+
+    if sads[0].uid == cl.actor.exid:
+        if round(sads[1].price - sads[0].price, 2) > 0.01:
+            sreq_upd.price = sads[1].price - 0.01
+            await cl.ad_upd(sreq_upd)
+    elif sads[0].price > 91:
+        sreq_upd.price = sads[0].price - 0.01
+        await cl.ad_upd(sreq_upd)
 
     await cl.stop()
 
 
 if __name__ == "__main__":
-    from asyncio import run, sleep
+    from asyncio import run
 
     run(_test())

{xync_client-0.0.155 → xync_client-0.0.155.dev2/xync_client.egg-info}/PKG-INFO

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