xync-schema 0.6.73.dev18__py3-none-any.whl → 0.6.75__py3-none-any.whl

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/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"
@@ -187,6 +188,10 @@ class User(UserTg, TsTrait):
         "models.User", related_name="proteges", null=True
     )
     ref_id: int | None
+    contacted_with: fields.ForeignKeyNullableRelation["User"] = fields.ForeignKeyField(
+        "models.User", related_name="contacts", null=True
+    )  # who can texts this user
+    contacted_with_id: int | None
 
     forum: fields.BackwardOneToOneRelation["Forum"]
     created_forums: fields.BackwardFKRelation["Forum"]
@@ -196,6 +201,7 @@ class User(UserTg, TsTrait):
     # fiats: fields.BackwardFKRelation["Fiat"]
     limits: fields.BackwardFKRelation["Limit"]
     msgs: fields.BackwardFKRelation["Msg"]
+    contacts: fields.BackwardFKRelation["User"]
     # vpn: fields.BackwardOneToOneRelation["Vpn"]
     # invite_requests: fields.BackwardFKRelation["Invite"]
     # invite_approvals: fields.BackwardFKRelation["Invite"]
@@ -353,7 +359,7 @@ class Pm(Model):
     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 +370,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
@@ -691,6 +697,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/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.dev18.dist-info → xync_schema-0.6.75.dist-info}/METADATA

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

xync_schema-0.6.75.dist-info/RECORD

@@ -0,0 +1,8 @@
+xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_schema/enums.py,sha256=LJme_4FsisEjXX3sDsvfB8xi6Lt0xe27FNRHEYzOUmg,12683
+xync_schema/models.py,sha256=GAO3xwg9xA-6RWskB5amYsJ8m3hgaQSDmHhHpbEPFg8,27641
+xync_schema/types.py,sha256=jubMlsGkaLpv1QZrInP0sEKW8SgWa6TyHENDz8OEvDM,1737
+xync_schema-0.6.75.dist-info/METADATA,sha256=s_8szki_cHh4g6fafDnZ53gtRsX64L9GmiKjoaX8FRk,4055
+xync_schema-0.6.75.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xync_schema-0.6.75.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
+xync_schema-0.6.75.dist-info/RECORD,,

xync_schema-0.6.73.dev18.dist-info/RECORD

@@ -1,8 +0,0 @@
-xync_schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xync_schema/enums.py,sha256=yNXG1ZMWKSrjS7kFMVUHpbruws5c_xO_UxswmQJPNOE,12547
-xync_schema/models.py,sha256=Hcsg6oUnbztWgxtOjmFIwaILEvOSsCY4hbDxY860s0M,26863
-xync_schema/types.py,sha256=fyuuiIcqrpStiCHpKB3vNMEnUhSyvMvW4bW10rK3vRY,2247
-xync_schema-0.6.73.dev18.dist-info/METADATA,sha256=P98sxxdqQzfXNsbtAFB5eKUJYdvMhh6p8eK4dn2viRg,4061
-xync_schema-0.6.73.dev18.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-xync_schema-0.6.73.dev18.dist-info/top_level.txt,sha256=jN8IBDfVY8b85Byyk8v0Gyj_0yLB8FO56WV4EvcXWY4,12
-xync_schema-0.6.73.dev18.dist-info/RECORD,,