xync-schema 0.6.31__tar.gz → 0.6.32.dev1__tar.gz

{xync_schema-0.6.31/xync_schema.egg-info → xync_schema-0.6.32.dev1}/PKG-INFO

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

{xync_schema-0.6.31 → xync_schema-0.6.32.dev1}/xync_schema/models.py

@@ -1,9 +1,10 @@
 from datetime import datetime
 from enum import IntEnum
 from tortoise import fields
+from x_auth.enums import Role
 from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
-from tg_auth.models import UserRefTrait, UserInfoTrait, User as BaseUser, UserStatus
+from tg_auth.models import UserStatus, AuthUser
 
 
 class AdStatus(IntEnum):
@@ -131,14 +132,13 @@ class Cur(Model):
     countries: fields.ReverseRelation[Country]
 
     _name = {"ticker"}
-    _icon = "currency-yuan"
 
     class Meta:
         table_description = "Fiat currencies"
 
 
 class Coin(Model):
-    # id: int = fields.SmallIntField(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)
@@ -151,13 +151,6 @@ class Coin(Model):
     # deps_bonus: fields.ReverseRelation["Dep"]
 
     _name = {"ticker"}
-    _icon = "coin"
-
-    def repr(self, *args):
-        return super().repr() + (self.is_fiat and " (fiat)" or "")
-
-    class Meta:
-        table_description = "Crypro coins"
 
 
 class Ex(Model):
@@ -179,9 +172,7 @@ class Ex(Model):
     pmexs: fields.ReverseRelation["Pmex"]
     pairs: fields.ReverseRelation["Pair"]
     # deps: fields.ReverseRelation["Dep"]
-    tests: fields.ReverseRelation["TestEx"]
-
-    _icon = "exchange"
+    # tests: fields.ReverseRelation["TestEx"]
 
     class Meta:
         table_description = "Exchanges"
@@ -210,16 +201,12 @@ class Pair(Model, TsTrait):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="pairs")
     directions: fields.ReverseRelation["Direction"]
 
-    _icon = "circles-relation"
     _name = {"coin__ticker", "cur__ticker"}
 
     class Meta:
         table_description = "Coin/Currency pairs"
         unique_together = (("coin", "cur", "ex"),)
 
-    def repr(self, *args):
-        return f"{self.coin.ticker}/{self.cur.ticker}"
-
 
 class Direction(Model):
     id = fields.SmallIntField(True)
@@ -228,25 +215,27 @@ class Direction(Model):
     total: int = fields.IntField()
     ads: fields.ReverseRelation["Ad"]
 
-    _icon = "direction-sign"
     _name = {"pair__coin__ticker", "pair__cur__ticker", "sell"}
 
     class Meta:
         table_description = "Trade directions"
         unique_together = (("pair", "sell"),)
 
-    def repr(self, *args):
-        return f"{self.pair.coin.ticker}/{self.pair.cur.ticker} {'SELL' if self.sell else 'BUY'}"
 
+class User(Model, TsTrait):
+    id: int = fields.BigIntField(True)
+    role: Role = fields.IntEnumField(Role)
+    status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
+    username: str | None = fields.CharField(95, unique=True, null=True)
+    ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
+        "models.User", related_name="proteges", null=True
+    )
+    ref_id: int | None
 
-class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
-    chat_status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.RESTRICTED)
-    in_channel: bool | None = fields.BooleanField(default=False, null=True)
-
+    proteges: fields.BackwardFKRelation["User"]
     agents: fields.BackwardFKRelation["Agent"]
     fiats: fields.BackwardFKRelation["Fiat"]
     limits: fields.BackwardFKRelation["Limit"]
-    proteges: fields.BackwardFKRelation["User"]
     # vpn: fields.BackwardOneToOneRelation["Vpn"]
     # invite_requests: fields.BackwardFKRelation["Invite"]
     # invite_approvals: fields.BackwardFKRelation["Invite"]
@@ -254,33 +243,44 @@ class User(BaseUser, UserRefTrait, UserInfoTrait):  # tg user
     # borrows: fields.BackwardFKRelation["Credit"]
     # investments: fields.BackwardFKRelation["Investment"]
 
+    async def free_assets(self):
+        assets = await Asset.filter(agent__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 self.fiats._db_queryset().values("amount", "pmcur__cur__rate")
+        return sum(fiat["amount"] * fiat["pmcur__cur__rate"] for fiat in fiats)
+
+    async def balance(self):
+        return await self.free_assets() + await self.fiats_sum()
+
+    def get_auth(self) -> AuthUser:
+        return AuthUser.model_validate(self, from_attributes=True)
+
+    class PydanticMeta(Model.PydanticMeta):
+        computed = ["balance"]
+
 
 class Agent(Model, TsTrait):
-    id: int
     exid: int = fields.IntField()
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
-    auth: dict = fields.JSONField(null=True)
+    auth: dict[str, str] = fields.JSONField(null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
-    user_id: int
+    # user_id: int
     assets: fields.ReverseRelation["Asset"]
     orders: fields.ReverseRelation["Order"]
     ads: fields.ReverseRelation["Ad"]
 
-    _icon = "spy"
-    _name = {"ex__name", "user__username"}
-
-    # def repr(self, *args):
-    #     return f"{self.ex.name}-{self.user.username}"
+    _name = {"exid"}
 
     def balance(self) -> int:
-        return self.exid * 2
-        # return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
+        return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
     class Meta:
         table_description = "Agents"
         unique_together = (("ex", "user"),)
 
-    class PydanticMeta:
+    class PydanticMeta(Model.PydanticMeta):
         computed = ["balance"]
 
     # class PydanticMetaListItem:
@@ -302,7 +302,6 @@ class Adpm(Model):
     ad: fields.ForeignKeyRelation["Ad"] = fields.ForeignKeyField("models.Ad")
     pm: fields.ForeignKeyRelation["Pm"] = fields.ForeignKeyField("models.Pm")
 
-    # no need repr()
     _name = {"ad__id", "pm__name"}
 
     class Meta:
@@ -326,9 +325,6 @@ class Ad(Model, TsTrait):
     _icon = "ad"
     _name = {"direction__pair__coin__ticker", "direction__pair__cur__ticker", "direction__sell", "price"}
 
-    def repr(self, *args):
-        return f"{TradeType(int(self.direction.sell.name)).name}: {self.price:.3g}"
-
     class Meta:
         table_description = "P2P Advertisements"
 
@@ -350,12 +346,10 @@ class Pm(Model):
     exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField(
         "models.Ex", through="pmex"
     )  # no need. use pmexs[.exid]
-    # orders: fields.ReverseRelation["Order"]
+    orders: fields.ReverseRelation["Order"]
     pmcurs: fields.ReverseRelation["Pmcur"]  # no need. use curs
     pmexs: fields.ReverseRelation["Pmex"]
 
-    _icon = "currency"
-
     class Meta:
         table_description = "Payment methods"
 
@@ -373,9 +367,6 @@ class Pmcur(Model):  # for fiat with no exs tie
 
     # _sorts = ['-limits_count']
 
-    def repr(self, *args):
-        return f"{self.pm.name}-{self.cur.ticker}"
-
     # @classmethod
     # def pydListItem(cls, max_recursion: int = 1, backward_relations: bool = False, exclude: tuple[str] = (), include: tuple[str] = (), force: bool = False) -> type[PydanticModel]:
     #     if not cls._pydListItem:
@@ -412,9 +403,6 @@ class Pmex(Model):  # existence pm in ex with no cur tie
 
     _name = {"pm__name", "ex__name"}
 
-    def repr(self, *args):
-        return f"{self.pm.name}-{self.ex.name}"
-
     class Meta:
         table_description = "Payment methods - Currencies"
         unique_together = (("pm_id", "ex_id"), ("ex_id", "exid"))
@@ -429,9 +417,6 @@ class Pmcurex(Model):  # existence pm in ex for exact cur, with "blocked" flag
 
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "ex__name"}
 
-    def repr(self, *args):
-        return ("[X] " if self.blocked else "") + super().repr()
-
     class Meta:
         table_description = "Payment methods - Currencies"
 
@@ -439,8 +424,8 @@ class Pmcurex(Model):  # existence pm in ex for exact cur, with "blocked" flag
 class Fiat(Model):
     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
+    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)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "fiats")
@@ -451,20 +436,16 @@ class Fiat(Model):
     exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", through="fiatex", related_name="fiats")
     orders: fields.ReverseRelation["Order"]
 
-    _icon = "cash"
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "amount"}
 
-    def repr(self, *args):
-        return f"{self.id}: {self.pmcur.repr()} ({self.user.username})"
-
     class Meta:
         table_description = "Currency accounts balance"
 
-    class PydanticMetaListItem:
-        max_recursion: int = 2
-        backward_relations = False
-        exclude = "user", "pmcur__exs"
-        # exclude_raw_fields = True
+    # class PydanticMetaListItem:
+    #     max_recursion: int = 2
+    #     backward_relations = False
+    #     exclude = "user", "pmcur__exs"
+    #     # exclude_raw_fields = True
 
 
 class Fiatex(Model):  # existence pm in ex with no cur tie
@@ -476,9 +457,6 @@ class Fiatex(Model):  # existence pm in ex with no cur tie
 
     _name = {"fiat__detail", "ex__name"}
 
-    def repr(self, *args):
-        return f"{self.fiat.detail}-{self.ex.name}"
-
     class Meta:
         table_description = "Fiat on Ex"
         unique_together = (("fiat_id", "ex_id"), ("ex_id", "exid"))
@@ -496,12 +474,8 @@ class Limit(Model):
     added_by: fields.ForeignKeyRelation["User"] = fields.ForeignKeyField("models.User", related_name="limits")
     added_by_id: int
 
-    _icon = "frame"
     _name = {"pmcur__pm__name", "pmcur__cur__ticker", "unit", "income", "amount"}
 
-    def repr(self, *args):
-        return f"{self.pmcur.repr()}[{'<-' if self.income else '->'}]"
-
     class Meta:
         table_description = "Currency accounts balance"
 
@@ -517,18 +491,14 @@ class Asset(Model):
     lock: float | None = fields.FloatField(default=0)
     target: float | None = fields.FloatField(default=0, null=True)
 
-    _icon = "currency-bitcoin"
     _name = {"coin__ticker", "free"}
 
-    def repr(self, *args):
-        return f"{self.coin.ticker} {self.free:.3g}/{self.freeze:.3g} user:{self.agent.repr()}"
-
     class Meta:
         table_description = "Coin balance"
         unique_together = (("coin", "agent", "type_"),)
 
-    class PydanticMeta:
-        exclude_raw_fields: bool = False
+    # class PydanticMeta(Model.PydanticMeta):
+    #     exclude_raw_fields: bool = False
 
 
 class Order(Model, TsTrait):
@@ -538,19 +508,16 @@ class Order(Model, TsTrait):
     amount: float = fields.FloatField()
     fiat: fields.ForeignKeyRelation[Fiat] = fields.ForeignKeyField("models.Fiat", related_name="orders", null=True)
     fiat_id: int | None
-    # pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", related_name="orders", null=True)  # why commented: already has in fiat.pmcur.pm
-    # pm_id: int | None
     taker: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "orders")
     taker_id: int
     status: OrderStatus = fields.IntEnumField(OrderStatus)
     notify_pay_at: datetime | None = DatetimeSecField(null=True)
     confirm_pay_at: datetime | None = DatetimeSecField(null=True)
 
-    _icon = "file-check"
-    _name = {"fiat__pmcur__pm__name", "ad__direction__sell"}
+    _name = {"fiat__pmcur__pm__name"}
 
-    def repr(self, *args):
-        return f"{self.taker.repr()}: {self.amount:.3g} pm:{self.fiat.pmcur.pm.name}/{self.fiat_id} {self.status.name}"
+    def repr(self):
+        return f"{self.fiat.pmcur.pm.name}/{self.fiat_id}:{self.amount:.3g} {self.status.name}"
 
     class Meta:
         table_description = "P2P Orders"
@@ -611,22 +578,22 @@ class Order(Model, TsTrait):
 #         table_description = "Investments"
 
 
-class TestEx(Model):
-    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="tests")
-    # ex_id: int
-    action: ExAction = fields.IntEnumField(ExAction)
-    ok: bool | None = fields.BooleanField(default=False, null=True)
-    updated_at: datetime | None = DatetimeSecField(auto_now=True)
-
-    _icon = "test-pipe"
-    _name = {"ex__name", "action", "ok"}
-
-    def repr(self, *args):
-        return f"{self.ex.name} {self.action.name} {self.ok}"
-
-    class Meta:
-        table_description = "Test Exs"
-        unique_together = (("action", "ex"),)
+# class TestEx(Model):
+#     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="tests")
+#     # ex_id: int
+#     action: ExAction = fields.IntEnumField(ExAction)
+#     ok: bool | None = fields.BooleanField(default=False, null=True)
+#     updated_at: datetime | None = DatetimeSecField(auto_now=True)
+#
+#     _icon = "test-pipe"
+#     _name = {"ex__name", "action", "ok"}
+#
+#     def repr(self, *args):
+#         return f"{self.ex.name} {self.action.name} {self.ok}"
+#
+#     class Meta:
+#         table_description = "Test Exs"
+#         unique_together = (("action", "ex"),)
 
 
 # class Vpn(Model):

{xync_schema-0.6.31 → xync_schema-0.6.32.dev1}/xync_schema/pydantic.py

@@ -1,11 +1,16 @@
 from pydantic import BaseModel
 
 
-class FiatForm(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
     user_id: int
     detail: str
-    name: str | None = None
-    amount: float
-    target: int | None = None
+    amount: float = 0

{xync_schema-0.6.31 → xync_schema-0.6.32.dev1/xync_schema.egg-info}/PKG-INFO

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