xync-schema 0.6.72__tar.gz → 0.6.73__tar.gz

{xync_schema-0.6.72/xync_schema.egg-info → xync_schema-0.6.73}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.6.72
+Version: 0.6.73
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -8,9 +8,11 @@ Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: xtg-auth
+Requires-Dist: xn-auth
+Requires-Dist: python-dotenv
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 

{xync_schema-0.6.72 → xync_schema-0.6.73}/pyproject.toml

@@ -9,11 +9,12 @@ readme = "README.md"
 license = {text = "EULA"}
 dynamic = ["version"]
 
-dependencies = ["xtg-auth"]
+dependencies = ["xn-auth", "python-dotenv"]
 
 [project.optional-dependencies]
 dev = [
     "build",
+    "pre-commit",
     "pytest-asyncio",
     "twine",
 ]

{xync_schema-0.6.72 → xync_schema-0.6.73}/tests/test_db.py

@@ -7,7 +7,7 @@ from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 
 from xync_schema import models
-from xync_schema.models import Cur
+from xync_schema.models import Ex
 
 load_dotenv()
 
@@ -25,5 +25,5 @@ async def test_init_db(dbc):
 
 
 async def test_models(dbc):
-    c = await Cur.all()
-    assert isinstance(c, list), "No currencies"
+    c = await Ex.first()
+    assert isinstance(c, Ex), "No exs"

{xync_schema-0.6.72 → xync_schema-0.6.73}/xync_schema/enums.py

@@ -1,6 +1,18 @@
 from enum import IntEnum
 
 
+class PersonStatus(IntEnum):
+    VIP = 2
+    DEFAULT = 1
+    BLOCKED = 0
+
+
+class UserStatus(IntEnum):
+    SLEEP = 0
+    PAY = 1
+    ACTIVE = 2
+
+
 class AdStatus(IntEnum):
     defActive = 0
     active = 1
@@ -57,11 +69,13 @@ class TradeType(IntEnum):
 
 class PmType(IntEnum):
     bank = 0
-    web_wallet = 1
+    emoney = 1
     cash = 2
+    card = 4
     gift_card = 3
-    credit_card = 4
     IFSC = 5
+    SBP = 6
+    phone = 7
 
 
 class TaskType(IntEnum):
@@ -112,6 +126,9 @@ class ExAction(IntEnum):
     coins = 22  # Список торгуемых монет (с ограничениям по валютам, если есть)
     pairs = 23  # Список пар валюта/монет
     ads = 24  # Список объяв по покупке/продаже, валюте, монете, платежному методу (buy/sell, cur, coin, pm)
+    set_coins = 44  # обновление монет биржи в бд
+    set_pmcurs = 45  # обновление валют и платежек биржи в бд
+    set_pairs = 46  # обновление пар биржи в бд
     ad = 42  # Чужая объява по id
     """ Agent: Fiat """
     my_fiats = 25  # Список реквизитов моих платежных методов
@@ -147,7 +164,7 @@ class ExAction(IntEnum):
 exs = {
     "Beribit": (
         ExType.p2p,
-        "https://sun9-41.userapi.com/impg/cZCGFTXH5-11_HjiWw9aWr3__SlbmMIiXSc-ig/YtOHJpjuVW0.jpg?size=604x604&quality=95&sign=def93bbe4283c563eb2d75a5968350f2",
+        "AgACAgIAAxkBAAIEY2ferEZ38wZbpG9kmfFPjsSGC3CmAAIo8DEbF_j4StC_ac-XA5fbAQADAgADeAADNgQ",
         "beribit.app",
         "beribit.app",
         "beribit.app/login",
@@ -155,7 +172,7 @@ exs = {
     ),
     "Binance": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/52/large/binance.jpg",
+        "AgACAgIAAxkBAAIEYGfeq1hpcgu2el0ROqFvWtWNHrtWAAIQ8DEbF_j4Sq7oecXCtoONAQADAgADbQADNgQ",
         "binance.com",
         "p2p.binance.com",
         "accounts.binance.com/login",
@@ -163,7 +180,7 @@ exs = {
     ),
     "BingX": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/812/large/YtFwQwJr_400x400.jpg",
+        "AgACAgIAAxkBAAIEZWferWiY5ZCV2SAWgSnUan76cl-TAAIy8DEbF_j4Sq1aMXmyATzQAQADAgADbQADNgQ",
         "bingx.com",
         "api-app.we-api.com",
         "bingx.com/login",
@@ -173,7 +190,7 @@ exs = {
     "BitcoinGlobal": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "BitGet": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/591/large/2023-07-25_21.47.43.jpg",
+        "AgACAgIAAxkBAAIEZ2ferYwPfGrx1PX-C7SBToZG-h-iAAI08DEbF_j4StxKwJlnBT3XAQADAgADbQADNgQ",
         "www.bitget.com",
         "www.bitget.com",
         "www.bitget.com/login",
@@ -181,7 +198,7 @@ exs = {
     ),
     "BitPapa": (
         ExType.p2p,
-        "https://avatars.mds.yandex.net/i?id=130c32d9900d514d738ef89b9c61bcd3_l-4767909-images-thumbs&n=13",
+        "AgACAgIAAxkBAAIEaWferbY69OMAASKXObrcYYLciuWVswACPPAxGxf4-EqNHJqqRTQmMgEAAwIAA3kAAzYE",
         "bitpapa.com",
         "bitpapa.com",
         "bitpapa.com/log-in",
@@ -190,7 +207,7 @@ exs = {
     "Bitvalve ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Bybit": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/698/large/bybit_spot.png",
+        "AgACAgIAAxkBAAIENGfeY4AfRquwTL2LpDrzqvFMVNt_AAIG9DEbXX3wSq3oI7t_PqQGAQADAgADbQADNgQ",
         "bybit.com",
         "api2.bybit.com",
         "bybit.com/login",
@@ -201,7 +218,7 @@ exs = {
     "Garantex": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Gate": (
         ExType.p2p,
-        "https://assets.coingecko.com/markets/images/403/large/gate_io_logo.jpg",
+        "AgACAgIAAxkBAAIEMmfeY2WPV9axwELiZp9JsG1qVVSDAAIF9DEbXX3wSmqKNrQMcr0GAQADAgADbQADNgQ",
         "gate.io",
         "gate.io",
         "www.gate.io/login",
@@ -210,7 +227,7 @@ exs = {
     "HodlHodl": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Htx": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/25/large/logo_V_colour_black.png",
+        "CAACAgIAAxkBAAIEQWfeZKFue_EuEx4aCWQuUUiBUFUWAAJcbQACXX3wSgpUwu_LgrVCNgQ",
         "www.htx.com",
         "www.htx.com",
         "htx.com/login",
@@ -219,7 +236,7 @@ exs = {
     "Koshelek": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "KuCoin": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/61/large/kucoin.png",
+        "AgACAgIAAxkBAAIELWfeYuCy-IaY2x4WDEFV30eDAlrLAAIC9DEbXX3wSskAAdr5c_L0LQEAAwIAA20AAzYE",
         "kucoin.com",
         "kucoin.com",
         "www.kucoin.com/ucenter/signin",
@@ -229,7 +246,7 @@ exs = {
     "LocalMonero": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Mexc": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/409/large/MEXC_logo_square.jpeg",
+        "AgACAgIAAxkBAAIEJ2feYl-98-SXYJQAARlswmCK7ihM-gAD9DEbXX3wSheqy--NeUvRAQADAgADbQADNgQ",
         "www.mexc.com",
         "www.mexc.com",
         "www.mexc.com/login",
@@ -238,7 +255,7 @@ exs = {
     "Noones ": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Okx": (
         ExType.main,
-        "https://assets.coingecko.com/markets/images/379/large/WeChat_Image_20220117220452.png",
+        "AgACAgIAAxkBAAIEJWfeYkG29cU8Nt1oaiskDutGInGvAAL_8zEbXX3wSrPVVMfw6kI5AQADAgADeQADNgQ",
         "www.okx.cab",
         "www.okx.cab",
         "www.okx.cab/account/login",
@@ -253,7 +270,7 @@ exs = {
     "RoboSats": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "Sigen": (
         ExType.p2p,
-        "https://yastatic.net/naydex/yandex-search/neZ1W6346/a21f02dA/2SvJ6dTLJwRiz_lTFP-fhywHqi1fxPNRcIxuKzcpwJ0DGlJzbzdT8ARet86SrINoGNj87R9U-t8HLZcrrBASQf0_6OkAL7cgl6uc0gCrHxI9Y369emE2MJF5yotCyODdZ5iXljtkQJMXTMV9VXsEL68seaiqQF578wnB3V",
+        "AgACAgIAAxkBAAIEIWfeYbAYWyMCtPtZ6q233_7VoQ87AAL-8zEbXX3wSqgLi3m0_G7AAQADAgADbQADNgQ",
         "sigen.pro",
         "sigen.pro",
         "sigen.pro/p2p",
@@ -264,7 +281,7 @@ exs = {
     "Solid": (ExType.main, "", "", "", "", ExStatus.plan),
     "TgWallet": (
         ExType.tg,
-        "https://telerock.ru/uploads/posts/2024-03/f658443d9e_c9d505bbf856e2360ba6812079ba02d0.webp",
+        "AgACAgIAAxkBAAIEEGfd3oDil7jFpVEZh_ek2RlmDSrpAALA6jEb7cjwSo3tCIf7UsVoAQADAgADbQADNgQ",
         "walletbot.me",
         "p2p.walletbot.me",
         "walletbot.me",
@@ -274,7 +291,7 @@ exs = {
     "WazirX": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "WebMoney": (
         ExType.p2p,
-        "https://vectorseek.com/wp-content/uploads/2023/08/Webmoney-Icon-Logo-Vector.svg-.png",
+        "AgACAgIAAxkBAAIEb2ferkkq2wWB-aJwIY6I2VZxSK4CAAJM8DEbF_j4SlHZDVKCzkUxAQADAgADeQADNgQ",
         "exchanger.money",
         "exchanger.money",
         "exchanger.money",
@@ -283,7 +300,7 @@ exs = {
     "WhiteBIT": (ExType.p2p, "", "", "", "", ExStatus.plan),
     "xRocket": (
         ExType.p2p,
-        "https://cdn.allmylinks.com/prod/Upload/file/R/L/6/8G0TaGNtUV8C1V7VQsivDtJcpEz2z7Lc.jpg",
+        "AgACAgIAAxkBAAIEHWfeXy5a7fM9D5ys8ReQrDIRpwAB0wAC8_MxG1198Eo01GgWSVjQ3wEAAwIAA3gAAzYE",
         "",
         "",
         "",

{xync_schema-0.6.72 → xync_schema-0.6.73}/xync_schema/models.py

@@ -1,36 +1,45 @@
 import sys
 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_auth.models import Model, UserTg
 from x_model.models import TsTrait, DatetimeSecField
-from tg_auth.models import UserStatus, AuthUser, UserInfoTrait
 
-from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction, ExStatus
+from xync_schema.enums import (
+    ExType,
+    AdStatus,
+    AssetType,
+    OrderStatus,
+    ExAction,
+    ExStatus,
+    PersonStatus,
+    UserStatus,
+    PmType,
+)
 
 
-# class Country(Model):
-#     id = fields.SmallIntField(True)
-#     code: int | None = fields.IntField(null=True)
-#     short: str | None = fields.CharField(3, unique=True, null=True)
-#     name: str | None = fields.CharField(63, unique=True, null=True)
-#     cur: fields.ForeignKeyRelation["Cur"] = fields.ForeignKeyField("models.Cur", related_name="countries")
-#     curexs: fields.ManyToManyRelation["Curex"]
-#     fiats: fields.BackwardFKRelation["Fiat"]
+class Country(Model):
+    id = fields.SmallIntField(True)
+    code: int | None = fields.IntField(null=True)
+    short: str | None = fields.CharField(3, null=True)
+    name: str | None = fields.CharField(63, unique=True, null=True)
+    cur: fields.ForeignKeyRelation["Cur"] = fields.ForeignKeyField("models.Cur", related_name="countries")
+    curexs: fields.ManyToManyRelation["Curex"]
+    fiats: fields.BackwardFKRelation["Fiat"]
 
 
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
+    scale: int = fields.SmallIntField(default=0)
     rate: float | None = fields.FloatField(default=0, null=True)
-    # country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="curex")
     pairs: fields.ReverseRelation["Pair"]
-    # countries: fields.ReverseRelation[Country]
+    countries: fields.ReverseRelation[Country]
 
     _name = {"ticker"}
 
@@ -41,6 +50,7 @@ class Cur(Model):
 class Coin(Model):
     id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
+    scale: int = fields.SmallIntField(default=0)
     rate: float | None = fields.FloatField(default=0)
     is_fiat: bool = fields.BooleanField(default=False)
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="coinex")
@@ -66,14 +76,14 @@ class Ex(Model):
 
     pms: fields.ManyToManyRelation["Pm"]
     curs: fields.ManyToManyRelation[Cur]
-    pmcurs: fields.ManyToManyRelation["Pmcur"] = fields.ManyToManyField("models.Pmcur", through="pmcurex")
+    # pmcurs: fields.ManyToManyRelation["Pmcur"] = fields.ManyToManyField("models.Pmcur", through="pmcurex")
     coins: fields.ManyToManyRelation[Coin]
 
-    contragents: fields.ReverseRelation["Contragent"]
+    actors: fields.ReverseRelation["Actor"]
     pmexs: fields.ReverseRelation["Pmex"]
-    pairs: fields.ReverseRelation["Pair"]
+    pairexs: fields.ReverseRelation["PairEx"]
     # deps: fields.ReverseRelation["Dep"]
-    # tests: fields.ReverseRelation["TestEx"]
+    tests: fields.ReverseRelation["TestEx"]
 
     class Meta:
         table_description = "Exchanges"
@@ -82,22 +92,22 @@ class Ex(Model):
     class PydanticMeta(Model.PydanticMeta):
         include = "name", "logo"
 
-    def client(self, agent: "Agent" = None):
+    def client(self):
         module_name = f"xync_client.{self.name}.ex"
         __import__(module_name)
         client = sys.modules[module_name].ExClient
-        return client(self, agent)
+        return client(self)
 
 
 class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
-    exid: str = fields.CharField(31)
-    minimum: float = fields.FloatField(null=True)
+    exid: str = fields.CharField(32)
+    minimum: int = fields.SmallIntField(null=True)
     rounding_scale: int = fields.SmallIntField(null=True)
-    # countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
-    #     "models.Country", through="curexcountry", backward_key="curexs"
-    # )
+    countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
+        "models.Country", through="curexcountry", backward_key="curexs"
+    )
 
     class Meta:
         table_description = "Currency in Exchange"
@@ -109,7 +119,7 @@ class Coinex(BaseModel):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     minimum: float = fields.FloatField(null=True)
 
-    exid: str = fields.CharField(31)
+    exid: str = fields.CharField(32)
     p2p: bool = fields.BooleanField(default=True)
 
     class Meta:
@@ -117,50 +127,75 @@ class Coinex(BaseModel):
         unique_together = (("ex_id", "coin_id"), ("ex_id", "exid"))
 
 
-class Pair(Model, TsTrait):
+class Pair(Model):
     id = fields.SmallIntField(True)
     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="pairs")
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur", related_name="pairs")
+
+    _name = {"coin__ticker", "cur__ticker"}
+
+    class Meta:
+        table_description = "Coin/Currency pairs"
+        unique_together = (("coin", "cur"),)
+
+
+class PairEx(Model, TsTrait):
+    pair: fields.ForeignKeyRelation[Pair] = fields.ForeignKeyField("models.Pair", related_name="pairexs")
+    pair_id: int
     fee: float = fields.FloatField(default=0)
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="pairs")
+    ex_id: int
     directions: fields.ReverseRelation["Direction"]
 
-    _name = {"coin__ticker", "cur__ticker"}
+    _name = {"pair__coin__ticker", "pair__cur__ticker", "ex__name"}
 
     class Meta:
-        table_description = "Coin/Currency pairs"
-        unique_together = (("coin", "cur", "ex"),)
+        table_description = "Pairs on Exs"
+        unique_together = (("pair", "ex"),)
 
 
 class Direction(Model):
     id = fields.SmallIntField(True)
-    pair: fields.ForeignKeyRelation[Pair] = fields.ForeignKeyField("models.Pair", related_name="directions")
+    pairex: fields.ForeignKeyRelation[PairEx] = fields.ForeignKeyField("models.PairEx", related_name="directions")
+    pairex_id: int
     sell: bool = fields.BooleanField()
     total: int = fields.IntField(null=True)
     ads: fields.ReverseRelation["Ad"]
 
-    _name = {"pair__coin__ticker", "pair__cur__ticker", "sell"}
+    _name = {"pairex__coin__ticker", "pairex__cur__ticker", "sell"}
 
     class Meta:
         table_description = "Trade directions"
-        unique_together = (("pair", "sell"),)
+        unique_together = (("pairex", "sell"),)
 
 
-class User(Model, TsTrait, UserInfoTrait):
-    id: int = fields.BigIntField(True)
-    forum: int = fields.BigIntField()
-    role: Role = fields.IntEnumField(Role, default=Role.READER)
-    status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
-    username: str | None = fields.CharField(95, unique=True, null=True)
+class Person(Model, TsTrait):
+    status: PersonStatus = fields.IntEnumField(PersonStatus, default=PersonStatus.DEFAULT)
+    name: str | None = fields.CharField(127, null=True)
+
+    user: fields.BackwardOneToOneRelation["User"]
+    creds: fields.BackwardFKRelation["Cred"]
+    actors: fields.BackwardFKRelation["Actor"]
+
+
+class User(UserTg, TsTrait):
+    status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.SLEEP)
+
+    person: fields.OneToOneRelation[Person] = fields.OneToOneField("models.Person", related_name="user")
+    person_id: int
     ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
         "models.User", related_name="proteges", null=True
     )
     ref_id: int | None
 
+    forum: fields.BackwardOneToOneRelation["Forum"]
+    created_forums: fields.BackwardFKRelation["Forum"]
     proteges: fields.BackwardFKRelation["User"]
-    agents: fields.BackwardFKRelation["Agent"]
+    creds: fields.BackwardFKRelation["Cred"]
+    actors: fields.BackwardFKRelation["Actor"]
     # fiats: fields.BackwardFKRelation["Fiat"]
     limits: fields.BackwardFKRelation["Limit"]
+    msgs: fields.BackwardFKRelation["Msg"]
     # vpn: fields.BackwardOneToOneRelation["Vpn"]
     # invite_requests: fields.BackwardFKRelation["Invite"]
     # invite_approvals: fields.BackwardFKRelation["Invite"]
@@ -169,66 +204,64 @@ class User(Model, TsTrait, UserInfoTrait):
     # investments: fields.BackwardFKRelation["Investment"]
 
     async def free_assets(self):
-        assets = await Asset.filter(agent__user_id=self.id).values("free", "coin__rate")
+        assets = await Asset.filter(agent__actor__person__user__id=self.id).values("free", "coin__rate")
         return sum(asset["free"] * asset["coin__rate"] for asset in assets)
 
     async def fiats_sum(self):
-        fiats = await Fiat.filter(user=self).values("amount", "pmcur__cur__rate")
-        return sum(fiat["amount"] * fiat["pmcur__cur__rate"] for fiat in fiats)
+        fiats = await Fiat.filter(cred__person__user__id=self.id).values("amount", "cred__pmcur__cur__rate")
+        return sum(fiat["amount"] * fiat["cred__pmcur__cur__rate"] for fiat in fiats)
 
     async def balance(self) -> float:
         return await self.free_assets() + await self.fiats_sum()
 
-    def get_auth(self) -> AuthUser:
-        return AuthUser.model_validate(self, from_attributes=True)
+    def name(self):
+        return f"{self.first_name} {self.last_name}".rstrip()
+
+    class PydanticMeta(Model.PydanticMeta):
+        max_recursion = 0
+        include = "role", "status"
+        # computed = ["balance"]
 
-    # class PydanticMeta(Model.PydanticMeta):
-    # max_recursion = 0
-    # include = "role", "status"
-    # computed = ["balance"]
+
+class Forum(Model, TsTrait):
+    id: int = fields.BigIntField(True)
+    joined: bool = fields.BooleanField(default=False)
+    user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", "forum")
+    user_id: int
+    # created_by: fields.BackwardFKRelation[User] = fields.ForeignKeyField("models.User", "created_forums")
 
 
-class Contragent(Model):
+class Actor(Model):
     exid: int = fields.BigIntField()
     name: int = fields.CharField(63)
-    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="contragents")
+    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="actors")
     ex_id: int
-    updated_at: datetime | None = DatetimeSecField(auto_now=True)
+    person: fields.ForeignKeyRelation[Person] = fields.ForeignKeyField("models.Person", related_name="actors")
+    person_id: int
 
     agent: fields.BackwardOneToOneRelation["Agent"]
-    creds: fields.BackwardFKRelation["Cred"]
-    my_ads: fields.BackwardFKRelation["Ad"]
+    ads: fields.BackwardFKRelation["Ad"]
     taken_orders: fields.BackwardFKRelation["Order"]
 
     class Meta:
-        table_description = "Agents"
-        unique_together = (("ex", "exid"),)
+        table_description = "Actors"
+        unique_together = (("ex", "exid"), ("ex", "person"))
 
 
 class Agent(Model, TsTrait):
-    auth: dict[str, str] = fields.JSONField(null=True)
-    contragent: fields.OneToOneRelation[Contragent] = fields.OneToOneField("models.Contragent", "agent")
-    contragent_id: int
-    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
-    user_id: int
-    assets: fields.ReverseRelation["Asset"]
+    auth: dict[str, str] = fields.JSONField(default={})
+    actor: fields.OneToOneRelation[Actor] = fields.OneToOneField("models.Actor", "agent")
+    actor_id: int
 
-    _name = {"contragent__name"}
-
-    def balance(self) -> int:
-        return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
+    assets: fields.ReverseRelation["Asset"]
 
-    class Meta:
-        table_description = "Agents"
-        unique_together = (("contragent", "user"),)
+    _name = {"actor__name"}
 
-    class PydanticMeta(Model.PydanticMeta):
-        # max_recursion = 3
-        include = "id", "contragent__ex", "assets", "auth", "updated_at"
-        computed = ["balance"]
+    # def balance(self) -> int:
+    #     return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
     def client(self):
-        module_name = f"xync_client.{self.contragent.ex.name}.agent"
+        module_name = f"xync_client.{self.actor.ex.name}.agent"
         __import__(module_name)
         client = sys.modules[module_name].AgentClient
         return client(self)
@@ -242,20 +275,25 @@ class Agent(Model, TsTrait):
     #     return client(self)
 
     def asset_client(self):
-        module_name = f"xync_client.{self.contragent.ex.name}.asset"
+        module_name = f"xync_client.{self.actor.ex.name}.asset"
         __import__(module_name)
         client = sys.modules[module_name].AssetClient
         return client(self)
 
+    # class PydanticMeta(Model.PydanticMeta):
+    # max_recursion = 3
+    # include = "id", "actor__ex", "auth", "updated_at"
+    # computed = ["balance"]
 
-class Adpm(Model):
-    ad: fields.ForeignKeyRelation["Ad"] = fields.ForeignKeyField("models.Ad")
-    pm: fields.ForeignKeyRelation["Pm"] = fields.ForeignKeyField("models.Pm")
-
-    _name = {"ad__id", "pm__name"}
 
-    class Meta:
-        table_description = "P2P Advertisements - Payment methods"
+# class Adpm(Model):
+#     ad: fields.ForeignKeyRelation["Ad"] = fields.ForeignKeyField("models.Ad")
+#     pm: fields.ForeignKeyRelation["Pm"] = fields.ForeignKeyField("models.Pm")
+#
+#     _name = {"ad__id", "pm__name"}
+#
+#     class Meta:
+#         table_description = "P2P Advertisements - Payment methods"
 
 
 # class AdCred(Model):
@@ -269,16 +307,16 @@ class Adpm(Model):
 
 
 class Ad(Model, TsTrait):
-    id: int = fields.BigIntField(True)
+    exid: int = fields.BigIntField()
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")
     price: float = fields.FloatField()
-    max_fiat: float = fields.FloatField()
     min_fiat: float = fields.FloatField()
+    max_fiat: float = fields.FloatField()
     detail: str | None = fields.CharField(4095, null=True)
     auto_msg: str | None = fields.CharField(255, null=True)
-    status: AdStatus = fields.IntEnumField(AdStatus, defaut=AdStatus.active)
+    status: AdStatus = fields.IntEnumField(AdStatus, default=AdStatus.active)
 
-    maker: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "my_ads")
+    maker: fields.ForeignKeyRelation[Actor] = fields.ForeignKeyField("models.Actor", "my_ads")
     maker_id: int
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
@@ -286,7 +324,7 @@ class Ad(Model, TsTrait):
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
-    _name = {"direction__pair__coin__ticker", "direction__pair__cur__ticker", "direction__sell", "price"}
+    _name = {"direction__pairex__coin__ticker", "direction__pairex__cur__ticker", "direction__sell", "price"}
 
     class Meta:
         table_description = "P2P Advertisements"
@@ -305,11 +343,17 @@ class Ad(Model, TsTrait):
 
 
 class Pm(Model):
-    name: str = fields.CharField(63, unique=True)
-    identifier: str | None = fields.CharField(63, unique=True, null=True)
-    # type_: PmType | None = fields.IntEnumField(PmType, null=True)
-    type_: int | None = fields.SmallIntField(null=True)
-    logo: str | None = fields.CharField(127, null=True)
+    # name: str = fields.CharField(63)  # mv to pmex cause it diffs on each ex
+    norm: str | None = fields.CharField(63)
+    acronym: str | None = fields.CharField(7, null=True)
+    country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", "pms", null=True)
+    alias: str | None = fields.CharField(63, null=True)
+    extra: str | None = fields.CharField(63, null=True)
+    ok: bool = fields.BooleanField(default=True)
+    bank: bool | None = fields.BooleanField(null=True)
+
+    typ: PmType | None = fields.IntEnumField(PmType, null=True)
+    logo: str | None = fields.CharField(119, null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
@@ -320,6 +364,7 @@ class Pm(Model):
 
     class Meta:
         table_description = "Payment methods"
+        unique_together = (("norm", "country_id"), ("alias", "country_id"))
 
     # class PydanticMeta(Model.PydanticMeta):
     #     max_recursion = 3
@@ -351,17 +396,21 @@ class Pmcur(Model):  # for fiat with no exs 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
+    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
+    pm_id: int
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
+    name_: str = fields.CharField(63, null=True)
 
     banks: fields.BackwardFKRelation["PmexBank"]
 
     class Meta:
-        unique_together = (("ex_id", "exid"),)
+        unique_together = (
+            ("ex", "exid"),
+            ("ex", "name_"),
+        )  # , ("ex", "pm"), ("ex", "name")  # todo: tmp removed for HTX duplicates
 
 
 class PmexBank(BaseModel):  # banks for SBP
@@ -370,18 +419,10 @@ class PmexBank(BaseModel):  # banks for SBP
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
 
-    class Meta:
-        unique_together = (("pmex", "exid"),)
-
-
-class CredBank(BaseModel):  # banks for SBP
-    pmexbank: fields.ForeignKeyRelation[PmexBank] = fields.ForeignKeyField("models.PmexBank", "credbanks")
-    pmexbank_id: int
-    cred: fields.ForeignKeyRelation["Cred"] = fields.ForeignKeyField("models.Cred", "credbanks")
-    cred_id: int
+    creds: fields.ManyToManyRelation["Cred"]
 
     class Meta:
-        unique_together = (("cred_id", "pmexbank_id"),)
+        unique_together = (("pmex", "exid"),)
 
 
 # class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" flag
@@ -396,34 +437,45 @@ class CredBank(BaseModel):  # banks for SBP
 
 
 class Cred(Model):
-    exid: int = fields.BigIntField()
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
-    # country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", related_name="fiats")
-    # country_id: int
     detail: str = fields.CharField(127)
     name: str | None = fields.CharField(127, null=True)
-    contragent: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "creds")
-    contragent_id: int
+    person: fields.ForeignKeyRelation[Person] = fields.ForeignKeyField("models.Person", "creds")
+    person_id: int
+
+    banks: fields.ManyToManyRelation[PmexBank] = fields.ManyToManyField("models.PmexBank", related_name="creds")
 
     fiat: fields.BackwardOneToOneRelation["Fiat"]
-    ads: fields.BackwardFKRelation[Ad]
+    ads: fields.ManyToManyRelation[Ad]
     orders: fields.BackwardFKRelation["Order"]
 
-    _name = {"exid"}
+    _name = {"detail"}
 
     class Meta:
         table_description = "Currency accounts"
-        unique_together = (("pmcur_id", "detail"), ("contragent", "exid"))
+        unique_together = (("person_id", "pmcur_id", "detail"),)
+
+
+class CredEx(Model):
+    exid: int = fields.BigIntField()
+    cred: fields.ForeignKeyRelation[Cred] = fields.ForeignKeyField("models.Cred", "credexs")
+    cred_id: int
+    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "credexs")
+    ex_id: int
+
+    _name = {"exid"}
+
+    class Meta:
+        table_description = "Credential on Exchange"
+        unique_together = (("ex", "exid"),)
 
 
 class Fiat(Model):
     cred: fields.OneToOneRelation[Cred] = fields.OneToOneField("models.Cred", "fiat")
     cred_id: int
-    # user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "fiats")
-    # user_id: int  # cred.contragent.agent.user_id
     amount: float | None = fields.FloatField(default=0)
-    target: float | None = fields.FloatField(default=None, null=True)
+    target: float = fields.FloatField(default=0)
 
     class Meta:
         table_description = "Currency balances"
@@ -485,16 +537,16 @@ class Asset(Model):
 
 
 class Order(Model):
-    id: int = fields.BigIntField(True)
+    exid: int = fields.BigIntField()
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
     amount: float = fields.FloatField()
     cred: fields.ForeignKeyRelation[Cred] = fields.ForeignKeyField("models.Cred", related_name="orders", null=True)
     cred_id: int | None
-    taker: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "taken_orders")
+    taker: fields.ForeignKeyRelation[Actor] = fields.ForeignKeyField("models.Actor", "taken_orders")
     taker_id: int
-    maker_topic: int = fields.IntField()
-    taker_topic: int = fields.IntField()
+    maker_topic: int = fields.IntField(null=True)  # todo: remove nullability
+    taker_topic: int = fields.IntField(null=True)
     status: OrderStatus = fields.IntEnumField(OrderStatus)
     created_at: datetime | None = DatetimeSecField(auto_now_add=True)
     payed_at: datetime | None = DatetimeSecField(null=True)
@@ -537,7 +589,7 @@ class Msg(Model):
     txt: str = fields.CharField(255)
     read: bool = fields.BooleanField(default=False)
     media: str | None = fields.CharField(255, null=True)
-    receiver: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", related_name="msgs")
+    receiver: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="msgs")
     order: fields.ForeignKeyRelation[Order] = fields.ForeignKeyField("models.Order", related_name="msgs")
 
     class PydanticMeta(Model.PydanticMeta):

xync_schema-0.6.73/xync_schema/types.py

@@ -0,0 +1,85 @@
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+from xync_schema.enums import AdStatus, OrderStatus
+from xync_schema import models
+
+
+class UnitEx(BaseModel):
+    exid: int | str
+    ticker: str
+    scale: int = None
+    rate: float | None = None
+
+
+class CoinEx(UnitEx):
+    p2p: bool = None
+    minimum: float | None = None
+
+
+class CurEx(UnitEx):
+    rounding_scale: int | None = None
+    minimum: int | None = None
+
+
+class PmexBank(BaseModel):
+    # id: int | None = None
+    exid: str
+    name: str
+
+
+# class Pmcur(Struct):
+#     id: int | None = None
+#     pm_id: int
+#     cur_id: int
+
+
+class BaseAd(BaseModel):
+    price: float
+    exid: int | None = Field(alias="id")
+
+
+class BaseAdIn(BaseAd):
+    min_fiat: float
+    max_fiat: float
+    direction: models.Direction
+    detail: str | None = None
+    auto_msg: str | None = None
+    status: AdStatus = AdStatus.active
+    maker: models.Actor = None
+    _unq = "exid", "maker", "direction"
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class AdBuyIn(BaseAdIn):
+    pms_: list[models.Pm]
+
+
+class AdSaleIn(BaseAdIn):
+    creds_: list[models.Cred]
+
+
+class BaseOrder(BaseModel):
+    id: int | None = None
+
+
+class OrderIn(BaseModel):
+    exid: int
+    amount: float
+    created_at: datetime
+    ad: models.Ad
+    cred: models.Cred
+    taker: models.Actor
+    id: int = None
+    maker_topic: int | None = None
+    taker_topic: int | None = None
+    status: OrderStatus = OrderStatus.created
+    payed_at: datetime | None = None
+    confirmed_at: datetime | None = None
+    appealed_at: datetime | None = None
+    _unq = "id", "exid", "amount", "maker_topic", "taker_topic", "ad", "cred", "taker"
+
+    class Config:
+        arbitrary_types_allowed = True

{xync_schema-0.6.72 → xync_schema-0.6.73/xync_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xync-schema
-Version: 0.6.72
+Version: 0.6.73
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -8,9 +8,11 @@ Project-URL: Homepage, https://gitlab.com/xync/back/schema
 Project-URL: Repository, https://gitlab.com/xync/back/schema
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: xtg-auth
+Requires-Dist: xn-auth
+Requires-Dist: python-dotenv
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 

{xync_schema-0.6.72 → xync_schema-0.6.73}/xync_schema.egg-info/SOURCES.txt

@@ -9,7 +9,7 @@ tests/test_db.py
 xync_schema/__init__.py
 xync_schema/enums.py
 xync_schema/models.py
-xync_schema/pydantic.py
+xync_schema/types.py
 xync_schema.egg-info/PKG-INFO
 xync_schema.egg-info/SOURCES.txt
 xync_schema.egg-info/dependency_links.txt

{xync_schema-0.6.72 → xync_schema-0.6.73}/xync_schema.egg-info/requires.txt

@@ -1,6 +1,8 @@
-xtg-auth
+xn-auth
+python-dotenv
 
 [dev]
 build
+pre-commit
 pytest-asyncio
 twine

xync_schema-0.6.72/xync_schema/pydantic.py

@@ -1,159 +0,0 @@
-from datetime import datetime
-from pydantic import BaseModel, model_validator
-
-from xync_schema.enums import AdStatus, PmType
-from xync_schema.models import Direction, Pmcur, Ex, Cred, Contragent
-
-
-class _CurCoin(BaseModel):
-    exid: int | str
-    ticker: str
-    rate: float | None = None
-
-
-class CoinEpyd(_CurCoin):
-    p2p: bool = True
-    minimum: float | None = None
-
-
-class CurEpyd(_CurCoin):
-    rounding_scale: int | None = None
-    minimum: int | None = None
-
-
-class PmexBankPyd(BaseModel):
-    id: int | None = None
-    exid: str
-    name: str
-
-
-class PmPyd(BaseModel):
-    id: int | None = None
-    name: str
-    identifier: str | None = None
-    type_: PmType | None = None
-    logo: str | None = None
-    banks: list[PmexBankPyd] | None = None
-
-
-# class PmcurPyd(BaseModel):
-#     id: int | None = None
-#     pm_id: int
-#     cur_id: int
-
-
-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
-    target: int | None = None
-
-
-class CredPydIn(BaseModel):
-    id: int | None = None
-    exid: str
-    ex: Ex | None = None
-    ex_id: int | None = None
-    pmcur_id: int | None = None
-    pmcur: Pmcur | None = None
-    detail: str
-    name: str = ""
-
-    class Config:
-        arbitrary_types_allowed = True
-
-    @classmethod
-    @model_validator(mode="before")
-    def check_at_least_one_field(cls, values):
-        if (values.get("ex") or values.get("ex_id")) and (values.get("pmcur") or values.get("pmcur_id")):
-            return values
-        raise ValueError("ex(_id) and pmcur(_id) is required")
-
-
-class FiatPydIn(BaseModel):
-    # unq
-    id: int = None
-    cred_id: int | None = None
-    cred: Cred | None = None
-    # df
-    amount: float
-    target: float | None = None
-
-    banks: list[str] = []
-
-    class Config:
-        arbitrary_types_allowed = True
-
-    @classmethod
-    @model_validator(mode="before")
-    def check_at_least_one_field(cls, values):
-        if values.get("cred") or values.get("cred_id"):
-            return values
-        raise ValueError("cred(_id) is required")
-
-    def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "cred_id", "cred"
-        df: tuple[str, ...] = "amount", "target"
-        d = self.model_dump()
-        return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}
-
-
-class BaseAd(BaseModel):
-    id: int | None = None
-    price: float
-
-
-class AdPydIn(BaseAd):
-    min_fiat: float
-    max_fiat: float | None = None
-    detail: str | None = None
-    auto_msg: str | None = None
-    status: AdStatus = AdStatus.active
-    maker_id: int | None = None
-    maker: Contragent | None = None
-    direction_id: int | None = None
-    direction: Direction | None = None
-    pms_: list | None = None
-    fiats_: list | None = None
-
-    class Config:
-        arbitrary_types_allowed = True
-
-    @classmethod
-    @model_validator(mode="before")
-    def check_at_least_one_field(cls, values):
-        maker = values.get("maker") or values.get("maker_id")
-        direction = values.get("direction") or values.get("direction_id")
-        pms_or_fiats = values.get("pms_") or values.get("fiats_")
-        if maker and direction and pms_or_fiats:
-            return values
-        raise ValueError("(pms or fiats) and maker(_id) and direction(_id) is required")
-
-
-class OrderPyd(BaseModel):
-    id: int
-    amount: float
-    status: str
-    actions: dict | None = {}
-    cred: Cred.pyd()
-    is_sell: bool
-    contragent: int | None = None
-    created_at: datetime
-    payed_at: datetime | None = None
-    appealed_at: datetime | None = None
-    confirmed_at: datetime | None = None
-    msgs: int = 0
-    topic: int
-
-
-class UreadMsgs(BaseModel):
-    order_id: int
-    unread_cnt: int