xync-schema 0.6.71__tar.gz → 0.6.72__tar.gz

{xync_schema-0.6.71/xync_schema.egg-info → xync_schema-0.6.72}/PKG-INFO

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

{xync_schema-0.6.71 → xync_schema-0.6.72}/xync_schema/enums.py

@@ -112,9 +112,7 @@ class ExAction(IntEnum):
     coins = 22  # Список торгуемых монет (с ограничениям по валютам, если есть)
     pairs = 23  # Список пар валюта/монет
     ads = 24  # Список объяв по покупке/продаже, валюте, монете, платежному методу (buy/sell, cur, coin, pm)
-    ad = 42  # Объява по id
-    cur_mins = 43  # Минимальные объемы валют в объявлении
-    coin_mins = 44  # Минимальные объемы монет в объявлении
+    ad = 42  # Чужая объява по id
     """ Agent: Fiat """
     my_fiats = 25  # Список реквизитов моих платежных методов
     fiat_new = 26  # Создание реквизита моего платежного метода
@@ -122,6 +120,7 @@ class ExAction(IntEnum):
     fiat_del = 28  # Удаление реквизита моего платежного метода
     """ Agent: Ad """
     my_ads = 29  # Список моих объявлений
+    my_ad = 43  # Моя объява по id
     ad_new = 30  # Создание объявления
     ad_upd = 31  # Редактирование объявления
     ad_del = 32  # Удаление объявления

{xync_schema-0.6.71 → xync_schema-0.6.72}/xync_schema/models.py

@@ -69,7 +69,7 @@ class Ex(Model):
     pmcurs: fields.ManyToManyRelation["Pmcur"] = fields.ManyToManyField("models.Pmcur", through="pmcurex")
     coins: fields.ManyToManyRelation[Coin]
 
-    agents: fields.ReverseRelation["Agent"]
+    contragents: fields.ReverseRelation["Contragent"]
     pmexs: fields.ReverseRelation["Pmex"]
     pairs: fields.ReverseRelation["Pair"]
     # deps: fields.ReverseRelation["Dep"]
@@ -159,7 +159,7 @@ class User(Model, TsTrait, UserInfoTrait):
 
     proteges: fields.BackwardFKRelation["User"]
     agents: fields.BackwardFKRelation["Agent"]
-    fiats: fields.BackwardFKRelation["Fiat"]
+    # fiats: fields.BackwardFKRelation["Fiat"]
     limits: fields.BackwardFKRelation["Limit"]
     # vpn: fields.BackwardOneToOneRelation["Vpn"]
     # invite_requests: fields.BackwardFKRelation["Invite"]
@@ -196,15 +196,16 @@ class Contragent(Model):
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
     agent: fields.BackwardOneToOneRelation["Agent"]
-    taken_orders: fields.BackwardFKRelation["Order"]
+    creds: fields.BackwardFKRelation["Cred"]
     my_ads: fields.BackwardFKRelation["Ad"]
+    taken_orders: fields.BackwardFKRelation["Order"]
 
     class Meta:
         table_description = "Agents"
         unique_together = (("ex", "exid"),)
 
 
-class Agent(Model):
+class Agent(Model, TsTrait):
     auth: dict[str, str] = fields.JSONField(null=True)
     contragent: fields.OneToOneRelation[Contragent] = fields.OneToOneField("models.Contragent", "agent")
     contragent_id: int
@@ -373,8 +374,8 @@ class PmexBank(BaseModel):  # banks for SBP
         unique_together = (("pmex", "exid"),)
 
 
-class FiatBank(BaseModel):  # banks for SBP
-    pmexbank: fields.ForeignKeyRelation[PmexBank] = fields.ForeignKeyField("models.PmexBank", "fiatbanks")
+class CredBank(BaseModel):  # banks for SBP
+    pmexbank: fields.ForeignKeyRelation[PmexBank] = fields.ForeignKeyField("models.PmexBank", "credbanks")
     pmexbank_id: int
     cred: fields.ForeignKeyRelation["Cred"] = fields.ForeignKeyField("models.Cred", "credbanks")
     cred_id: int
@@ -528,7 +529,7 @@ class Order(Model):
     class PydanticMeta(Model.PydanticMeta):
         max_recursion: int = 0
         exclude_raw_fields: bool = False
-        exclude = ("taker", "ad", "fiat", "msgs")
+        exclude = ("taker", "ad", "cred", "msgs")
 
 
 class Msg(Model):

{xync_schema-0.6.71 → xync_schema-0.6.72}/xync_schema/pydantic.py

@@ -1,9 +1,8 @@
 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, Pmcur, User, Ex
+from xync_schema.models import Direction, Pmcur, Ex, Cred, Contragent
 
 
 class _CurCoin(BaseModel):
@@ -58,20 +57,15 @@ class FiatNew(FiatUpd):
     target: int | None = None
 
 
-class FiatPydIn(BaseModel):
-    # unq
-    id: int = None
-    user_id: int | None = None
-    user: User | None = None
+class CredPydIn(BaseModel):
+    id: int | None = None
+    exid: str
+    ex: Ex | None = None
+    ex_id: int | 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
@@ -79,24 +73,21 @@ class FiatPydIn(BaseModel):
     @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")):
+        if (values.get("ex") or values.get("ex_id")) and (values.get("pmcur") or values.get("pmcur_id")):
             return values
-        raise ValueError("pmcur(_id) and user(_id) is required")
+        raise ValueError("ex(_id) and pmcur(_id) 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 FiatPydIn(BaseModel):
+    # unq
+    id: int = None
+    cred_id: int | None = None
+    cred: Cred | None = None
+    # df
+    amount: float
+    target: float | None = None
 
-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
+    banks: list[str] = []
 
     class Config:
         arbitrary_types_allowed = True
@@ -104,9 +95,15 @@ class FiatexPydIn(BaseModel):
     @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")):
+        if values.get("cred") or values.get("cred_id"):
             return values
-        raise ValueError("ex(_id) and fiat(_id) is required")
+        raise ValueError("cred(_id) is required")
+
+    def args(self) -> tuple[dict, dict]:
+        unq: tuple[str, ...] = "id", "cred_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):
@@ -120,9 +117,9 @@ class AdPydIn(BaseAd):
     detail: str | None = None
     auto_msg: str | None = None
     status: AdStatus = AdStatus.active
-    agent_id: int | None = None
+    maker_id: int | None = None
+    maker: Contragent | None = None
     direction_id: int | None = None
-    agent: Agent | None = None
     direction: Direction | None = None
     pms_: list | None = None
     fiats_: list | None = None
@@ -133,12 +130,12 @@ class AdPydIn(BaseAd):
     @classmethod
     @model_validator(mode="before")
     def check_at_least_one_field(cls, values):
-        agent = values.get("agent") or values.get("agent_id")
+        maker = values.get("maker") or values.get("maker_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:
+        if maker and direction and pms_or_fiats:
             return values
-        raise ValueError("(pms or fiats) and agent(_id) and direction(_id) is required")
+        raise ValueError("(pms or fiats) and maker(_id) and direction(_id) is required")
 
 
 class OrderPyd(BaseModel):
@@ -146,7 +143,7 @@ class OrderPyd(BaseModel):
     amount: float
     status: str
     actions: dict | None = {}
-    fiat: Fiat.pyd()
+    cred: Cred.pyd()
     is_sell: bool
     contragent: int | None = None
     created_at: datetime

{xync_schema-0.6.71 → xync_schema-0.6.72/xync_schema.egg-info}/PKG-INFO

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