xync-schema 0.6.36.dev3__py3-none-any.whl → 0.6.37__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,14 +247,11 @@ 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)
     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]
@@ -271,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):
@@ -337,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.37.dist-info/METADATA

@@ -0,0 +1,204 @@
+Metadata-Version: 2.1
+Name: xync-schema
+Version: 0.6.37
+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
+Description-Content-Type: text/markdown
+Requires-Dist: xtg-auth
+Provides-Extra: dev
+Requires-Dist: build ; extra == 'dev'
+Requires-Dist: pytest-asyncio ; extra == 'dev'
+Requires-Dist: twine ; extra == 'dev'
+
+## INSTALL
+```bash
+# Create python virtual environment
+python3 -m venv venv
+# Activate this environment
+source venv/bin/activate
+# Install dependencies
+pip install -r requirements.dev.txt
+
+# Create pg db
+createdb --U username -W dbname
+## set password for db user
+
+# Copy .env file from sample template
+cp .env.sample .env
+## set your pg creds in .env file
+```
+
+## TEST
+```bash
+pytest
+```
+
+
+### pre-commit
+You can done `commit` only after `pytest` will done success.
+Pre-commit script stored in `.git/hooks/pre-commit` file; current script is:
+```shell
+#!/bin/sh
+pytest
+```
+
+### Relations
+```mermaid
+classDiagram
+direction BT
+class Agent {
+   timestamp(0) with time zone created_at
+   timestamp(0) with time zone updated_at
+   integer exid
+   jsonb auth
+   smallint ex_id
+   bigint user_id
+   integer id
+}
+class Asset {
+   smallint type_  /* spot: 1\nearn: 2\nfound: 3 */
+   double precision free
+   double precision freeze
+   double precision lock
+   double precision target
+   integer agent_id
+   smallint coin_id
+   integer id
+}
+class Coin {
+   varchar(15) ticker
+   double precision rate
+   boolean is_fiat
+   smallint id
+}
+class CoinEx {
+   varchar(31) exid
+   boolean p2p
+   smallint coin_id
+   smallint ex_id
+   integer id
+}
+class Country {
+   integer code
+   varchar(3) short
+   varchar(63) name
+   smallint cur_id
+   smallint id
+}
+class Cur {
+   varchar(3) ticker
+   double precision rate
+   varchar(63) country
+   smallint id
+}
+class CurEx {
+   varchar(31) exid
+   boolean p2p
+   smallint cur_id
+   smallint ex_id
+   integer id
+}
+class CurExCountry {
+   integer curexs
+   smallint country_id
+}
+class Ex {
+   varchar(31) name
+   varchar(63) host  /* With no protocol 'https://' */
+   varchar(63) host_p2p  /* With no protocol 'https://' */
+   varchar(63) url_login  /* With no protocol 'https://' */
+   smallint type_  /* p2p: 1\ncex: 2\nmain: 3\ndex: 4\nfutures: 8 */
+   varchar(511) logo
+   smallint id
+}
+class Fiat {
+   varchar(127) detail
+   varchar(127) name
+   double precision amount
+   double precision target
+   smallint country_id
+   integer pmcur_id
+   bigint user_id
+   integer id
+}
+class FiatEx {
+   integer exid
+   smallint ex_id
+   integer fiat_id
+   integer id
+}
+class Limit {
+   integer amount
+   integer unit
+   integer level
+   boolean income
+   bigint added_by_id
+   integer pmcur_id
+   integer id
+}
+class Pm {
+   varchar(63) name
+   smallint rank
+   smallint type_  /* bank: 0\nweb_wallet: 1\ncash: 2\ngift_card: 3\ncredit_card: 4 */
+   varchar(127) logo
+   boolean multiAllow
+   integer id
+}
+class PmCur {
+   smallint cur_id
+   integer pm_id
+   integer id
+}
+class PmCurEx {
+   boolean blocked
+   smallint ex_id
+   integer pmcur_id
+   integer id
+}
+class PmEx {
+   varchar(31) exid
+   smallint ex_id
+   integer pm_id
+   integer id
+}
+class User {
+   timestamp(0) with time zone created_at
+   timestamp(0) with time zone updated_at
+   smallint role  /* READER: 4\nWRITER: 2\nMANAGER: 6\nADMIN: 7 */
+   smallint status  /* CREATOR: 5\nADMINISTRATOR: 4\nMEMBER: 3\nRESTRICTED: 2\nLEFT:... */
+   varchar(95) username
+   bigint ref_id
+   bigint id
+}
+
+Agent  -->  Ex : ex_id-id
+Agent  -->  User : user_id-id
+Asset  -->  Agent : agent_id-id
+Asset  -->  Coin : coin_id-id
+CoinEx  -->  Coin : coin_id-id
+CoinEx  -->  Ex : ex_id-id
+Country  -->  Cur : cur_id-id
+CurEx  -->  Cur : cur_id-id
+CurEx  -->  Ex : ex_id-id
+CurExCountry  -->  Country : country_id-id
+CurExCountry  -->  CurEx : curexs-id
+Fiat  -->  Country : country_id-id
+Fiat  -->  PmCur : pmcur_id-id
+Fiat  -->  User : user_id-id
+FiatEx  -->  Ex : ex_id-id
+FiatEx  -->  Fiat : fiat_id-id
+Limit  -->  PmCur : pmcur_id-id
+Limit  -->  User : added_by_id-id
+PmCur  -->  Cur : cur_id-id
+PmCur  -->  Pm : pm_id-id
+PmCurEx  -->  Ex : ex_id-id
+PmCurEx  -->  PmCur : pmcur_id-id
+PmEx  -->  Ex : ex_id-id
+PmEx  -->  Pm : pm_id-id
+User  -->  User : ref_id-id
+
+```

xync_schema-0.6.37.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.37.dist-info/METADATA,sha256=uHomi_tU8TxJIpbejuWbSnAEQ2jQt2TAk_9ENjgpiJ4,4352
+xync_schema-0.6.37.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+xync_schema-0.6.37.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.37.dist-info/RECORD,,

{xync_schema-0.6.36.dev3.dist-info → xync_schema-0.6.37.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.dev3.dist-info/METADATA

@@ -1,47 +0,0 @@
-Metadata-Version: 2.1
-Name: xync-schema
-Version: 0.6.36.dev3
-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
-Description-Content-Type: text/markdown
-Requires-Dist: xtg-auth
-Provides-Extra: dev
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: pytest-asyncio ; extra == 'dev'
-Requires-Dist: twine ; extra == 'dev'
-
-## INSTALL
-```bash
-# Create python virtual environment
-python3 -m venv venv
-# Activate this environment
-source venv/bin/activate
-# Install dependencies
-pip install -r requirements.dev.txt
-
-# Create pg db
-createdb --U username -W dbname
-## set password for db user
-
-# Copy .env file from sample template
-cp .env.sample .env
-## set your pg creds in .env file
-```
-
-## TEST
-```bash
-pytest
-```
-
-
-### pre-commit
-You can done `commit` only after `pytest` will done success.
-Pre-commit script stored in `.git/hooks/pre-commit` file; current script is:
-```shell
-#!/bin/sh
-pytest
-```

xync_schema-0.6.36.dev3.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=AT_ZZA6H1xz_Lg-tikATVMpcm3X3-lawCL95H7_jS1o,20093
-xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
-xync_schema-0.6.36.dev3.dist-info/METADATA,sha256=4OIwa3Ug1J1fWwRB7qBume4sEv-iSPlum8Uk78lqYv8,1099
-xync_schema-0.6.36.dev3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-xync_schema-0.6.36.dev3.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.36.dev3.dist-info/RECORD,,