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

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

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

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

@@ -1,6 +1,7 @@
 from datetime import datetime
 from enum import IntEnum
 from tortoise import fields
+from tortoise.queryset import QuerySet
 from x_auth.enums import Role
 from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
@@ -178,6 +179,9 @@ class Ex(Model):
         table_description = "Exchanges"
         unique_together = (("name", "type_"),)
 
+    class PydanticMeta(Model.PydanticMeta):
+        include = "name", "logo"
+
 
 class Curex(Model):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
@@ -224,7 +228,7 @@ class Direction(Model):
 
 class User(Model, TsTrait):
     id: int = fields.BigIntField(True)
-    role: Role = fields.IntEnumField(Role)
+    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)
     ref: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
@@ -281,21 +285,18 @@ class Agent(Model, TsTrait):
         unique_together = (("ex", "user"),)
 
     class PydanticMeta(Model.PydanticMeta):
+        # max_recursion = 3
+        include = "ex", "assets", "auth"
         computed = ["balance"]
 
-    # class PydanticMetaListItem:
-    #     max_recursion = 1
-    #     backward_relations: bool = True
-    #     exclude = ("user",)
-    #     computed = ["balance"]
+    async def client(self):
+        import sys
 
-    # async def client(self):
-    #     import sys
-    #     if isinstance(self.ex, QuerySet):
-    #         # noinspection PyTypeChecker
-    #         self.ex: Ex = await self.ex
-    #     client = sys.modules[f'xync_client.{self.ex.name}.p2p'].AgentClient
-    #     return client(self)
+        if isinstance(self.ex, QuerySet):
+            # noinspection PyTypeChecker
+            self.ex: Ex = await self.ex
+        client = sys.modules[f"xync_client.{self.ex.name}.p2p"].AgentClient
+        return client(self)
 
 
 class Adpm(Model):
@@ -365,32 +366,11 @@ class Pmcur(Model):  # for fiat with no exs tie
 
     _name = {"pm__name", "cur__ticker"}
 
-    # _sorts = ['-limits_count']
-
-    # @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:
-    #         mo = PydanticMeta
-    #         mo.max_recursion = 1
-    #         mo.exclude_raw_fields = True  # default: True
-    #         # mo.backward_relations = False # default: True
-    #         cls._pydListItem = pydantic_model_creator(cls, name=cls.__name__ + 'ListItem', meta_override=mo, exclude=('pmcurexs',))
-    #     return cls._pydListItem
-
-    # @classmethod
-    # def pageQuery(cls, sorts: list[str], limit: int = 1000, offset: int = 0, q: str = None, owner: bool = None, **kwargs) -> QuerySet:
-    #     query = super().pageQuery([], limit, offset, q)
-    #     if kwargs.pop('only_empty', None):
-    #         query = query.exclude(limits__not_isnull=True)
-    #     else:
-    #         query = query.annotate(limits_count=Count('limits')).order_by('-limits_count')
-    #     return query.filter(**kwargs)
-
     class Meta:
         table_description = "Payment methods - Currencies"
         unique_together = (("pm", "cur"),)
 
-    class PydanticMeta:
+    class PydanticMeta(Model.PydanticMeta):
         exclude_raw_fields: bool = False
 
 
@@ -436,15 +416,16 @@ class Fiat(Model):
     exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", through="fiatex", related_name="fiats")
     orders: fields.ReverseRelation["Order"]
 
-    _name = {"pmcur__pm__name", "pmcur__cur__ticker", "amount"}
+    # _name = {"pmcur__pm__name", "pmcur__cur__ticker", "amount"}
 
     class Meta:
         table_description = "Currency accounts balance"
 
-    # class PydanticMetaListItem:
-    #     max_recursion: int = 2
-    #     backward_relations = False
-    #     exclude = "user", "pmcur__exs"
+    class PydanticMeta(Model.PydanticMeta):
+        #     max_recursion: int = 2
+        backward_relations = False
+        include = "id", "pmcur", "detail", "name", "amount"
+
     #     # exclude_raw_fields = True
 
 
@@ -497,8 +478,8 @@ class Asset(Model):
         table_description = "Coin balance"
         unique_together = (("coin", "agent", "type_"),)
 
-    # class PydanticMeta(Model.PydanticMeta):
-    #     exclude_raw_fields: bool = False
+    class PydanticMeta(Model.PydanticMeta):
+        max_recursion: int = 2  # default: 3
 
 
 class Order(Model, TsTrait):
@@ -578,22 +559,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.32.dev1 → xync_schema-0.6.34}/xync_schema/pydantic.py

@@ -11,6 +11,12 @@ class FiatUpd(BaseModel):
 class FiatNew(FiatUpd):
     cur_id: int
     pm_id: int
-    user_id: int
+    detail: str
+    amount: float = 0
+
+
+class Agent(BaseModel):
+    cur_id: int
+    pm_id: int
     detail: str
     amount: float = 0

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

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