xync-client 0.0.218.dev1__tar.gz → 0.0.218.dev2__tar.gz

{xync_client-0.0.218.dev1 → xync_client-0.0.218.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.218.dev1
+Version: 0.0.218.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.218.dev1 → xync_client-0.0.218.dev2}/xync_client/Abc/Ex.py

@@ -470,6 +470,7 @@ class BaseExClient(HttpClient, AdLoader):
             cond_id=cond and cond.id,
             pair_side_id=await self.e2x_pair(base_ad.coinex_exid, base_ad.curex_exid, bool(base_ad.side.value)),
             pms=await models.Pm.filter(pmexs__ex=self.ex, pmexs__exid__in=base_ad.pmex_exids),
+            filtered=badd.filtered,
         )
         ad = xtype.BaseAd.model_validate(badd)
         ad_upd = models.Ad.validate(ad.model_dump(), with_pk=False)

{xync_client-0.0.218.dev1 → xync_client-0.0.218.dev2}/xync_client/Abc/xtype.py

@@ -130,6 +130,7 @@ class BaseAd(BaseModel):
     # recentOrderNum: int
     side: Literal[Side.BUY, Side.SALE]
     status: Literal[AdStatus.active, AdStatus.defActive, AdStatus.soldOut]  # 10: online; 20: offline; 30: completed
+    filtered: bool = False
 
     @model_validator(mode="after")
     def amount_or_quantity_required(self):

{xync_client-0.0.218.dev1 → xync_client-0.0.218.dev2}/xync_client/Bybit/etype/ad.py

@@ -139,7 +139,7 @@ class Ad(BaseAd, RemapBase):
     # recentOrderNum: int
     side: Literal[Side.BUY, Side.SALE]
     priceType: Literal[PriceType.FIX, PriceType.FLOAT]
-    # tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
+    tradingPreferenceSet: TradingPreferenceSet | None = None  # for initial actualize
 
     # accountId: str = None  # for initial actualize
     # authStatus: int = None  # for initial actualize
@@ -180,6 +180,11 @@ class Ad(BaseAd, RemapBase):
     # def status(self, status, _info) -> xtype.AdStatus:
     #     return {10: xtype.AdStatus.active, 20: xtype.AdStatus.defActive, 30: xtype.AdStatus.soldOut}[status]
 
+    @model_validator(mode="after")
+    def set_filtered_flag(self):
+        self.filtered = bool(self.tradingPreferenceSet.completeRateDay30 or self.tradingPreferenceSet.hasRegisterTime)
+        return self
+
 
 class MyAd(Ad, BaseCredexsExidsTrait):
     credex_exids: list[int] = Field(alias="paymentTerms")

{xync_client-0.0.218.dev1 → xync_client-0.0.218.dev2}/xync_client/Bybit/ex.py

@@ -11,7 +11,7 @@ from xync_schema.models import Ex, Agent
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.loader import NET_TOKEN, PRX
-from xync_client.Bybit.etype import ad
+from xync_client.Bybit.etype import ad as ad_etype
 from xync_client.Abc.xtype import PmEx, MapOfIdsList, GetAdsReq
 from xync_client.loader import TORM
 
@@ -28,6 +28,7 @@ class ExClient(BaseExClient):  # Bybit client
         "sec-fetch-site": "same-origin",
         "traceparent": f"00-{tuid}-{tuid[16::-1]}-01",
         "origin": "https://www.bybit.com",
+        "cookies": f"deviceId={uuid4()}",
         # "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36",
     }
 
@@ -40,8 +41,7 @@ class ExClient(BaseExClient):  # Bybit client
         }[status]
 
     async def _get_config(self):
-        cks = {"deviceId": "bc6ea1d0-a81e-4f4c-f5a4-df1dc27e1345"}
-        resp = await self._get("/x-api/fiat/p2p/config/initial", hdrs=self.sec_hdrs, cks=cks)
+        resp = await self._get("/x-api/fiat/p2p/config/initial", hdrs=self.sec_hdrs)
         return resp["result"]["symbols"]  # todo: tokens, pairs, ...
 
     # 19: Список поддерживаемых валют тейкера
@@ -87,18 +87,18 @@ class ExClient(BaseExClient):  # Bybit client
         return cc, cc
 
     # 24: Список объяв по (buy/sell, cur, coin, pm)
-    async def _ads(self, req: ad.AdsReq, post_pmexs: set[models.PmEx] = None) -> list[ad.Ad]:
+    async def _ads(self, req: ad_etype.AdsReq, post_pmexs: set[models.PmEx] = None) -> list[ad_etype.Ad]:
         if post_pmexs:
             req.payment = []
             req.size = str(min(1000, int(req.size) * 25))
-        res = await self._post("/x-api/fiat/otc/item/online/", req.model_dump())
-        ads = [ad.Ad(**_ad) for _ad in res["result"]["items"]]
+        res = await self._post("/x-api/fiat/otc/item/online/", req.model_dump(), hdrs=self.sec_hdrs)
+        ads = [ad_etype.Ad(**_ad) for _ad in res["result"]["items"]]
         if post_pmexs:
             post_pmexids = {p.exid for p in post_pmexs}
             ads = [
                 ad
                 for ad in ads
-                if (set(ad.payments) & post_pmexids or [True for px in post_pmexs if px.pm.norm in ad.remark.lower()])
+                if (set(ad.pmex_exids) & post_pmexids or [True for px in post_pmexs if px.pm.norm in ad.remark.lower()])
             ]
         return ads
 
@@ -107,15 +107,15 @@ async def main():
     _ = await init_db(TORM, True)
     ex = await Ex.get(name="Bybit")
     bot = FileClient(NET_TOKEN)
-    await bot.start()
+    # await bot.start()
     prx = PRX and "http://" + PRX
     cl: ExClient = ex.client(proxy=prx)
+    x_ads_req = GetAdsReq(coin_id=1, cur_id=1, is_sell=True, amount=1000)  # , pm_ids=[330, 366, 1853]
+    _ads = await cl.ads(x_ads_req)
     # await cl.set_curs()
     await cl.set_pms(bot)
     await cl.set_coins()
     await cl.set_pairs()
-    x_ads_req = GetAdsReq(coin_id=1, cur_id=1, is_sell=True, pm_ids=[330, 366, 1853], amount=1000)
-    _ads = await cl.ads(x_ads_req)
     # await bot.stop()
     await cl.stop()
 

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

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