xn-auth 0.2.66__tar.gz → 0.2.68.dev1__tar.gz

xn_auth-0.2.68.dev1/.env.dist

@@ -0,0 +1,3 @@
+VENV=.venv
+WS_TOKEN=
+PG_DSN=

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.66
+Version: 0.2.68.dev1
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -17,7 +17,10 @@ Requires-Dist: pyjwt
 Requires-Dist: xn-model
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 # X-Auth

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/pyproject.toml

@@ -22,7 +22,10 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "build",
+    "pre-commit",
     "python-dotenv",
+    "pytest",
+    "pytest-asyncio",
     "twine"
 ]
 
@@ -42,4 +45,9 @@ version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMV
 local_scheme = "no-local-version"
 
 [tool.ruff]
-line-length = 120
+line-length = 120
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"
+markers = ["live: реально ходит в webshare, нужен WST"]
+addopts = "-m 'not live'"

xn_auth-0.2.68.dev1/tests/test_proxy.py

@@ -0,0 +1,86 @@
+"""Реальные вызовы Proxy: живые запросы в webshare, load_list ещё и пишет в базу."""
+
+from datetime import datetime
+from os import getenv
+
+import pytest
+import pytest_asyncio
+from dotenv import load_dotenv
+from tortoise import Tortoise
+
+from x_auth.models import Proxy
+from x_auth.types import Replacement
+
+load_dotenv()
+
+WST = getenv("WS_TOKEN")
+
+pytestmark = pytest.mark.asyncio
+
+
+@pytest_asyncio.fixture
+async def db():
+    await Tortoise.init(
+        {
+            "connections": {"default": getenv("PG_DSN")},
+            "apps": {"models": {"models": ["x_auth.models"]}},
+            "use_tz": True,
+            "timezone": "UTC",
+        }
+    )
+    yield
+    await Tortoise.close_connections()
+
+
+async def test_load_list(db):
+    prxs = await Proxy.get_list(WST)
+    assert prxs, "webshare вернул пустой список"
+    was = await Proxy.all().count()
+
+    await Proxy.load_list(WST)
+
+    print(f"\nиз webshare {len(prxs)} шт., в базе было {was}, стало {await Proxy.all().count()}")
+    for r in prxs:
+        prx = await Proxy.get_or_none(id=r.id)
+        assert prx, f"{r.host}:{r.port} (id={r.id}) не доехал до базы"
+        assert (prx.host, prx.port) == (r.host, r.port)
+        assert (prx.username, prx.password) == (r.username, r.password)
+        assert prx.valid is r.valid
+        # last_verification из webshare до базы не доезжает: TsTrait.updated_at это auto_now
+        assert prx.updated_at != r.updated_at
+        country = await prx.country
+        assert country.short == r.country_code
+        print(f"  {prx.id} {country.short} {prx.str()} valid={prx.valid} upd={prx.updated_at:%F %T}")
+
+
+async def test_load_list_idempotent(db):
+    """Повторный прогон не должен плодить дубли: апсерт идёт по pk и по (host, port)."""
+    await Proxy.load_list(WST)
+    was = await Proxy.all().count()
+
+    await Proxy.load_list(WST)
+
+    assert await Proxy.all().count() == was
+
+
+async def test_get_replaced():
+    """В базу не ходит, поэтому без фикстуры db."""
+    reps = await Proxy.get_replaced(WST)
+
+    assert isinstance(reps, list)
+    if not reps:
+        pytest.skip("у аккаунта нет замен (count=0) - разбор ответа проверить не на чем")
+
+    print(f"\nзамен: {len(reps)}")
+    for r in reps:
+        print(f"  {r.created_at:%F %T} {r.reason}: {r.proxy}:{r.proxy_port} ({r.proxy_country_code})")
+        print(f"    -> {r.replaced_with}:{r.replaced_with_port} ({r.replaced_with_country_code})")
+
+    for r in reps:
+        assert isinstance(r, Replacement)
+        # reason в структуре Literal - на неизвестном значении convert упал бы ещё в get_replaced
+        assert r.reason in ("auto_invalidated", "auto_out_of_rotation")
+        assert r.proxy and r.proxy_port
+        assert r.replaced_with and r.replaced_with_port
+        assert len(r.proxy_country_code) == len(r.replaced_with_country_code) == 2
+        assert isinstance(r.created_at, datetime)

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/x_auth/models.py

@@ -4,6 +4,7 @@ from aiogram.utils.web_app import WebAppUser
 from aiohttp import ClientSession
 from litestar.exceptions import NotFoundException
 from msgspec import convert
+from msgspec.structs import asdict
 from pyrogram.enums.client_platform import ClientPlatform
 from pyrogram.types import User as PyroUser
 from aiogram.types import User as AioUser
@@ -117,21 +118,6 @@ class Proxy(Model, TsTrait):
     class Meta:
         unique_together = (("host", "port"),)
 
-    @staticmethod
-    async def load(wst: str):
-        async with ClientSession("https://proxy.webshare.io/api/v2/") as s:
-            resp = await s.post("download_token/proxy_list/", headers={"Authorization": f"Token {wst}"})
-            dtok = (await resp.json())["key"]
-            resp = await s.get(f"proxy/list/download/{dtok}/-/any/username/direct/-/")
-            res = (await resp.text()).split("\r\n")
-            proxies = [
-                Proxy(host=p[0], port=p[1], username=p[2], password=p[3], success=True)
-                for r in res
-                if r and (p := r.split(":"))
-            ]
-            await Proxy.bulk_create(proxies, 10, False, ["username", "password", "success"], ["host", "port"])
-            return proxies
-
     @staticmethod
     async def get_list(wst: str) -> list[types.Proxy]:
         async with ClientSession("https://proxy.webshare.io/api/v2/") as s:
@@ -146,19 +132,16 @@ class Proxy(Model, TsTrait):
         ccl = cls._meta.fields_map["country"].related_model
         cmap = dict(await ccl.filter(short__in=[p.country_code for p in prxs]).values_list("short", "id"))
         for r in prxs:
-            df = dict(
-                username=r.username,
-                password=r.password,
-                valid=r.valid,
-                country_id=cmap[r.country_code],
-                updated_at=r.last_verification,
-            )
-            if prx := await cls.get_or_none(host=r.proxy_address, port=r.port):
-                await prx.update_from_dict({**df, "id": r.id}).save()
-            elif prx := await cls.get_or_none(id=r.id):
-                await prx.update_from_dict({**df, "host": r.proxy_address, "port": r.port}).save()
+            df = asdict(r)  # имена полей структуры уже совпадают с колонками модели
+            pk, host, port = df.pop("id"), df.pop("host"), df.pop("port")
+            df["country_id"] = cmap[df.pop("country_code")]
+            # у webshare независимо меняются и id, и пара (host, port) - ищем по обоим уникальным ключам
+            if prx := await cls.get_or_none(host=host, port=port):
+                await prx.update_from_dict({**df, "id": pk}).save()
+            elif prx := await cls.get_or_none(id=pk):
+                await prx.update_from_dict({**df, "host": host, "port": port}).save()
             else:
-                await cls.create(**df, host=r.proxy_address, port=r.port, id=r.id)
+                await cls.create(**df, id=pk, host=host, port=port)
 
     @staticmethod
     async def get_replaced(wst: str):
@@ -214,13 +197,15 @@ class Session(TortModel):
     api_id: int
     dc: ForeignKeyRelation[Dc] = ForeignKeyField("models.Dc", "sessions", on_update=CASCADE, db_default=2)
     dc_id: int
-    test_mode = BooleanField(db_default=False)
+    # default дублирует db_default не зря: при явном pk tortoise вставляет строку целиком и шлёт по
+    # таким колонкам NULL вместо того, что б их опустить и дать сработать дефолту базы
+    test_mode = BooleanField(db_default=False, default=False)
     auth_key = BinaryField(null=True)
-    date = IntField(db_default=0)  # todo: refact to datetime?
+    date = IntField(db_default=0, default=0)  # todo: refact to datetime?
     user: OneToOneNullableRelation[Username] = OneToOneField("models.Username", "session", on_update=CASCADE, null=True)
     user_id: int
     is_bot = CharField(42, null=True)
-    state: dict = JSONField(db_default={})
+    state: dict = JSONField(db_default={}, default=dict)
     proxy: ForeignKeyNullableRelation[Proxy] = ForeignKeyField("models.Proxy", "sessions", on_update=CASCADE, null=True)
 
     peers: BackwardFKRelation["Peer"]

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/x_auth/types.py

@@ -14,17 +14,15 @@ class AuthUser(Struct):
     role: Role
 
 
-class Proxy(Struct):
+class Proxy(Struct, rename={"host": "proxy_address", "updated_at": "last_verification"}):
     id: str
     username: str
     password: str
-    proxy_address: str
+    host: str
     port: int
     valid: bool
-    last_verification: datetime
+    updated_at: datetime
     country_code: str
-    city_name: str
-    created_at: datetime
 
 
 class Replacement(Struct):

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/xn_auth.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.66
+Version: 0.2.68.dev1
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT
@@ -17,7 +17,10 @@ Requires-Dist: pyjwt
 Requires-Dist: xn-model
 Provides-Extra: dev
 Requires-Dist: build; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: twine; extra == "dev"
 
 # X-Auth

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/xn_auth.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ CLAUDE.md
 README.md
 makefile
 pyproject.toml
+tests/test_proxy.py
 x_auth/controller.py
 x_auth/enums.py
 x_auth/exceptions.py

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/xn_auth.egg-info/requires.txt

@@ -7,5 +7,8 @@ xn-model
 
 [dev]
 build
+pre-commit
 python-dotenv
+pytest
+pytest-asyncio
 twine

{xn_auth-0.2.66 → xn_auth-0.2.68.dev1}/xn_auth.egg-info/scm_file_list.json

@@ -1,17 +1,18 @@
 {
   "files": [
-    ".pre-commit-config.yaml",
-    "makefile",
-    "pyproject.toml",
     ".env.dist",
-    "README.md",
     ".gitignore",
+    ".pre-commit-config.yaml",
     "CLAUDE.md",
-    "x_auth/enums.py",
+    "README.md",
+    "makefile",
+    "pyproject.toml",
+    "tests/test_proxy.py",
     "x_auth/controller.py",
-    "x_auth/models.py",
-    "x_auth/types.py",
+    "x_auth/enums.py",
     "x_auth/exceptions.py",
-    "x_auth/middleware.py"
+    "x_auth/middleware.py",
+    "x_auth/models.py",
+    "x_auth/types.py"
   ]
 }

xn_auth-0.2.68.dev1/xn_auth.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.2.67",
+  "distance": 1,
+  "node": "gdbf4963c34ccf29752f04494ca9dfb7e368700c2",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-08-17"
+}

xn_auth-0.2.66/.env.dist

@@ -1 +0,0 @@
-VENV=venv

xn_auth-0.2.66/xn_auth.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.2.66",
-  "distance": 0,
-  "node": "gedb47eec341e11cdbc3c44441cc795f50c552a42",
-  "dirty": false,
-  "branch": "main",
-  "node_date": "2026-07-19"
-}