xync-db 0.5.5.dev12__tar.gz → 0.5.5.dev15__tar.gz

{xync_db-0.5.5.dev12 → xync_db-0.5.5.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: xync-db
-Version: 0.5.5.dev12
+Version: 0.5.5.dev15
 Summary: Xync DB schema: Tortoise ORM models, enums, pydantic DTOs.
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 License: LicenseRef-EULA

{xync_db-0.5.5.dev12 → xync_db-0.5.5.dev15}/src/xync_db/enums.py

@@ -1,5 +1,8 @@
 from enum import IntEnum
 
+# FileType живёт в pyro-client (там же модель File) — здесь только реэкспорт для обратной совместимости
+from pyro_client.enums import FileType  # noqa: F401
+
 ZERO_TS = 1770000000  # Feb 02 2026 02:40:00 (UTC)
 
 
@@ -164,19 +167,6 @@ class TaskType(IntEnum):
     order_user_define = 2
 
 
-class FileType(IntEnum):
-    pdf = 1
-    jpg = 2
-    png = 3
-    webp = 4
-    mov = 5
-    mp4 = 6
-    gif = 7
-    svg = 8
-    tgs = 9
-    jpeg = 10
-
-
 class AgentStatus(IntEnum):
     off = 0
     race = 1

{xync_db-0.5.5.dev12 → xync_db-0.5.5.dev15}/src/xync_db/models/CLAUDE.md

@@ -105,6 +105,8 @@ actor.set_user(username_id):
 ### Management
 `Limit`, `ExStat`, `Vpn`, `Invite`, `Credit`, `File`
 
+`File` (и enum `FileType`) объявлены в пакете `pyro-client` (`pyro_client/models.py`, `pyro_client/enums.py`) — рядом с `FileClient`, который их пишет; сюда только реэкспортируются (`xync_db.models.File`, `xync_db.enums.FileType`), так что для tortoise они остаются в app `models`.
+
 ## ORM gotchas
 
 ### `exclude(**kwargs)` negates each kwarg separately (NOT Django's `NOT(AND)`)
@@ -135,6 +137,6 @@ PmAgent.client()  -> xync_client.Pms.{pm.norm}.agent
 
 ## Enums
 
-All enums are in `xync_db/enums.py` (all `IntEnum`). Key ones: `AdStatus`, `OrderStatus`, `OrderAction`, `OrderErr`, `ExType`, `ExStatus`, `ExAction` (~50 actions), `PmType`, `TransactionStatus`, `PersonStatus`, `UserStatus`, `HotStatus`, `FileType`, `DepType`, `AgentStatus`.
+All enums are in `xync_db/enums.py` (all `IntEnum`; `FileType` реэкспортируется из `pyro_client.enums`). Key ones: `AdStatus`, `OrderStatus`, `OrderAction`, `OrderErr`, `ExType`, `ExStatus`, `ExAction` (~50 actions), `PmType`, `TransactionStatus`, `PersonStatus`, `UserStatus`, `HotStatus`, `FileType`, `DepType`, `AgentStatus`.
 
 `TransactionStatus` is imported as `TS` alias in this file.

{xync_db-0.5.5.dev12 → xync_db-0.5.5.dev15}/src/xync_db/models/__init__.py

@@ -14,6 +14,9 @@ from uuid import UUID
 from aiohttp import ClientSession
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey, Ed25519PublicKey
+
+# noinspection PyUnusedImports
+from pyro_client.models import File  # noqa: F401
 from tortoise import BackwardFKRelation, BackwardOneToOneRelation, BaseDBAsyncClient, connections
 from tortoise import Model as BaseModel
 from tortoise.expressions import Q
@@ -74,7 +77,6 @@ from xync_db.enums import (
     ExAction,
     ExStatus,
     ExType,
-    FileType,
     HotStatus,
     LinkType,
     OrderErr,
@@ -107,6 +109,7 @@ SHARE_HEX_EX_IDS = [4]
 
 
 class Country(BaseCountry):
+    ccn3: int | None = UInt2Field(null=True)  # числовой ISO 3166-1 (базовый `code` — телефонный)
     cur: ForeignKeyRelation[Cur] = ForeignKeyField("models.Cur", "countries", on_update=CASCADE)
     # curexs: ManyToManyRelation[CurEx]
     # forbidden_exs: ManyToManyRelation[Ex]
@@ -2878,26 +2881,6 @@ class Vpn(Model):
         table_description = "VPNs"
 
 
-class File(Model):
-    name: str = CharField(255, null=True, unique=True)
-    typ: FileType = IntEnumField(FileType)
-    ref: bytes = UniqBinaryField(unique=True)
-    size: int = UInt4Field()
-    created_at: datetime | None = DatetimeSecField(auto_now_add=True, db_default=Now())
-
-    msg: BackwardOneToOneRelation[Msg]
-    transfer: BackwardOneToOneRelation[Transfer]
-    pmex_logos: BackwardFKRelation[PmEx]
-
-    _icon: ClassVar = "file"
-    _name: ClassVar = {"name"}
-
-    class Meta:
-        table_description = "Files"
-        # Создаем индекс через raw SQL
-        # indexes = [CREATE UNIQUE INDEX IF NOT EXISTS idx_bytea_unique ON file (encode(sha256(ref), 'hex'))"]
-
-
 class Invite(Model, TsTrait):
     ref: ForeignKeyRelation[User] = ForeignKeyField("models.User", "invite_approvals", on_update=CASCADE)
     ref_id: int