xn-auth 0.2.31__py3-none-any.whl → 0.2.33__py3-none-any.whl

x_auth/models.py

@@ -34,6 +34,7 @@ from x_auth.types import AuthUser
 class Username(TortModel):
     id: int = BigIntField(True, description="tg_id")
     username: str = CharField(127, null=True)
+    phone = BigIntField(null=True)
 
     user: BackwardOneToOneRelation["User"]
     peers: BackwardFKRelation["Peer"]
@@ -49,6 +50,8 @@ class User(Model):
     lang: Lang | None = IntEnumField(Lang, default=Lang.ru, null=True)
     role: Role = IntEnumField(Role, default=Role.READER)
 
+    app: BackwardOneToOneRelation["App"]
+
     def get_auth(self) -> AuthUser:
         return AuthUser.model_validate(self, from_attributes=True)
 
@@ -65,8 +68,8 @@ class User(Model):
     async def is_blocked(cls, sid: str) -> bool:
         return (await cls[int(sid)]).blocked
 
-    class Meta:
-        abstract = True
+    # class Meta:
+    #     abstract = True
 
 
 class Country(Model):
@@ -145,7 +148,7 @@ class Proxy(Model, TsTrait):
 class Dc(TortModel):
     id: int = SmallIntField(True)
     ip = CharField(15, unique=True)
-    pub = CharField(495)
+    pub = CharField(495, null=True)
 
     apps: BackwardFKRelation["App"]
 
@@ -157,29 +160,30 @@ class Fcm(TortModel):
     apps: BackwardFKRelation["App"]
 
 
-class App(TortModel):
+class App(Model):
     hsh = CharField(32, unique=True)
     dc: ForeignKeyRelation[Dc] = ForeignKeyField("models.Dc", "apps", default=2)
     dc_id: int
     title = CharField(127)
-    short = CharField(95)
+    short = CharField(76)
+    ver = CharField(18, default="0.0.1")
     fcm: ForeignKeyNullableRelation[Fcm] = ForeignKeyField("models.Fcm", "apps", null=True)
     fcm_id: int
+    owner: OneToOneRelation["User"] = OneToOneField("models.User", "app")
 
     sessions: BackwardFKRelation["Session"]
 
 
 class Session(TortModel):
-    id = CharField(127, primary_key=True)
-    dc_id = IntField(null=True)
+    id = CharField(85, primary_key=True)
     api: ForeignKeyRelation[App] = ForeignKeyField("models.App", "sessions")
     api_id: int
     test_mode = BooleanField(default=False)
     auth_key = BinaryField(null=True)
-    date = IntField(null=True)  # todo: refact to datetime?
+    date = IntField(default=0)  # todo: refact to datetime?
     user: ForeignKeyNullableRelation[Username] = ForeignKeyField("models.Username", "sessions", null=True)
     user_id: int
-    is_bot = BooleanField(null=True)
+    is_bot = CharField(42, null=True)
     state: dict = JSONField(default={})
     proxy: ForeignKeyNullableRelation[Proxy] = ForeignKeyField("models.Proxy", "sessions", null=True)
 
@@ -187,7 +191,7 @@ class Session(TortModel):
     update_states: BackwardFKRelation["UpdateState"]
 
     class Meta:
-        unique_together = (("user_id", "dc_id"),)
+        unique_together = (("user_id", "api_id"),)
 
 
 class Peer(TortModel):
@@ -197,7 +201,7 @@ class Peer(TortModel):
     session: ForeignKeyRelation[Session] = ForeignKeyField("models.Session", "peers")
     session_id: int
     type = CharField(127)
-    phone_number = BigIntField(null=True)
+    phone_number = BigIntField(null=True)  # todo: rm (already moved to Username.phone)
     last_update_on: datetime | None = DatetimeSecField(auto_now=True)
 
     class Meta:

{xn_auth-0.2.31.dist-info → xn_auth-0.2.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.31
+Version: 0.2.33
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

{xn_auth-0.2.31.dist-info → xn_auth-0.2.33.dist-info}/RECORD

@@ -2,9 +2,9 @@ x_auth/controller.py,sha256=0QhqmqXOqFaWIUTWHlJKITQNmJQ5kXZOkLg7wSUTh60,2240
 x_auth/enums.py,sha256=kmkX-j1bWNpel6_-fw2YtMEmJSAj9w2iizkG03s3ZSU,631
 x_auth/exceptions.py,sha256=2B4okJxhPyNqTJXlSTfblJUQJ60bLGXdgJIu6ue7S6w,162
 x_auth/middleware.py,sha256=JfssQomDv0J_69GfS2a_2_uyRzs26zSY6IW1Vk7m8K0,2900
-x_auth/models.py,sha256=etxzc8ejaF4c2zhP6S1X4ysLW3By0dl3OfbxfgfKIrM,7396
+x_auth/models.py,sha256=5N9DvItkYkSDvHTskAYTW4qCK0FY9MGJ_iBUjrv6jNU,7614
 x_auth/types.py,sha256=j3WGcyH24DmFEdTT6U7xzb_fEm1tFcBZsANKMy7bydo,689
-xn_auth-0.2.31.dist-info/METADATA,sha256=O7wgwTNe1P4Vy0YHJ3jjJlEGCWzHRGW1cJPLnl_vs2E,799
-xn_auth-0.2.31.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-xn_auth-0.2.31.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
-xn_auth-0.2.31.dist-info/RECORD,,
+xn_auth-0.2.33.dist-info/METADATA,sha256=ZVPjVhXD2_LoQhakKS5IG4wsyqnoPcWDd8Jw0JNJ3jE,799
+xn_auth-0.2.33.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+xn_auth-0.2.33.dist-info/top_level.txt,sha256=ydMDkzxgQPtW-E_MNDfUAroAFZvWSqU-x_kZSA7NSFo,7
+xn_auth-0.2.33.dist-info/RECORD,,