xync-client 0.0.57.dev24__tar.gz → 0.0.57.dev26__tar.gz

{xync_client-0.0.57.dev24/xync_client.egg-info → xync_client-0.0.57.dev26}/PKG-INFO

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

@@ -397,7 +397,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 # status=status,  # 50 - завершено
                 # tokenId=token_id,
                 beginTime=begin_time,
-                endTime=end_time,
+                # endTime=end_time,
                 # side=side,  # 1 - продажа, 0 - покупка
             )
         except FailedRequestError as e:
@@ -533,6 +533,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 self.overprice_filter(ads, ceil, k)
 
     def get_cad(self, ads: list[Ad], ceil: float, k: Literal[-1, 1], place: int, cur_plc: int) -> Ad:
+        if not ads:
+            return None
         # чью цену будем обгонять, предыдущей или слещующей объявы?
         cad: Ad = ads[place] if cur_plc > place else ads[cur_plc]
         # а цена обгоняемой объявы не выше нашего потолка?
@@ -585,7 +587,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
             if not ads:
                 await sleep(60)
                 continue
-            cad = self.get_cad(ads, ceil, k, place, cur_plc)
+            if not (cad := self.get_cad(ads, ceil, k, place, cur_plc)):
+                continue
             new_price = f"%.{curex.cur.scale}f" % round(float(cad.price) - k * step(mad, cad), curex.cur.scale)
             if mad.price == new_price:  # Если нужная цена и так уже стоит
                 print(end="v" if taker_side else "^", flush=True)
@@ -714,7 +717,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 if rest_uids := {ra.maker_id for ra in rest_ads} - {ad_db.maker_id}:
                     # создадим новое условие и присвоим его только текущей объяве
                     new_cond = await Cond.create(raw_txt=cleaned)
-                    await self.sim_new(new_cond.id, get_sim(cleaned, ad_db.cond.raw_txt), ad_db.cond_id)
+                    if sim := get_sim(cleaned, ad_db.cond.raw_txt):
+                        await CondSim.create(cond_id=new_cond.id, similarity=sim, cond_rel_id=ad_db.cond_id)
                     ad_db.cond_id = new_cond.id
                     self.all_conds[ad_db.cond_id] = cleaned, {ad_db.maker.exid}
                     await ad_db.save()
@@ -763,19 +767,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
     async def cond_get_max_sim(self, cid: int, txt: str, uids: set[int]) -> tuple[int | None, int | None]:
         # находим все старые тексты похожие на 90% и более
+        if len(txt) < 15:
+            return None, None
         sims: dict[int, int] = {}
         for old_cid, (old_txt, old_uids) in self.all_conds.items():
-            if len(old_txt) < 15 or cid == old_cid or uids == old_uids:
-                continue
-            elif self.cond_sims.get(cid) == old_cid:
+            if len(old_txt) < 15 or uids == old_uids:
                 continue
-            elif self.cond_sims.get(old_cid) == cid:
-                continue
-            elif cid in self.rcond_sims.get(old_cid, {}):
-                continue
-            elif old_cid in self.rcond_sims.get(cid, {}):
-                continue
-            elif self.find_in_tree(cid, old_cid):
+            elif not self.can_add_sim(cid, old_cid):
                 continue
             if sim := get_sim(txt, old_txt):
                 sims[old_cid] = sim
@@ -786,6 +784,21 @@ class AgentClient(BaseAgentClient):  # Bybit client
             return old_cid, sim
         return None, None
 
+    def can_add_sim(self, cid: int, old_cid: int) -> bool:
+        if cid == old_cid:
+            return False
+        elif self.cond_sims.get(cid) == old_cid:
+            return False
+        elif self.find_in_tree(cid, old_cid):
+            return False
+        elif self.cond_sims.get(old_cid) == cid:
+            return False
+        elif cid in self.rcond_sims.get(old_cid, {}):
+            return False
+        elif old_cid in self.rcond_sims.get(cid, {}):
+            return False
+        return 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:
@@ -820,11 +833,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
         await ad_db.pms.add(*(await models.Pm.filter(pmexs__ex=self.ex_client.ex, pmexs__exid__in=ad.payments)))
         return ad_db
 
-    async def sim_new(self, new_cid: int, sim: int, old_cid: int):
-        if not sim:
-            return None
-        return await CondSim.create(cond_id=new_cid, similarity=sim, cond_rel_id=old_cid)
-
     async def sim_check_rels(self, cid: int, new_txt: int):
         if _old_sims := await CondSim.filter(Q(join_type="OR", cond_id=cid, cond_rel_id=cid)):
             for sim_db in _old_sims:
@@ -968,60 +976,60 @@ async def main():
     actor = (
         await models.Actor.filter(ex_id=9, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
-    # async with FileClient(TOKEN) as b:
-    cl: AgentClient = actor.client(FileClient(TOKEN))
-    # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"])  # 617 -> 639
-    # await cl.set_creds()
-    # await cl.ex_client.set_pairs()
-    usdt = await models.Coinex.get(coin__ticker="USDT", ex=cl.actor.ex).prefetch_related("coin")
-    btc = await models.Coinex.get(coin__ticker="BTC", ex=cl.actor.ex).prefetch_related("coin")
-    eth = await models.Coinex.get(coin__ticker="ETH", ex=cl.actor.ex).prefetch_related("coin")
-    usdc = await models.Coinex.get(coin__ticker="USDC", ex=cl.actor.ex).prefetch_related("coin")
-    rub = await models.Curex.get(cur__ticker="RUB", ex=cl.actor.ex).prefetch_related("cur")
-    cl.all_conds = {
-        c.id: (c.raw_txt, {a.maker.exid for a in c.ads}) for c in await Cond.all().prefetch_related("ads__maker")
-    }
-    for curr, old in await CondSim.filter().values_list("cond_id", "cond_rel_id"):
-        cl.cond_sims[curr] = old
-        cl.rcond_sims[old] |= {curr}
-    cl.build_tree()
-    a = set()
-
-    def check_tree(tre):
-        for p, c in tre.items():
-            a.add(p)
-            check_tree(c)
-
-    for pr, ch in cl.tree.items():
-        check_tree(ch)
-    await cl.actual_cond()
-    await gather(
-        cl.get_api_orders(10, 1737493200000, 1742590800000),  # 10, 1738357200000, 1742504399999
-        cl.battle(usdt, rub, False, ["volet"], 79.8),  # гонка в стакане покупки - мы продаем
-        cl.battle(usdt, rub, True, ["volet"], 79.8),  # гонка в стакане продажи - мы покупаем
-        cl.battle(eth, rub, False, ["volet"], 206_000),
-        cl.battle(eth, rub, True, ["volet"], 200_000),
-        cl.battle(btc, rub, False, ["volet"], 8_500_000),
-        cl.battle(btc, rub, True, ["volet"], 8_400_000),
-        cl.battle(usdc, rub, False, ["volet"], 80.5),
-        cl.battle(usdc, rub, True, ["volet"], 79),
-        cl.take(usdt, rub, False, ceil=80, volume=360),
-        cl.take(usdt, rub, True, ceil=80, volume=360),
-    )
+    async with FileClient(TOKEN) as b:
+        cl: AgentClient = actor.client(b)
+        # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"])  # 617 -> 639
+        # await cl.set_creds()
+        # await cl.ex_client.set_pairs()
+        usdt = await models.Coinex.get(coin__ticker="USDT", ex=cl.actor.ex).prefetch_related("coin")
+        btc = await models.Coinex.get(coin__ticker="BTC", ex=cl.actor.ex).prefetch_related("coin")
+        eth = await models.Coinex.get(coin__ticker="ETH", ex=cl.actor.ex).prefetch_related("coin")
+        usdc = await models.Coinex.get(coin__ticker="USDC", ex=cl.actor.ex).prefetch_related("coin")
+        rub = await models.Curex.get(cur__ticker="RUB", ex=cl.actor.ex).prefetch_related("cur")
+        cl.all_conds = {
+            c.id: (c.raw_txt, {a.maker.exid for a in c.ads}) for c in await Cond.all().prefetch_related("ads__maker")
+        }
+        for curr, old in await CondSim.filter().values_list("cond_id", "cond_rel_id"):
+            cl.cond_sims[curr] = old
+            cl.rcond_sims[old] |= {curr}
+        cl.build_tree()
+        a = set()
+
+        def check_tree(tre):
+            for p, c in tre.items():
+                a.add(p)
+                check_tree(c)
+
+        for pr, ch in cl.tree.items():
+            check_tree(ch)
+        # await cl.actual_cond()
+        await gather(
+            cl.get_api_orders(10, 1742504400000),  # 10, 1738357200000, 1742504399999
+            cl.battle(usdt, rub, False, ["volet"], 79.8),  # гонка в стакане покупки - мы продаем
+            cl.battle(usdt, rub, True, ["volet"], 79.8),  # гонка в стакане продажи - мы покупаем
+            cl.battle(eth, rub, False, ["volet"], 206_000),
+            cl.battle(eth, rub, True, ["volet"], 200_000),
+            cl.battle(btc, rub, False, ["volet"], 8_500_000),
+            cl.battle(btc, rub, True, ["volet"], 8_400_000),
+            cl.battle(usdc, rub, False, ["volet"], 80.5),
+            cl.battle(usdc, rub, True, ["volet"], 79),
+            cl.take(usdt, rub, False, ceil=80, volume=360),
+            cl.take(usdt, rub, True, ceil=80, volume=360),
+        )
 
-    bor = BaseOrderReq(
-        ad_id="1861440060199632896",
-        # asset_amount=40,
-        fiat_amount=3000,
-        amount_is_fiat=True,
-        is_sell=False,
-        cur_exid=rub.exid,
-        coin_exid=usdt.exid,
-        coin_scale=usdt.coin.scale,
-    )
-    res: OrderResp = await cl.order_request(bor)
-    await cl.cancel_order(res.orderId)
-    await cl.close()
+        bor = BaseOrderReq(
+            ad_id="1861440060199632896",
+            # asset_amount=40,
+            fiat_amount=3000,
+            amount_is_fiat=True,
+            is_sell=False,
+            cur_exid=rub.exid,
+            coin_exid=usdt.exid,
+            coin_scale=usdt.coin.scale,
+        )
+        res: OrderResp = await cl.order_request(bor)
+        await cl.cancel_order(res.orderId)
+        await cl.close()
 
 
 if __name__ == "__main__":

{xync_client-0.0.57.dev24 → xync_client-0.0.57.dev26/xync_client.egg-info}/PKG-INFO

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