xync-client 0.0.147__py3-none-any.whl → 0.0.148__py3-none-any.whl

xync_client/Abc/AdLoader.py

@@ -0,0 +1,285 @@
+import logging
+import re
+from asyncio import sleep
+from collections import defaultdict
+from difflib import SequenceMatcher
+
+from xync_schema import models
+from xync_schema.xtype import BaseAd
+
+
+class AdLoader:
+    ex: models.Ex
+    all_conds: dict[int, tuple[str, set[int]]] = {}
+    cond_sims: dict[int, int] = defaultdict(set)
+    rcond_sims: dict[int, set[int]] = defaultdict(set)  # backward
+    tree: dict = {}
+
+    async def old_conds_load(self):
+        # пока не порешали рейс-кондишн, очищаем сиротские условия при каждом запуске
+        # [await c.delete() for c in await Cond.filter(ads__isnull=True)]
+        self.all_conds = {
+            c.id: (c.raw_txt, {a.maker.exid for a in c.ads})
+            for c in await models.Cond.all().prefetch_related("ads__maker")
+        }
+        for curr, old in await models.CondSim.filter().values_list("cond_id", "cond_rel_id"):
+            self.cond_sims[curr] = old
+            self.rcond_sims[old] |= {curr}
+
+        self.build_tree()
+        a = set()
+
+        def check_tree(tre):
+            for p, c in tre.items():
+                a.add(p)
+                check_tree(c)
+
+        for pr, ch in self.tree.items():
+            check_tree(ch)
+        if ct := set(self.tree.keys()) & a:
+            logging.exception(f"cycle cids: {ct}")
+
+    async def person_name_update(self, name: str, exid: int) -> models.Person:
+        if actor := await models.Actor.get_or_none(exid=exid, ex=self.ex).prefetch_related("person"):
+            actor.person.name = name
+            await actor.person.save()
+            return actor.person
+        # return await models.Person.create(note=f'{actor.ex_id}:{actor.exid}:{name}') # no person for just ads with no orders
+        raise ValueError(f"Agent #{exid} not found")
+
+    async def ad_load(
+        self,
+        pad: BaseAd,
+        cid: int = None,
+        ps: models.PairSide = None,
+        maker: models.Actor = None,
+        coinex: models.CoinEx = None,
+        curex: models.CurEx = None,
+        rname: str = None,
+        pms_from_cond: bool = False,
+    ) -> models.Ad:
+        if not maker:
+            if not (maker := await models.Actor.get_or_none(exid=pad.userId, ex=self.ex)):
+                person = await models.Person.create(name=rname, note=f"{self.ex.id}:{pad.userId}:{pad.nickName}")
+                maker = await models.Actor.create(name=pad.nickName, person=person, exid=pad.userId, ex=self.ex)
+        if rname:
+            await self.person_name_update(rname, int(pad.userId))
+        ps = ps or await models.PairSide.get_or_none(
+            is_sell=pad.side,
+            pair__coin__ticker=pad.tokenId,
+            pair__cur__ticker=pad.currencyId,
+        ).prefetch_related("pair")
+        # if not ps or not ps.pair:
+        #     ...  # THB/USDC: just for initial filling
+        ad_upd = models.Ad.validate(pad.model_dump(by_alias=True))
+        cur_scale = 10 ** (curex or await models.CurEx.get(coin_id=ps.pair.cur_id, ex=self.ex)).scale
+        coin_scale = 10 ** (coinex or await models.CoinEx.get(coin_id=ps.pair.coin_id, ex=self.ex)).scale
+        df_unq = ad_upd.df_unq(
+            maker_id=maker.id,
+            pair_side_id=ps.id,
+            amount=int(float(pad.quantity) * float(pad.price) * cur_scale),
+            quantity=int(float(pad.quantity) * coin_scale),
+            min_fiat=int(float(pad.minAmount) * cur_scale),
+            max_fiat=pad.maxAmount and int(float(pad.maxAmount) * cur_scale),
+            price=int(float(pad.price) * cur_scale),
+            premium=int(float(pad.premium) * 100),
+            cond_id=cid,
+        )
+        ad_db, _ = await models.Ad.update_or_create(**df_unq)
+        if not pms_from_cond:
+            await ad_db.pms.add(*(await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=pad.payments)))
+        return ad_db
+
+    async def cond_load(  # todo: refact from Bybit Ad format to universal
+        self,
+        ad: BaseAd,
+        ps: models.PairSide = None,
+        force: bool = False,
+        rname: str = None,
+        coinex: models.CoinEx = None,
+        curex: models.CurEx = None,
+        pms_from_cond: bool = False,
+    ) -> tuple[models.Ad, bool]:
+        _sim, cid = None, None
+        ad_db = await models.Ad.get_or_none(exid=ad.id, maker__ex=self.ex).prefetch_related("cond")
+        # если точно такое условие уже есть в бд
+        if not (cleaned := clean(ad.remark)) or (cid := {oc[0]: ci for ci, oc in self.all_conds.items()}.get(cleaned)):
+            # и объява с таким ид уже есть, но у нее другое условие
+            if ad_db and ad_db.cond_id != cid:
+                # то обновляем ид ее условия
+                ad_db.cond_id = cid
+                await ad_db.save()
+                logging.info(f"{ad.nickName} upd cond#{ad_db.cond_id}->{cid}")
+                # old_cid = ad_db.cond_id # todo: solve race-condition, а пока что очищаем при каждом запуске
+                # if not len((old_cond := await Cond.get(id=old_cid).prefetch_related('ads')).ads):
+                #     await old_cond.delete()
+                #     logging.warning(f"Cond#{old_cid} deleted!")
+            return (
+                ad_db
+                or force
+                and await self.ad_load(
+                    ad, cid, ps, coinex=coinex, curex=curex, rname=rname, pms_from_cond=pms_from_cond
+                )
+            ), False
+        # если эта объява в таким ид уже есть в бд, но с другим условием (или без), а текущего условия еще нет в бд
+        if ad_db:
+            await ad_db.fetch_related("cond__ads", "maker")
+            if not ad_db.cond_id or (
+                # у измененного условия этой объявы есть другие объявы?
+                (rest_ads := set(ad_db.cond.ads) - {ad_db})
+                and
+                # другие объявы этого условия принадлежат другим юзерам
+                {ra.maker_id for ra in rest_ads} - {ad_db.maker_id}
+            ):
+                # создадим новое условие и присвоим его только текущей объяве
+                cid = await self.cond_new(cleaned, {int(ad.userId)})
+                ad_db.cond_id = cid
+                await ad_db.save()
+
+                return ad_db, True
+            # а если других объяв со старым условием этой обявы нет, либо они все этого же юзера
+            # обновляем условие (в тч во всех ЕГО объявах)
+            ad_db.cond.last_ver = ad_db.cond.raw_txt
+            ad_db.cond.raw_txt = cleaned
+            await ad_db.cond.save()
+            await self.cond_upd(ad_db.cond, {ad_db.maker.exid})
+            # и подправим коэфициенты похожести нового текста
+            await self.fix_rel_sims(ad_db.cond_id, cleaned)
+            return ad_db, False
+
+        cid = await self.cond_new(cleaned, {int(ad.userId)})
+        return await self.ad_load(
+            ad, cid, ps, coinex=coinex, curex=curex, rname=rname, pms_from_cond=pms_from_cond
+        ), True
+
+    async def cond_new(self, txt: str, uids: set[int]) -> int:
+        new_cond, _ = await models.Cond.update_or_create(raw_txt=txt)
+        # и максимально похожую связь для нового условия (если есть >= 60%)
+        await self.cond_upd(new_cond, uids)
+        return new_cond.id
+
+    async def cond_upd(self, cond: models.Cond, uids: set[int]):
+        self.all_conds[cond.id] = cond.raw_txt, uids
+        # и максимально похожую связь для нового условия (если есть >= 60%)
+        old_cid, sim = await self.cond_get_max_sim(cond.id, cond.raw_txt, uids)
+        await self.actual_sim(cond.id, old_cid, sim)
+
+    def find_in_tree(self, cid: int, old_cid: int) -> bool:
+        if p := self.cond_sims.get(old_cid):
+            if p == cid:
+                return True
+            return self.find_in_tree(cid, p)
+        return False
+
+    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 uids == old_uids:
+                continue
+            elif not self.can_add_sim(cid, old_cid):
+                continue
+            if sim := get_sim(txt, old_txt):
+                sims[old_cid] = sim
+        # если есть, берем самый похожий из них
+        if sims:
+            old_cid, sim = max(sims.items(), key=lambda x: x[1])
+            await sleep(0.3)
+            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 fix_rel_sims(self, cid: int, new_txt: str):
+        for rel_sim in await models.CondSim.filter(cond_rel_id=cid).prefetch_related("cond"):
+            if sim := get_sim(new_txt, rel_sim.cond.raw_txt):
+                rel_sim.similarity = sim
+                await rel_sim.save()
+            else:
+                await rel_sim.delete()
+
+    async def actual_cond(self):
+        for curr, old in await models.CondSim.all().values_list("cond_id", "cond_rel_id"):
+            self.cond_sims[curr] = old
+            self.rcond_sims[old] |= {curr}
+        for cid, (txt, uids) in self.all_conds.items():
+            old_cid, sim = await self.cond_get_max_sim(cid, txt, uids)
+            await self.actual_sim(cid, old_cid, sim)
+            # хз бля чо это ваще
+            # for ad_db in await models.Ad.filter(direction__pairex__ex=self.ex).prefetch_related("cond", "maker"):
+            #     ad = Ad(id=str(ad_db.exid), userId=str(ad_db.maker.exid), remark=ad_db.cond.raw_txt)
+            #     await self.cond_upsert(ad, force=True)
+
+    async def actual_sim(self, cid: int, old_cid: int, sim: int):
+        if not sim:
+            return
+        if old_sim := await models.CondSim.get_or_none(cond_id=cid):
+            if old_sim.cond_rel_id != old_cid:
+                if sim > old_sim.similarity:
+                    logging.warning(f"R {cid}: {old_sim.similarity}->{sim} ({old_sim.cond_rel_id}->{old_cid})")
+                    await old_sim.update_from_dict({"similarity": sim, "old_rel_id": old_cid}).save()
+                    self._cond_sim_upd(cid, old_cid)
+            elif sim != old_sim.similarity:
+                logging.info(f"{cid}: {old_sim.similarity}->{sim}")
+                await old_sim.update_from_dict({"similarity": sim}).save()
+        else:
+            await models.CondSim.create(cond_id=cid, cond_rel_id=old_cid, similarity=sim)
+            self._cond_sim_upd(cid, old_cid)
+
+    def _cond_sim_upd(self, cid: int, old_cid: int):
+        if old_old_cid := self.cond_sims.get(cid):  # если старый cid уже был в дереве:
+            self.rcond_sims[old_old_cid].remove(cid)  # удаляем из обратного
+        self.cond_sims[cid] = old_cid  # а в прямом он автоматом переопределится, даже если и был
+        self.rcond_sims[old_cid] |= {cid}  # ну и в обратное добавим новый
+
+    def build_tree(self):
+        set(self.cond_sims.keys()) | set(self.cond_sims.values())
+        tree = defaultdict(dict)
+        # Группируем родителей по детям
+        for child, par in self.cond_sims.items():
+            tree[par] |= {child: {}}  # todo: make from self.rcond_sim
+
+        # Строим дерево снизу вверх
+        def subtree(node):
+            if not node:
+                return node
+            for key in node:
+                subnode = tree.pop(key, {})
+                d = subtree(subnode)
+                node[key] |= d  # actual tree rebuilding here!
+            return node  # todo: refact?
+
+        # Находим корни / без родителей
+        roots = set(self.cond_sims.values()) - set(self.cond_sims.keys())
+        for root in roots:
+            _ = subtree(tree[root])
+
+        self.tree = tree
+
+
+def get_sim(s1, s2) -> int:
+    sim = int((SequenceMatcher(None, s1, s2).ratio() - 0.6) * 10_000)
+    return sim if sim > 0 else 0
+
+
+def clean(s) -> str:
+    clear = r"[^\w\s.,!?;:()\-]"
+    repeat = r"(.)\1{2,}"
+    s = re.sub(clear, "", s).lower()
+    s = re.sub(repeat, r"\1", s)
+    return s.replace("\n\n", "\n").replace("  ", " ").strip(" \n/.,!?-")

xync_client/Abc/Ex.py

@@ -11,11 +11,12 @@ from xync_schema import models
 from xync_schema.enums import FileType
 from xync_schema.xtype import CurEx, CoinEx, BaseAd, BaseAdIn
 
+from xync_client.Abc.AdLoader import AdLoader
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.pm_unifier import PmUnifier, PmUni
 
 
-class BaseExClient(HttpClient):
+class BaseExClient(HttpClient, AdLoader):
     cur_map: dict[int, str] = {}
     unifier_class: type = PmUnifier
     logo_pre_url: str
@@ -72,6 +73,7 @@ class BaseExClient(HttpClient):
         pm_exids: list[str | int] = None,
         amount: int = None,
         lim: int = None,
+        vm_filter: bool = False,
     ) -> list[BaseAd]:  # {ad.id: ad}
         ...
 
@@ -250,14 +252,14 @@ class BaseExClient(HttpClient):
         return True
 
     # Сохранение чужого объявления (с Pm-ами) в бд
-    async def ad_pydin2db(self, ad_pydin: BaseAdIn) -> models.Ad:
-        dct = ad_pydin.model_dump()
-        dct["exid"] = dct.pop("id")
-        ad_in = models.Ad.validate(dct)
-        ad_db, _ = await models.Ad.update_or_create(**ad_in.df_unq())
-        await ad_db.credexs.add(*getattr(ad_pydin, "credexs_", []))
-        await ad_db.pmexs.add(*getattr(ad_pydin, "pmexs_", []))
-        return ad_db
+    # async def ad_pydin2db(self, ad_pydin: BaseAdIn) -> models.Ad:
+    #     dct = ad_pydin.model_dump()
+    #     dct["exid"] = dct.pop("id")
+    #     ad_in = models.Ad.validate(dct)
+    #     ad_db, _ = await models.Ad.update_or_create(**ad_in.df_unq())
+    #     await ad_db.credexs.add(*getattr(ad_pydin, "credexs_", []))
+    #     await ad_db.pmexs.add(*getattr(ad_pydin, "pmexs_", []))
+    #     return ad_db
 
     async def file_upsert(self, url: str, ss: ClientSession = None) -> models.File:
         if not (file := await models.File.get_or_none(name__startswith=url.split("?")[0])):

xync_client/Bybit/agent.py

@@ -2,7 +2,6 @@ import asyncio
 import logging
 import re
 from asyncio import sleep, gather
-from collections import defaultdict
 from datetime import datetime, timedelta, timezone
 from difflib import SequenceMatcher
 from enum import IntEnum
@@ -18,7 +17,7 @@ from payeer_api import PayeerAPI
 from pyro_client.client.file import FileClient
 from tortoise import BaseDBAsyncClient
 from tortoise.exceptions import IntegrityError
-from tortoise.expressions import F, Q
+from tortoise.expressions import Q
 from tortoise.functions import Count
 from tortoise.signals import post_save
 from urllib3.exceptions import ReadTimeoutError
@@ -28,7 +27,7 @@ from xync_bot import XyncBot
 from xync_schema import models
 from xync_schema.enums import OrderStatus
 
-from xync_schema.models import Actor, Cond, CondSim, PmCur, PairSide, Agent
+from xync_schema.models import Actor, PmCur, Agent
 
 from xync_client.Abc.Agent import BaseAgentClient
 from xync_client.Abc.xtype import FlatDict, BaseOrderReq
@@ -85,16 +84,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
         "actionType": "MODIFY",
         "securityRiskToken": "",
     }
-    all_conds: dict[int, tuple[str, set[int]]] = {}
-    cond_sims: dict[int, int] = defaultdict(set)
-    rcond_sims: dict[int, set[int]] = defaultdict(set)  # backward
-    tree: dict = {}
 
     def __init__(self, agent: Agent, fbot: FileClient, bbot: XyncBot, **kwargs):
         super().__init__(agent, fbot, bbot, **kwargs)
         self.api = P2P(testnet=False, api_key=agent.auth["key"], api_secret=agent.auth["sec"])
-        self.hist: dict = None
-        self.completed_orders: list[int] = None
+        self.hist: dict | None = None
+        self.completed_orders: list[int] | None = None
 
     """ Private METHs"""
 
@@ -118,12 +113,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
         else:
             return logging.exception(method1)
 
-    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 get_payment_method(self, fiat_id: int) -> CredEpyd:
+        return self.creds()[fiat_id]
 
     def creds(self) -> dict[int, CredEpyd]:
         data = self.api.get_user_payment_types()
@@ -206,13 +197,13 @@ class AgentClient(BaseAgentClient):  # Bybit client
     # 27
     async def fiat_upd(self, fiat_id: int, detail: str, name: str = None) -> dict:
         fiat = self.get_payment_method(fiat_id)
-        fiat["realName"] = name
-        fiat["accountNo"] = detail
-        result = await self._post("/fiat/otc/user/payment/new_update", fiat)
+        fiat.realName = name
+        fiat.accountNo = detail
+        result = await self._post("/fiat/otc/user/payment/new_update", fiat.model_dump(exclude_none=True))
         srt = result["result"]["securityRiskToken"]
         await self._check_2fa(srt)
-        fiat["securityRiskToken"] = srt
-        result2 = await self._post("/fiat/otc/user/payment/new_update", fiat)
+        fiat.securityRiskToken = srt
+        result2 = await self._post("/fiat/otc/user/payment/new_update", fiat.model_dump(exclude_none=True))
         return result2
 
     # 28
@@ -244,10 +235,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
             cnx.exid, crx.exid, is_sell, [pmex.exid for pmex in pmxs or []], amount, lim, vm_filter
         )
 
-    def online_ads(self) -> str:
-        online = self._get("/fiat/otc/maker/work-config/get")
-        return online["result"]["workStatus"]
-
     @staticmethod
     def get_rate(list_ads: list) -> float:
         ads = [ad for ad in list_ads if set(ad["payments"]) - {"5", "51"}]
@@ -264,7 +251,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
         ads = self.my_ads(True)
         if not active:
             ads += self.my_ads(False)
-        res = [await self.ad_create(ad, actor=self.actor) for ad in ads]
+        res = [await self.ex_client.ad_load(ad, maker=self.actor) for ad in ads]
         res = [await models.MyAd.update_or_create(ad=ad) for ad in res]
         return len(res)
 
@@ -494,12 +481,14 @@ class AgentClient(BaseAgentClient):  # Bybit client
         maker_name = order.buyerRealName, order.sellerRealName
         im_maker = int(order.makerUserId == order.userId)
         taker_id = (order.userId, order.targetUserId)[im_maker]
-        taker_person = await self.person_upsert(maker_name[::-1][ad.side], taker_id)
+        taker_person = await self.ex_client.person_name_update(maker_name[::-1][ad.side], taker_id)
         seller_person = (
-            self.actor.person if order.side else await self.person_upsert(order.sellerRealName, int(order.targetUserId))
+            self.actor.person
+            if order.side
+            else await self.ex_client.person_name_update(order.sellerRealName, int(order.targetUserId))
         )
         taker_nick = (self.actor.name, order.targetNickName)[im_maker]  # todo: check
-        ad_db, cond_isnew = await self.cond_upsert(ad, maker_name[ad.side], force=True)
+        ad_db, cond_isnew = await self.ex_client.cond_load(ad, force=True, rname=maker_name[ad.side])
         if not ad_db:
             ...
         ecredex: CredEpyd = order.confirmedPayTerm
@@ -602,7 +591,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
             buyer_person = (
                 self.actor.person
                 if not order.side
-                else await self.person_upsert(order.buyerRealName, int(order.targetUserId))
+                else await self.ex_client.person_name_update(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:
@@ -755,7 +744,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
         pmexs: list[models.PmEx] = await models.PmEx.filter(pm_id__in=pm_ids, ex=self.actor.ex).prefetch_related("pm")
         k = (-1) ** int(taker_side)  # on_buy=1, on_sell=-1
         sleep_sec = 3  # 1 if set(pms) & {"volet"} and coinex.coin_id == 1 else 5
-        creds: list[models.CredEx] = await self.get_credexs_by_pms(race.road.ad.pms, curex.cur_id)
+        creds: list[models.CredEx] = await self.actor.get_credexs_by(pm_ids, curex.cur_id)
         _lstat, volume = None, 0
 
         while self.actor.person.user.status > 0:
@@ -814,7 +803,7 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 await sleep(15)
                 continue
             (cur_plc,) = cur_plc  # может упасть если в списке > 1 наш ad
-            [(await self.cond_upsert(ad, ps=race.road.ad.pair_side, force=True))[0] for ad in ads[:cur_plc]]
+            [(await self.ex_client.cond_load(ad, race.road.ad.pair_side, True))[0] for ad in ads[:cur_plc]]
             # rivals = [
             #     (await models.RaceStat.update_or_create({"place": plc, "price": ad.price, "premium": ad.premium}, ad=ad))[
             #         0
@@ -955,286 +944,6 @@ class AgentClient(BaseAgentClient):  # Bybit client
         bc, sc = mdl + mdl * (perc / 2), mdl - mdl * (perc / 2)
         return (bc, sc), hp, vmf, zplace
 
-    async def parse_ads(
-        self,
-        coinex: models.CoinEx,
-        curex: models.CurEx,
-        taker_side: bool,
-        pms: list[str] = None,
-        ceil: float = None,
-        volume: float = 9000,
-        min_fiat: int = None,
-        max_fiat: int = None,
-    ):
-        k = (-1) ** int(taker_side)  # on_buy=1, on_sell=-1
-
-        if pms:
-            creds: dict[models.PmEx, models.CredEx] = await self.get_credexs_by_norms(pms, curex.cur_id)
-            [str(p.exid) for p in creds.values()]
-
-            if taker_side:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
-                fiats = await models.Fiat.filter(
-                    cred_id__in=[cx.cred_id for cx in creds.values()], amount__not=F("target")
-                )
-                volume = min(volume, max(fiats, key=lambda f: f.target - f.amount).amount / ceil)
-            else:  # гонка в стакане покупки - мы продаем МОНЕТУ за фиат
-                asset = await models.Asset.get(addr__actor=self.actor, addr__coin_id=coinex.coin_id)
-                volume = min(volume, asset.free)
-        volume = str(round(volume, coinex.coin.scale))
-        ps = await PairSide.get(
-            is_sell=taker_side,
-            pair__coin_id=coinex.coin_id,
-            pair__cur_id=curex.cur_id,
-        )
-        while self.actor.person.user.status > 0:  # todo: depends on rest asset/fiat
-            ads: list[Ad] = await self.ads(coinex, curex, taker_side, pms and list(creds.keys()))
-
-            if not ads:
-                print(coinex.exid, curex.exid, taker_side, "no ads!")
-                await sleep(300)
-                continue
-
-            for i, ad in enumerate(ads):
-                if (ceil - float(ad.price)) * k < 0:
-                    break
-                if int(ad.userId) == self.actor.exid:
-                    logging.info(f"My ad {'-' if taker_side else '+'}{coinex.exid}/{curex.exid} on place#{i}")
-                    continue
-                ad_db, isnew = await self.cond_upsert(ad, ps=ps)
-                if isnew:
-                    s = f"{'-' if taker_side else '+'}{ad.price}[{ad.minAmount}-{ad.maxAmount}]{coinex.exid}/{curex.exid}"
-                    print(s, end=" | ", flush=True)
-                try:
-                    # take
-                    ...
-                except FailedRequestError as e:
-                    if ExcCode(e.status_code) == ExcCode.RareLimit:
-                        await sleep(195)
-                    elif ExcCode(e.status_code) == ExcCode.Timestamp:
-                        await sleep(2)
-                    else:
-                        raise e
-                except (ReadTimeoutError, ConnectionDoesNotExistError):
-                    logging.warning("Connection failed. Restarting..")
-            await sleep(3)
-
-    async def cond_upsert(
-        self, ad: Ad, rname: str = None, ps: PairSide = None, force: bool = False
-    ) -> tuple[models.Ad, bool]:
-        _sim, cid = None, None
-        ad_db = await models.Ad.get_or_none(exid=ad.id, maker__ex=self.ex_client.ex).prefetch_related("cond")
-        # если точно такое условие уже есть в бд
-        if not (cleaned := clean(ad.remark)) or (cid := {oc[0]: ci for ci, oc in self.all_conds.items()}.get(cleaned)):
-            # и объява с таким ид уже есть, но у нее другое условие
-            if ad_db and ad_db.cond_id != cid:
-                # то обновляем ид ее условия
-                ad_db.cond_id = cid
-                await ad_db.save()
-                logging.info(f"{ad.nickName} upd cond#{ad_db.cond_id}->{cid}")
-                # old_cid = ad_db.cond_id # todo: solve race-condition, а пока что очищаем при каждом запуске
-                # if not len((old_cond := await Cond.get(id=old_cid).prefetch_related('ads')).ads):
-                #     await old_cond.delete()
-                #     logging.warning(f"Cond#{old_cid} deleted!")
-            return (ad_db or force and await self.ad_create(ad, cid, rname, ps)), False
-        # если эта объява в таким ид уже есть в бд, но с другим условием (или без), а текущего условия еще нет в бд
-        if ad_db:
-            await ad_db.fetch_related("cond__ads", "maker")
-            if not ad_db.cond_id or (
-                # у измененного условия этой объявы есть другие объявы?
-                (rest_ads := set(ad_db.cond.ads) - {ad_db})
-                and
-                # другие объявы этого условия принадлежат другим юзерам
-                {ra.maker_id for ra in rest_ads} - {ad_db.maker_id}
-            ):
-                # создадим новое условие и присвоим его только текущей объяве
-                cid = await self.cond_new(cleaned, {int(ad.userId)})
-                ad_db.cond_id = cid
-                await ad_db.save()
-
-                return ad_db, True
-            # а если других объяв со старым условием этой обявы нет, либо они все этого же юзера
-            # обновляем условие (в тч во всех ЕГО объявах)
-            ad_db.cond.last_ver = ad_db.cond.raw_txt
-            ad_db.cond.raw_txt = cleaned
-            await ad_db.cond.save()
-            await self.cond_upd(ad_db.cond, {ad_db.maker.exid})
-            # и подправим коэфициенты похожести нового текста
-            await self.fix_rel_sims(ad_db.cond_id, cleaned)
-            return ad_db, False
-
-        cid = await self.cond_new(cleaned, {int(ad.userId)})
-        return await self.ad_create(ad, cid, rname, ps), True
-
-    async def cond_new(self, txt: str, uids: set[int]) -> int:
-        new_cond, _ = await Cond.update_or_create(raw_txt=txt)
-        # и максимально похожую связь для нового условия (если есть >= 60%)
-        await self.cond_upd(new_cond, uids)
-        return new_cond.id
-
-    async def cond_upd(self, cond: Cond, uids: set[int]):
-        self.all_conds[cond.id] = cond.raw_txt, uids
-        # и максимально похожую связь для нового условия (если есть >= 60%)
-        old_cid, sim = await self.cond_get_max_sim(cond.id, cond.raw_txt, uids)
-        await self.actual_sim(cond.id, old_cid, sim)
-
-    def find_in_tree(self, cid: int, old_cid: int) -> bool:
-        if p := self.cond_sims.get(old_cid):
-            if p == cid:
-                return True
-            return self.find_in_tree(cid, p)
-        return False
-
-    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 uids == old_uids:
-                continue
-            elif not self.can_add_sim(cid, old_cid):
-                continue
-            if sim := get_sim(txt, old_txt):
-                sims[old_cid] = sim
-        # если есть, берем самый похожий из них
-        if sims:
-            old_cid, sim = max(sims.items(), key=lambda x: x[1])
-            await sleep(0.3)
-            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:
-                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 = None, rname: str = None, ps: PairSide = None, actor: Actor = None
-    ) -> models.Ad:
-        act_df = {}
-        if int(ad.userId) != self.actor.exid:
-            act_df |= {"name": ad.nickName}
-        if rname:
-            act_df |= {"person": await self.person_upsert(rname, int(ad.userId))}
-        if not actor:
-            act_df |= {"person": await self.person_upsert(ad.nickName, int(ad.userId))}
-            actor, _ = await Actor.update_or_create(act_df, exid=ad.userId, ex=self.ex_client.ex)
-        ps = ps or await PairSide.get_or_none(
-            is_sell=ad.side,
-            pair__coin__ticker=ad.tokenId,
-            pair__cur__ticker=ad.currencyId,
-        ).prefetch_related("pair__cur", "pair__coin")
-        if not ps or not ps.pair:
-            ...  # THB/USDC
-        ad_upd = models.Ad.validate(ad.model_dump(by_alias=True))
-        cur_scale = 10**ps.pair.cur.scale
-        coinex = await models.CoinEx.get(coin_id=ps.pair.coin_id, ex=self.ex_client.ex)
-        df_unq = ad_upd.df_unq(
-            maker_id=actor.id,
-            pair_side_id=ps.id,
-            amount=int(float(ad.quantity) * float(ad.price) * cur_scale),
-            quantity=int(float(ad.quantity) * 10**coinex.scale),
-            min_fiat=int(float(ad.minAmount) * cur_scale),
-            max_fiat=ad.maxAmount and int(float(ad.maxAmount) * cur_scale),
-            price=int(float(ad.price) * cur_scale),
-            premium=int(float(ad.premium) * cur_scale),
-        )
-        ad_db, _ = await models.Ad.update_or_create(**df_unq)
-        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 fix_rel_sims(self, cid: int, new_txt: str):
-        for rel_sim in await CondSim.filter(cond_rel_id=cid).prefetch_related("cond"):
-            if sim := get_sim(new_txt, rel_sim.cond.raw_txt):
-                rel_sim.similarity = sim
-                await rel_sim.save()
-            else:
-                await rel_sim.delete()
-
-    async def actual_cond(self):
-        for curr, old in await CondSim.all().values_list("cond_id", "cond_rel_id"):
-            self.cond_sims[curr] = old
-            self.rcond_sims[old] |= {curr}
-        for cid, (txt, uids) in self.all_conds.items():
-            old_cid, sim = await self.cond_get_max_sim(cid, txt, uids)
-            await self.actual_sim(cid, old_cid, sim)
-            # хз бля чо это ваще
-            # for ad_db in await models.Ad.filter(direction__pairex__ex=self.ex_client.ex).prefetch_related("cond", "maker"):
-            #     ad = Ad(id=str(ad_db.exid), userId=str(ad_db.maker.exid), remark=ad_db.cond.raw_txt)
-            #     await self.cond_upsert(ad, force=True)
-
-    async def actual_sim(self, cid: int, old_cid: int, sim: int):
-        if not sim:
-            return
-        if old_sim := await CondSim.get_or_none(cond_id=cid):
-            if old_sim.cond_rel_id != old_cid:
-                if sim > old_sim.similarity:
-                    logging.warning(f"R {cid}: {old_sim.similarity}->{sim} ({old_sim.cond_rel_id}->{old_cid})")
-                    await old_sim.update_from_dict({"similarity": sim, "old_rel_id": old_cid}).save()
-                    self._cond_sim_upd(cid, old_cid)
-            elif sim != old_sim.similarity:
-                logging.info(f"{cid}: {old_sim.similarity}->{sim}")
-                await old_sim.update_from_dict({"similarity": sim}).save()
-        else:
-            await CondSim.create(cond_id=cid, cond_rel_id=old_cid, similarity=sim)
-            self._cond_sim_upd(cid, old_cid)
-
-    def _cond_sim_upd(self, cid: int, old_cid: int):
-        if old_old_cid := self.cond_sims.get(cid):  # если старый cid уже был в дереве:
-            self.rcond_sims[old_old_cid].remove(cid)  # удаляем из обратного
-        self.cond_sims[cid] = old_cid  # а в прямом он автоматом переопределится, даже если и был
-        self.rcond_sims[old_cid] |= {cid}  # ну и в обратное добавим новый
-
-    async def get_credexs_by_pms(self, pms: list[models.Pm], cur_id: int) -> list[models.CredEx]:
-        return await models.CredEx.filter(
-            ex_id=self.actor.ex_id,
-            cred__pmcur__pm_id__in=[pm.id for pm in pms],
-            cred__person_id=self.actor.person_id,
-            cred__pmcur__cur_id=cur_id,
-        )
-
-    def build_tree(self):
-        set(self.cond_sims.keys()) | set(self.cond_sims.values())
-        tree = defaultdict(dict)
-        # Группируем родителей по детям
-        for child, par in self.cond_sims.items():
-            tree[par] |= {child: {}}  # todo: make from self.rcond_sim
-
-        # Строим дерево снизу вверх
-        def subtree(node):
-            if not node:
-                return node
-            for key in node:
-                subnode = tree.pop(key, {})
-                d = subtree(subnode)
-                node[key] |= d  # actual tree rebuilding here!
-            return node  # todo: refact?
-
-        # Находим корни / без родителей
-        roots = set(self.cond_sims.values()) - set(self.cond_sims.keys())
-        for root in roots:
-            _ = subtree(tree[root])
-
-        self.tree = tree
-
     async def take_ad(self, req: TakeAdReq):
         ad: Ad = Ad.model_validate(self.api.get_ad_details(itemId=req.ad_id))
         bor = BaseOrderReq(
@@ -1249,16 +958,73 @@ class AgentClient(BaseAgentClient):  # Bybit client
         resp: OrderResp = await self._order_request(bor)
         return resp
 
+    # async def parse_ads(
+    #     self,
+    #     coinex: models.CoinEx,
+    #     curex: models.CurEx,
+    #     taker_side: bool,
+    #     pms: list[str] = None,
+    #     ceil: float = None,
+    #     volume: float = 9000,
+    #     min_fiat: int = None,
+    #     max_fiat: int = None,
+    # ):
+    #     k = (-1) ** int(taker_side)  # on_buy=1, on_sell=-1
+    #     if pms:
+    #         creds: dict[models.PmEx, models.CredEx] = await self.get_credexs_by_norms(pms, curex.cur_id)
+    #         [str(p.exid) for p in creds.values()]
+    #
+    #         if taker_side:  # гонка в стакане продажи - мы покупаем монету за ФИАТ
+    #             fiats = await models.Fiat.filter(
+    #                 cred_id__in=[cx.cred_id for cx in creds.values()], amount__not=F("target")
+    #             )
+    #             volume = min(volume, max(fiats, key=lambda f: f.target - f.amount).amount / ceil)
+    #         else:  # гонка в стакане покупки - мы продаем МОНЕТУ за фиат
+    #             asset = await models.Asset.get(addr__actor=self.actor, addr__coin_id=coinex.coin_id)
+    #             volume = min(volume, asset.free)
+    #     volume = str(round(volume, coinex.coin.scale))
+    #     ps = await PairSide.get(
+    #         is_sell=taker_side,
+    #         pair__coin_id=coinex.coin_id,
+    #         pair__cur_id=curex.cur_id,
+    #     )
+    #     while self.actor.person.user.status > 0:  # todo: depends on rest asset/fiat
+    #         ads: list[Ad] = await self.ads(coinex, curex, taker_side, pms and list(creds.keys()))
+    #
+    #         if not ads:
+    #             print(coinex.exid, curex.exid, taker_side, "no ads!")
+    #             await sleep(300)
+    #             continue
+    #
+    #         for i, ad in enumerate(ads):
+    #             if (ceil - float(ad.price)) * k < 0:
+    #                 break
+    #             if int(ad.userId) == self.actor.exid:
+    #                 logging.info(f"My ad {'-' if taker_side else '+'}{coinex.exid}/{curex.exid} on place#{i}")
+    #                 continue
+    #             ad_db, isnew = await self.cond_upsert(ad, ps=ps)
+    #             if isnew:
+    #                 s = f"{'-' if taker_side else '+'}{ad.price}[{ad.minAmount}-{ad.maxAmount}]{coinex.exid}/{curex.exid}"
+    #                 print(s, end=" | ", flush=True)
+    #             try:
+    #                 # take
+    #                 ...
+    #             except FailedRequestError as e:
+    #                 if ExcCode(e.status_code) == ExcCode.RareLimit:
+    #                     await sleep(195)
+    #                 elif ExcCode(e.status_code) == ExcCode.Timestamp:
+    #                     await sleep(2)
+    #                 else:
+    #                     raise e
+    #             except (ReadTimeoutError, ConnectionDoesNotExistError):
+    #                 logging.warning("Connection failed. Restarting..")
+    #         await sleep(3)
+
 
 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
-
-
 def detailed_diff(str1, str2):
     matcher = SequenceMatcher(None, str1, str2)
     result = []
@@ -1276,14 +1042,6 @@ def detailed_diff(str1, str2):
     return "".join(result)
 
 
-def clean(s) -> str:
-    clear = r"[^\w\s.,!?;:()\-]"
-    repeat = r"(.)\1{2,}"
-    s = re.sub(clear, "", s).lower()
-    s = re.sub(repeat, r"\1", s)
-    return s.replace("\n\n", "\n").replace("  ", " ").strip(" \n/.,!?-")
-
-
 def step_is_need(mad, cad) -> bool:
     # todo: пока не решен непонятный кейс, почему то конкурент по всем параметрам слабже, но в списке ранжируется выше.
     #  текущая версия: recentExecuteRate округляется до целого, но на бэке байбита его дробная часть больше
@@ -1353,28 +1111,6 @@ async def main():
     #     s, _ = await models.Synonym.update_or_create(typ=SynonymType.name, txt=name)
     #     await s.curs.add(rub.cur)
 
-    # пока порешали рейс-кондишн, очищаем сиротские условия при каждом запуске
-    # [await c.delete() for c in await Cond.filter(ads__isnull=True)]
-    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)
-    if ct := set(cl.tree.keys()) & a:
-        logging.exception(f"cycle cids: {ct}")
-
     pauth = (await models.PmAgent[1]).auth
     papi = PayeerAPI(pauth["email"], pauth["api_id"], pauth["api_sec"])
     hist: dict = papi.history(count=1000)

xync_client/Bybit/etype/ad.py

@@ -113,7 +113,7 @@ class Ad(BaseAd):
     recommend: bool = None  # for initial actualize
     recommendTag: str = None  # for initial actualize
     remark: str = Field(serialization_alias="auto_msg")
-    side: Literal[0, 1] = None  # for initial actualize  # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
+    side: Literal[0, 1] = None  # for initial actualize # 0 - покупка, 1 - продажа (для мейкера, т.е КАКАЯ объява)
     status: Literal[10, 20, 30]  # 10: online; 20: offline; 30: completed
     symbolInfo: SymbolInfo = None  # for initial actualize
     tokenId: str = None  # for initial actualize

xync_client/Bybit/etype/cred.py

@@ -52,6 +52,7 @@ class CredEpyd(CredExOut):
     paymentExt5: str
     paymentExt6: str
     paymentTemplateVersion: int
+    securityRiskToken: str = ""
 
 
 class MyCredEpyd(CredEpyd):  # todo: заменить везде где надо CredEpyd -> MyCredEpyd

{xync_client-0.0.147.dist-info → xync_client-0.0.148.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.147
+Version: 0.0.148
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client
@@ -8,6 +8,9 @@ Requires-Python: >=3.11
 Requires-Dist: asynchuobi
 Requires-Dist: bs4
 Requires-Dist: bybit-p2p
+Requires-Dist: google-api-python-client
+Requires-Dist: google-auth-httplib2
+Requires-Dist: google-auth-oauthlib
 Requires-Dist: requests-toolbelt
 Requires-Dist: msgspec
 Requires-Dist: python-binance

{xync_client-0.0.147.dist-info → xync_client-0.0.148.dist-info}/RECORD

@@ -2,11 +2,12 @@ xync_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/details.py,sha256=21itVPCgAtaYRR1H9J9oYudj95gafcFjExUN6QL17OI,1330
 xync_client/loader.py,sha256=hxf8ob50DO7r_qjr2qBoO7IyjkXeHHzVQ63YjXerjoU,600
 xync_client/pm_unifier.py,sha256=T2Xh-tvcu114P2YBI6RK_XDiaIhyq6ABMrXDuXPlx7A,6541
+xync_client/Abc/AdLoader.py,sha256=-9UpLgFdIKcpQ2Z6PLCin7c0JmlUQ66WMouNUTWyEHg,13362
 xync_client/Abc/Agent.py,sha256=FmKT4EefJn2oNc9icIgxDqoJoRe33FGgaNwBw5P5B4A,5727
 xync_client/Abc/Asset.py,sha256=hlgyFaU9byr2N2r8Heh-_ICx49SKuKxfRTUA4yQWmEw,454
 xync_client/Abc/Auth.py,sha256=OPQXN7_XYQZP9431ylFksd6JDusbKG8N_1g6CXTZ6yY,1495
 xync_client/Abc/BaseTest.py,sha256=vaAs5Z4HYV7k_C3zQz6JKO75s2hXtVbBI3-0Srkzv5Q,2388
-xync_client/Abc/Ex.py,sha256=n41-XCjoIV-KpC_lK3jO049tQKbFmE0eDU3SDlgZTws,12986
+xync_client/Abc/Ex.py,sha256=6i78hduLVULyaTYlKbu7hsSrCIWVGrFB0HMll0TeSxM,13091
 xync_client/Abc/Exception.py,sha256=Sts7RpP370NBdjaH_cyXDdHtjge8zXNUGWCrKw49Zyk,482
 xync_client/Abc/HasAbotUid.py,sha256=LsTHHjMHBauCwJoqgDa9Lx4R6xsDOHfsN4jM539Bpqg,279
 xync_client/Abc/InAgent.py,sha256=XLf5czbxxEimsIIe653buoP7OsWZD6mc2w37q4TkNd0,703
@@ -36,14 +37,14 @@ xync_client/BitGet/ex.py,sha256=uEvvXuLaJv8o8BFi0bMA3XyBuTfVDWagAjLOHZl-xlE,3765
 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=1Y4ZyxqAY8xbAflku48fJjjlSs4pOz2mFFJSO9iWg8w,26405
-xync_client/Bybit/agent.py,sha256=vThoZdscmprogrL4a1wEhUga5uKapF8lhm7R5VT_xno,64529
+xync_client/Bybit/agent.py,sha256=VftYukdo0nYysxUMFMwVpKH6xmeP4LVfnvoT3SIWCFo,51978
 xync_client/Bybit/ex.py,sha256=3oARvReBoDs90FzQY31-L-q_YU-TIRbvWB7z4lwESsA,4715
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
 xync_client/Bybit/web_p2p.py,sha256=sAXzK03t6jwDnz4rrvP2IzI0KxfKa7C_5GuzH1HwLuA,11768
 xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
-xync_client/Bybit/etype/ad.py,sha256=HJOHi9KrbLQMpwEyd4oA8436QTNRqrd2HWFF-JNZGDo,8066
-xync_client/Bybit/etype/cred.py,sha256=dgFExLB4e5Wf6SqfU9SOdeooHQa84DRbTGm_OJhNw_o,1354
+xync_client/Bybit/etype/ad.py,sha256=pCD0I9SL4Paaegs85fHGtvZ-7Cm917AQXYel0k1MbY0,8065
+xync_client/Bybit/etype/cred.py,sha256=qDQUsMqLV4XtXKYWZV4f805kLDf7AdcPYscHRA-IMBo,1386
 xync_client/Bybit/etype/order.py,sha256=668UJdCNEnvnalmbtTQ9Tw50arJtgpV_09GHu0iyaRU,8870
 xync_client/Gate/ex.py,sha256=QbhB3u7TWnvVGD-AknB2nay6KZjEXQ-1JT9UacX4sWI,3735
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
@@ -96,7 +97,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.147.dist-info/METADATA,sha256=spFbottWxSke1DGsyR1ypIgZH8LVjREO2Vfvv2HP-4g,1037
-xync_client-0.0.147.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.147.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.147.dist-info/RECORD,,
+xync_client-0.0.148.dist-info/METADATA,sha256=v2HPGq4q5LhjcUCezyrU7_37urzKs6je3wy5XSWmTKM,1149
+xync_client-0.0.148.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.148.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.148.dist-info/RECORD,,