xync-schema 0.6.42__py3-none-any.whl → 0.6.44__py3-none-any.whl

xync_schema/enums.py

@@ -11,14 +11,20 @@ class AdStatus(IntEnum):
 
 
 class OrderStatus(IntEnum):
-    zero = 0
-    active = 1
-    two = 2
-    three = 3
-    done = 4
-    fifth = 5
+    requested = 1
+    request_canceled = 2
+    created = 3
+    rejected = 4
+    paid = 5
     canceled = 6
-    paid_and_canceled = 7
+    completed = 7
+    appealed_by_seller = 9
+    appealed_by_buyer = 10
+    seller_appeal_disputed_by_buyer = 11
+    buyer_appeal_disputed_by_seller = 12
+    appeal_canceled = 15
+    # todo: 8T - один вирт экшн на бездействие обеих сторон, а 12T и 13T - по отдельности?
+    # paid_and_canceled = 7
     # COMPLETED, PENDING, TRADING, BUYER_PAYED, DISTRIBUTING, COMPLETED, IN_APPEAL, CANCELLED, CANCELLED_BY_SYSTEM
 
 

xync_schema/models.py

@@ -182,12 +182,14 @@ class User(Model, TsTrait):
     # computed = ["balance"]
 
 
-class Agent(Model, TsTrait):
-    exid: int = fields.IntField()
+class Agent(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.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="agents")
     user_id: int
+    updated_at: datetime | None = DatetimeSecField(auto_now=True)
+
     assets: fields.ReverseRelation["Asset"]
     orders: fields.ReverseRelation["Order"]
     ads: fields.ReverseRelation["Ad"]
@@ -209,9 +211,6 @@ class Agent(Model, TsTrait):
     async def client(self):
         import sys
 
-        if isinstance(self.ex, QuerySet):
-            # noinspection PyTypeChecker
-            self.ex: Ex = await self.ex
         client = sys.modules[f"xync_client.{self.ex.name}.agent"].Client
         return client(self)
 
@@ -233,8 +232,8 @@ class Ad(Model, TsTrait):
     pms: fields.ManyToManyRelation["Pm"] = fields.ManyToManyField("models.Pm", through="adpm")  # only root pms
     maxFiat: float = fields.FloatField()
     minFiat: float = fields.FloatField()
-    detail: str = fields.CharField(4095, null=True)
-    autoMsg: str = fields.CharField(255, null=True)
+    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")
     status: AdStatus = fields.IntEnumField(AdStatus)
 
@@ -330,7 +329,7 @@ class Fiat(Model):
         table_description = "Currency accounts balance"
 
     class PydanticMeta(Model.PydanticMeta):
-        #     max_recursion: int = 2
+        # max_recursion: int = 2
         backward_relations = False
         include = "id", "pmcur", "detail", "name", "amount"
 
@@ -388,7 +387,7 @@ class Asset(Model):
         max_recursion: int = 2  # default: 3
 
 
-class Order(Model, TsTrait):
+class Order(Model):
     id: int = fields.BigIntField(True)
     ad: fields.ForeignKeyRelation[Ad] = fields.ForeignKeyField("models.Ad", related_name="ads")
     ad_id: int
@@ -398,17 +397,37 @@ class Order(Model, TsTrait):
     taker: fields.ForeignKeyRelation[Agent] = fields.ForeignKeyField("models.Agent", "orders")
     taker_id: int
     status: OrderStatus = fields.IntEnumField(OrderStatus)
-    notify_pay_at: datetime | None = DatetimeSecField(null=True)
-    confirm_pay_at: datetime | None = DatetimeSecField(null=True)
+    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
+    payed_at: datetime | None = DatetimeSecField(null=True)
+    confirmed_at: datetime | None = DatetimeSecField(null=True)
+    appealed_at: datetime | None = DatetimeSecField(null=True)
 
     _name = {"fiat__pmcur__pm__name"}
 
     def repr(self):
         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")
+        elif isinstance(self.ad, Ad) and isinstance(self.ad.agent, QuerySet):
+            # noinspection PyTypeChecker
+            self.ad.agent = await self.ad.agent.prefetch_related("ex")
+        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
+        return client(self)
+
     class Meta:
         table_description = "P2P Orders"
 
+    class PydanticMeta(Model.PydanticMeta):
+        exclude = ("taker",)
+
 
 # class Dep(Model, TsTrait):
 #     pid: str = fields.CharField(31)  # product_id

{xync_schema-0.6.42.dist-info → xync_schema-0.6.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xync-schema
-Version: 0.6.42
+Version: 0.6.44
 Summary: XyncNet project database model schema
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: EULA
@@ -10,9 +10,9 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: xtg-auth
 Provides-Extra: dev
-Requires-Dist: build ; extra == 'dev'
-Requires-Dist: pytest-asyncio ; extra == 'dev'
-Requires-Dist: twine ; extra == 'dev'
+Requires-Dist: build; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
+Requires-Dist: twine; extra == "dev"
 
 ## INSTALL
 ```bash

xync_schema-0.6.44.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=Ys6MKg3sRL_XkzPZIFMGgfZrXKVa65hb-foNuRNQQ48,10361
+xync_schema/models.py,sha256=zOC_9SqbwhyG4c0ZpgO0I20vYyFAln5mCmiAa6Inpf8,21046
+xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
+xync_schema-0.6.44.dist-info/METADATA,sha256=4f6h2z66r6j2JDsVBxt43YYcCeMCHDEFRettylgVXdQ,3985
+xync_schema-0.6.44.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+xync_schema-0.6.44.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.44.dist-info/RECORD,,

{xync_schema-0.6.42.dist-info → xync_schema-0.6.44.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

xync_schema-0.6.42.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=hOX2jtSOa2_Pk4wasMS5JHlBDro8biMKiKRtfSJyBp0,10030
-xync_schema/models.py,sha256=EK-pigi1bTYWFiXSt7QqyPPEfkLfnS2WhjRjpdPyCjI,20220
-xync_schema/pydantic.py,sha256=cyviSX1P2Cj6fLFq_IsrYdWB6gBOYwR4adPXrAmlP7g,274
-xync_schema-0.6.42.dist-info/METADATA,sha256=fl8yaOPUDzN5DyfREKVw2jcX13d7UNiR2xs53jFAXt0,3988
-xync_schema-0.6.42.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-xync_schema-0.6.42.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.42.dist-info/RECORD,,