xn-auth 0.2.34.dev1__tar.gz → 0.2.36__tar.gz

{xn_auth-0.2.34.dev1/xn_auth.egg-info → xn_auth-0.2.36}/PKG-INFO

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

{xn_auth-0.2.34.dev1 → xn_auth-0.2.36}/x_auth/models.py

@@ -1,10 +1,9 @@
 from datetime import datetime
 
-from aiogram.types import User as TgUser
-from aiogram.utils.web_app import WebAppUser
 from aiohttp import ClientSession
 from msgspec import convert
 from pyrogram.enums.client_platform import ClientPlatform
+from pyrogram.types import User as TgUser
 from tortoise.fields import (
     BigIntField,
     BooleanField,
@@ -15,6 +14,7 @@ from tortoise.fields import (
     IntField,
     BinaryField,
     OneToOneRelation,
+    OneToOneNullableRelation,
     OneToOneField,
     SmallIntField,
     BackwardOneToOneRelation,
@@ -41,7 +41,7 @@ class Username(TortModel):
 
     user: BackwardOneToOneRelation["User"]
     peers: BackwardFKRelation["Peer"]
-    sessions: BackwardFKRelation["Session"]
+    session: BackwardOneToOneRelation["Session"]
 
 
 class User(Model):
@@ -59,9 +59,15 @@ class User(Model):
         return AuthUser.model_validate(self, from_attributes=True)
 
     @classmethod
-    async def tg2in(cls, u: TgUser | WebAppUser, blocked: bool = None) -> BaseUpd:
+    async def tg2in(cls, u: TgUser, blocked: bool = None) -> BaseUpd:
+        un, _ = await cls._meta.fields_map["username"].related_model.update_or_create({"username": u.username}, id=u.id)
         user = cls.validate(
-            {**u.model_dump(), "username": u.username or u.id, "lang": u.language_code and Lang[u.language_code]}
+            {
+                "first_name": u.first_name,
+                "last_name": u.last_name,
+                "username_id": un.id,
+                "lang": u.language_code and Lang[u.language_code],
+            }
         )
         if blocked is not None:
             user.blocked = blocked
@@ -75,6 +81,13 @@ class User(Model):
     #     abstract = True
 
 
+# @pre_save(User)
+# async def username(_meta, user: User, _db, _updated: dict) -> None:
+#     if user.username_id:
+#         return
+#     user.username = await Username.create(name=user.username)
+
+
 class Country(Model):
     id = SmallIntField(True)
     code: int | None = IntField(null=True)
@@ -147,6 +160,12 @@ class Proxy(Model, TsTrait):
             reps = [convert(r, types.Replacement) for r in lst]
             return reps
 
+    def dict(self):
+        return dict(scheme="socks5", hostname=self.host, port=self.port, username=self.username, password=self.password)
+
+    def str(self):
+        return f"http://{self.username}:{self.password}@{self.host}:{self.port}"
+
 
 class Dc(TortModel):
     id: int = SmallIntField(True)
@@ -174,13 +193,13 @@ class App(Model):
     fcm: ForeignKeyNullableRelation[Fcm] = ForeignKeyField("models.Fcm", "apps", null=True)
     fcm_id: int
     platform: ClientPlatform = CharEnumFieldInstance(ClientPlatform)
-    owner: OneToOneRelation["User"] = OneToOneField("models.User", "app")
+    owner: OneToOneNullableRelation["User"] = OneToOneField("models.User", "app", null=True)
 
     sessions: BackwardFKRelation["Session"]
 
 
 class Session(TortModel):
-    id = CharField(85, primary_key=True)
+    id = BigIntField(True)
     api: ForeignKeyRelation[App] = ForeignKeyField("models.App", "sessions")
     api_id: int
     dc: ForeignKeyRelation[Dc] = ForeignKeyField("models.Dc", "sessions", default=2)
@@ -188,7 +207,7 @@ class Session(TortModel):
     test_mode = BooleanField(default=False)
     auth_key = BinaryField(null=True)
     date = IntField(default=0)  # todo: refact to datetime?
-    user: ForeignKeyNullableRelation[Username] = ForeignKeyField("models.Username", "sessions", null=True)
+    user: OneToOneNullableRelation[Username] = OneToOneField("models.Username", "session", null=True)
     user_id: int
     is_bot = CharField(42, null=True)
     state: dict = JSONField(default={})

{xn_auth-0.2.34.dev1 → xn_auth-0.2.36/xn_auth.egg-info}/PKG-INFO

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