xync-schema 0.6.47__tar.gz → 0.6.48.dev2__tar.gz

{xync_schema-0.6.47/xync_schema.egg-info → xync_schema-0.6.48.dev2}/PKG-INFO

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

{xync_schema-0.6.47 → xync_schema-0.6.48.dev2}/xync_schema/enums.py

@@ -33,6 +33,7 @@ class ExType(IntEnum):
     cex = 2
     main = 3  # p2p+cex
     dex = 4
+    tg = 5
     futures = 8
 
 
@@ -67,6 +68,12 @@ class TaskType(IntEnum):
     invite_approve = 1
 
 
+class ExStatus(IntEnum):
+    plan = 0
+    parted = 1
+    full = 2
+
+
 class ExAction(IntEnum):
     """Order"""
 
@@ -145,7 +152,7 @@ exs = {
         ExType.p2p,
         "https://assets.coingecko.com/markets/images/812/large/YtFwQwJr_400x400.jpg",
         "bingx.com",
-        "bingx.com",
+        "api-app.we-api.com",
         "bingx.com/login",
     ),
     "Bisq": (ExType.p2p, "", "", "", ""),
@@ -169,7 +176,7 @@ exs = {
         ExType.main,
         "https://assets.coingecko.com/markets/images/698/large/bybit_spot.png",
         "bybit.com",
-        "bybit.com",
+        "api2.bybit.com",
         "bybit.com/login",
     ),
     "CoinCola": (ExType.main, "", "", "", ""),

{xync_schema-0.6.47 → xync_schema-0.6.48.dev2}/xync_schema/models.py

@@ -7,7 +7,7 @@ from x_auth.models import Model
 from x_model.models import TsTrait, DatetimeSecField
 from tg_auth.models import UserStatus, AuthUser, UserInfoTrait
 
-from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction
+from xync_schema.enums import ExType, AdStatus, AssetType, OrderStatus, ExAction, ExStatus
 
 
 # class Country(Model):
@@ -60,6 +60,7 @@ class Ex(Model):
     host_p2p: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
     url_login: str | None = fields.CharField(63, null=True, description="With no protocol 'https://'")
     type_: ExType = fields.IntEnumField(ExType)
+    status: ExStatus = fields.IntEnumField(ExStatus, default=ExStatus.plan)
     logo: str = fields.CharField(511, default="")
 
     pms: fields.ManyToManyRelation["Pm"]
@@ -80,10 +81,12 @@ class Ex(Model):
     class PydanticMeta(Model.PydanticMeta):
         include = "name", "logo"
 
-    async def client(self):
+    def client(self):
         import sys
 
-        client = sys.modules[f"xync_client.{self.name}.ex"].Client
+        module_name = f"xync_client.{self.name}.ex"
+        __import__(module_name)
+        client = sys.modules[module_name].ExClient
         return client(self)
 
 
@@ -402,6 +405,8 @@ class Order(Model):
     confirmed_at: datetime | None = DatetimeSecField(null=True)
     appealed_at: datetime | None = DatetimeSecField(null=True)
 
+    msgs: fields.BackwardFKRelation["Msg"]
+
     _name = {"fiat__pmcur__pm__name"}
 
     def repr(self):
@@ -429,6 +434,14 @@ class Order(Model):
         exclude = ("taker",)
 
 
+class Msg(Model):
+    tgid: int = fields.IntField()
+    txt: str = fields.CharField(255)
+    media: str | None = fields.CharField(255, null=True)
+    receiver: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.User", related_name="msgs")
+    order: fields.ForeignKeyRelation[Order] = fields.ForeignKeyField("models.Order", related_name="msgs")
+
+
 # class Dep(Model, TsTrait):
 #     pid: str = fields.CharField(31)  # product_id
 #     apr: float = fields.FloatField()

{xync_schema-0.6.47 → xync_schema-0.6.48.dev2/xync_schema.egg-info}/PKG-INFO

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