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

{xync_schema-0.6.70/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.70
+Version: 0.6.72
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA

{xync_schema-0.6.70 → 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.70 → xync_schema-0.6.72}/xync_schema/models.py

@@ -1,7 +1,5 @@
 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
@@ -71,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"]
@@ -161,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"]
@@ -190,36 +188,47 @@ class User(Model, TsTrait, UserInfoTrait):
     # computed = ["balance"]
 
 
-class Agent(Model):
+class Contragent(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.ForeignKeyNullableRelation[User] = fields.ForeignKeyField(
-        "models.User", related_name="agents", null=True
-    )
-    user_id: int
+    name: int = fields.CharField(63)
+    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", related_name="contragents")
+    ex_id: int
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
+    agent: fields.BackwardOneToOneRelation["Agent"]
+    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, TsTrait):
+    auth: dict[str, str] = fields.JSONField(null=True)
+    contragent: fields.OneToOneRelation[Contragent] = fields.OneToOneField("models.Contragent", "agent")
+    contragent_id: int
+    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
+    user_id: int
     assets: fields.ReverseRelation["Asset"]
-    orders: fields.ReverseRelation["Order"]
-    ads: fields.ReverseRelation["Ad"]
 
-    _name = {"exid"}
+    _name = {"contragent__name"}
 
     def balance(self) -> int:
         return sum(asset.free * (asset.coin.rate or 0) for asset in self.assets)
 
     class Meta:
         table_description = "Agents"
-        unique_together = (("ex", "user"),)
+        unique_together = (("contragent", "user"),)
 
     class PydanticMeta(Model.PydanticMeta):
         # max_recursion = 3
-        include = "id", "ex", "assets", "auth", "updated_at"
+        include = "id", "contragent__ex", "assets", "auth", "updated_at"
         computed = ["balance"]
 
     def client(self):
-        module_name = f"xync_client.{self.ex.name}.agent"
+        module_name = f"xync_client.{self.contragent.ex.name}.agent"
         __import__(module_name)
         client = sys.modules[module_name].AgentClient
         return client(self)
@@ -233,7 +242,7 @@ class Agent(Model):
     #     return client(self)
 
     def asset_client(self):
-        module_name = f"xync_client.{self.ex.name}.asset"
+        module_name = f"xync_client.{self.contragent.ex.name}.asset"
         __import__(module_name)
         client = sys.modules[module_name].AssetClient
         return client(self)
@@ -249,14 +258,14 @@ 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 AdCred(Model):
+#     ad: fields.ForeignKeyRelation["Ad"] = fields.ForeignKeyField("models.Ad")
+#     cred: fields.ForeignKeyRelation["Cred"] = fields.ForeignKeyField("models.Cred")
+#
+#     _name = {"ad__id", "cred__id"}
+#
+#     class Meta:
+#         table_description = "P2P Advertisements - Payment details"
 
 
 class Ad(Model, TsTrait):
@@ -269,10 +278,11 @@ class Ad(Model, TsTrait):
     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
+    maker: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "my_ads")
+    maker_id: int
 
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
+    creds: fields.ManyToManyRelation["Cred"] = fields.ManyToManyField("models.Cred", through="adcred")
     orders: fields.ReverseRelation["Order"]
 
     _icon = "ad"
@@ -281,17 +291,17 @@ class Ad(Model, TsTrait):
     class Meta:
         table_description = "P2P Advertisements"
 
-    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,
-            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,
-        )
+    # def epyds(self) -> tuple[PydModel, PydModel, PydModel, PydModel, PydModel, PydModel]:
+    #     module_name = f"xync_client.{self.maker.ex.name}.pyd"
+    #     __import__(module_name)
+    #     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):
@@ -328,7 +338,7 @@ class Pmcur(Model):  # for fiat with no exs tie
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     cur_id: int
 
-    fiats: fields.BackwardFKRelation["Fiat"]
+    creds: fields.BackwardFKRelation["Cred"]
     exs: fields.ManyToManyRelation[Ex]
 
     class Meta:
@@ -364,52 +374,64 @@ 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
-    fiat: fields.ForeignKeyRelation["Fiat"] = fields.ForeignKeyField("models.Fiat", "fiatbanks")
-    fiat_id: int
+    cred: fields.ForeignKeyRelation["Cred"] = fields.ForeignKeyField("models.Cred", "credbanks")
+    cred_id: int
 
     class Meta:
-        unique_together = (("fiat_id", "pmexbank_id"),)
-
+        unique_together = (("cred_id", "pmexbank_id"),)
 
-class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" flag
-    pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
-    pmcur_id: int
-    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
-    ex_id: int
-    blocked: bool = fields.BooleanField(default=False)
 
-    # class Meta:
-    #     unique_together = (("ex_id", "pmcur_id"),)
+# class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" flag
+#     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
+#     pmcur_id: int
+#     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
+#     ex_id: int
+#     blocked: bool = fields.BooleanField(default=False)  # todo: move to cureex or pmex?
+#
+#     # class Meta:
+#     #     unique_together = (("ex_id", "pmcur_id"),)
 
 
-class Fiat(Model):
-    id: int = fields.BigIntField(True)
+class Cred(Model):
+    exid: int = fields.BigIntField()
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
     # country: fields.ForeignKeyRelation[Country] = fields.ForeignKeyField("models.Country", related_name="fiats")
     # country_id: int
     detail: str = fields.CharField(127)
     name: str | None = fields.CharField(127, null=True)
-    user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "fiats")
-    user_id: int
-    amount: float | None = fields.FloatField(default=0)
-    target: float | None = fields.FloatField(default=None, null=True)
+    contragent: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "creds")
+    contragent_id: int
 
-    exs: fields.ManyToManyRelation[Ex] = fields.ManyToManyField("models.Ex", through="fiatex", related_name="fiats")
-    orders: fields.ReverseRelation["Order"]
+    fiat: fields.BackwardOneToOneRelation["Fiat"]
+    ads: fields.BackwardFKRelation[Ad]
+    orders: fields.BackwardFKRelation["Order"]
 
-    # _name = {"pmcur__pm__name", "pmcur__cur__ticker", "amount"}
+    _name = {"exid"}
 
     class Meta:
-        table_description = "Currency accounts balance"
+        table_description = "Currency accounts"
+        unique_together = (("pmcur_id", "detail"), ("contragent", "exid"))
+
+
+class Fiat(Model):
+    cred: fields.OneToOneRelation[Cred] = fields.OneToOneField("models.Cred", "fiat")
+    cred_id: int
+    # user: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", "fiats")
+    # user_id: int  # cred.contragent.agent.user_id
+    amount: float | None = fields.FloatField(default=0)
+    target: float | None = fields.FloatField(default=None, null=True)
+
+    class Meta:
+        table_description = "Currency balances"
 
     class PydanticMeta(Model.PydanticMeta):
         # max_recursion: int = 2
         backward_relations = False
-        include = "id", "pmcur", "detail", "name", "amount"
+        include = "id", "cred__pmcur", "cred__detail", "cred__name", "amount"
 
     @staticmethod
     def epyd(ex: Ex):
@@ -418,18 +440,6 @@ class Fiat(Model):
         return sys.modules[module_name].FiatEpyd
 
 
-class Fiatex(BaseModel):  # existence pm in ex with no cur tie
-    fiat: fields.ForeignKeyRelation[Fiat] = fields.ForeignKeyField("models.Fiat", "fiatexs")
-    fiat_id: int
-    ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex", "fiatexs")
-    ex_id: int
-    exid: int = fields.BigIntField()
-
-    class Meta:
-        table_description = "Fiat on Ex"
-        unique_together = (("fiat_id", "ex_id"), ("ex_id", "exid"))
-
-
 class Limit(Model):
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
@@ -479,9 +489,9 @@ class Order(Model):
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
     amount: float = fields.FloatField()
-    fiat: fields.ForeignKeyRelation[Fiat] = fields.ForeignKeyField("models.Fiat", related_name="orders", null=True)
-    fiat_id: int | None
-    taker: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "orders")
+    cred: fields.ForeignKeyRelation[Cred] = fields.ForeignKeyField("models.Cred", related_name="orders", null=True)
+    cred_id: int | None
+    taker: fields.ForeignKeyRelation[Contragent] = fields.ForeignKeyField("models.Contragent", "taken_orders")
     taker_id: int
     maker_topic: int = fields.IntField()
     taker_topic: int = fields.IntField()
@@ -493,10 +503,7 @@ class Order(Model):
 
     msgs: fields.BackwardFKRelation["Msg"]
 
-    _name = {"fiat__pmcur__pm__name"}
-
-    def repr(self):
-        return f"{self.fiat.pmcur.pm.name}/{self.fiat_id}:{self.amount:.3g} {self.status.name}"
+    _name = {"cred__pmcur__pm__name"}
 
     async def client(self):
         if isinstance(self.ad, QuerySet):
@@ -508,7 +515,7 @@ class Order(Model):
         elif isinstance(self.ad.agent, Agent) and isinstance(self.ad.agent.ex, QuerySet):
             # noinspection PyTypeChecker
             self.ad.agent.ex = await self.ad.agent.ex
-        client = sys.modules[f"xync_client.{self.ad.agent.ex.name}.order"].Client
+        client = sys.modules[f"xync_client.{self.ad.maker.ex.name}.order"].Client
         return client(self)
 
     # def epyd(self):  # todo: for who?
@@ -522,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.70 → xync_schema-0.6.72}/xync_schema/pydantic.py

@@ -1,17 +1,24 @@
 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 CurEpyd(BaseModel):
+class _CurCoin(BaseModel):
     exid: int | str
     ticker: str
     rate: float | None = None
-    minimum: int | None = None
+
+
+class CoinEpyd(_CurCoin):
+    p2p: bool = True
+    minimum: float | None = None
+
+
+class CurEpyd(_CurCoin):
     rounding_scale: int | None = None
+    minimum: int | None = None
 
 
 class PmexBankPyd(BaseModel):
@@ -50,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
@@ -71,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
@@ -96,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):
@@ -112,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
@@ -125,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):
@@ -138,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.70 → 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.70
+Version: 0.6.72
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA