xync-schema 0.6.69__py3-none-any.whl → 0.6.70__py3-none-any.whl

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/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,11 +82,23 @@ 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
+
+    @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):
@@ -96,7 +116,8 @@ class AdPydIn(BaseAd):
     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
@@ -104,9 +125,12 @@ class AdPydIn(BaseAd):
     @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.69.dist-info → xync_schema-0.6.70.dist-info}/METADATA

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

xync_schema-0.6.70.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=zPdnf6J--qaBoyin_qXO3z_UnfpiHGXVHKs9v3ug1Qk,12428
+xync_schema/models.py,sha256=9nyibPT9ZPMWaiXHO3gBGipvN-P-h4sJjehOgH6ccUg,25126
+xync_schema/pydantic.py,sha256=Xw7ARA2yV4QDako2Uw9rLw-pMjcpVTW-Sade3ARXZFQ,3936
+xync_schema-0.6.70.dist-info/METADATA,sha256=nmh9EGERPywOssPlHY1ww6BJPHOl5pnmWtMmAVha8Dc,3985
+xync_schema-0.6.70.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xync_schema-0.6.70.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.70.dist-info/RECORD,,

xync_schema-0.6.69.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=zPdnf6J--qaBoyin_qXO3z_UnfpiHGXVHKs9v3ug1Qk,12428
-xync_schema/models.py,sha256=_IzK9e4H6lXl8VMjyl0m-Ir7RfrCHAc2JM0RZiWJxBA,24722
-xync_schema/pydantic.py,sha256=B2neARFVzQUkrzbkWKoNLvyUScq2TLaMAZTUgawh8ew,3142
-xync_schema-0.6.69.dist-info/METADATA,sha256=-3CtP6GunNW70ZewZmcc5YOKDBXAI9D7NWhxtpGI8PE,3985
-xync_schema-0.6.69.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-xync_schema-0.6.69.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.69.dist-info/RECORD,,