xync-schema 0.6.46__tar.gz → 0.6.48__tar.gz

{xync_schema-0.6.46/xync_schema.egg-info → xync_schema-0.6.48}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.46
+Version: 0.6.48
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
 Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
-Requires-Python: >=3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: xtg-auth
 Provides-Extra: dev

{xync_schema-0.6.46 → xync_schema-0.6.48}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xync-schema"
-requires-python = ">=3.12"
+requires-python = ">=3.11"
 authors = [
     {name = "Mike Artemiev", email = "mixartemev@gmail.com"},
 ]

{xync_schema-0.6.46 → xync_schema-0.6.48}/xync_schema/enums.py

@@ -33,6 +33,7 @@ class ExType(IntEnum):
     cex = 2
     main = 3  # p2p+cex
     dex = 4
+    tg = 5
     futures = 8
 
 
@@ -67,9 +68,16 @@ class TaskType(IntEnum):
     invite_approve = 1
 
 
+class ExStatus(IntEnum):
+    plan = 0
+    parted = 1
+    full = 2
+
+
 class ExAction(IntEnum):
     """Order"""
 
+    get_orders = 0  # Получшение заявок за заданное время, в статусе, по валюте, монете, направлению: `get_orders(stauts=OrderStatus.active, coin='USDT', cur='RUB', is_sell=False) => [order]`
     order_request = 1  # [T] Запрос на старт сделки
     order_request_ask = -1  # [M] - Запрос мейкеру на сделку
     cancel_request = 2  # [T] Отмена запроса на сделку
@@ -98,10 +106,11 @@ class ExAction(IntEnum):
     send_appeal_msg = 17  # Отправка сообщения по апелляции
     get_appeal_msg = -17  # Получение сообщения по апелляции
     """ Ex: Public """
+    curs = 19  # Список поддерживаемых валют тейкера
     pms = 20  # Список платежных методов по каждой валюте
-    curs = 21  # Список поддерживаемых валют тейкера
-    cur_pms_map = 22  # Мэппинг валюта => платежные методы
-    coins = 23  # Список торгуемых монет (с ограничениям по валютам, если есть)
+    cur_pms_map = 21  # Мэппинг валюта => платежные методы
+    coins = 22  # Список торгуемых монет (с ограничениям по валютам, если есть)
+    pairs = 23  # Список пар валюта/монет
     ads = 24  # Список объяв по (buy/sell, cur, coin, pm)
     """ Agent: Fiat """
     my_fiats = 25  # Список реквизитов моих платежных методов
@@ -133,6 +142,7 @@ exs = {
         "beribit.app",
         "beribit.app",
         "beribit.app/login",
+        ExStatus.plan,
     ),
     "Binance": (
         ExType.main,
@@ -140,22 +150,25 @@ exs = {
         "binance.com",
         "p2p.binance.com",
         "accounts.binance.com/login",
+        ExStatus.plan,
     ),
     "BingX": (
         ExType.p2p,
         "https://assets.coingecko.com/markets/images/812/large/YtFwQwJr_400x400.jpg",
         "bingx.com",
-        "bingx.com",
+        "api-app.we-api.com",
         "bingx.com/login",
+        ExStatus.parted,
     ),
-    "Bisq": (ExType.p2p, "", "", "", ""),
-    "BitcoinGlobal": (ExType.p2p, "", "", "", ""),
+    "Bisq": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "BitcoinGlobal": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "BitGet": (
         ExType.p2p,
         "https://assets.coingecko.com/markets/images/591/large/2023-07-25_21.47.43.jpg",
         "www.bitget.com",
         "www.bitget.com",
         "www.bitget.com/login",
+        ExStatus.parted,
     ),
     "BitPapa": (
         ExType.p2p,
@@ -163,98 +176,109 @@ exs = {
         "bitpapa.com",
         "bitpapa.com",
         "bitpapa.com/log-in",
+        ExStatus.plan,
     ),
-    "Bitvalve ": (ExType.p2p, "", "", "", ""),
+    "Bitvalve ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Bybit": (
         ExType.main,
         "https://assets.coingecko.com/markets/images/698/large/bybit_spot.png",
         "bybit.com",
-        "bybit.com",
+        "api2.bybit.com",
         "bybit.com/login",
+        ExStatus.parted,
     ),
-    "CoinCola": (ExType.main, "", "", "", ""),
-    "CRYPTED": (ExType.p2p, "", "", "", ""),
-    "Garantex": (ExType.p2p, "", "", "", ""),
+    "CoinCola": (ExType.main, "", "", "", "", ExStatus.plan),
+    "CRYPTED": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "Garantex": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Gate": (
         ExType.p2p,
         "https://assets.coingecko.com/markets/images/403/large/gate_io_logo.jpg",
         "gate.io",
         "gate.io",
         "www.gate.io/login",
+        ExStatus.parted,
     ),
-    "HodlHodl": (ExType.p2p, "", "", "", ""),
+    "HodlHodl": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Htx": (
         ExType.main,
         "https://assets.coingecko.com/markets/images/25/large/logo_V_colour_black.png",
         "www.htx.com",
         "www.htx.com",
         "htx.com/login",
+        ExStatus.parted,
     ),
-    "Koshelek": (ExType.p2p, "", "", "", ""),
+    "Koshelek": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "KuCoin": (
         ExType.main,
         "https://assets.coingecko.com/markets/images/61/large/kucoin.png",
         "kucoin.com",
         "kucoin.com",
         "www.kucoin.com/ucenter/signin",
+        ExStatus.plan,
     ),
-    "LocalCoinSwap": (ExType.p2p, "", "", "", ""),
-    "LocalMonero": (ExType.p2p, "", "", "", ""),
+    "LocalCoinSwap": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "LocalMonero": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Mexc": (
         ExType.main,
         "https://assets.coingecko.com/markets/images/409/large/MEXC_logo_square.jpeg",
         "www.mexc.com",
         "www.mexc.com",
         "www.mexc.com/login",
+        ExStatus.plan,
     ),
-    "Noones ": (ExType.p2p, "", "", "", ""),
+    "Noones ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Okx": (
         ExType.main,
         "https://assets.coingecko.com/markets/images/379/large/WeChat_Image_20220117220452.png",
         "www.okx.cab",
         "www.okx.cab",
         "www.okx.cab/account/login",
+        ExStatus.plan,
     ),
-    "Paxful": (ExType.p2p, "", "", "", ""),
-    "PeachBitcoin": (ExType.p2p, "", "", "", ""),
-    "Phemex": (ExType.p2p, "", "", "", ""),
-    "Poloniex": (ExType.main, "", "", "", ""),
-    "Remitano": (ExType.p2p, "", "", "", ""),
-    "RiseX": (ExType.p2p, "", "", "", ""),
-    "RoboSats": (ExType.p2p, "", "", "", ""),
+    "Paxful": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "PeachBitcoin": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "Phemex": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "Poloniex": (ExType.main, "", "", "", "", ExStatus.plan),
+    "Remitano": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "RiseX": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "RoboSats": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Sigen": (
         ExType.p2p,
         "https://yastatic.net/naydex/yandex-search/neZ1W6346/a21f02dA/2SvJ6dTLJwRiz_lTFP-fhywHqi1fxPNRcIxuKzcpwJ0DGlJzbzdT8ARet86SrINoGNj87R9U-t8HLZcrrBASQf0_6OkAL7cgl6uc0gCrHxI9Y369emE2MJF5yotCyODdZ5iXljtkQJMXTMV9VXsEL68seaiqQF578wnB3V",
         "sigen.pro",
         "sigen.pro",
         "sigen.pro/p2p",
+        ExStatus.plan,
     ),
-    "SkyCrypto": (ExType.p2p, "", "", "", ""),
-    "SmartSwap": (ExType.p2p, "", "", "", ""),
-    "Solid": (ExType.main, "", "", "", ""),
+    "SkyCrypto": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "SmartSwap": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "Solid": (ExType.main, "", "", "", "", ExStatus.plan),
     "TgWallet": (
-        ExType.p2p,
+        ExType.tg,
         "https://telerock.ru/uploads/posts/2024-03/f658443d9e_c9d505bbf856e2360ba6812079ba02d0.webp",
         "walletbot.me",
         "p2p.walletbot.me",
         "walletbot.me",
+        ExStatus.parted,
     ),
-    "TotalCoin": (ExType.p2p, "", "", "", ""),
-    "WazirX": (ExType.p2p, "", "", "", ""),
+    "TotalCoin": (ExType.p2p, "", "", "", "", ExStatus.plan),
+    "WazirX": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "WebMoney": (
         ExType.p2p,
         "https://vectorseek.com/wp-content/uploads/2023/08/Webmoney-Icon-Logo-Vector.svg-.png",
         "exchanger.money",
         "exchanger.money",
         "exchanger.money",
+        ExStatus.plan,
     ),
-    "WhiteBIT": (ExType.p2p, "", "", "", ""),
+    "WhiteBIT": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "xRocket": (
         ExType.p2p,
         "https://cdn.allmylinks.com/prod/Upload/file/R/L/6/8G0TaGNtUV8C1V7VQsivDtJcpEz2z7Lc.jpg",
         "",
         "",
         "",
+        ExStatus.plan,
     ),
     # "catalogop2p(.com": ExType.p2p, ''), todo: discover brazilian p2p platforms
 }

{xync_schema-0.6.46 → xync_schema-0.6.48}/xync_schema/models.py

@@ -5,9 +5,9 @@ from tortoise import Model as BaseModel
 from x_auth.enums import Role
 from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
-from tg_auth.models import UserStatus, AuthUser
+from tg_auth.models import UserStatus, AuthUser, UserInfoTrait
 
-from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
+from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction, ExStatus
 
 
 # class Country(Model):
@@ -60,6 +60,7 @@ class Ex(Model):
     host_p2p: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
     url_login: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
     type_: ExType = fields.IntEnumField(ExType)
+    status: ExStatus = fields.IntEnumField(ExStatus, default=ExStatus.plan)
     logo: str = fields.CharField(511, default="")
 
     pms: fields.ManyToManyRelation["Pm"]
@@ -80,10 +81,12 @@ class Ex(Model):
     class PydanticMeta(Model.PydanticMeta):
         include = "name", "logo"
 
-    async def client(self):
+    def client(self):
         import sys
 
-        client = sys.modules[f"xync_client.{self.name}.ex"].Client
+        module_name = f"xync_client.{self.name}.ex"
+        __import__(module_name)
+        client = sys.modules[module_name].ExClient
         return client(self)
 
 
@@ -141,7 +144,7 @@ class Direction(Model):
         unique_together = (("pair", "sell"),)
 
 
-class User(Model, TsTrait):
+class User(Model, TsTrait, UserInfoTrait):
     id: int = fields.BigIntField(True)
     role: Role = fields.IntEnumField(Role, default=Role.READER)
     status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
@@ -402,6 +405,8 @@ class Order(Model):
     confirmed_at: datetime | None = DatetimeSecField(null=True)
     appealed_at: datetime | None = DatetimeSecField(null=True)
 
+    msgs: fields.BackwardFKRelation["Msg"]
+
     _name = {"fiat__pmcur__pm__name"}
 
     def repr(self):
@@ -429,6 +434,14 @@ class Order(Model):
         exclude = ("taker",)
 
 
+class Msg(Model):
+    tgid: int = fields.IntField()
+    txt: str = fields.CharField(255)
+    media: str | None = fields.CharField(255, null=True)
+    receiver: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.User", related_name="msgs")
+    order: fields.ForeignKeyRelation[Order] = fields.ForeignKeyField("models.Order", related_name="msgs")
+
+
 # class Dep(Model, TsTrait):
 #     pid: str = fields.CharField(31)  # product_id
 #     apr: float = fields.FloatField()

xync_schema-0.6.48/xync_schema/pydantic.py

@@ -0,0 +1,33 @@
+from datetime import datetime
+
+from pydantic import BaseModel
+from xync_schema.models import Fiat, Msg
+
+
+class FiatUpd(BaseModel):
+    detail: str | None = None
+    name: str | None = None
+    amount: float | None = None
+    target: int | None = None
+
+
+class FiatNew(FiatUpd):
+    cur_id: int
+    pm_id: int
+    detail: str
+    amount: float = 0
+
+
+class OrderPyd(BaseModel):
+    id: int
+    amount: float
+    status: str
+    actions: dict | None = None
+    fiat: Fiat.pyd()
+    is_sell: bool
+    contragent: int
+    created_at: datetime
+    payed_at: datetime | None = None
+    appealed_at: datetime | None = None
+    confirmed_at: datetime | None = None
+    msgs: list[Msg.pyd()] = []

{xync_schema-0.6.46 → xync_schema-0.6.48/xync_schema.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.46
+Version: 0.6.48
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
 Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
-Requires-Python: >=3.12
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: xtg-auth
 Provides-Extra: dev

xync_schema-0.6.46/xync_schema/pydantic.py

@@ -1,15 +0,0 @@
-from pydantic import BaseModel
-
-
-class FiatUpd(BaseModel):
-    detail: str | None = None
-    name: str | None = None
-    amount: float | None = None
-    target: int | None = None
-
-
-class FiatNew(FiatUpd):
-    cur_id: int
-    pm_id: int
-    detail: str
-    amount: float = 0