xync-schema 0.6.68__tar.gz → 0.6.70__tar.gz

{xync_schema-0.6.68/xync_schema.egg-info → xync_schema-0.6.70}/PKG-INFO

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

{xync_schema-0.6.68 → xync_schema-0.6.70}/xync_schema/enums.py

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

{xync_schema-0.6.68 → xync_schema-0.6.70}/xync_schema/models.py

@@ -26,7 +26,7 @@ from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
 class Cur(Model):
     id = fields.SmallIntField(True)
     ticker: str = fields.CharField(3, unique=True)
-    rate: float | None = fields.FloatField(default=0)
+    rate: float | None = fields.FloatField(default=0, null=True)
     # country: str | None = fields.CharField(63, null=True)
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="pmcur")
@@ -84,11 +84,11 @@ class Ex(Model):
     class PydanticMeta(Model.PydanticMeta):
         include = "name", "logo"
 
-    def client(self):
+    def client(self, agent: "Agent" = None):
         module_name = f"xync_client.{self.name}.ex"
         __import__(module_name)
         client = sys.modules[module_name].ExClient
-        return client(self)
+        return client(self, agent)
 
 
 class Curex(BaseModel):
@@ -96,6 +96,7 @@ class Curex(BaseModel):
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     exid: str = fields.CharField(31)
     minimum: float = fields.FloatField(null=True)
+    rounding_scale: int = fields.SmallIntField(null=True)
     # countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
     #     "models.Country", through="curexcountry", backward_key="curexs"
     # )
@@ -248,6 +249,16 @@ class Adpm(Model):
         table_description = "P2P Advertisements - Payment methods"
 
 
+class Adfiat(Model):
+    ad: fields.ForeignKeyRelation["Ad"] = fields.ForeignKeyField("models.Ad")
+    fiat: fields.ForeignKeyRelation["Fiat"] = fields.ForeignKeyField("models.Fiat")
+
+    _name = {"ad__id", "fiat__id"}
+
+    class Meta:
+        table_description = "P2P Advertisements - Payment details"
+
+
 class Ad(Model, TsTrait):
     id: int = fields.BigIntField(True)
     direction: fields.ForeignKeyRelation[Direction] = fields.ForeignKeyField("models.Direction", related_name="ads")

{xync_schema-0.6.68 → xync_schema-0.6.70}/xync_schema/pydantic.py

@@ -3,7 +3,15 @@ from datetime import datetime
 from pydantic import BaseModel, model_validator
 
 from xync_schema.enums import AdStatus, PmType
-from xync_schema.models import Fiat, Agent, Direction, Pm, Pmcur, User
+from xync_schema.models import Fiat, Agent, Direction, Pmcur, User, Ex
+
+
+class CurEpyd(BaseModel):
+    exid: int | str
+    ticker: str
+    rate: float | None = None
+    minimum: int | None = None
+    rounding_scale: int | None = None
 
 
 class PmexBankPyd(BaseModel):
@@ -65,7 +73,7 @@ class FiatPydIn(BaseModel):
     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")
+        raise ValueError("pmcur(_id) and user(_id) is required")
 
     def args(self) -> tuple[dict, dict]:
         unq: tuple[str, ...] = "id", "user_id", "user", "pmcur_id", "pmcur"
@@ -74,18 +82,31 @@ class FiatPydIn(BaseModel):
         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 FiatexPydIn(BaseModel):
+    id: int | None = None
+    exid: str
+    ex: Ex | None = None
+    ex_id: int | None = None
+    fiat: Fiat | None = None
+    fiat_id: int | None = None
 
+    class Config:
+        arbitrary_types_allowed = True
 
-class AdPydIn(BaseModel):
-    # unq
-    id: int
-    # df
+    @classmethod
+    @model_validator(mode="before")
+    def check_at_least_one_field(cls, values):
+        if (values.get("ex") or values.get("ex_id")) and (values.get("fiat") or values.get("fiat_id")):
+            return values
+        raise ValueError("ex(_id) and fiat(_id) is required")
+
+
+class BaseAd(BaseModel):
+    id: int | None = None
     price: float
+
+
+class AdPydIn(BaseAd):
     min_fiat: float
     max_fiat: float | None = None
     detail: str | None = None
@@ -95,7 +116,8 @@ class AdPydIn(BaseModel):
     direction_id: int | None = None
     agent: Agent | None = None
     direction: Direction | None = None
-    payMeths: list[Pm]
+    pms_: list | None = None
+    fiats_: list | None = None
 
     class Config:
         arbitrary_types_allowed = True
@@ -103,9 +125,12 @@ class AdPydIn(BaseModel):
     @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")):
+        agent = values.get("agent") or values.get("agent_id")
+        direction = values.get("direction") or values.get("direction_id")
+        pms_or_fiats = values.get("pms_") or values.get("fiats_")
+        if agent and direction and pms_or_fiats:
             return values
-        raise ValueError("pmcur_id or pmcur is required")
+        raise ValueError("(pms or fiats) and agent(_id) and direction(_id) is required")
 
 
 class OrderPyd(BaseModel):

{xync_schema-0.6.68 → xync_schema-0.6.70/xync_schema.egg-info}/PKG-INFO

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