xync-schema 0.6.73.dev7__tar.gz → 0.6.73.dev8__tar.gz

{xync_schema-0.6.73.dev7/xync_schema.egg-info → xync_schema-0.6.73.dev8}/PKG-INFO

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

{xync_schema-0.6.73.dev7 → xync_schema-0.6.73.dev8}/xync_schema/types.py

@@ -1,16 +1,16 @@
 from datetime import datetime
-
 from pydantic import BaseModel
-from x_model.types import New, Upd
+from x_model.types import New
 
-from xync_schema.enums import AdStatus, OrderStatus, PmType
+from xync_schema.enums import AdStatus, OrderStatus
 from xync_schema import models
 
 
 class UnitEx(BaseModel):
     exid: int | str
     ticker: str
-    scale: int
+    scale: int = None
+    rate: float | None = None
 
 
 class CoinEx(UnitEx):
@@ -24,93 +24,61 @@ class CurEx(UnitEx):
 
 
 class PmexBank(BaseModel):
-    id: int | None = None
+    # id: int | None = None
     exid: str
     name: str
 
 
-class PmIn(New):
-    norm: str
-    acronym: str | None = None
-    alias: str | None = None
-    extra: str | None = None
-    bank: bool | None = None
-    country_id: int | None = None
-    type_: PmType | None = None
-    logo: str | None = None
-
-
-class PmOut(PmIn, Upd):
-    banks: list[PmexBank] | None = None
-
-
-# class Pmcur(BaseModel):
+# class Pmcur(Struct):
 #     id: int | None = None
 #     pm_id: int
 #     cur_id: int
 
 
-class CredIn(BaseModel):
-    id: int | None = None
+class CredIn(New):
     exid: int
     pmcur: models.Pmcur
     actor: models.Actor
     detail: str = ""
     name: str = ""
+    id: int | None = None
     banks: list[str] | None = None
+    _unq = "id", "exid", "ch", "pmcur"
 
     class Config:
         arbitrary_types_allowed = True
 
-    def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "exid", "ch", "pmcur"
-        df: tuple[str, ...] = "detail", "name"
-        d = self.model_dump()
-        return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}
-
 
-class FiatIn(BaseModel):
-    # unq
-    id: int = None
+class FiatIn(New):
     cred: models.Cred
-    # df
     amount: float
+    id: int = None
     target: float | None = None
+    _unq = "id", "cred"
 
     class Config:
         arbitrary_types_allowed = True
 
-    def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "cred"
-        df: tuple[str, ...] = "amount", "target"
-        d = self.model_dump()
-        return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}
-
 
 class BaseAd(BaseModel):
-    id: int | None = None
     price: float
+    id: int | None = None
 
 
-class BaseAdIn(BaseAd):
+class BaseAdIn(New):
     exid: int
     min_fiat: float
-    max_fiat: float | None = None
+    max_fiat: float
+    direction: models.Direction
     detail: str | None = None
     auto_msg: str | None = None
     status: AdStatus = AdStatus.active
     maker: models.Actor = None
-    direction: models.Direction
+    _unq = "id", "exid", "maker", "direction"
 
     class Config:
         arbitrary_types_allowed = True
 
-    def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "exid", "maker", "direction"
-        df: tuple[str, ...] = "price", "price", "min_fiat", "max_fiat", "detail", "auto_msg", "status"
-        d = self.model_dump(exclude_none=True)
-        return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}
-
 
 class AdBuyIn(BaseAdIn):
     pms_: list[models.Pm]
@@ -128,42 +96,37 @@ class Order(BaseModel):
     id: int
     amount: float
     status: str
-    actions: dict | None = {}
     cred: models.Cred.out_type()
     is_sell: bool
-    actor: int | None = None
     created_at: datetime
+    topic: int
+    actions: dict | None = {}
+    actor: int | None = None
     payed_at: datetime | None = None
     appealed_at: datetime | None = None
     confirmed_at: datetime | None = None
     msgs: int = 0
-    topic: int
 
 
 class OrderIn(BaseModel):
-    id: int = None
     exid: int
     amount: float
+    created_at: datetime
+    ad: models.Ad
+    cred: models.Cred
+    taker: models.Actor
+    id: int = None
     maker_topic: int | None = None
     taker_topic: int | None = None
     status: OrderStatus = OrderStatus.created
-    created_at: datetime
     payed_at: datetime | None = None
     confirmed_at: datetime | None = None
     appealed_at: datetime | None = None
-    ad: models.Ad
-    cred: models.Cred
-    taker: models.Actor
+    _unq = "id", "exid", "amount", "maker_topic", "taker_topic", "ad", "cred", "taker"
 
     class Config:
         arbitrary_types_allowed = True
 
-    def args(self) -> tuple[dict, dict]:
-        unq: tuple[str, ...] = "id", "exid", "amount", "maker_topic", "taker_topic", "ad", "cred", "taker"
-        df: tuple[str, ...] = "status", "created_at", "payed_at", "confirmed_at", "appealed_at"
-        d = self.model_dump(exclude_none=True)
-        return {k: getattr(self, k) for k in df if d.get(k)}, {k: getattr(self, k) for k in unq if d.get(k)}
-
 
 class UreadMsgs(BaseModel):
     order_id: int

{xync_schema-0.6.73.dev7 → xync_schema-0.6.73.dev8/xync_schema.egg-info}/PKG-INFO

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

{xync_schema-0.6.73.dev7 → xync_schema-0.6.73.dev8}/xync_schema/models.py

@@ -316,8 +316,8 @@ class Ad(Model, TsTrait):
     exid: int = fields.BigIntField()
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")
     price: float = fields.FloatField()
-    max_fiat: float = fields.FloatField()
     min_fiat: float = fields.FloatField()
+    max_fiat: float = fields.FloatField()
     detail: str | None = fields.CharField(4095, null=True)
     auto_msg: str | None = fields.CharField(255, null=True)
     status: AdStatus = fields.IntEnumField(AdStatus, defaut=AdStatus.active)