xync-schema 0.6.67__py3-none-any.whl → 0.6.68__py3-none-any.whl

xync_schema/enums.py

@@ -112,6 +112,8 @@ class ExAction(IntEnum):
     coins = 22  # Список торгуемых монет (с ограничениям по валютам, если есть)
     pairs = 23  # Список пар валюта/монет
     ads = 24  # Список объяв по покупке/продаже, валюте, монете, платежному методу (buy/sell, cur, coin, pm)
+    cur_mins = 42  # Минимальные объемы валют в объявлении
+    coin_mins = 43  # Минимальные объемы монет в объявлении
     """ Agent: Fiat """
     my_fiats = 25  # Список реквизитов моих платежных методов
     fiat_new = 26  # Создание реквизита моего платежного метода

xync_schema/models.py

@@ -1,5 +1,7 @@
 import sys
 from datetime import datetime
+
+from pydantic import BaseModel as PydModel
 from tortoise import fields
 from tortoise.queryset import QuerySet
 from tortoise import Model as BaseModel
@@ -93,6 +95,7 @@ class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     exid: str = fields.CharField(31)
+    minimum: float = fields.FloatField(null=True)
     # countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
     #     "models.Country", through="curexcountry", backward_key="curexs"
     # )
@@ -119,7 +122,7 @@ class Pair(Model, TsTrait):
     id = fields.SmallIntField(True)
     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin", related_name="pairs")
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur", related_name="pairs")
-    fee: float = fields.FloatField()
+    fee: float = fields.FloatField(default=0)
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="pairs")
     directions: fields.ReverseRelation["Direction"]
 
@@ -134,7 +137,7 @@ class Direction(Model):
     id = fields.SmallIntField(True)
     pair: fields.ForeignKeyRelation[Pair] = fields.ForeignKeyField("models.Pair", related_name="directions")
     sell: bool = fields.BooleanField()
-    total: int = fields.IntField()
+    total: int = fields.IntField(null=True)
     ads: fields.ReverseRelation["Ad"]
 
     _name = {"pair__coin__ticker", "pair__cur__ticker", "sell"}
@@ -190,7 +193,9 @@ class Agent(Model):
     exid: int = fields.BigIntField()
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="agents")
     auth: dict[str, str] = fields.JSONField(null=True)
-    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
+    user: fields.ForeignKeyNullableRelation[User] = fields.ForeignKeyField(
+        "models.User", related_name="agents", null=True
+    )
     user_id: int
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
@@ -247,15 +252,16 @@ class Ad(Model, TsTrait):
     id: int = fields.BigIntField(True)
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")
     price: float = fields.FloatField()
-    pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
-    maxFiat: float = fields.FloatField()
-    minFiat: float = fields.FloatField()
+    max_fiat: float = fields.FloatField()
+    min_fiat: float = fields.FloatField()
     detail: str | None = fields.CharField(4095, null=True)
-    autoMsg: str | None = fields.CharField(255, null=True)
+    auto_msg: str | None = fields.CharField(255, null=True)
+    status: AdStatus = fields.IntEnumField(AdStatus, defaut=AdStatus.active)
+
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "ads")
     agent_id: int
-    status: AdStatus = fields.IntEnumField(AdStatus)
 
+    pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
@@ -264,10 +270,17 @@ class Ad(Model, TsTrait):
     class Meta:
         table_description = "P2P Advertisements"
 
-    def epyd(self):
-        module_name = f"xync_client.{self.ex.name}.pyd"
+    def epyds(self) -> tuple[PydModel, PydModel, PydModel, PydModel, PydModel, PydModel]:
+        module_name = f"xync_client.{self.agent.ex.name}.pyd"
         __import__(module_name)
-        return sys.modules[module_name].AdEpyd
+        return (
+            sys.modules[module_name].AdEpyd,
+            sys.modules[module_name].AdFullEpyd,
+            sys.modules[module_name].MyAdEpydPurchase,
+            sys.modules[module_name].MyAdInEpydPurchase,
+            sys.modules[module_name].MyAdEpydSale,
+            sys.modules[module_name].MyAdInEpydSale,
+        )
 
 
 class Pm(Model):
@@ -362,6 +375,7 @@ class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" fl
 
 
 class Fiat(Model):
+    id: int = fields.BigIntField(True)
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
     # country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", related_name="fiats")
@@ -398,7 +412,7 @@ class Fiatex(BaseModel):  # existence pm in ex with no cur tie
     fiat_id: int
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "fiatexs")
     ex_id: int
-    exid: int = fields.IntField()
+    exid: int = fields.BigIntField()
 
     class Meta:
         table_description = "Fiat on Ex"

xync_schema/pydantic.py

@@ -1,8 +1,30 @@
 from datetime import datetime
 
-from pydantic import BaseModel
+from pydantic import BaseModel, model_validator
 
-from xync_schema.models import Fiat
+from xync_schema.enums import AdStatus, PmType
+from xync_schema.models import Fiat, Agent, Direction, Pm, Pmcur, User
+
+
+class PmexBankPyd(BaseModel):
+    id: int | None = None
+    exid: str
+    name: str
+
+
+class PmPyd(BaseModel):
+    id: int | None = None
+    name: str
+    identifier: str | None = None
+    type_: PmType | None = None
+    logo: str | None = None
+    banks: list[PmexBankPyd] | None = None
+
+
+# class PmcurPyd(BaseModel):
+#     id: int | None = None
+#     pm_id: int
+#     cur_id: int
 
 
 class FiatUpd(BaseModel):
@@ -20,6 +42,72 @@ class FiatNew(FiatUpd):
     target: int | None = None
 
 
+class FiatPydIn(BaseModel):
+    # unq
+    id: int = None
+    user_id: int | None = None
+    user: User | None = None
+    pmcur_id: int | None = None
+    pmcur: Pmcur | None = None
+    # df
+    detail: str
+    name: str = ""
+    amount: float
+    target: float | None = None
+
+    banks: list[str] = []
+
+    class Config:
+        arbitrary_types_allowed = True
+
+    @classmethod
+    @model_validator(mode="before")
+    def check_at_least_one_field(cls, values):
+        if (values.get("pmcur") or values.get("pmcur_id")) and (values.get("user") or values.get("user_id")):
+            return values
+        raise ValueError("pmcur_id or pmcur is required")
+
+    def args(self) -> tuple[dict, dict]:
+        unq: tuple[str, ...] = "id", "user_id", "user", "pmcur_id", "pmcur"
+        df: tuple[str, ...] = "detail", "name", "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 FiatexPyd(BaseModel):
+#     id: int | None = None
+#     exid: str
+#     ex_id: int
+#     fiat_id: int
+
+
+class AdPydIn(BaseModel):
+    # unq
+    id: int
+    # df
+    price: float
+    min_fiat: float
+    max_fiat: float | None = None
+    detail: str | None = None
+    auto_msg: str | None = None
+    status: AdStatus = AdStatus.active
+    agent_id: int | None = None
+    direction_id: int | None = None
+    agent: Agent | None = None
+    direction: Direction | None = None
+    payMeths: list[Pm]
+
+    class Config:
+        arbitrary_types_allowed = True
+
+    @classmethod
+    @model_validator(mode="before")
+    def check_at_least_one_field(cls, values):
+        if (values.get("agent") or values.get("agent_id")) and (values.get("direction") or values.get("direction_id")):
+            return values
+        raise ValueError("pmcur_id or pmcur is required")
+
+
 class OrderPyd(BaseModel):
     id: int
     amount: float

{xync_schema-0.6.67.dist-info → xync_schema-0.6.68.dist-info}/METADATA

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

xync_schema-0.6.68.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=i9VyTiOFdoKeiw71w-5t4UoMQMJtU5qkBwe8zyJIm5A,12392
+xync_schema/models.py,sha256=_IzK9e4H6lXl8VMjyl0m-Ir7RfrCHAc2JM0RZiWJxBA,24722
+xync_schema/pydantic.py,sha256=14wzPsDL4BkmSyTVoa1EGdWWpqCTCIGSjiBAupNaweY,3123
+xync_schema-0.6.68.dist-info/METADATA,sha256=x4OEJKvnsJFg8Rpk8ZwLLeQ9J6NvCg1FrZZJH93NH9M,3985
+xync_schema-0.6.68.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xync_schema-0.6.68.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.68.dist-info/RECORD,,

xync_schema-0.6.67.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=la85coRbxXL0HiAgJYpOU4Yyf_atVp6DZSlAV3ICvEk,12207
-xync_schema/models.py,sha256=rPvWqAMNl0JdEXTGhpcNHQEekPhQp1wGMgtEbETYznE,24141
-xync_schema/pydantic.py,sha256=7uTAqoN3WT1w9RByyBwn78FOkD3nfO9b3UGnR-DWAro,794
-xync_schema-0.6.67.dist-info/METADATA,sha256=Ij-gJ-Zixk-pfBRayN2JraYYQ45dwxGpe5YrK1x8OAA,3985
-xync_schema-0.6.67.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-xync_schema-0.6.67.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.67.dist-info/RECORD,,