aioqzone 1.8.6.dev1__tar.gz → 1.9.1.dev3__tar.gz

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/PKG-INFO

@@ -1,29 +1,29 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.6.dev1
+Version: 1.9.1.dev3
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone
 Author-email: zzzzss990315@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Provides-Extra: slide-captcha
 Requires-Dist: aiohttp (>=3.9.0,<4.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
 Requires-Dist: pillow (>=10.1.0,<11.0.0)
-Requires-Dist: pychaosvm (>=0.4.0,<0.5.0)
+Requires-Dist: pychaosvm (>=0.4.1,<0.5.0)
 Requires-Dist: pydantic (>=2.5.0,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.2.0,<3.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)
@@ -43,7 +43,7 @@ aioqzone封装了一些Qzone接口。
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
+[![discuss](https://img.shields.io/endpoint?label=Discuss&style=social&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
 
 [English](README_en.md) | 简体中文
 
@@ -98,7 +98,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2023 aioqzone.
+Copyright (C) 2022-2024 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/README.md

@@ -5,7 +5,7 @@ aioqzone封装了一些Qzone接口。
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
+[![discuss](https://img.shields.io/endpoint?label=Discuss&style=social&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
 
 [English](README_en.md) | 简体中文
 
@@ -60,7 +60,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2023 aioqzone.
+Copyright (C) 2022-2024 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.6.dev1"
+version = "1.9.1.dev3"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -27,7 +27,7 @@ exclude = ["*.js"]
 "Discussion" = "https://t.me/aioqzone_chatroom"
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 aiohttp = "^3.9.0"
 pydantic = "^2.5.0"
 pydantic-settings = "^2.2.0"
@@ -36,7 +36,7 @@ tenacity = ">=8.2.3,<10.0.0"
 exceptiongroup = "^1.1.1"
 tylisten = "^2.1.4"
 pillow = "^10.1.0"
-pychaosvm = { version = "~0.4.0", source = "aioqzone-index" }
+pychaosvm = { version = "~0.4.1", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
@@ -94,8 +94,8 @@ line_length = 99
 
 [tool.black]
 line-length = 99
-target-version = ['py38']
+target-version = ['py39']
 
 [tool.pyright]
-pythonVersion = "3.8"
+pythonVersion = "3.9"
 pythonPlatform = "All"

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/aioqzone/model/api/feed.py

@@ -15,15 +15,6 @@ from pydantic import (
 
 __all__ = ["FeedData"]
 
-if sys.version_info >= (3, 9):
-    removeprefix = str.removeprefix
-else:
-
-    def removeprefix(self: str, prefix: str, /):
-        if self.startswith(prefix):
-            return self[len(prefix) :]
-        return self
-
 
 class UgcRight(IntEnum):
     unknown = 0
@@ -225,13 +216,13 @@ class Share(HasCommon):
 
 class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
     @model_validator(mode="before")
-    def remove_prefix(cls, v: dict):
-        return {removeprefix(k, "cell_"): i for k, i in v.items()}
+    def remove_prefix(cls, v: dict[str, t.Any]):
+        return {k.removeprefix("cell_"): i for k, i in v.items()}
 
     @field_validator("summary")
     @classmethod
     def remove_colon(cls, v: FeedSummary):
-        v.summary = removeprefix(v.summary, "：")
+        v.summary = v.summary.removeprefix("：")
         return v
 
 

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/aioqzone/model/api/profile.py

@@ -21,7 +21,6 @@ from .feed import (
     Share,
     ShareInfo,
     UserInfo,
-    removeprefix,
 )
 
 
@@ -89,13 +88,13 @@ class ProfileComment(FeedComment):
 
 class ProfileFeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):
     @model_validator(mode="before")
-    def remove_prefix(cls, v: dict):
-        return {removeprefix(k, "cell_"): i for k, i in v.items()}
+    def remove_prefix(cls, v: dict[str, t.Any]):
+        return {k.removeprefix("cell_"): i for k, i in v.items()}
 
     @field_validator("summary")
     @classmethod
     def remove_colon(cls, v: FeedSummary):
-        v.summary = removeprefix(v.summary, "：")
+        v.summary = v.summary.removeprefix("：")
         return v
 
 

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/type.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 
 from pydantic import BaseModel
 
-if sys.version_info >= (3, 9):
+if sys.version_info >= (3, 10):
     frozen_args = dict(frozen=True, slots=True)
 else:
     frozen_args = dict(frozen=True)

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/up/captcha/__init__.py

@@ -18,7 +18,8 @@ from ...utils.net import ClientAdapter
 from .._model import VerifyResp
 from ._model import PrehandleResp
 from .capsess import BaseTcaptchaSession as TcaptchaSession
-from .select._types import SelectCaptchaSession
+from .click import ClickCaptchaSession
+from .select import SelectCaptchaSession
 
 PREHANDLE_URL = "https://t.captcha.qq.com/cap_union_prehandle"
 SHOW_NEW_URL = "https://t.captcha.qq.com/cap_union_new_show"
@@ -132,6 +133,8 @@ class Captcha(_CaptchaHookMixin):
         sess = TcaptchaSession.factory(sid, await retry_closure())
         if isinstance(sess, SelectCaptchaSession):
             sess.solve_captcha_hook = self.solve_select_captcha
+        elif isinstance(sess, ClickCaptchaSession):
+            raise NotImplementedError("“依次点击”类验证码正在施工")
         else:
             sess.solve_captcha_hook = self.solve_slide_captcha
         return sess

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/up/captcha/_model.py

@@ -1,6 +1,6 @@
-from typing import List, Optional
+import typing as t
 
-from pydantic import BaseModel, Field
+from pydantic import AliasPath, BaseModel, Field
 
 
 class PowCfg(BaseModel):
@@ -15,12 +15,25 @@ class CommonCaptchaConf(BaseModel):
     """relative path to get tdc.js"""
 
 
+class CommonClickConf(BaseModel):
+    data_type: str = Field(validation_alias=AliasPath("data_type", 0))
+    mark_style: str
+
+
+class CommonBgElmConf(BaseModel):
+    cfg: CommonClickConf = Field(validation_alias="click_cfg")
+
+
+class CommonRender(BaseModel):
+    bg: CommonBgElmConf = Field(validation_alias="bg_elem_cfg")
+
+
 class Sprite(BaseModel):
     """Represents a sprite from a source material."""
 
-    size_2d: List[int]
+    size_2d: t.List[int]
     """sprite size (w, h)"""
-    sprite_pos: List[int]
+    sprite_pos: t.List[int]
     """sprite position on material (x, y)"""
 
     @property
@@ -37,37 +50,13 @@ class Sprite(BaseModel):
         return (l, t, l + self.width, l + self.height)
 
 
-class ClickCfg(BaseModel):
-    mark_style: str
-    data_type: List[str]
-
-
-class MoveCfg(BaseModel):
-    track_limit: str
-    move_factor: List[int]
-    data_type: Optional[List[str]] = None
-
-
-class FgElemCfg(Sprite):
-    id: int
-    init_pos: List[int]
-    move_cfg: Optional[MoveCfg] = None
-
-
-class FgBindingCfg(BaseModel):
-    master: int
-    slave: int
-    bind_type: str
-    bind_factor: int
-
-
 class CaptchaData(BaseModel):
     common: CommonCaptchaConf = Field(alias="comm_captcha_cfg")
-    render: dict = Field(alias="dyn_show_info")
+    render: dict[str, t.Any] = Field(alias="dyn_show_info")
 
 
 class PrehandleResp(BaseModel):
-    captcha: CaptchaData = Field(alias="data", default=None)
+    captcha: t.Optional[CaptchaData] = Field(alias="data", default=None)
     sess: str
 
     capclass: int = 0

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/up/captcha/capsess.py

@@ -1,19 +1,23 @@
 import asyncio
+import logging
 import typing as t
 from abc import ABC, abstractmethod
 from hashlib import md5
 from time import time
 
+from pydantic import ValidationError
 from tylisten import HookSpec
 from yarl import URL
 
 from qqqr.utils.net import ClientAdapter
 
-from ._model import PrehandleResp
+from ._model import CommonRender, PrehandleResp
+
+log = logging.getLogger(__name__)
 
 
 class BaseTcaptchaSession(ABC):
-    data_type: str = "DynAnswerType_UC"
+    data_type: str
     mouse_track: "asyncio.Future[t.Optional[t.List[t.Tuple[int, int]]]]"
     solve_captcha_hook: HookSpec
 
@@ -32,6 +36,7 @@ class BaseTcaptchaSession(ABC):
         self.mouse_track = asyncio.get_event_loop().create_future()
 
     def parse_captcha_data(self):
+        assert self.prehandle.captcha
         self.conf = self.prehandle.captcha
 
     def solve_workload(self, *, timeout: float = 30.0):
@@ -97,10 +102,21 @@ class BaseTcaptchaSession(ABC):
 
     @classmethod
     def factory(cls, session: str, prehandle: PrehandleResp):
-        render = prehandle.captcha.render
-        if "json_payload" in render:
-            from .select._types import SelectCaptchaSession as cls
+        assert prehandle.captcha
+
+        try:
+            render = CommonRender.model_validate(prehandle.captcha.render)
+        except ValidationError:
+            log.error(prehandle.captcha.render)
+            raise
+
+        if render.bg.cfg.data_type == "DynAnswerType_UC":
+            from .select import SelectCaptchaSession as cls
+        elif render.bg.cfg.data_type == "DynAnswerType_POS":
+            log.error(prehandle.captcha.render)
+            raise NotImplementedError("“依次点击”类验证码正在施工")
+            from .click import ClickCaptchaSession as cls
         else:
-            from .slide._types import SlideCaptchaSession as cls
+            from .slide import SlideCaptchaSession as cls
 
         return cls(session=session, prehandle=prehandle)

aioqzone-1.9.1.dev3/src/qqqr/up/captcha/click/__init__.py

@@ -0,0 +1,3 @@
+from ._types import ClickCaptchaSession
+
+__all__ = ["ClickCaptchaSession"]

aioqzone-1.9.1.dev3/src/qqqr/up/captcha/click/_types.py

@@ -0,0 +1,8 @@
+from .._model import PrehandleResp
+from ..capsess import BaseTcaptchaSession
+
+
+class ClickCaptchaSession(BaseTcaptchaSession):
+    def __init__(self, session: str, prehandle: PrehandleResp) -> None:
+        super().__init__(session, prehandle)
+        self.mouse_track.set_result(None)

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/up/captcha/select/_types.py

@@ -3,22 +3,21 @@ import logging
 import typing as t
 from contextlib import suppress
 
-from pydantic import AliasPath, BaseModel, Field, model_validator
+from pydantic import AliasPath, BaseModel, Field, ValidationError, model_validator
 
 from qqqr.message import solve_select_captcha
 from qqqr.utils.iter import first
 from qqqr.utils.jsjson import json_loads
 from qqqr.utils.net import ClientAdapter
 
-from .._model import ClickCfg, PrehandleResp, Sprite
+from .._model import CommonBgElmConf, CommonRender, PrehandleResp, Sprite
 from ..capsess import BaseTcaptchaSession
 from ..pil_utils import *
 
 log = logging.getLogger(__name__)
 
 
-class SelectBgElemCfg(Sprite):
-    click_cfg: ClickCfg
+class SelectBgElemCfg(CommonBgElmConf, Sprite):
     img_url: str
 
 
@@ -40,7 +39,7 @@ class SelectJsonPayload(BaseModel):
         return len(self.picture_ids)
 
 
-class SelectCaptchaDisplay(BaseModel):
+class SelectRender(CommonRender):
     instruction: str
     bg: SelectBgElemCfg = Field(alias="bg_elem_cfg")
     verify_trigger_cfg: dict
@@ -56,15 +55,14 @@ class SelectCaptchaDisplay(BaseModel):
 class SelectCaptchaSession(BaseTcaptchaSession):
     solve_captcha_hook: solve_select_captcha.TyInst
 
-    def __init__(self, session: str, prehandle: PrehandleResp) -> None:
+    def __init__(self, session: str, prehandle: "PrehandleResp") -> None:
         super().__init__(session, prehandle)
         self.mouse_track.set_result(None)
 
     def parse_captcha_data(self):
         super().parse_captcha_data()
-        self.render = SelectCaptchaDisplay.model_validate(self.conf.render)
-        if self.render.bg.click_cfg.data_type:
-            self.data_type = self.render.bg.click_cfg.data_type[0]
+        self.render = SelectRender.model_validate(self.conf.render)
+        self.data_type = self.render.bg.cfg.data_type
 
     async def get_captcha_problem(self, client: ClientAdapter):
         async with client.get(self._cdn_join(self.render.bg.img_url)) as r:

{aioqzone-1.8.6.dev1 → aioqzone-1.9.1.dev3}/src/qqqr/up/captcha/slide/_types.py

@@ -4,13 +4,13 @@ import typing as t
 from contextlib import suppress
 from random import choices, randint
 
-from pydantic import BaseModel, Field
+from pydantic import AliasPath, BaseModel, Field
 
 from qqqr.message import solve_slide_captcha
 from qqqr.utils.iter import first, firstn
 from qqqr.utils.net import ClientAdapter
 
-from .._model import FgBindingCfg, FgElemCfg, Sprite
+from .._model import CommonBgElmConf, CommonRender, Sprite
 from ..capsess import BaseTcaptchaSession
 from ..pil_utils import *
 
@@ -58,14 +58,33 @@ except ImportError:
         return noise_x, noise_y
 
 
-class SlideBgElemCfg(Sprite):
+class MoveCfg(BaseModel):
+    track_limit: str
+    move_factor: t.List[int]
+    data_type: str = Field(validation_alias=AliasPath("data_type", 0))
+
+
+class FgElemCfg(Sprite):
+    id: int
+    init_pos: t.List[int]
+    move_cfg: t.Optional[MoveCfg] = None
+
+
+class FgBindingCfg(BaseModel):
+    master: int
+    slave: int
+    bind_type: str
+    bind_factor: int
+
+
+class SlideBgElemCfg(CommonBgElmConf, Sprite):
     img_url: str
     """relative url to get jigsaw puzzle image (background with dimmed piece shape)."""
     init_pos: t.List[int] = Field(default=[0, 0])
     """sprite init position on captcha (x, y)"""
 
 
-class SlideCaptchaDisplay(BaseModel):
+class SlideRender(CommonRender):
     bg: SlideBgElemCfg = Field(alias="bg_elem_cfg")
     """Background (puzzle)"""
     fg_binding_list: t.List[FgBindingCfg] = Field(default=[])
@@ -80,7 +99,8 @@ class SlideCaptchaSession(BaseTcaptchaSession):
 
     def parse_captcha_data(self):
         super().parse_captcha_data()
-        self.render = SlideCaptchaDisplay.model_validate(self.conf.render)
+        self.render = SlideRender.model_validate(self.conf.render)
+
         self.cdn_urls = (
             self._cdn_join(self.render.bg.img_url),
             self._cdn_join(self.render.sprite_url),
@@ -89,8 +109,7 @@ class SlideCaptchaSession(BaseTcaptchaSession):
 
         self.piece_sprite = first(self.render.sprites, lambda s: s.move_cfg)
         assert self.piece_sprite.move_cfg
-        if self.piece_sprite.move_cfg.data_type:
-            self.data_type = self.piece_sprite.move_cfg.data_type[0]
+        self.data_type = self.piece_sprite.move_cfg.data_type
 
     async def get_captcha_problem(self, client: ClientAdapter):
         """