xync-schema 0.6.84.dev4__tar.gz → 0.6.86__tar.gz

{xync_schema-0.6.84.dev4/xync_schema.egg-info → xync_schema-0.6.86}/PKG-INFO

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

{xync_schema-0.6.84.dev4 → xync_schema-0.6.86}/xync_schema/enums.py

@@ -56,7 +56,7 @@ class DepType(IntEnum):
     lend = 4
 
 
-class AssetType(IntEnum):
+class AddrExType(IntEnum):
     spot = 1
     earn = 2
     found = 3

{xync_schema-0.6.84.dev4 → xync_schema-0.6.86}/xync_schema/models.py

@@ -10,7 +10,6 @@ from x_model.models import TsTrait, DatetimeSecField
 from xync_schema.enums import (
     ExType,
     AdStatus,
-    AssetType,
     OrderStatus,
     ExAction,
     ExStatus,
@@ -18,6 +17,7 @@ from xync_schema.enums import (
     UserStatus,
     PmType,
     FileType,
+    AddrExType,
 )
 
 
@@ -327,8 +327,10 @@ class Ad(Model, TsTrait):
     maker_id: int
     pay_req: fields.ForeignKeyNullableRelation["PayReq"] = fields.ForeignKeyField("models.PayReq", "ads", null=True)
 
-    pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
-    creds: fields.ManyToManyRelation["Cred"] = fields.ManyToManyField("models.Cred", through="adcred")
+    pmexs: fields.ManyToManyRelation["Pmex"] = fields.ManyToManyField("models.Pmex", "adpmex", related_name="ads")
+    credexs: fields.ManyToManyRelation["CredEx"] = fields.ManyToManyField(
+        "models.CredEx", through="adcredex", related_name="ads"
+    )
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
@@ -362,7 +364,6 @@ class Pm(Model):
 
     typ: PmType | None = fields.IntEnumField(PmType, null=True)
 
-    ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
     exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", "pmex")  # no need. use pmexs[.exid]
     orders: fields.ReverseRelation["Order"]
@@ -395,7 +396,7 @@ class Pmcur(Model):  # for fiat with no exs tie
 
     class Meta:
         table_description = "Payment methods - Currencies"
-        # unique_together = ("pm_id", "cur_id"),
+        unique_together = (("pm_id", "cur_id"),)
 
     class PydanticMeta(Model.PydanticMeta):
         max_recursion: int = 2  # default: 3
@@ -412,6 +413,7 @@ class Pmex(BaseModel):  # existence pm in ex with no cur tie
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
 
+    ads: fields.ManyToManyRelation[Ad]
     banks: fields.BackwardFKRelation["PmexBank"]
 
     class Meta:
@@ -452,7 +454,6 @@ class Cred(Model):
     banks: fields.ManyToManyRelation[PmexBank] = fields.ManyToManyField("models.PmexBank", related_name="creds")
 
     fiat: fields.BackwardOneToOneRelation["Fiat"]
-    ads: fields.ManyToManyRelation[Ad]
     credexs: fields.BackwardFKRelation["CredEx"]
     orders: fields.BackwardFKRelation["Order"]
 
@@ -470,6 +471,8 @@ class CredEx(Model):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "credexs")
     ex_id: int
 
+    ads: fields.ManyToManyRelation[Ad]
+
     _name = {"exid"}
 
     class Meta:
@@ -518,27 +521,38 @@ class Limit(Model):
         table_description = "Currency accounts balance"
 
 
-class Asset(Model):
-    coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="assets")
+class Addr(Model):
+    coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="addrs")
     coin_id: int
+    actor: fields.ForeignKeyRelation[Actor] = fields.ForeignKeyField("models.Actor", "addrs")
+    actor_id: int
+
+    pay_reqs: fields.ReverseRelation["PayReq"]
+
+    _name = {"coin__ticker", "free"}
+
+    class Meta:
+        table_description = "Coin address on cex"
+        unique_together = (("coin_id", "actor_id"),)
+
+
+class Asset(Model):
+    addr: fields.ForeignKeyRelation[Addr] = fields.ForeignKeyField("models.Addr", related_name="addrs")
+    addr_id: int
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "assets")
     agent_id: int
-    type_: AssetType = fields.IntEnumField(AssetType, default=AssetType.found)
+
+    typ: AddrExType = fields.IntEnumField(AddrExType, default=AddrExType.found)
     free: float = fields.FloatField()
     freeze: float | None = fields.FloatField(default=0)
     lock: float | None = fields.FloatField(default=0)
     target: float | None = fields.FloatField(default=0, null=True)
 
-    pay_reqs: fields.ReverseRelation["PayReq"]
-
-    _name = {"coin__ticker", "free"}
+    _name = {"asset__coin__ticker", "free"}
 
     class Meta:
         table_description = "Coin balance"
-        unique_together = (("coin_id", "agent_id", "type_"),)
-
-    class PydanticMeta(Model.PydanticMeta):
-        max_recursion: int = 2  # default: 3
+        unique_together = (("addr_id", "agent_id", "typ"),)
 
     def epyd(self):
         module_name = f"xync_client.{self.agent.ex.name}.pyd"

{xync_schema-0.6.84.dev4 → xync_schema-0.6.86}/xync_schema/types.py

@@ -41,6 +41,7 @@ class BaseAd(BaseModel):
 
 class BaseAdIn(BaseAd):
     min_fiat: float
+    amount: float
     max_fiat: float
     direction_id: int
     detail: str | None = None
@@ -54,11 +55,11 @@ class BaseAdIn(BaseAd):
 
 
 class AdBuyIn(BaseAdIn):
-    pms_: list[models.Pm]
+    pmexs_: list[models.Pmex]
 
 
 class AdSaleIn(BaseAdIn):
-    creds_: list[models.Cred]
+    credexs_: list[models.CredEx]
 
 
 class OrderIn(BaseModel):

{xync_schema-0.6.84.dev4 → xync_schema-0.6.86/xync_schema.egg-info}/PKG-INFO

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