xync-client 0.0.135__tar.gz → 0.0.137__tar.gz

{xync_client-0.0.135/xync_client.egg-info → xync_client-0.0.137}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.135
+Version: 0.0.137
 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.135 → xync_client-0.0.137}/xync_client/Bybit/InAgent.py

@@ -11,6 +11,7 @@ from decimal import Decimal
 from playwright.async_api import async_playwright
 from pydantic import ValidationError
 from pyro_client.client.file import FileClient
+from tortoise.exceptions import IntegrityError
 from tortoise.timezone import now
 from tortoise.transactions import in_transaction
 
@@ -116,15 +117,18 @@ class InAgentClient(BaseInAgentClient):
                                                         f"Order {order.id} created at {order.createDate}, not paid yet"
                                                     )
                                                     continue
-                                                t, is_new = await models.Transfer.update_or_create(
-                                                    dict(
-                                                        amount=int(float(order.amount) * 100),
-                                                        accepted_at=datetime.now(timezone.utc),
-                                                        order=order_db,
-                                                    ),
-                                                    # pm_id=order_db.cred.pmcur.pm_id,
-                                                    pmid=tid,
-                                                )
+                                                try:
+                                                    t, is_new = await models.Transfer.update_or_create(
+                                                        dict(
+                                                            amount=int(float(order.amount) * 100),
+                                                            order=order_db,
+                                                        ),
+                                                        pmid=tid,
+                                                    )
+                                                except IntegrityError as e:
+                                                    logging.error(tid)
+                                                    logging.error(order)
+                                                    logging.exception(e)
 
                                                 if not is_new:  # если по этому платежу уже отпущен другая продажа
                                                     continue
@@ -137,6 +141,8 @@ class InAgentClient(BaseInAgentClient):
                                                     if (
                                                         o["amount"] == order.amount
                                                         and o["id"] != upd.id
+                                                        and o.paymentTermList[0].accountNo
+                                                        == order.paymentTermList[0].accountNo
                                                         and int(order.createDate) < int(o["createDate"]) + 3600 * 000
                                                     )
                                                 ]
@@ -145,6 +151,7 @@ class InAgentClient(BaseInAgentClient):
                                                 )
                                                 pos_db = await models.Order.filter(
                                                     exid__not=order.id,
+                                                    cred_id=order_db.cred_id,
                                                     amount=int(float(order.amount) * 10**curex.scale),
                                                     status__not_in=[OrderStatus.completed, OrderStatus.canceled],
                                                     created_at__gt=now() - timedelta(hours=1),
@@ -278,7 +285,7 @@ class InAgentClient(BaseInAgentClient):
 
     async def money_upd(self, order_db: models.Order):
         # обновляем остаток монеты
-        await order_db.fetch_related("ad__pair_side__pair", "cred")
+        await order_db.fetch_related("ad__pair_side__pair", "cred", "transfer")
         ass = await models.Asset.get(
             addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.agent_client.actor
         )
@@ -341,11 +348,7 @@ class InAgentClient(BaseInAgentClient):
             # отправляем деньги
             tid, img, rest_amount = await pma.send(dest=dest, amount=fmt_am, cur=cur)
             # создаем перевод в бд
-            t, _ = await models.Transfer.update_or_create(
-                {"amount": order_db.amount},
-                order=order_db,
-                pmid=tid,
-            )
+            t, _ = await models.Transfer.update_or_create({"order": order_db, "amount": order_db.amount}, pmid=tid)
             await self.send_receipt(str(order_db.exid), tid)  # отправляем продавцу чек
             logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
 

{xync_client-0.0.135 → xync_client-0.0.137}/xync_client/Bybit/agent.py

@@ -393,6 +393,12 @@ class AgentClient(BaseAgentClient):  # Bybit client
             },
         )
 
+    def my_reviews(self):
+        return self._post(
+            "/x-api/fiat/otc/order/appraiseList",
+            {"makerUserId": self.actor.exid, "page": "1", "size": "10", "appraiseType": "1"},  # "0" - bad
+        )
+
     async def get_orders_active(
         self, side: int = None, status: int = None, begin_time: int = None, end_time: int = None, token_id: str = None
     ):

{xync_client-0.0.135 → xync_client-0.0.137}/xync_client/details.py

@@ -5,10 +5,26 @@ from xync_schema import models
 import re
 from typing import List, Dict
 
-phrases = ["дай(те)?", "номер", "рек(и|визиты)", "карту", "банк(и|а)?", "куда", "(на )?как(ой|ую)", "актуал"]
+details = ["дай(те)?", "номер", "рек(и|визиты)", "карту", "банк(и|а)?", "куда", "(на )?как(ой|ую)", "актуал"]
 
+begging = ["вз (лайк|отзыв)", "взаим(о|ный)?", "отзыву?", "like", "лайкни"]
 
-async def request_for_details(phrases_to_find) -> List[Dict[str, str]]:
+greetings = [
+    "привет(ствую|ик)?",
+    "здаровa?",
+    "здоров(а|енько)",
+    "здравствуй(те)?",
+    "Добрый ?(день|вечер)?",
+    "h(i|ello)",
+    "сал(ют|лам)",
+    "ку",
+    "йо",
+    "хай",
+    "добро пожаловать",
+]
+
+
+async def search_messages(phrases_to_find) -> List[Dict[str, str]]:
     _ = await init_db(TORM, True)
     msgs = await models.Msg.all().values("txt")
     patterns = [re.compile(rf"\b{phrase}\b", re.IGNORECASE) for phrase in phrases_to_find]
@@ -19,9 +35,10 @@ async def request_for_details(phrases_to_find) -> List[Dict[str, str]]:
         for pattern in patterns:
             if pattern.search(msg["txt"]):
                 results.append({pattern.pattern: msg["txt"]})
-
+    for i in results:
+        print(i)
     return results
 
 
 if __name__ == "__main__":
-    asyncio.run(request_for_details(phrases))
+    asyncio.run(search_messages(greetings))

{xync_client-0.0.135 → xync_client-0.0.137/xync_client.egg-info}/PKG-INFO

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