aioqzone 1.8.1.dev1__tar.gz → 1.8.2.dev3__tar.gz

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.1.dev1
+Version: 1.8.2.dev3
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -23,7 +23,7 @@ Provides-Extra: slide-captcha
 Requires-Dist: aiohttp (>=3.8.5,<4.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
 Requires-Dist: pillow (>=10.0.1,<11.0.0)
-Requires-Dist: pychaosvm (>=0.3.3,<0.4.0)
+Requires-Dist: pychaosvm (>=0.3.4,<0.5.0)
 Requires-Dist: pydantic (>=2.0.3,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.2,<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_chatrooom)
+[![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)
 
 [English](README_en.md) | 简体中文
 

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.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_chatrooom)
+[![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)
 
 [English](README_en.md) | 简体中文
 

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.1.dev1"
+version = "1.8.2.dev3"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -36,7 +36,7 @@ tenacity = "^8.2.3"
 exceptiongroup = "^1.1.1"
 tylisten = "^2.1.3"
 pillow = "^10.0.1"
-pychaosvm = { version = "~0.3.3", source = "aioqzone-index" }
+pychaosvm = { version = ">=0.3.4,<0.5.0", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
@@ -47,8 +47,8 @@ slide-captcha = ["slide-tc"]
 optional = false
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.4.0"
-pytest-asyncio = "~0.21.0"
+pytest = "^8.2.0"
+pytest-asyncio = "~0.21.2"
 
 [tool.poetry.group.dev]
 optional = true

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/api/h5/model.py

@@ -61,7 +61,7 @@ class QzoneH5API:
         async for attempt in self._relogin_retry:
             with attempt:
                 if (gtk := self.login.gtk) == 0:
-                    raise TryAgain
+                    raise TryAgain("no login state")
                 if api.attach_token:
                     params["g_tk"] = gtk
                     hostuin: int = getattr(api.params, "hostuin", self.login.uin)

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/api/login/__init__.py

@@ -118,6 +118,7 @@ class UpLoginManager(Loginable):
             client=self.client,
             uin=self.config.uin,
             pwd=self.config.pwd.get_secret_value(),
+            fake_ip=self.config.fake_ip and str(self.config.fake_ip),
             h5=enable,
         )
         self.sms_code_input = self.uplogin.sms_code_input

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/model/api/__init__.py

@@ -12,6 +12,8 @@ TyHttpMethod = t.Union[t.Literal["GET"], t.Literal["POST"]]
 
 
 class QzoneApi(BaseModel, t.Generic[TyRequest, TyResponse]):
+    """The base class for all Qzone APIs below."""
+
     host: t.ClassVar[str] = "https://h5.qzone.qq.com"
     http_method: t.ClassVar[TyHttpMethod]
     path: t.ClassVar[str]

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/model/api/profile.py

@@ -1,6 +1,7 @@
 """
 Qzone uses different feed schemes for ``/mqzone/profile``. This module patches :mod:`.feed`.
 """
+
 import typing as t
 
 from pydantic import AliasPath, BaseModel, Field, HttpUrl, field_validator, model_validator

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/model/protocol/__init__.py

@@ -1,6 +1,7 @@
 """This module defines types that are used internally by aioqzone and its plugins.
 These types are not designed to represent responses from Qzone.
 """
+
 from pydantic import BaseModel
 
 from .config import *

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/model/protocol/config.py

@@ -1,6 +1,7 @@
-from typing import Literal, Union
+import typing as t
+from ipaddress import IPv4Address
 
-from pydantic import Field, SecretStr
+from pydantic import AnyUrl, Field, SecretStr
 from pydantic_settings import BaseSettings
 
 
@@ -13,6 +14,12 @@ class UpLoginConfig(LoginConfig):
     pwd: SecretStr = Field(default="")
     """User password."""
 
+    fake_ip: t.Optional[IPv4Address] = None
+    """Fake IP used when collecting network environment.
+
+    .. versionadded:: 1.8.2
+    """
+
 
 class QrLoginConfig(LoginConfig):
     max_refresh_times: int = 6

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/utils/regex.py

@@ -1,6 +1,7 @@
 """
 some patterns for matching html and so on.
 """
+
 import re
 
 # use this to match qzone api response

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/aioqzone/utils/retry.py

@@ -14,8 +14,7 @@ class RetryIfCode(retry_if_exception, Generic[_E]):
 
     @classmethod
     @abstractmethod
-    def get_code(cls, exc: _E) -> int:
-        ...
+    def get_code(cls, exc: _E) -> int: ...
 
     def __init__(self, *code: int) -> None:
         super().__init__(lambda exc: isinstance(exc, self._exc_cls) and self.get_code(exc) in code)

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/qr/__init__.py

@@ -88,6 +88,10 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
         return QrSession(await self.show(push_qr), login_sig=login_sig)
 
     async def show(self, push_qr=False) -> QR:
+        """``ptqrshow`` api.
+
+        :param push_qr: push QR to mobile client.
+        """
         data = {
             "appid": self.app.appid,
             "daid": self.app.daid,
@@ -125,7 +129,7 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
     async def poll(self, sess: QrSession) -> PollResp:
         """Poll QR status.
 
-        :raise `httpx.HTTPStatusError`: if response status code != 200
+        :raise `aiohttp.ClientResponseError`: if response status code != 200
 
         :return: a poll response object
         """
@@ -168,17 +172,17 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
         poll_freq: float = 3,
     ):
         """Loop until cookie is returned or max `refresh_times` exceeds.
-        - This method will emit :meth:`QrEvent.QrFetched` event if a new qrcode is fetched.
-        - If qr is not scanned after `refresh_times`, it will raise :exc:`asyncio.TimeoutError`.
-        - If :obj:`QrEvent.refresh_flag` is set, it will refresh qrcode at once without increasing expire counter.
-        - If :obj:`QrEvent.cancel_flag` is set, it will raise :exc:`UserBreak` before next polling.
+        - This method will emit :obj:`.qr_fetched` event if a new qrcode is fetched.
+        - If qr is not scanned after `refresh_times`, it will raise :exc:`UserTimeout`.
+        - If :obj:`.refresh` is set, it will refresh qrcode at once without increasing expire counter.
+        - If :obj:`.cancel` is set, it will raise :exc:`UserBreak` before next polling.
 
         :meta public:
         :param refresh_times: max qr expire times.
         :param poll_freq: interval between two status polling, in seconds, default as 3.
 
         :raise `UserTimeout`: if qr is not scanned after `refresh_times` expires.
-        :raise `UserBreak`: if :obj:`QrEvent.cancel_flag` is set.
+        :raise `UserBreak`: if :obj:`.cancel` is set.
         """
         self.refresh.clear()
         self.cancel.clear()

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/up/captcha/__init__.py

@@ -52,7 +52,13 @@ class Captcha(_CaptchaHookMixin):
     solve_select_captcha: solve_select_captcha.TyInst
     solve_slide_captcha: solve_slide_captcha.TyInst
 
-    def __init__(self, client: ClientAdapter, appid: int, xlogin_url: str):
+    def __init__(
+        self,
+        client: ClientAdapter,
+        appid: int,
+        xlogin_url: str,
+        fake_ip: t.Optional[str] = None,
+    ):
         """
         :param client: network client
         :param appid: Specify the appid of the application
@@ -64,6 +70,7 @@ class Captcha(_CaptchaHookMixin):
         self.appid = appid
         self.xlogin_url = xlogin_url
         self.client.headers["Referer"] = "https://xui.ptlogin2.qq.com/"
+        self.fake_ip = fake_ip
 
     @property
     def base64_ua(self):
@@ -149,7 +156,7 @@ class Captcha(_CaptchaHookMixin):
             return await sess.solve_captcha()
 
         async def get_tdc_collect(client: ClientAdapter) -> str:
-            await sess.get_tdc(client)
+            await sess.get_tdc(client, ip=self.fake_ip)
             return unquote(str(sess.tdc.getData(None, True)))
 
         ans, collect, _ = await asyncio.gather(

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/up/captcha/capsess.py

@@ -70,7 +70,9 @@ class BaseTcaptchaSession(ABC):
     def _vmslide_js_url(self):
         raise NotImplementedError
 
-    async def get_tdc(self, client: ClientAdapter, ua: t.Optional[str] = None):
+    async def get_tdc(
+        self, client: ClientAdapter, ua: t.Optional[str] = None, ip: t.Optional[str] = None
+    ):
         """
         .. note:: If :obj:`.mouse_track` should be set, set it before calling this method.
         """
@@ -80,14 +82,13 @@ class BaseTcaptchaSession(ABC):
             r.raise_for_status()
             self.tdc = prepare(
                 await r.text("utf8"),
-                ip=self.prehandle.uip,
+                ip=ip or self.prehandle.uip,
                 ua=ua or client.headers["User-Agent"],
                 mouse_track=await self.mouse_track,
             )
 
     @abstractmethod
-    async def get_captcha_problem(self, client: ClientAdapter):
-        ...
+    async def get_captcha_problem(self, client: ClientAdapter): ...
 
     @abstractmethod
     async def solve_captcha(self) -> str:

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/up/web.py

@@ -123,17 +123,20 @@ class UpWebLogin(LoginBase[UpWebSession], _UpHookMixin):
         app: t.Optional[APPID] = None,
         proxy: t.Optional[Proxy] = None,
         info: t.Optional[PT_QR_APP] = None,
+        fake_ip: t.Optional[str] = None,
     ):
         super().__init__(client, uin=uin, h5=h5, app=app, proxy=proxy, info=info)
         self.pwd = pwd
         self.pwder = TeaEncoder(pwd)
-        self.captcha = Captcha(self.client, self.app.appid, str(self.login_page_url))
+        self.captcha = Captcha(
+            self.client, self.app.appid, str(self.login_page_url), fake_ip=fake_ip
+        )
 
     async def new(self):
         """Create a :class:`UpWebSession`. This will call `check` api of Qzone, and receive result
         about whether this login needs a captcha, sms verification, etc.
 
-        :raise `httpx.HTTPStatusError`:
+        :raise `aiohttp.ClientResponseError`: if response status != 200
 
         :return: a up login session
         """

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/utils/iter.py

@@ -5,8 +5,9 @@ D = t.TypeVar("D")
 
 
 @t.overload
-def first(it: t.Iterable[T], pred: t.Optional[t.Callable[[T], t.Optional[object]]] = None) -> T:
-    ...
+def first(
+    it: t.Iterable[T], pred: t.Optional[t.Callable[[T], t.Optional[object]]] = None
+) -> T: ...
 
 
 @t.overload
@@ -15,8 +16,7 @@ def first(
     pred: t.Optional[t.Callable[[T], t.Optional[object]]] = None,
     *,
     default: D,
-) -> t.Union[T, D]:
-    ...
+) -> t.Union[T, D]: ...
 
 
 def first(

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/utils/jsjson.py

@@ -10,9 +10,13 @@ JsonValue = Union[bool, int, str, JsonDict, JsonList]
 
 
 class AstLoader:
-    """`AstLoader` uses standard :mod:`ast` module to parse the js/json"""
+    """:class:`AstLoader` uses standard :mod:`ast` module to parse the js/json"""
 
     class RewriteUndef(ast.NodeTransformer):
+        """
+        :meta private:
+        """
+
         const = {
             "undefined": ast.Constant(value=None),
             "null": ast.Constant(value=None),
@@ -28,12 +32,12 @@ class AstLoader:
     @classmethod
     def json_loads(cls, js: str, filename: str = "stdin") -> JsonValue:
         """
-        The json_loads function loads a JSON object from a js/json string. It uses standard
+        The :meth:`~AstLoader.json_loads` function loads a JSON object from a js/json string. It uses standard
         :mod:`ast` module to parse the js/json.
 
         :param js: Used to Pass the js/json string to be parsed.
         :param filename: Used to Specify the name of the file that is being read. This is only for debug use.
-        :return: A jsonvalue object.
+        :return: A :obj:`JsonValue` object.
         """
         js = dedent(js).replace(r"\/", "/")
         node = ast.parse(js, mode="eval")
@@ -43,14 +47,14 @@ class AstLoader:
 
 
 def json_loads(js: str) -> JsonValue:
-    """The json_loads function converts a string representation of JS/JSON data into a Python object.
+    """The :meth:`json_loads` function converts a string representation of JS/JSON data into a Python object.
     Current implementation is using :external+python:mod:`ast`.
 
-    If you need more parameters or another implementation, call `xxxLoader.json_loads` instead.
-
     .. seealso:: :meth:`.AstLoader.json_loads`
 
+    If you need more parameters or another implementation, call ``xxxLoader.json_loads`` instead.
+
     :param js: Used to Pass the JS/JSON string.
-    :return: A jsonvalue object.
+    :return: A :obj:`JsonValue` object.
     """
     return AstLoader.json_loads(js)

{aioqzone-1.8.1.dev1 → aioqzone-1.8.2.dev3}/src/qqqr/utils/net.py

@@ -9,12 +9,12 @@ __all__ = ["raise_for_status", "get_all_cookie", "ClientAdapter"]
 
 
 def raise_for_status(response: Response, *accept_code: int):
-    """A checker more strict than :meth:`~httpx.Response.raise_for_status`.
+    """A checker more strict than :meth:`~aiohttp.ClientResponse.raise_for_status`.
 
     :param response: Client response to check.
     :param accept_code: Overwrite codes that can be accepted, If not given, default is `(200, )`
 
-    :raise `httpx.HTTPStatusError`: if status not in :obj:`accept_code`
+    :raise `aiohttp.ClientResponseError`: if status not in :obj:`accept_code`
     """
     response.raise_for_status
     accept_code = accept_code or (200,)