xync-schema 0.6.73.dev17__tar.gz → 0.6.74__tar.gz

{xync_schema-0.6.73.dev17/xync_schema.egg-info → xync_schema-0.6.74}/PKG-INFO

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

{xync_schema-0.6.73.dev17 → xync_schema-0.6.74}/xync_schema/enums.py

@@ -82,6 +82,18 @@ class TaskType(IntEnum):
     invite_approve = 1
 
 
+class FileType(IntEnum):
+    pdf = 1
+    jpg = 2
+    png = 3
+    webp = 4
+    mov = 5
+    mp4 = 6
+    gif = 7
+    svg = 8
+    tgs = 9
+
+
 class ExStatus(IntEnum):
     plan = 0
     parted = 1

{xync_schema-0.6.73.dev17 → xync_schema-0.6.74}/xync_schema/models.py

@@ -17,6 +17,7 @@ from xync_schema.enums import (
     PersonStatus,
     UserStatus,
     PmType,
+    FileType,
 )
 
 
@@ -103,7 +104,7 @@ class Curex(BaseModel):
     cur: fields.ForeignKeyRelation[Cur] = fields.ForeignKeyField("models.Cur")
     ex: fields.ForeignKeyRelation[Ex] = fields.ForeignKeyField("models.Ex")
     exid: str = fields.CharField(32)
-    minimum: float = fields.FloatField(null=True)
+    minimum: int = fields.SmallIntField(null=True)
     rounding_scale: int = fields.SmallIntField(null=True)
     countries: fields.ManyToManyRelation[Country] = fields.ManyToManyField(
         "models.Country", through="curexcountry", backward_key="curexs"
@@ -314,7 +315,7 @@ class Ad(Model, TsTrait):
     max_fiat: float = fields.FloatField()
     detail: str | None = fields.CharField(4095, null=True)
     auto_msg: str | None = fields.CharField(255, null=True)
-    status: AdStatus = fields.IntEnumField(AdStatus, defaut=AdStatus.active)
+    status: AdStatus = fields.IntEnumField(AdStatus, default=AdStatus.active)
 
     maker: fields.ForeignKeyRelation[Actor] = fields.ForeignKeyField("models.Actor", "my_ads")
     maker_id: int
@@ -350,10 +351,10 @@ class Pm(Model):
     alias: str | None = fields.CharField(63, null=True)
     extra: str | None = fields.CharField(63, null=True)
     ok: bool = fields.BooleanField(default=True)
-    bank: bool = fields.BooleanField(null=True)
+    bank: bool | None = fields.BooleanField(null=True)
 
     typ: PmType | None = fields.IntEnumField(PmType, null=True)
-    logo: str | None = fields.CharField(119, null=True)
+    logo: fields.ForeignKeyNullableRelation["File"] = fields.ForeignKeyField("models.File", "pm_logos", null=True)
 
     ads: fields.ManyToManyRelation[Ad]
     curs: fields.ManyToManyRelation[Cur]
@@ -364,7 +365,7 @@ class Pm(Model):
 
     class Meta:
         table_description = "Payment methods"
-        unique_together = (("norm", "country"), ("alias", "country"))
+        unique_together = (("norm", "country_id"), ("alias", "country_id"))
 
     # class PydanticMeta(Model.PydanticMeta):
     #     max_recursion = 3
@@ -454,7 +455,7 @@ class Cred(Model):
 
     class Meta:
         table_description = "Currency accounts"
-        unique_together = (("person", "pmcur", "detail"),)
+        unique_together = (("person_id", "pmcur_id", "detail"),)
 
 
 class CredEx(Model):
@@ -691,6 +692,21 @@ class Vpn(Model):
         table_description = "VPNs"
 
 
+class File(Model):
+    name: str = fields.CharField(51, null=True)
+    typ: FileType = fields.IntEnumField(FileType, null=True)
+    fid: str = fields.CharField(76, unique=True, null=True)
+    ref: bytes = fields.BinaryField(null=True)
+    size: bytes = fields.IntField()
+    created_at: datetime | None = DatetimeSecField(auto_now_add=True)
+
+    _icon = "file"
+    _name = {"name"}
+
+    class Meta:
+        table_description = "Files"
+
+
 # class Invite(Model, TsTrait):
 #     ref: fields.ForeignKeyRelation[User] = fields.ForeignKeyField("models.User", related_name="invite_approvals")
 #     ref_id: int

{xync_schema-0.6.73.dev17 → xync_schema-0.6.74}/xync_schema/types.py

@@ -1,6 +1,5 @@
 from datetime import datetime
 from pydantic import BaseModel, Field
-from x_model.types import New
 
 from xync_schema.enums import AdStatus, OrderStatus
 from xync_schema import models
@@ -35,37 +34,12 @@ class PmexBank(BaseModel):
 #     cur_id: int
 
 
-class CredIn(New):
-    exid: int
-    pmcur: models.Pmcur
-    actor: models.Actor
-    detail: str = ""
-    name: str = ""
-    id: int | None = None
-    banks: list[str] | None = None
-    _unq = "id", "exid", "ch", "pmcur"
-
-    class Config:
-        arbitrary_types_allowed = True
-
-
-class FiatIn(New):
-    cred: models.Cred
-    amount: float
-    id: int = None
-    target: float | None = None
-    _unq = "id", "cred"
-
-    class Config:
-        arbitrary_types_allowed = True
-
-
 class BaseAd(BaseModel):
     price: float
     exid: int | None = Field(alias="id")
 
 
-class BaseAdIn(BaseAd, New):
+class BaseAdIn(BaseAd):
     min_fiat: float
     max_fiat: float
     direction: models.Direction

{xync_schema-0.6.73.dev17 → xync_schema-0.6.74/xync_schema.egg-info}/PKG-INFO

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