xync-schema 0.0.54.dev2__tar.gz → 0.0.54.dev4__tar.gz

{xync_schema-0.0.54.dev2/xync_schema.egg-info → xync_schema-0.0.54.dev4}/PKG-INFO

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

{xync_schema-0.0.54.dev2 → xync_schema-0.0.54.dev4}/xync_schema/enums.py

@@ -29,23 +29,40 @@ class AdStatus(IntEnum):
 
 
 class OrderStatus(IntEnum):
-    deleted = 0
-    requested = 1
-    request_canceled = 2
-    created = 3
-    rejected = 4
-    paid = 5
-    canceled = 6
-    completed = 7
-    appealable = 8
-    appealed_by_seller = 9
-    appealed_by_buyer = 10
-    seller_appeal_disputed_by_buyer = 11
-    buyer_appeal_disputed_by_seller = 12
+    created = 1
+    paid = 2
+    completed = 3
+    canceled = 4
+    appealed_by_seller = 5
+    appealed_by_buyer = 6
+    appeal_disputed = 7
     # todo: 8T - один вирт экшн на бездействие обеих сторон, а 12T и 13T - по отдельности?
     # COMPLETED, PENDING, TRADING, BUYER_PAYED, DISTRIBUTING, COMPLETED, IN_APPEAL, CANCELLED, CANCELLED_BY_SYSTEM
 
 
+class OrderAction(IntEnum):
+    # requested
+    taker_create = 1
+    wait_for_cancel = 0
+    # created
+    buyer_pay = 2
+    seller_confirm = 3
+    buyer_cancel = 4
+    # paid
+    wait_for_pay = 5
+    seller_appeal = 6
+    buyer_appeal = 7
+    # appealed by seller
+    buyer_dispute_appeal_s = 8
+    buyer_agree_appeal_s = 10  # cancel
+    wait_appeal_s = 12  # -> cancel
+    # appealed by buyer
+    seller_dispute_appeal_b = 9
+    seller_agree_appeal_b = 11  # confirm
+    wait_appeal_b = 13  # -> confirm
+    wait_disputed_appeal = 14  # ?
+
+
 class ExType(IntEnum):
     p2p = 1
     cex = 2

xync_schema-0.0.54.dev4/xync_schema/graph.py

@@ -0,0 +1,65 @@
+from xync_schema.enums import OrderStatus, OrderAction
+
+acts = (
+    {  # buyer
+        # 1
+        OrderStatus.created: {
+            OrderAction.buyer_cancel: OrderStatus.canceled,
+            OrderAction.buyer_pay: OrderStatus.paid,
+        },
+        # 2
+        OrderStatus.paid: {
+            OrderAction.buyer_cancel: OrderStatus.canceled,
+            OrderAction.buyer_appeal: OrderStatus.appealed_by_buyer,
+        },
+        # 5
+        OrderStatus.appealed_by_seller: {
+            OrderAction.buyer_cancel: OrderStatus.canceled,
+            OrderAction.buyer_dispute_appeal_s: OrderStatus.appeal_disputed,
+        },
+        # 6
+        OrderStatus.appealed_by_buyer: {
+            OrderAction.buyer_cancel: OrderStatus.canceled,
+        },
+        # 7
+        OrderStatus.appeal_disputed: {
+            OrderAction.buyer_cancel: OrderStatus.canceled,
+        },
+    },
+    {  # seller
+        # 2
+        OrderStatus.paid: {
+            OrderAction.seller_confirm: OrderStatus.completed,
+            OrderAction.seller_appeal: OrderStatus.appealed_by_seller,
+        },
+        # 5
+        OrderStatus.appealed_by_seller: {
+            OrderAction.seller_confirm: OrderStatus.completed,
+        },
+        # 6
+        OrderStatus.appealed_by_buyer: {
+            OrderAction.seller_dispute_appeal_b: OrderStatus.appeal_disputed,
+            OrderAction.seller_confirm: OrderStatus.completed,
+        },
+        # 7
+        OrderStatus.appeal_disputed: {
+            OrderAction.seller_confirm: OrderStatus.completed,
+        },
+    },
+)
+
+
+waits: dict[OrderStatus, dict[OrderAction, OrderStatus]] = {
+    # 1
+    OrderStatus.created: {
+        OrderAction.wait_for_cancel: OrderStatus.canceled,
+    },
+    # 5
+    OrderStatus.appealed_by_seller: {
+        OrderAction.wait_appeal_s: OrderStatus.canceled,
+    },
+    # 6
+    OrderStatus.appealed_by_buyer: {
+        OrderAction.wait_appeal_b: OrderStatus.completed,
+    },
+}

{xync_schema-0.0.54.dev2 → xync_schema-0.0.54.dev4}/xync_schema/models.py

@@ -1,6 +1,7 @@
 import re
 import struct
 import sys
+from typing import Any
 from uuid import UUID
 from datetime import datetime, timezone, timedelta
 from decimal import Decimal
@@ -164,6 +165,11 @@ class Ex(Model):
         client = sys.modules[module_name].ExClient
         return client(self, bot, **kwargs)
 
+    def etype(self):
+        module_name = f"xync_client.{self.name}.etype"
+        __import__(module_name)
+        return sys.modules[module_name]
+
 
 class CurEx(BaseModel):
     cur: ForeignKeyRelation[Cur] = ForeignKeyField("models.Cur", on_update=CASCADE)
@@ -297,6 +303,11 @@ class User(TgUser, TsTrait):
     borrows: BackwardFKRelation["Credit"]
     investments: BackwardFKRelation["Investment"]
 
+    def __init__(self, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self.pm_clients = {pma.pm_id: pma.client() for pma in self.pm_agents}
+        self.agent_clients = {a.id: a.client() for a in self.person.actor.agents}
+
     async def free_assets(self):
         assets = await Asset.filter(agent__actor__person__user__id=self.id).values("free", "addr__coin__rate")
         return sum(asset["free"] * asset["addr__coin__rate"] for asset in assets)
@@ -527,12 +538,19 @@ class Agent(Model, TsTrait):
     # include = "id", "actor__ex", "auth", "updated_at"
     # computed = ["balance"]
 
-    def client(self, ex_cl, fbot, bbot, proxy=None):
+    def client(self, ex_cl, fbot, bbot, pm_clients=None, proxy=None):
         module_name = f"xync_client.{self.actor.ex.name}.agent"
         __import__(module_name)
         client = sys.modules[module_name].AgentClient
         return client(
-            self, ex_cl, fbot, bbot, headers=self.auth.get("headers"), cookies=self.auth.get("cookies"), proxy=proxy
+            self,
+            ex_cl,
+            fbot,
+            bbot,
+            pm_clients or {},
+            headers=self.auth.get("headers"),
+            cookies=self.auth.get("cookies"),
+            proxy=proxy,
         )
 
 
@@ -688,9 +706,14 @@ class Ad(Model, TsTrait):
 
 
 class MyAd(Model):  # Road
+    WEB = "https://www.bybit.com/ru-RU/p2p/sell/USDT/RUB?share="
+    MOB = "https://app.bybit.com/inapp?by_dp=bybitapp://open/route?targetUrl=by-mini://p2p/home?share="
+
     ad: OneToOneRelation[Ad] = OneToOneField("models.Ad", "my_ad", on_update=CASCADE)
     ad_id: int  # new
     target_place: int = UInt1Field(default=1)
+    hex: bytes = BinaryField(null=True)
+    shared_at: datetime | None = DatetimeSecField(null=True)
 
     pay_req: ForeignKeyNullableRelation["PayReq"] = ForeignKeyField(
         "models.PayReq", "maked_ads", on_update=CASCADE, null=True
@@ -703,6 +726,12 @@ class MyAd(Model):  # Road
     class Meta:
         table = "my_ad"
 
+    def get_url(self):
+        # if not self.hex:
+        #     return None
+        hx = self.hex.hex()
+        return self.WEB + hx, self.MOB + hx
+
 
 class Race(Model):
     road: ForeignKeyRelation[MyAd] = ForeignKeyField("models.MyAd", "race", on_update=CASCADE)
@@ -764,10 +793,15 @@ class PmAgent(Model):
         table = "pm_agent"
         unique_together = (("pm_id", "user_id"),)
 
-    def client(self, browser, bot):
-        module_name = f"xync_client.Pms.{self.pm.norm.capitalize()}"
+    def client(self, bot=None, browser=None):
+        module_name = f"xync_client.Pms.{self.pm.norm.capitalize()}.agent"
         __import__(module_name)
-        return sys.modules[module_name].Client(self, browser, bot)
+        kwargs = {}
+        if bot:
+            kwargs["bot"] = bot
+        if browser:
+            kwargs["browser"] = browser
+        return sys.modules[module_name].PmAgentClient(self, **kwargs)
 
 
 class PmCur(Model):  # for fiat with no exs tie
@@ -1022,7 +1056,7 @@ class Order(Model):
     payreq_id: int
     maker_topic: int = UInt2Field(null=True)  # todo: remove nullability
     taker_topic: int = UInt2Field(null=True)
-    status: OrderStatus = IntEnumField(OrderStatus, default=OrderStatus.requested)
+    status: OrderStatus = IntEnumField(OrderStatus, default=OrderStatus.created)
     created_at: datetime | None = DatetimeSecField(auto_now_add=True)
     payed_at: datetime | None = DatetimeSecField(null=True)
     confirmed_at: datetime | None = DatetimeSecField(null=True)
@@ -1034,6 +1068,13 @@ class Order(Model):
 
     _name = {"cred__pmcur__pm__name"}
 
+    def ami_maker(self, uid: int) -> bool:
+        return self.taker_id != uid
+
+    async def ami_seller(self, uid: int) -> bool:
+        await self.fetch_related("ad__pair_side")  # todo: check and fetch if only need
+        return self.ad.pair_side.is_sell == self.ami_maker(uid)
+
     async def client(self):
         if isinstance(self.ad, QuerySet):
             # noinspection PyTypeChecker

{xync_schema-0.0.54.dev2 → xync_schema-0.0.54.dev4}/xync_schema/xtype.py

@@ -29,8 +29,9 @@ class PmExBank(BaseModel):
 
 
 class BaseAd(BaseModel):
-    price: float
     id: int | str = None
+    price: float
+    # txt: str
 
 
 class BaseAdIn(BaseAd):

{xync_schema-0.0.54.dev2 → xync_schema-0.0.54.dev4/xync_schema.egg-info}/PKG-INFO

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

{xync_schema-0.0.54.dev2 → xync_schema-0.0.54.dev4}/xync_schema.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ tests/__init__.py
 tests/test_db.py
 xync_schema/__init__.py
 xync_schema/enums.py
+xync_schema/graph.py
 xync_schema/models.py
 xync_schema/xtype.py
 xync_schema.egg-info/PKG-INFO