xync-schema 0.6.39__py3-none-any.whl → 0.6.41__py3-none-any.whl

xync_schema/enums.py

@@ -131,7 +131,7 @@ exs = {
         ExType.main,
         "https://assets.coingecko.com/markets/images/52/large/binance.jpg",
         "binance.com",
-        "binance.com",
+        "p2p.binance.com",
         "accounts.binance.com/login",
     ),
     "BingX": (

xync_schema/models.py

@@ -23,7 +23,7 @@ from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
-    rate: float | None = fields.FloatField(null=True)
+    rate: float | None = fields.FloatField(default=0)
     # country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
@@ -40,7 +40,7 @@ class Cur(Model):
 class Coin(Model):
     id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
-    rate: float | None = fields.FloatField(null=True)
+    rate: float | None = fields.FloatField(default=0)
     is_fiat: bool = fields.BooleanField(default=False)
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="coinex")
 
@@ -167,17 +167,19 @@ class User(Model, TsTrait):
         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")
+        fiats = await Fiat.filter(user=self).values("amount", "pmcur__cur__rate")
         return sum(fiat["amount"] * fiat["pmcur__cur__rate"] for fiat in fiats)
 
-    async def balance(self):
+    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)
 
-    class PydanticMeta(Model.PydanticMeta):
-        computed = ["balance"]
+    # class PydanticMeta(Model.PydanticMeta):
+    # max_recursion = 0
+    # include = "role", "status"
+    # computed = ["balance"]
 
 
 class Agent(Model, TsTrait):
@@ -289,7 +291,8 @@ class Pmex(BaseModel):  # existence pm in ex with no cur tie
     pm_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "pmexs")
     ex_id: int
-    exid: str = fields.CharField(31)
+    exid: str = fields.IntField()
+    name: str = fields.CharField(63)
 
     class Meta:
         unique_together = (("ex_id", "exid"),)
@@ -479,6 +482,9 @@ class TestEx(Model):
         table_description = "Test Exs"
         unique_together = (("action", "ex"),)
 
+    class PydanticMeta(Model.PydanticMeta):
+        max_recursion: int = 2
+
 
 # class Vpn(Model):
 #     user: fields.OneToOneRelation[User] = fields.OneToOneField("models.User", related_name="vpn")

{xync_schema-0.6.39.dist-info → xync_schema-0.6.41.dist-info}/METADATA

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

xync_schema-0.6.41.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=fj0aYOxiAAz1ERSbsfOl7UMIMlJyWpe5mgNhohL2Ksg,10017
+xync_schema/models.py,sha256=deKsDSVH1JCkWPMYwBfUPnh9joHH6YqXV1lB0NrF544,20222
+xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
+xync_schema-0.6.41.dist-info/METADATA,sha256=rESGDAUBNb5H7QegQJ7SWuHiyMPe502jLC3vfGp8K30,3988
+xync_schema-0.6.41.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+xync_schema-0.6.41.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.41.dist-info/RECORD,,

xync_schema-0.6.39.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=oOpyfG2i1-UKD8Udh2sVBIMUHTIhKZMPIA6Rh7lqnDA,10013
-xync_schema/models.py,sha256=aFEKN2KDr587qSCbOKtzf-0PKJBeVC4mxxSZG_gh4KU,20049
-xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
-xync_schema-0.6.39.dist-info/METADATA,sha256=DFciGVAiMseMNplR8swvk-1FWBt043NQ4GACPIqeWUM,3988
-xync_schema-0.6.39.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-xync_schema-0.6.39.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.39.dist-info/RECORD,,