xync-schema 0.0.53.dev1__tar.gz → 0.0.54.dev2__tar.gz

{xync_schema-0.0.53.dev1 → xync_schema-0.0.54.dev2}/.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   ### Ruff version.
-  rev: v0.12.5
+  rev: v0.14.4
   hooks:
     ### Run the linter.
     - id: ruff

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

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

{xync_schema-0.0.53.dev1 → xync_schema-0.0.54.dev2}/xync_schema/enums.py

@@ -101,6 +101,13 @@ class FileType(IntEnum):
     jpeg = 10
 
 
+class AgentStatus(IntEnum):
+    off = 0
+    race = 1
+    listen = 2
+    # ... = 4
+
+
 class SynonymType(IntEnum):
     name = 1
     ppo = 2
@@ -120,9 +127,12 @@ class SynonymType(IntEnum):
 
 class Boundary(IntEnum):
     no = 0
-    left = 1
-    right = 2
-    both = 3
+    left_word = 1
+    right_word = 2
+    both_word = 3
+    left_all = 4
+    right_all = 5
+    both_all = 6
 
 
 class SbpStrict(IntEnum):

{xync_schema-0.0.53.dev1 → xync_schema-0.0.54.dev2}/xync_schema/models.py

@@ -1,3 +1,4 @@
+import re
 import struct
 import sys
 from uuid import UUID
@@ -132,7 +133,6 @@ class Ex(Model):
     url_login: str | None = CharField(63, null=True, description="With no protocol 'https://'")
     typ: ExType = IntEnumField(ExType)
     status: ExStatus = IntEnumField(ExStatus, default=ExStatus.plan)
-    is_started: bool = BooleanField(default=False)
     logo: str = CharField(511, default="")
 
     ads: ManyToManyRelation["Ad"]
@@ -309,7 +309,7 @@ class User(TgUser, TsTrait):
         return int(await self.free_assets()) + int(await self.fiats_sum())
 
     async def balances(self, ctd: bool = True) -> dict[int, int | float]:  # ctd - convert to decimal
-        dbt = {
+        dbt = {1: 0, 2: 0, 3: 0} | {
             c: v * 10 ** (-s) if ctd else v
             for c, v, s in await Transaction.filter(receiver=self, status__gte=TS.signed)
             .prefetch_related("cur")
@@ -512,8 +512,8 @@ class Agent(Model, TsTrait):
     auth: dict = JSONField(default={})
     actor: OneToOneRelation[Actor] = OneToOneField("models.Actor", "agent", on_update=CASCADE)
     actor_id: int
-    active: bool = BooleanField(null=True, default=False)
     expire_at: datetime | None = DatetimeSecField(null=True)
+    status: int = SmallIntField(default=0)
 
     assets: BackwardFKRelation["Asset"]
 
@@ -527,17 +527,13 @@ class Agent(Model, TsTrait):
     # include = "id", "actor__ex", "auth", "updated_at"
     # computed = ["balance"]
 
-    def client(self, fbot, bbot):
+    def client(self, ex_cl, fbot, bbot, proxy=None):
         module_name = f"xync_client.{self.actor.ex.name}.agent"
         __import__(module_name)
         client = sys.modules[module_name].AgentClient
-        return client(self, fbot, bbot, headers=self.auth.get("headers"), cookies=self.auth.get("cookies"))
-
-    def in_client(self, fbot, bbot):
-        module_name = f"xync_client.{self.actor.ex.name}.InAgent"
-        __import__(module_name)
-        client = sys.modules[module_name].InAgentClient
-        return client(self, fbot, bbot)
+        return client(
+            self, ex_cl, fbot, bbot, headers=self.auth.get("headers"), cookies=self.auth.get("cookies"), proxy=proxy
+        )
 
 
 class Cond(Model, TsTrait):
@@ -611,6 +607,7 @@ class Pm(Model):
     pmcurs: BackwardFKRelation["PmCur"]  # no need. use curs
     pmexs: BackwardFKRelation["PmEx"]
     agents: BackwardFKRelation["PmAgent"]
+    topupable: BackwardFKRelation["TopUpAble"]
 
     class Meta:
         table_description = "Payment methods"
@@ -698,7 +695,7 @@ class MyAd(Model):  # Road
     pay_req: ForeignKeyNullableRelation["PayReq"] = ForeignKeyField(
         "models.PayReq", "maked_ads", on_update=CASCADE, null=True
     )
-    creds: ManyToManyRelation["Cred"] = ManyToManyField(
+    credexs: ManyToManyRelation["CredEx"] = ManyToManyField(
         "models.CredEx", through="myad_cred", related_name="my_ads", on_update=CASCADE
     )
     race: BackwardFKRelation["Cred"]
@@ -711,9 +708,10 @@ class Race(Model):
     road: ForeignKeyRelation[MyAd] = ForeignKeyField("models.MyAd", "race", on_update=CASCADE)
     road_id: int
     ceil: int = UInt4Field(null=True)  # /10^cur.scale
-    target_place: int = UInt1Field(default=1)
+    target_place: int = SmallIntField(default=1)
     vm_filter: bool = BooleanField(default=True)
     started: bool = BooleanField(default=True)
+    filter_amount: int = UInt4Field()  # /10^cur.scale
     updated_at: datetime | None = DatetimeSecField(auto_now=True)
 
     stats: BackwardFKRelation["RaceStat"]
@@ -766,10 +764,10 @@ class PmAgent(Model):
         table = "pm_agent"
         unique_together = (("pm_id", "user_id"),)
 
-    def client(self, bot):
+    def client(self, browser, bot):
         module_name = f"xync_client.Pms.{self.pm.norm.capitalize()}"
         __import__(module_name)
-        return sys.modules[module_name].Client(self, bot)
+        return sys.modules[module_name].Client(self, browser, bot)
 
 
 class PmCur(Model):  # for fiat with no exs tie
@@ -836,13 +834,15 @@ class PmExBank(BaseModel):  # banks for SBP
 class Cred(Model):
     pmcur: ForeignKeyRelation[PmCur] = ForeignKeyField("models.PmCur", on_update=CASCADE)
     pmcur_id: int
-    detail: str = CharField(127)
+    detail: str = CharField(255)
     name: str | None = CharField(127, null=True)
     extra: str | None = CharField(255, null=True)
     person: ForeignKeyRelation[Person] = ForeignKeyField("models.Person", "creds")
     person_id: int
     from_chat: int  # todo: ForeignKeyNullableRelation["Order"] = ForeignKeyField("models.Order", null=True)
 
+    ovr_pm: ForeignKeyRelation[Pm] = ForeignKeyField("models.Pm", on_update=CASCADE, null=True)
+    ovr_pm_id: int
     banks: ManyToManyRelation[PmExBank] = ManyToManyField("models.PmExBank", related_name="creds", on_update=CASCADE)
 
     fiat: BackwardOneToOneRelation["Fiat"]
@@ -860,7 +860,34 @@ class Cred(Model):
 
     class Meta:
         table_description = "Currency accounts"
-        unique_together = (("person_id", "pmcur_id", "detail"),)
+        unique_together = (("person_id", "pmcur_id", "ovr_pm_id"),)
+
+
+@pre_save(Cred)
+async def cred_ovr_pm(_meta, cred: Cred, _db, _updated: dict) -> None:
+    # payeer
+    op = None
+    if "payeer" in cred.extra.lower() or "payeer" in cred.detail.lower():
+        op = 366
+    elif re.match(r"[PpРр]\d{7,10}\b", cred.detail):
+        op = 366
+    elif re.match(r"[PpРр]\d{7,10}\b", cred.extra):
+        op = 366
+    # volet
+    if (
+        "volet" in cred.detail.lower()
+        or "advcash" in cred.detail.lower()
+        or "volet" in cred.extra.lower()
+        or "advcash" in cred.extra.lower()
+    ):
+        op = 545
+    elif re.match(r"[REUTLD]\d{4} ?\d{4} ?\d{4}\b", cred.detail):
+        op = 545
+    elif re.match(r"[REUTLD]\d{4} ?\d{4} ?\d{4}\b", cred.extra):
+        op = 545
+
+    if op and op != (await cred.pmcur).pm_id:
+        cred.ovr_pm_id = op
 
 
 class CredEx(Model):

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

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