xync-schema 0.6.85__tar.gz → 0.6.87__tar.gz

{xync_schema-0.6.85/xync_schema.egg-info → xync_schema-0.6.87}/PKG-INFO

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

{xync_schema-0.6.85 → xync_schema-0.6.87}/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.85 → xync_schema-0.6.87}/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,7 +327,7 @@ class Ad(Model, TsTrait):
     maker_id: int
     pay_req: fields.ForeignKeyNullableRelation["PayReq"] = fields.ForeignKeyField("models.PayReq", "ads", null=True)
 
-    pmexs: fields.ManyToManyRelation["Pmex"] = fields.ManyToManyField("models.Pm", "adpmex", related_name="ads")
+    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"
     )
@@ -396,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
@@ -456,6 +456,7 @@ class Cred(Model):
     fiat: fields.BackwardOneToOneRelation["Fiat"]
     credexs: fields.BackwardFKRelation["CredEx"]
     orders: fields.BackwardFKRelation["Order"]
+    pay_reqs: fields.ReverseRelation["PayReq"]
 
     _name = {"detail"}
 
@@ -486,8 +487,6 @@ class Fiat(Model):
     amount: float | None = fields.FloatField(default=0)
     target: float = fields.FloatField(default=0)
 
-    pay_reqs: fields.ReverseRelation["PayReq"]
-
     class Meta:
         table_description = "Currency balances"
 
@@ -521,27 +520,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"
@@ -551,13 +561,13 @@ class Asset(Model):
 
 class PayReq(Model, TsTrait):
     pay_until: datetime = DatetimeSecField()
-    asset: fields.ForeignKeyNullableRelation[Asset] = fields.ForeignKeyField("models.Asset", "pay_reqs", null=True)
-    fiat: fields.ForeignKeyNullableRelation[Fiat] = fields.ForeignKeyField("models.Fiat", "pay_reqs", null=True)
+    addr: fields.ForeignKeyNullableRelation[Addr] = fields.ForeignKeyField("models.Addr", "pay_reqs", null=True)
+    cred: fields.ForeignKeyNullableRelation[Cred] = fields.ForeignKeyField("models.Cred", "pay_reqs", null=True)
     user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "pay_reqs")
     user_id: int
     amount: float = fields.FloatField()
-    parts: int = fields.SmallIntField(default=1)
-    # todo: payed_at or status?
+    min_amount: int = fields.IntField()
+    payed_at: datetime | None = DatetimeSecField(default=None)
 
     ads: fields.ReverseRelation["Ad"]
 
@@ -566,7 +576,7 @@ class PayReq(Model, TsTrait):
 
     class Meta:
         table_description = "Payment request"
-        unique_together = (("user_id", "fiat_id", "asset_id"),)
+        unique_together = (("user_id", "cred_id", "addr_id"),)
 
 
 class Order(Model):

{xync_schema-0.6.85 → xync_schema-0.6.87}/xync_schema/types.py

@@ -55,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.85 → xync_schema-0.6.87/xync_schema.egg-info}/PKG-INFO

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