xync-client 0.0.43.dev10__tar.gz → 0.0.43.dev11__tar.gz

{xync_client-0.0.43.dev10/xync_client.egg-info → xync_client-0.0.43.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.43.dev10
+Version: 0.0.43.dev11
 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.43.dev10 → xync_client-0.0.43.dev11}/xync_client/Abc/Ex.py

@@ -73,7 +73,9 @@ class BaseExClient(BaseClient):
         return []
 
     # Импорт Pm-ов (с Pmcur-, Pmex- и Pmcurex-ами) и валют (с Curex-ами) с биржи в бд
-    async def set_pmcurexs(self):
+    async def set_pmcurexs(self, cookies: dict = None):
+        if cookies:
+            self.session.cookie_jar.update_cookies(cookies)
         # Curs
         cur_pyds: dict[str, CurEx] = await self.curs()
         curs: dict[int | str, models.Cur] = {

{xync_client-0.0.43.dev10 → xync_client-0.0.43.dev11}/xync_client/Bybit/agent.py

@@ -95,22 +95,33 @@ class AgentClient(BaseAgentClient):  # Bybit client
 
     def creds(self) -> list[CredEpyd]:
         data = self.api.get_user_payment_types()
-        return data["result"] if data["ret_code"] == 0 else data
+        if data["ret_code"] > 0:
+            return data
+        return [CredEpyd.model_validate(credex) for credex in data["result"]]
 
     async def cred_epyd2db(self, cred: CredEpyd) -> models.CredEx:
-        if not (pmex := await models.Pmex.get_or_none(exid=cred.id, ex=self.ex_client.ex).prefetch_related("pm__curs")):
-            raise HTTPException(f"No Pmex {cred.paymentMethod.code} on ex#{self.ex_client.ex.name}", 404)
-        curs = cred.currencyBalance or [c.ticker for c in pmex.pm.curs]
-        if not (pmcurs := await models.Pmcur.filter(cur__ticker__in=curs, pm_id=pmex.pm_id)):
-            raise HTTPException(f"No Pmcur with cur#{cred.currency} and pm#{cred.paymentMethod.code}", 404)
-        if not (person := await models.Person.get_or_none(actors__exid=cred.userId)):
-            raise HTTPException(f"No Pmcur with cur#{cred.currency} and pm#{cred.paymentMethod.code}", 404)
-        dct = {"pmcur_id": pmcur.id, "name": cred.name, "person_id": person.id}
-        cred_in = models.Cred.validate(dct, False)
-        cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
-        credex_in = models.CredEx.validate({"exid": cred.id, "cred_id": cred_db.id, "ex_id": self.ex.id})
-        credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
-        return credex_db
+        if cred.paymentType not in (416,):
+            if not (
+                pmex := await models.Pmex.get_or_none(exid=cred.paymentType, ex=self.ex_client.ex).prefetch_related(
+                    "pm__curs"
+                )
+            ):
+                raise HTTPException(f"No Pmex {cred.paymentType} on ex#{self.ex_client.ex.name}", 404)
+            curs = cred.currencyBalance or {c.ticker for c in pmex.pm.curs}
+            if not (pmcurs := await models.Pmcur.filter(cur__ticker__in=curs, pm_id=pmex.pm_id)):
+                raise HTTPException(f"No Pmcur with cur#{cred.currencyBalance} and pm#{cred.paymentType}", 404)
+            if not (person := await models.Person.get_or_none(actors__exid=self.actor.exid)):
+                raise HTTPException(f"No Pmcur with cur#{cred.currencyBalance} and pm#{cred.paymentType}", 404)
+            dct = {
+                "pmcur_id": pmcurs[0].id,
+                "name": cred.paymentConfigVo.paymentName,
+                "person_id": person.id,
+            }  # todo: WTD with multicur pms?
+            cred_in = models.Cred.validate(dct, False)
+            cred_db, _ = await models.Cred.update_or_create(**cred_in.df_unq())
+            credex_in = models.CredEx.validate({"exid": cred.paymentType, "cred_id": cred_db.id, "ex_id": self.ex.id})
+            credex_db, _ = await models.CredEx.update_or_create(**credex_in.df_unq())
+            return credex_db
 
     # 25: Список реквизитов моих платежных методов
     async def set_creds(self) -> list[models.CredEx]:
@@ -342,7 +353,8 @@ class AgentClient(BaseAgentClient):  # Bybit client
                 mad: Ad = ads[cur_plc]
                 mad.price = str(float(ads[place].price) - 0.01 * (-1) ** int(is_sell))
                 req = AdUpdateRequest.model_validate(mad.model_dump())
-                self.ad_upd(req)
+                res = self.ad_upd(req)
+                print(res)
             await sleep(5)
 
 
@@ -359,6 +371,8 @@ async def main():
     coin = await models.Coin.get(ticker="USDT")
     cur = await models.Cur.get(ticker="RUB")
     volet = await models.Pm.get(norm="volet")
+    # await cl.ex_client.set_pmcurexs(cookies=actor.agent.auth["cookies"]) 607 -> 629
+    await cl.set_creds()
     await cl.battle(coin, cur, False, [volet], 1)
 
     bor = BaseOrderReq(

{xync_client-0.0.43.dev10 → xync_client-0.0.43.dev11/xync_client.egg-info}/PKG-INFO

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