aioqzone 1.9.6.dev5__tar.gz → 1.9.7.dev1__tar.gz

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioqzone
-Version: 1.9.6.dev5
+Version: 1.9.7.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioqzone"
-version = "1.9.6.dev5"
+version = "1.9.7.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = [{ name = "aioqzone" }]
 maintainers = [
@@ -38,7 +38,11 @@ Documentation = "https://aioqzone.github.io/aioqzone"
 
 [dependency-groups]
 test = ["pytest>=9.0.3", "pytest-asyncio>=1.1,<1.4"]
-dev = ["pre-commit", "ruff"]
+dev = [
+    "pre-commit",
+    "ruff",
+    "ty",
+]
 doc = [
     "Sphinx>=8.1.3; python_version=='3.10'",
     "Sphinx~=9.0; python_version>='3.11'",

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/aioqzone/api/h5/model.py

@@ -89,7 +89,7 @@ class QzoneH5API:
                         log.debug(f"Error when validating {obj}, {api=}")
                         raise
         else:
-            raise AssertionError
+            raise RuntimeError("max retry exceeded")
 
     async def _retry_sleep(self, *_) -> None:
         await self.login.new_cookie()

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/aioqzone/api/login/__init__.py

@@ -101,6 +101,7 @@ class UpLoginManager(Loginable):
                 raise TryAgain from e
             raise
         except NotImplementedError:
+            # intended: forwarded as NeedSmsVerify
             from qqqr.constant import StatusCode
 
             raise TencentLoginError(StatusCode.NeedSmsVerify, "需要手机验证")
@@ -108,7 +109,7 @@ class UpLoginManager(Loginable):
             log.warning(f"密码登录：{type(e).__name__}，重试", exc_info=True)
             log.debug(e.args, extra=e.__dict__)
             raise TryAgain from e
-        except BaseException as e:
+        except Exception as e:
             log.fatal("密码登录异常", exc_info=True)
             raise UnexpectedLoginError from e
 
@@ -178,8 +179,8 @@ class QrLoginManager(Loginable):
         except (GeneratorExit, ClientError) as e:
             log.warning(f"二维码登录：{type(e).__name__}，重试", exc_info=True)
             log.debug(e.args, extra=e.__dict__)
-            raise TryAgain
-        except BaseException as e:
+            raise TryAgain from e
+        except Exception as e:
             log.fatal("二维码登录异常", exc_info=True)
             raise UnexpectedLoginError from e
 

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/aioqzone/api/login/_base.py

@@ -57,7 +57,7 @@ class Loginable(ABC):
             async with self.lock:
                 try:
                     self.cookie = await self._new_cookie()
-                except BaseException as e:
+                except Exception as e:
                     self.ch_login_notify.add_awaitable(self.login_failed.emit(self.uin, e))
                     return False
                 else:

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/aioqzone/exception.py

@@ -8,7 +8,7 @@ class QzoneError(RuntimeError):
         self.robj = robj
         if len(args) > 0 and isinstance(args[0], str):
             self.msg = args[0]
-        super().__init__(self, *args)
+        super().__init__(*args)
 
     def __str__(self) -> str:
         return f"QzoneCode {self.code}: {self.msg}"

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/aioqzone/model/api/response.py

@@ -212,7 +212,8 @@ class ProfilePagePesp(QzoneResponse):
         data = script[m.end() - 1 : m.end() + entire_closing(script[m.end() - 1 :], "[")]
         data = re.sub(r",,\]$", "]", data)
         data = json_loads(data)
-        assert isinstance(data, list)
+        if not isinstance(data, list):
+            raise TryAgain("ProfilePageResponse: profile not returned")
         if len(data) < 2:
             raise TryAgain("ProfilePageResponse: profile not returned")
 
@@ -261,7 +262,8 @@ class AddCommentLegacyResp(QzoneResponse):
             raise TryAgain("AddCommentLegacyResponse: script tag not found")
 
         m = response_callback.search(script)
-        assert m
+        if not m:
+            raise TryAgain("AddCommentLegacyResponse: callback not found")
         return validate_strdict(json_loads(m.group(1)))
 
 
@@ -280,7 +282,8 @@ class DeleteCommentResp(QzoneResponse):
             raise TryAgain("DeleteCommentResponse: script tag not found")
 
         m = response_callback.search(script)
-        assert m
+        if not m:
+            raise TryAgain("DeleteCommentResponse: callback not found")
         return validate_strdict(json_loads(m.group(1)))
 
 
@@ -306,7 +309,8 @@ class UploadPicResponse(QzoneResponse):
     @classmethod
     async def response_to_object(cls, response: ClientResponse) -> StrDict:
         m = response_callback.search(await response.text())
-        assert m
+        if not m:
+            raise TryAgain("UploadPicResponse: callback not found")
         return validate_strdict(json_loads(m.group(1)))
 
 
@@ -331,10 +335,12 @@ class PhotosPreuploadResponse(QzoneResponse):
     @classmethod
     async def response_to_object(cls, response: ClientResponse) -> StrDict:
         m = response_callback.search(await response.text())
-        assert m
+        if not m:
+            raise TryAgain("PhotosPreuploadResponse: callback not found")
 
         picinfos = json_loads(m.group(1))
-        assert isinstance(picinfos, list)
+        if not isinstance(picinfos, list):
+            raise TryAgain("PhotosPreuploadResponse: picinfos not a list")
         return dict(photos=[PicInfo.from_response_object(info["picinfo"]) for info in picinfos])  # type: ignore
 
 

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/qqqr/base.py

@@ -120,8 +120,10 @@ class LoginBase(ABC, t.Generic[_S]):
     async def _get_login_url(
         self, sess: _S, cur_cookies: t.Optional[t.Mapping[str, t.Any]] = None
     ) -> t.Dict[str, str]:
-        assert sess.login_url
-        assert not sess.logined, "This session is logined."
+        if not sess.login_url:
+            raise ValueError("login_url is required")
+        if sess.logined:
+            raise RuntimeError("This session is logined.")
 
         r = {}
         if cur_cookies is not None:

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/qqqr/qr/__init__.py

@@ -136,7 +136,8 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
         async with self.client.get(SHOW_QR, params=data) as r:
             qrsig = r.cookies.get("qrsig")
             if not push_qr:
-                assert qrsig
+                if not qrsig:
+                    raise RuntimeError("qrsig cookie not found")
                 return QR(
                     png=await r.content.read(),
                     sig=qrsig.value,
@@ -144,7 +145,8 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
             m = re.search(r"ptui_qrcode_CB\((.*)\)", r := await r.text())
 
         log.debug(f"ptqrshow(qr_push) response: {r}")
-        assert m
+        if not m:
+            raise RuntimeError("ptui_qrcode_CB not found in response")
         resp = PushQrResp.model_validate_json(m.group(1))
         if qrsig and resp.code == 0:
             log.info("二维码已推送至用户手机端")

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/qqqr/up/captcha/__init__.py

@@ -127,7 +127,8 @@ class Captcha(_CaptchaHookMixin):
                 r.raise_for_status()
                 m = re.search(CALLBACK + r"\((\{.*\})\)", await r.text("utf8"))
 
-            assert m
+            if not m:
+                raise RuntimeError("prehandle callback not found")
             return PrehandleRespValidator.validate_json(m.group(1))
 
         sess = TcaptchaSession.factory(sid, await retry_closure())
@@ -142,6 +143,14 @@ class Captcha(_CaptchaHookMixin):
     prehandle = new
     """alias of :meth:`.new`"""
 
+    async def _get_tdc_collect(self, sess: TcaptchaSession, client: ClientAdapter) -> str:
+        try:
+            await sess.get_tdc(client, ip=self.fake_ip)
+        except Exception:
+            log.debug("get_tdc failed", exc_info=True)
+            return ""
+        return unquote(str(sess.tdc.getData(None, True)))
+
     @retry(
         stop=stop_after_attempt(2),
         retry=retry_if_result(lambda rst: not rst.ticket),
@@ -158,13 +167,9 @@ class Captcha(_CaptchaHookMixin):
             await sess.get_captcha_problem(client)
             return await sess.solve_captcha()
 
-        async def get_tdc_collect(client: ClientAdapter) -> str:
-            await sess.get_tdc(client, ip=self.fake_ip)
-            return unquote(str(sess.tdc.getData(None, True)))
-
         ans, collect, _ = await asyncio.gather(
             get_solve_captcha(self.client),
-            get_tdc_collect(self.client),
+            self._get_tdc_collect(sess, self.client),
             loop.run_in_executor(None, sess.solve_workload),
         )
         if not ans:
@@ -175,7 +180,8 @@ class Captcha(_CaptchaHookMixin):
             data=ans,
         )
         info = sess.tdc.getInfo(None)["info"]
-        assert isinstance(info, str)
+        if not isinstance(info, str):
+            raise TypeError(f"expected str for tdc info, got {type(info).__name__}")
 
         data = {
             "collect": collect,

{aioqzone-1.9.6.dev5 → aioqzone-1.9.7.dev1}/src/qqqr/up/web.py

@@ -1,8 +1,6 @@
-import asyncio
 import logging
 import re
 import typing as t
-from contextlib import suppress
 from random import choice, random
 from time import time_ns
 
@@ -18,7 +16,7 @@ from qqqr.utils.net import ClientAdapter, get_all_cookie
 
 from ._model import CheckResp, CheckRespValidator, LoginResp, RedirectCookies, VerifyResp
 from .captcha import Captcha
-from .encrypt import PasswdEncoder, TeaEncoder
+from .encrypt import TeaEncoder
 
 CHECK_URL = "https://ssl.ptlogin2.qq.com/check"
 LOGIN_URL = "https://ssl.ptlogin2.qq.com/login"
@@ -93,7 +91,7 @@ class UpWebSession(LoginSession):
             ) from e.last_attempt.exception()
         except NotImplementedError:
             raise
-        except BaseException as e:
+        except Exception as e:
             raise TencentLoginError(StatusCode.NeedCaptcha, "验证过程出现错误") from e
 
         log.info("成功通过验证码")
@@ -278,11 +276,14 @@ class UpWebLogin(LoginBase[UpWebSession], _UpHookMixin):
                     # fast return so we won't always request smscode which may risk test account.
                     raise TencentLoginError(resp.code, "未实现的功能：输入验证码")
                 await self.send_sms_code(sess)
-                with suppress(BaseException):
+                try:
                     hook_results = await self.sms_code_input.results(
                         uin=self.uin, phone=resp.msg, nickname=resp.nickname
                     )
-                    sess.sms_code = firstn(hook_results, lambda c: c and len(c.strip()) >= 4)
+                except Exception:
+                    log.warning("sms_code_input hook failed", exc_info=True)
+                    hook_results = []
+                sess.sms_code = firstn(hook_results, lambda c: c and len(c.strip()) >= 4)
                 if sess.sms_code is None:
                     raise TencentLoginError(resp.code, "未获得动态(SMS)验证码")
             else: