xync-schema 0.6.88__py3-none-any.whl → 0.6.90__py3-none-any.whl

xync_schema/models.py

@@ -177,10 +177,12 @@ class Person(Model, TsTrait):
     user: fields.BackwardOneToOneRelation["User"]
     creds: fields.BackwardFKRelation["Cred"]
     actors: fields.BackwardFKRelation["Actor"]
+    pm_agents: fields.BackwardFKRelation["PmAgent"]
 
 
 class User(UserTg, TsTrait):
     status: UserStatus = fields.IntEnumField(UserStatus, default=UserStatus.SLEEP)
+    gmail_auth: dict = fields.JSONField(default={})
 
     person: fields.OneToOneRelation[Person] = fields.OneToOneField("models.Person", related_name="user")
     person_id: int
@@ -210,8 +212,8 @@ class User(UserTg, TsTrait):
     # investments: fields.BackwardFKRelation["Investment"]
 
     async def free_assets(self):
-        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)
+        assets = await Asset.filter(agent__actor__person__user__id=self.id).values("free", "addr__coin__rate")
+        return sum(asset["free"] * asset["addr__coin__rate"] for asset in assets)
 
     async def fiats_sum(self):
         fiats = await Fiat.filter(cred__person__user__id=self.id).values("amount", "cred__pmcur__cur__rate")
@@ -275,7 +277,7 @@ class Actor(Model):
 
 
 class Agent(Model, TsTrait):
-    auth: dict[str, str] = fields.JSONField(default={})
+    auth: dict = fields.JSONField(default={})
     actor: fields.OneToOneRelation[Actor] = fields.OneToOneField("models.Actor", "agent")
     actor_id: int
 
@@ -356,7 +358,8 @@ class Pm(Model):
     # 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)
+    country: fields.ForeignKeyNullableRelation[Country] = fields.ForeignKeyField("models.Country", "pms", null=True)
+    df_cur: fields.ForeignKeyNullableRelation[Cur] = fields.ForeignKeyField("models.Cur", "df_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)
@@ -385,6 +388,16 @@ class Pm(Model):
     #     return sys.modules[module_name].PmEpyd
 
 
+class PmAgent(Model):
+    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", related_name="agents")
+    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="pm_agents")
+    user_id: int
+    auth: dict = fields.JSONField(default={})
+
+    class Meta:
+        unique_together = (("pm_id", "user_id"),)
+
+
 class Pmcur(Model):  # for fiat with no exs tie
     pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm")
     pm_id: int

{xync_schema-0.6.88.dist-info → xync_schema-0.6.90.dist-info}/METADATA

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

xync_schema-0.6.90.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=MM5s20GpI8gsPlPS9nYFtkyrPheTvlcDYESwjnZ4Hmg,12698
+xync_schema/models.py,sha256=tDyIW-8GguHYBllhR4bVPl87Y1ySO9Eko8H0bDwN9EM,29877
+xync_schema/types.py,sha256=sYWjJMcwv7mjm38FnWyxWhT6Z4bGpt92BTVZrqyZ0Ic,1675
+xync_schema-0.6.90.dist-info/METADATA,sha256=OOKBByV63zAMDG1r1KxTGgZHSPAnAAT16KljOj7n574,4055
+xync_schema-0.6.90.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+xync_schema-0.6.90.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.90.dist-info/RECORD,,

{xync_schema-0.6.88.dist-info → xync_schema-0.6.90.dist-info}/WHEEL

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

xync_schema-0.6.88.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=MM5s20GpI8gsPlPS9nYFtkyrPheTvlcDYESwjnZ4Hmg,12698
-xync_schema/models.py,sha256=9nt8Tjv9E0OC9SNPTtzxFu13T7FWwC3rYYQ3aAoRWHY,29291
-xync_schema/types.py,sha256=sYWjJMcwv7mjm38FnWyxWhT6Z4bGpt92BTVZrqyZ0Ic,1675
-xync_schema-0.6.88.dist-info/METADATA,sha256=Hi8MOzjX5N9UlC5QCrXN_HD_UO8PkUmOZBahOSzCzBo,4055
-xync_schema-0.6.88.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-xync_schema-0.6.88.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.88.dist-info/RECORD,,