xync-schema 0.6.61__tar.gz → 0.6.66__tar.gz

{xync_schema-0.6.61/xync_schema.egg-info → xync_schema-0.6.66}/PKG-INFO

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

{xync_schema-0.6.61 → xync_schema-0.6.66}/xync_schema/models.py

@@ -1,3 +1,4 @@
+import sys
 from datetime import datetime
 from tortoise import fields
 from tortoise.queryset import QuerySet
@@ -82,8 +83,6 @@ class Ex(Model):
         include = "name", "logo"
 
     def client(self):
-        import sys
-
         module_name = f"xync_client.{self.name}.ex"
         __import__(module_name)
         client = sys.modules[module_name].ExClient
@@ -94,7 +93,6 @@ class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     exid: str = fields.CharField(31)
-    p2p: bool = fields.BooleanField(default=True)
     # countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
     #     "models.Country", through="curexcountry", backward_key="curexs"
     # )
@@ -107,6 +105,8 @@ class Curex(BaseModel):
 class Coinex(BaseModel):
     coin: fields.ForeignKeyRelation[Coin] = fields.ForeignKeyField("models.Coin")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
+    minimum: float = fields.FloatField(null=True)
+
     exid: str = fields.CharField(31)
     p2p: bool = fields.BooleanField(default=True)
 
@@ -213,16 +213,20 @@ class Agent(Model):
         computed = ["balance"]
 
     def client(self):
-        import sys
-
         module_name = f"xync_client.{self.ex.name}.agent"
         __import__(module_name)
         client = sys.modules[module_name].AgentClient
         return client(self)
 
-    def asset_client(self):
-        import sys
+    # def in_client(self) -> "BaseInAgentClient":
+    #     import sys
+    #
+    #     module_name = f"xync_client.{self.ex.name}.inAgent"
+    #     __import__(module_name)
+    #     client = sys.modules[module_name].InAgentClient
+    #     return client(self)
 
+    def asset_client(self):
         module_name = f"xync_client.{self.ex.name}.asset"
         __import__(module_name)
         client = sys.modules[module_name].AssetClient
@@ -249,6 +253,7 @@ class Ad(Model, TsTrait):
     detail: str | None = fields.CharField(4095, null=True)
     autoMsg: str | None = fields.CharField(255, null=True)
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "ads")
+    agent_id: int
     status: AdStatus = fields.IntEnumField(AdStatus)
 
     orders: fields.ReverseRelation["Order"]
@@ -259,6 +264,11 @@ class Ad(Model, TsTrait):
     class Meta:
         table_description = "P2P Advertisements"
 
+    def epyd(self):
+        module_name = f"xync_client.{self.ex.name}.pyd"
+        __import__(module_name)
+        return sys.modules[module_name].AdEpyd
+
 
 class Pm(Model):
     name: str = fields.CharField(63, unique=True)
@@ -277,8 +287,15 @@ class Pm(Model):
     class Meta:
         table_description = "Payment methods"
 
-    class PydanticMeta(Model.PydanticMeta):
-        include = ("id", "name", "logo")
+    # class PydanticMeta(Model.PydanticMeta):
+    #     max_recursion = 3
+    #     backward_relations = True
+    #     include = "id", "name", "logo", "pmexs__sbp"
+
+    # def epyd(self):
+    #     module_name = f"xync_client.{self.ex.name}.pyd"
+    #     __import__(module_name)
+    #     return sys.modules[module_name].PmEpyd
 
 
 class Pmcur(Model):  # for fiat with no exs tie
@@ -287,7 +304,7 @@ class Pmcur(Model):  # for fiat with no exs tie
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     cur_id: int
 
-    fiats: fields.ReverseRelation["Fiat"]
+    fiats: fields.BackwardFKRelation["Fiat"]
     exs: fields.ManyToManyRelation[Ex]
 
     class Meta:
@@ -307,10 +324,22 @@ class Pmex(BaseModel):  # existence pm in ex with no cur tie
     exid: str = fields.CharField(63)
     name: str = fields.CharField(63)
 
+    banks: fields.BackwardFKRelation["PmexBank"]
+
     class Meta:
         unique_together = (("ex_id", "exid"),)
 
 
+class PmexBank(BaseModel):  # banks for SBP
+    pmex: fields.ForeignKeyRelation[Pmex] = fields.ForeignKeyField("models.Pmex", "banks")
+    pmex_id: int
+    exid: str = fields.CharField(63)
+    name: str = fields.CharField(63)
+
+    class Meta:
+        unique_together = (("pmex", "exid"),)
+
+
 class Pmcurex(BaseModel):  # existence pm in ex for exact cur, with "blocked" flag
     pmcur: fields.ForeignKeyRelation[Pmcur] = fields.ForeignKeyField("models.Pmcur")
     pmcur_id: int
@@ -347,7 +376,11 @@ class Fiat(Model):
         backward_relations = False
         include = "id", "pmcur", "detail", "name", "amount"
 
-    #     # exclude_raw_fields = True
+    @staticmethod
+    def epyd(ex: Ex):
+        module_name = f"xync_client.{ex.name}.pyd"
+        __import__(module_name)
+        return sys.modules[module_name].FiatEpyd
 
 
 class Fiatex(BaseModel):  # existence pm in ex with no cur tie
@@ -385,7 +418,7 @@ class Asset(Model):
     coin_id: int
     agent: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "assets")
     agent_id: int
-    type_: AssetType = fields.IntEnumField(AssetType)
+    type_: AssetType = fields.IntEnumField(AssetType, default=AssetType.found)
     free: float = fields.FloatField()
     freeze: float | None = fields.FloatField(default=0)
     lock: float | None = fields.FloatField(default=0)
@@ -400,6 +433,11 @@ class Asset(Model):
     class PydanticMeta(Model.PydanticMeta):
         max_recursion: int = 2  # default: 3
 
+    def epyd(self):
+        module_name = f"xync_client.{self.agent.ex.name}.pyd"
+        __import__(module_name)
+        return sys.modules[module_name].AssetEpyd
+
 
 class Order(Model):
     id: int = fields.BigIntField(True)
@@ -426,8 +464,6 @@ class Order(Model):
         return f"{self.fiat.pmcur.pm.name}/{self.fiat_id}:{self.amount:.3g} {self.status.name}"
 
     async def client(self):
-        import sys
-
         if isinstance(self.ad, QuerySet):
             # noinspection PyTypeChecker
             self.ad: Ad = await self.ad.prefetch_related("agent__ex")
@@ -440,6 +476,11 @@ class Order(Model):
         client = sys.modules[f"xync_client.{self.ad.agent.ex.name}.order"].Client
         return client(self)
 
+    # def epyd(self):  # todo: for who?
+    #     module_name = f"xync_client.{self.ex.name}.pyd"
+    #     __import__(module_name)
+    #     return sys.modules[module_name].OrderEpyd
+
     class Meta:
         table_description = "P2P Orders"
 

{xync_schema-0.6.61 → xync_schema-0.6.66}/xync_schema/pydantic.py

@@ -17,6 +17,7 @@ class FiatNew(FiatUpd):
     pm_id: int
     detail: str
     amount: float = 0
+    target: int | None = None
 
 
 class OrderPyd(BaseModel):

{xync_schema-0.6.61 → xync_schema-0.6.66/xync_schema.egg-info}/PKG-INFO

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