aioqzone 1.4.2.dev2__tar.gz → 1.4.2.dev5__tar.gz

{aioqzone-1.4.2.dev2 → aioqzone-1.4.2.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.4.2.dev2
+Version: 1.4.2.dev5
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -25,7 +25,7 @@ Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
 Requires-Dist: lxml (>=4.9.1,<5.0.0)
 Requires-Dist: numpy (>=1.22.3,<2.0.0) ; extra == "captcha"
 Requires-Dist: pillow (>=10.0.1,<11.0.0) ; extra == "captcha"
-Requires-Dist: pychaosvm (>=0.2.3,<0.3.0) ; extra == "captcha"
+Requires-Dist: pychaosvm (>=0.2.7,<0.3.0) ; extra == "captcha"
 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)

{aioqzone-1.4.2.dev2 → aioqzone-1.4.2.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.4.2.dev2"
+version = "1.4.2.dev5"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -40,7 +40,7 @@ tylisten = { version = "^1.1.2", source = "aioqzone-index" }
 
 numpy = { version = "^1.22.3", optional = true}
 pillow = { version = "^10.0.1", optional = true}
-pychaosvm = { version = "~0.2.3", optional = true, source = "aioqzone-index" }
+pychaosvm = { version = "~0.2.7", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
 captcha = ["numpy", "pillow", "pychaosvm"]

{aioqzone-1.4.2.dev2 → aioqzone-1.4.2.dev5}/src/qqqr/up/captcha/__init__.py

@@ -1,4 +1,3 @@
-import asyncio
 import base64
 import json
 import logging
@@ -8,7 +7,7 @@ from random import random
 from time import time
 
 from pydantic import ValidationError
-from tenacity import retry, retry_if_exception_type, stop_after_attempt
+from tenacity import after_log, retry, retry_if_exception_type, retry_if_result, stop_after_attempt
 
 from ...utils.net import ClientAdapter
 from .._model import VerifyResp
@@ -125,6 +124,11 @@ class Captcha:
     prehandle = new
     """alias of :meth:`.new`"""
 
+    @retry(
+        stop=stop_after_attempt(2),
+        retry=retry_if_result(lambda rst: not rst.ticket),
+        after=after_log(log, logging.WARNING),
+    )
     async def verify(self):
         """
         :raise NotImplementedError: cannot solve captcha

{aioqzone-1.4.2.dev2 → aioqzone-1.4.2.dev5}/src/qqqr/up/web.py

@@ -6,6 +6,7 @@ from contextlib import suppress
 from random import choice, random
 from time import time_ns
 
+from tenacity import RetryError
 from yarl import URL
 
 import qqqr.message as MT
@@ -325,12 +326,9 @@ class UpWebLogin(_UpHookMixin, LoginBase[UpWebSession]):
         if solver is None:
             return
 
-        for retry in range(4):
+        try:
             sess.verify_rst = await solver.verify()
-            if sess.verify_rst.ticket:
-                break
-            log.warning(f"ticket is empty. retry={retry}")
-        else:
+        except RetryError as e:
             from qqqr.constant import captcha_status_description
 
             r = sess.verify_rst
@@ -339,7 +337,7 @@ class UpWebLogin(_UpHookMixin, LoginBase[UpWebSession]):
                 StatusCode.NeedCaptcha,
                 captcha_status_description.get(r.code, r.errMessage),
                 subcode=r.code,
-            )
+            ) from e.last_attempt.result()
 
         log.info("verify success!")
         return sess

{aioqzone-1.4.2.dev2 → aioqzone-1.4.2.dev5}/src/qqqr/utils/jsjson.py

@@ -1,8 +1,7 @@
 import ast
-import json
 import logging
 from textwrap import dedent
-from typing import Callable, Dict, List, Union
+from typing import Dict, List, Union
 
 logger = logging.getLogger(__name__)
 JsonDict = Dict[Union[str, int], "JsonValue"]