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

{xync_schema-0.6.73.dev6/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.dev6
+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.dev6 → xync_schema-0.6.73.dev8}/tests/test_db.py

@@ -7,7 +7,7 @@ from tortoise.backends.asyncpg import AsyncpgDBClient
 from x_model import init_db
 
 from xync_schema import models
-from xync_schema.models import Cur
+from xync_schema.models import Ex
 
 load_dotenv()
 
@@ -25,5 +25,5 @@ async def test_init_db(dbc):
 
 
 async def test_models(dbc):
-    c = await Cur.all()
-    assert isinstance(c, list), "No currencies"
+    c = await Ex.first()
+    assert isinstance(c, Ex), "No exs"

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

@@ -8,7 +8,17 @@ from tortoise.signals import pre_save
 from x_auth.models import Model, UserTg
 from x_model.models import TsTrait, DatetimeSecField
 
-from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction, ExStatus, PersonStatus, UserStatus
+from xync_schema.enums import (
+    ExType,
+    AdStatus,
+    AssetType,
+    OrderStatus,
+    ExAction,
+    ExStatus,
+    PersonStatus,
+    UserStatus,
+    PmType,
+)
 
 
 class Country(Model):
@@ -24,6 +34,7 @@ class Country(Model):
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
+    scale: int = fields.SmallIntField(default=0)
     rate: float | None = fields.FloatField(default=0, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
@@ -40,6 +51,7 @@ class Cur(Model):
 class Coin(Model):
     id: int = fields.SmallIntField(True)
     ticker: str = fields.CharField(15, unique=True)
+    scale: int = fields.SmallIntField(default=0)
     rate: float | None = fields.FloatField(default=0)
     is_fiat: bool = fields.BooleanField(default=False)
     exs: fields.ManyToManyRelation["Ex"] = fields.ManyToManyField("models.Ex", through="coinex")
@@ -160,7 +172,7 @@ class Direction(Model):
 
 class Person(Model, TsTrait):
     status: PersonStatus = fields.IntEnumField(PersonStatus, default=PersonStatus.DEFAULT)
-    name: str | None = fields.CharField(127)
+    name: str | None = fields.CharField(127, null=True)
 
     user: fields.BackwardOneToOneRelation["User"]
     creds: fields.BackwardFKRelation["Cred"]
@@ -274,10 +286,10 @@ class Agent(Model, TsTrait):
         client = sys.modules[module_name].AssetClient
         return client(self)
 
-    class PydanticMeta(Model.PydanticMeta):
-        # max_recursion = 3
-        include = "id", "actor__ex", "auth", "updated_at"
-        # computed = ["balance"]
+    # class PydanticMeta(Model.PydanticMeta):
+    # max_recursion = 3
+    # include = "id", "actor__ex", "auth", "updated_at"
+    # computed = ["balance"]
 
 
 # class Adpm(Model):
@@ -304,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)
@@ -337,15 +349,17 @@ class Ad(Model, TsTrait):
 
 
 class Pm(Model):
-    name: str = fields.CharField(63, unique=True)
-    identifier: str | None = fields.CharField(63, unique=True, null=True)
-    alias: str | None = fields.CharField(63, unique=True, null=True)
-    country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField(
-        "models.Country", related_name="pms", null=True
-    )
-    # type_: PmType | None = fields.IntEnumField(PmType, null=True)  # todo: get back
-    type_: int | None = fields.SmallIntField(null=True)
-    logo: str | None = fields.CharField(127, null=True)
+    # 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, unique=True, null=True)
+    country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", "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)
+    bank: bool = fields.BooleanField(null=True)
+
+    type_: PmType | None = fields.IntEnumField(PmType, null=True)
+    logo: str | None = fields.CharField(119, null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
@@ -356,6 +370,7 @@ class Pm(Model):
 
     class Meta:
         table_description = "Payment methods"
+        unique_together = (("norm", "country"), ("alias", "country"))
 
     # class PydanticMeta(Model.PydanticMeta):
     #     max_recursion = 3
@@ -387,17 +402,21 @@ class Pmcur(Model):  # for fiat with no exs tie
 
 
 class Pmex(BaseModel):  # existence pm in ex with no cur tie
-    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
-    pm_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "pmexs")
     ex_id: int
+    pm: fields.ForeignKeyRelation[Pm] = fields.ForeignKeyField("models.Pm", "pmexs")
+    pm_id: int
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
+    name_: str = fields.CharField(63, null=True)
 
     banks: fields.BackwardFKRelation["PmexBank"]
 
     class Meta:
-        unique_together = (("ex_id", "exid"),)
+        unique_together = (
+            ("ex", "exid"),
+            ("ex", "name_"),
+        )  # , ("ex", "pm"), ("ex", "name")  # todo: tmp removed for HTX duplicates
 
 
 class PmexBank(BaseModel):  # banks for SBP
@@ -462,7 +481,7 @@ class Fiat(Model):
     cred: fields.OneToOneRelation[Cred] = fields.OneToOneField("models.Cred", "fiat")
     cred_id: int
     amount: float | None = fields.FloatField(default=0)
-    target: float | None = fields.FloatField(default=None, null=True)
+    target: float = fields.FloatField(default=0)
 
     class Meta:
         table_description = "Currency balances"

xync_schema-0.6.73.dev8/xync_schema/types.py

@@ -0,0 +1,133 @@
+from datetime import datetime
+from pydantic import BaseModel
+from x_model.types import New
+
+from xync_schema.enums import AdStatus, OrderStatus
+from xync_schema import models
+
+
+class UnitEx(BaseModel):
+    exid: int | str
+    ticker: str
+    scale: int = None
+    rate: float | None = None
+
+
+class CoinEx(UnitEx):
+    p2p: bool = None
+    minimum: float | None = None
+
+
+class CurEx(UnitEx):
+    rounding_scale: int | None = None
+    minimum: int | None = None
+
+
+class PmexBank(BaseModel):
+    # id: int | None = None
+    exid: str
+    name: str
+
+
+# class Pmcur(Struct):
+#     id: int | None = None
+#     pm_id: int
+#     cur_id: int
+
+
+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
+
+
+class FiatIn(New):
+    cred: models.Cred
+    amount: float
+    id: int = None
+    target: float | None = None
+    _unq = "id", "cred"
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class BaseAd(BaseModel):
+    price: float
+    id: int | None = None
+
+
+class BaseAdIn(New):
+    exid: int
+    min_fiat: float
+    max_fiat: float
+    direction: models.Direction
+    detail: str | None = None
+    auto_msg: str | None = None
+    status: AdStatus = AdStatus.active
+    maker: models.Actor = None
+    _unq = "id", "exid", "maker", "direction"
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class AdBuyIn(BaseAdIn):
+    pms_: list[models.Pm]
+
+
+class AdSaleIn(BaseAdIn):
+    creds_: list[models.Cred]
+
+
+class BaseOrder(BaseModel):
+    id: int | None = None
+
+
+class Order(BaseModel):
+    id: int
+    amount: float
+    status: str
+    cred: models.Cred.out_type()
+    is_sell: bool
+    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
+
+
+class OrderIn(BaseModel):
+    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
+    payed_at: datetime | None = None
+    confirmed_at: datetime | None = None
+    appealed_at: datetime | None = None
+    _unq = "id", "exid", "amount", "maker_topic", "taker_topic", "ad", "cred", "taker"
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+class UreadMsgs(BaseModel):
+    order_id: int
+    unread_cnt: int

{xync_schema-0.6.73.dev6 → 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.dev6
+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.dev6/xync_schema/types.py

@@ -1,181 +0,0 @@
-from datetime import datetime
-
-from pydantic import BaseModel
-
-from xync_schema.enums import AdStatus, OrderStatus, PmType
-from xync_schema import models
-
-
-class _CurCoin(BaseModel):
-    exid: int | str
-    ticker: str
-    rate: float | None = None
-
-
-class CoinE(_CurCoin):
-    p2p: bool = True
-    minimum: float | None = None
-
-
-class CurE(_CurCoin):
-    rounding_scale: int | None = None
-    minimum: int | None = None
-
-
-class PmexBank(BaseModel):
-    id: int | None = None
-    exid: str
-    name: str
-
-
-class Pm(BaseModel):
-    id: int = None
-    name: str
-    identifier: str | None = None
-    type_: PmType | None = None
-    logo: str | None = None
-    banks: list[PmexBank] | None = None
-
-
-# class Pmcur(BaseModel):
-#     id: int | None = None
-#     pm_id: int
-#     cur_id: int
-
-
-class FFiat(BaseModel):
-    detail: str
-    name: str | None = None
-    amount: float = 0
-    target: int | None = None
-    banks: list[str] = []
-
-
-class FiatNew(FFiat):
-    cur_id: int
-    pm_id: int
-
-
-class FiatUpd(FFiat):
-    id: int
-    exid: int
-
-
-class CredIn(BaseModel):
-    id: int | None = None
-    exid: int
-    pmcur: models.Pmcur
-    actor: models.Actor
-    detail: str = ""
-    name: str = ""
-    banks: list[str] | None = None
-
-    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
-    cred: models.Cred
-    # df
-    amount: float
-    target: float | None = None
-
-    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
-
-
-class BaseAdIn(BaseAd):
-    exid: int
-    min_fiat: float
-    max_fiat: float | None = None
-    detail: str | None = None
-    auto_msg: str | None = None
-    status: AdStatus = AdStatus.active
-    maker: models.Actor = None
-    direction: models.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[Pm]
-
-
-class AdSaleIn(BaseAdIn):
-    creds_: list[models.Cred]
-
-
-class BaseOrder(BaseModel):
-    id: int | None = None
-
-
-class Order(BaseModel):
-    id: int
-    amount: float
-    status: str
-    actions: dict | None = {}
-    cred: models.Cred.pyd()
-    is_sell: bool
-    actor: int | None = None
-    created_at: datetime
-    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
-    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
-
-    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
-    unread_cnt: int