xync-schema 0.6.25.dev3__py3-none-any.whl → 0.6.28__py3-none-any.whl

xync_schema/{models.py → model.py}

@@ -1,10 +1,9 @@
 from datetime import datetime
 from enum import IntEnum
-
-from pydantic import create_model
 from tortoise import fields
-from tortoise.contrib.pydantic import PydanticModel
-from tortoise_api_model import Model, TsModel, DatetimeSecField, User as BaseUser
+from x_auth.model import Model
+from x_model.model import TsTrait, DatetimeSecField
+from tg_auth.models import UserRefTrait, UserInfoTrait, User as BaseUser, UserStatus
 
 
 class AdvStatus(IntEnum):
@@ -66,20 +65,6 @@ class TaskType(IntEnum):
     invite_approve = 1
 
 
-class UserStatus(IntEnum):
-    CREATOR = 5
-    ADMINISTRATOR = 4
-    MEMBER = 3
-    RESTRICTED = 2
-    LEFT = 1
-    KICKED = 0
-
-
-class Lang(IntEnum):
-    ru = 1
-    en = 2
-
-
 class ExAction(IntEnum):
     """Public"""
 
@@ -122,7 +107,7 @@ class ExAction(IntEnum):
 
 
 class Country(Model):
-    id = fields.SmallIntField(pk=True)
+    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)
@@ -134,7 +119,7 @@ class Country(Model):
 
 
 class Cur(Model):
-    id = fields.SmallIntField(pk=True)
+    id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
     rate: float | None = fields.FloatField(null=True)
     country: str | None = fields.CharField(63, null=True)
@@ -152,7 +137,7 @@ class Cur(Model):
 
 
 class Coin(Model):
-    id: int = fields.SmallIntField(pk=True)
+    id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
     rate: float | None = fields.FloatField(null=True)
     is_fiat: bool = fields.BooleanField(default=False)
@@ -175,7 +160,7 @@ class Coin(Model):
 
 
 class Ex(Model):
-    id: int = fields.SmallIntField(pk=True)
+    id: int = fields.SmallIntField(True)
     name: str = fields.CharField(31)
     host: str | None = fields.CharField(31, null=True)
     url: str | None = fields.CharField(63, null=True)
@@ -211,8 +196,8 @@ class Curex(Model):
     _name = {"cur__ticker", "ex__name"}
 
 
-class Pair(TsModel):
-    id = fields.SmallIntField(pk=True)
+class Pair(Model, TsTrait):
+    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")
     fee: float = fields.FloatField()
@@ -231,7 +216,7 @@ class Pair(TsModel):
 
 
 class Direction(Model):
-    id = fields.SmallIntField(pk=True)
+    id = fields.SmallIntField(True)
     pair: fields.ForeignKeyRelation[Pair] = fields.ForeignKeyField("models.Pair", related_name="directions")
     sell: bool = fields.BooleanField()
     total: int = fields.IntField()
@@ -248,20 +233,9 @@ class Direction(Model):
         return f"{self.pair.coin.ticker}/{self.pair.cur.ticker} {'SELL' if self.sell else 'BUY'}"
 
 
-class User(BaseUser):  # tg user
-    id: int = fields.BigIntField(True)
-    status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
-    username: str | None = fields.CharField(95, unique=True, null=True)
+class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
     chat_status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.LEFT)
     in_channel: bool | None = fields.BooleanField(default=False, null=True)
-    first_name: str | None = fields.CharField(95, null=True)
-    last_name: str | None = fields.CharField(95, null=True)
-    pic: str | None = fields.CharField(95, null=True)
-    lang: Lang | None = fields.IntEnumField(Lang, default=Lang.ru, null=True)
-    ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
-        "models.User", related_name="proteges", null=True
-    )
-    ref_id: int | None
 
     agents: fields.BackwardFKRelation["Agent"]
     fiats: fields.BackwardFKRelation["Fiat"]
@@ -274,13 +248,8 @@ class User(BaseUser):  # tg user
     borrows: fields.BackwardFKRelation["Credit"]
     investments: fields.BackwardFKRelation["Investment"]
 
-    _icon = "user"
 
-    class Meta:
-        table_description = "Users"
-
-
-class Agent(TsModel):
+class Agent(Model, TsTrait):
     id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
     # ex_id: int
@@ -297,18 +266,9 @@ class Agent(TsModel):
     def repr(self):
         return f"{self.ex.name}-{self.user.username}"
 
-    @property
     def balance(self) -> float:
         return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
-    @classmethod
-    def pydListItem(cls) -> type[PydanticModel]:
-        return create_model(
-            cls.__name__ + "ListItem",
-            balance=(int, 0),
-            __base__=super().pydListItem(),
-        )
-
     class Meta:
         table_description = "Agents"
         unique_together = (("ex", "user"),)
@@ -319,9 +279,8 @@ class Agent(TsModel):
     class PydanticMetaListItem:
         max_recursion = 1
         backward_relations: bool = True
-        exclude = "user",
-        # include = "balance",
-        # computed = ["balance"]
+        exclude = ("user",)
+        computed = ["balance"]
 
 
 class Adpm(Model):
@@ -335,8 +294,8 @@ class Adpm(Model):
         table_description = "P2P Advertisements - Payment methods"
 
 
-class Ad(TsModel):
-    id: int = fields.BigIntField(pk=True)
+class Ad(Model, TsTrait):
+    id: int = fields.BigIntField(True)
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")
     price: float = fields.FloatField()
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
@@ -539,8 +498,8 @@ class Asset(Model):
         exclude_raw_fields: bool = False
 
 
-class Order(TsModel):
-    id: int = fields.BigIntField(pk=True)
+class Order(Model, TsTrait):
+    id: int = fields.BigIntField(True)
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
     amount: float = fields.FloatField()
@@ -564,7 +523,7 @@ class Order(TsModel):
         table_description = "P2P Orders"
 
 
-class Dep(TsModel):
+class Dep(Model, TsTrait):
     pid: str = fields.CharField(31)  # product_id
     apr: float = fields.FloatField()
     fee: float | None = fields.FloatField(null=True)
@@ -602,7 +561,7 @@ class Dep(TsModel):
         unique_together = (("pid", "type", "ex"),)
 
 
-class Investment(TsModel):
+class Investment(Model, TsTrait):
     dep: fields.ForeignKeyRelation[Dep] = fields.ForeignKeyField("models.Dep", related_name="investments")
     dep_id: int
     amount: float = fields.FloatField()
@@ -654,7 +613,7 @@ class Vpn(Model):
         table_description = "VPNs"
 
 
-class Invite(TsModel):
+class Invite(Model, TsTrait):
     ref: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_approvals")
     ref_id: int
     protege: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_requests")
@@ -671,7 +630,7 @@ class Invite(TsModel):
         table_description = "Invites"
 
 
-class Credit(TsModel):
+class Credit(Model, TsTrait):
     lender: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="lends")
     lender_id: int
     borrower: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="borrows")

{xync_schema-0.6.25.dev3.dist-info → xync_schema-0.6.28.dist-info}/METADATA

@@ -1,20 +1,18 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.25.dev3
+Version: 0.6.28
 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.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: tortoise-api-model
-Requires-Dist: aiogram
+Requires-Dist: xtg-auth
 Provides-Extra: dev
 Requires-Dist: pytest ; extra == 'dev'
 Requires-Dist: build ; extra == 'dev'
 Requires-Dist: twine ; extra == 'dev'
-Requires-Dist: setuptools-scm ; extra == 'dev'
 
 ## INSTALL
 ```bash

xync_schema-0.6.28.dist-info/RECORD

@@ -0,0 +1,6 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/model.py,sha256=EsjxApW0tIT7Ho2ak1d89f3JHtRllsSwzvpHRExC7lQ,23663
+xync_schema-0.6.28.dist-info/METADATA,sha256=BJtj28PGUcJpTF1M8YTRbgJZNT_U99Pn39ua_NCIrLo,1086
+xync_schema-0.6.28.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+xync_schema-0.6.28.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.28.dist-info/RECORD,,

{xync_schema-0.6.25.dev3.dist-info → xync_schema-0.6.28.dist-info}/WHEEL

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

xync_schema-0.6.25.dev3.dist-info/RECORD

@@ -1,6 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/models.py,sha256=sfg4ftJ5gf2P96ZsPl6Vn9fEcT_1bGIFF0yb77QdUWg,24730
-xync_schema-0.6.25.dev3.dist-info/METADATA,sha256=uppTgZLst_v8RIo068fhCFL_2MyptPe5Z8UGAi6bXJk,1171
-xync_schema-0.6.25.dev3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-xync_schema-0.6.25.dev3.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.25.dev3.dist-info/RECORD,,