xync-schema 0.6.36.dev2__py3-none-any.whl → 0.6.36.dev4__py3-none-any.whl

xync_schema/enums.py

@@ -91,9 +91,10 @@ class ExAction(IntEnum):
     send_appeal_msg = 17  # Отправка сообщения по апелляции
     get_appeal_msg = -17  # Получение сообщения по апелляции
     """ Ex: Public """
-    taker_curs = 21  # Список поддерживаемых валют тейкера
-    coins = 22  # Список торгуемых монет (с ограничениям по валютам, если есть)
-    pms = 23  # Список платежных методов по каждой валюте
+    pms = 20  # Список платежных методов по каждой валюте
+    curs = 21  # Список поддерживаемых валют тейкера
+    cur_pms_map = 22  # Мэппинг валюта => платежные методы
+    coins = 23  # Список торгуемых монет (с ограничениям по валютам, если есть)
     ads = 24  # Список объяв по (buy/sell, cur, coin, pm)
     """ Agent: Fiat """
     my_fiats = 25  # Список реквизитов моих платежных методов

xync_schema/models.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from tortoise import fields
 from tortoise.queryset import QuerySet
+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
@@ -18,8 +19,6 @@ class Country(Model):
     curexs: fields.ManyToManyRelation["Curex"]
     fiats: fields.BackwardFKRelation["Fiat"]
 
-    _icon = "location"
-
 
 class Cur(Model):
     id = fields.SmallIntField(True)
@@ -28,8 +27,7 @@ class Cur(Model):
     country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
-    curexs: fields.ReverseRelation["Curex"]
-    pmcurs: fields.ReverseRelation["Pmcur"]  # no need. use pms
+    exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="curex")
     pairs: fields.ReverseRelation["Pair"]
     countries: fields.ReverseRelation[Country]
 
@@ -65,12 +63,11 @@ class Ex(Model):
     logo: str = fields.CharField(511, default="")
 
     pms: fields.ManyToManyRelation["Pm"]
+    curs: fields.ManyToManyRelation[Cur]
     pmcurs: fields.ManyToManyRelation["Pmcur"] = fields.ManyToManyField("models.Pmcur", through="pmcurex")
     coins: fields.ManyToManyRelation[Coin]
 
     agents: fields.ReverseRelation["Agent"]
-    curexs: fields.ReverseRelation["Curex"]
-    pmcurexs: fields.ReverseRelation["Pmcurex"]
     pmexs: fields.ReverseRelation["Pmex"]
     pairs: fields.ReverseRelation["Pair"]
     # deps: fields.ReverseRelation["Dep"]
@@ -90,18 +87,29 @@ class Ex(Model):
         return client(self)
 
 
-class Curex(Model):
+class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
+    exid: str = fields.CharField(31)
+    p2p: bool = fields.BooleanField(default=True)
     countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
         "models.Country", through="curexcountry", backward_key="curexs"
     )
 
-    _name = {"cur__ticker", "ex__name"}
+    class Meta:
+        table_description = "Currency in Exchange"
+        unique_together = (("ex_id", "cur_id"), ("ex_id", "exid"))
+
+
+class Coinex(BaseModel):
+    coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin")
+    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
+    exid: str = fields.CharField(31)
+    p2p: bool = fields.BooleanField(default=True)
 
     class Meta:
         table_description = "Currency in Exchange"
-        unique_together = (("cur_id", "ex_id"),)
+        unique_together = (("ex_id", "coin_id"), ("ex_id", "exid"))
 
 
 class Pair(Model, TsTrait):
@@ -193,7 +201,7 @@ class Agent(Model, TsTrait):
 
     class PydanticMeta(Model.PydanticMeta):
         # max_recursion = 3
-        include = "ex", "assets", "auth", "updated_at"
+        include = "id", "ex", "assets", "auth", "updated_at"
         computed = ["balance"]
 
     async def client(self):
@@ -239,21 +247,15 @@ class Ad(Model, TsTrait):
 
 class Pm(Model):
     name: str = fields.CharField(63, unique=True)
-    identifier: str | None = fields.CharField(63, unique=True, null=True)
+    # identifier: str | None = fields.CharField(63, unique=True, null=True)
     rank: int | None = fields.SmallIntField(default=0)
     type_: PmType | None = fields.IntEnumField(PmType, null=True)
-    template: int | None = fields.SmallIntField(null=True)
     logo: str | None = fields.CharField(127, null=True)
-    color: str | None = fields.CharField(7, null=True)
     multiAllow: bool | None = fields.BooleanField(null=True)
-    riskLevel: int | None = fields.SmallIntField(null=True)
-    chatNeed: bool | None = fields.BooleanField(null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
-    exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField(
-        "models.Ex", through="pmex"
-    )  # no need. use pmexs[.exid]
+    exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", "pmex")  # no need. use pmexs[.exid]
     orders: fields.ReverseRelation["Order"]
     pmcurs: fields.ReverseRelation["Pmcur"]  # no need. use curs
     pmexs: fields.ReverseRelation["Pmex"]
@@ -262,7 +264,7 @@ class Pm(Model):
         table_description = "Payment methods"
 
     class PydanticMeta(Model.PydanticMeta):
-        include = ("logo",)
+        include = ("id", "name", "logo")
 
 
 class Pmcur(Model):  # for fiat with no exs tie
@@ -274,42 +276,35 @@ class Pmcur(Model):  # for fiat with no exs tie
     fiats: fields.ReverseRelation["Fiat"]
     exs: fields.ManyToManyRelation[Ex]
 
-    _name = {"pm__name", "cur__ticker"}
-
     class Meta:
         table_description = "Payment methods - Currencies"
-        unique_together = (("pm", "cur"),)
+        # unique_together = ("pm", "cur"),
 
     class PydanticMeta(Model.PydanticMeta):
         max_recursion: int = 2  # default: 3
         include = "cur_id", "pm"
 
 
-class Pmex(Model):  # existence pm in ex with no cur tie
+class Pmex(BaseModel):  # existence pm in ex with no cur tie
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
     pm_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "pmexs")
     ex_id: int
-    exid: int = fields.SmallIntField()
-
-    _name = {"pm__name", "ex__name"}
+    exid: str = fields.CharField(31)
 
     class Meta:
-        table_description = "Payment methods - Currencies"
         unique_together = (("pm_id", "ex_id"), ("ex_id", "exid"))
 
 
-class Pmcurex(Model):  # existence pm in ex for exact cur, with "blocked" flag
+class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" flag
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     ex_id: int
     blocked: bool = fields.BooleanField(default=False)
 
-    _name = {"pmcur__pm__name", "pmcur__cur__ticker", "ex__name"}
-
-    class Meta:
-        table_description = "Payment methods - Currencies"
+    # class Meta:
+    #     unique_together = (("ex_id", "pmcur_id"),)
 
 
 class Fiat(Model):
@@ -340,14 +335,12 @@ class Fiat(Model):
     #     # exclude_raw_fields = True
 
 
-class Fiatex(Model):  # existence pm in ex with no cur tie
+class Fiatex(BaseModel):  # existence pm in ex with no cur tie
     fiat: fields.ForeignKeyRelation[Fiat] = fields.ForeignKeyField("models.Fiat", "fiatexs")
     fiat_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "fiatexs")
     ex_id: int
-    exid: int = fields.SmallIntField()
-
-    _name = {"fiat__detail", "ex__name"}
+    exid: int = fields.IntField()
 
     class Meta:
         table_description = "Fiat on Ex"

{xync_schema-0.6.36.dev2.dist-info → xync_schema-0.6.36.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.36.dev2
+Version: 0.6.36.dev4
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA

xync_schema-0.6.36.dev4.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=oOpyfG2i1-UKD8Udh2sVBIMUHTIhKZMPIA6Rh7lqnDA,10013
+xync_schema/models.py,sha256=x5RiBV1Wvqwu9TSezDyGtyXqIQBhbDZJM6EOVl2F4t0,20106
+xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
+xync_schema-0.6.36.dev4.dist-info/METADATA,sha256=IUQNxQiWCi4OTgIw2weBWFIlIeqO-RgGmnatwGJBNaQ,1099
+xync_schema-0.6.36.dev4.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+xync_schema-0.6.36.dev4.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.36.dev4.dist-info/RECORD,,

{xync_schema-0.6.36.dev2.dist-info → xync_schema-0.6.36.dev4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xync_schema-0.6.36.dev2.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=555m5ZD-l5be9h-_hAHysfCkmKHwKjLFDPM1pw_gFuQ,9932
-xync_schema/models.py,sha256=QWYFTUKw8UHxjSa_cS-9jgYbSxaLfqqBmqteZFx0cwQ,20157
-xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
-xync_schema-0.6.36.dev2.dist-info/METADATA,sha256=cNhbrLNpO_s-DTY8QymKGg7hjy9OfR1T5Dkemvrtwk0,1099
-xync_schema-0.6.36.dev2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-xync_schema-0.6.36.dev2.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.36.dev2.dist-info/RECORD,,