aioqzone 1.9.6.dev2__tar.gz → 1.9.6.dev4__tar.gz

{aioqzone-1.9.6.dev2 → aioqzone-1.9.6.dev4}/PKG-INFO

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

{aioqzone-1.9.6.dev2 → aioqzone-1.9.6.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioqzone"
-version = "1.9.6.dev2"
+version = "1.9.6.dev4"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = [{ name = "aioqzone" }]
 maintainers = [
@@ -40,10 +40,10 @@ Documentation = "https://aioqzone.github.io/aioqzone"
 test = ["pytest>=8.2.0", "pytest-asyncio>=1.1,<1.3"]
 dev = ["pre-commit", "ruff"]
 doc = [
-    "Sphinx>=7.0.1; python_version=='3.10'",
-    "Sphinx>=8.2.0; python_version>='3.11'",
-    "autodoc-pydantic>=2.0.1",
-    "sphinx-autodoc-typehints~=2.5",
+    "Sphinx>=8.1.3; python_version=='3.10'",
+    "Sphinx~=9.0; python_version>='3.11'",
+    "autodoc-pydantic>=2.2.0",
+    "sphinx-autodoc-typehints~=3.0",
     "furo",
     "sphinx-intl",
     "sphinx-inline-tabs",
@@ -84,8 +84,3 @@ ignore = [
     "F403",  # 'from module import *' used; unable to detect undefined names
     "F405",  # name may be undefined, or defined from star imports
 ]
-
-[tool.pyright]
-pythonVersion = "3.10"
-pythonPlatform = "All"
-reportIncompatibleVariableOverride = "information"

{aioqzone-1.9.6.dev2 → aioqzone-1.9.6.dev4}/src/aioqzone/api/h5/model.py

@@ -86,7 +86,7 @@ class QzoneH5API:
                     try:
                         return api.response.from_response_object(obj)
                     except ValidationError:
-                        log.debug(f"Error when validating {obj}", api)
+                        log.debug(f"Error when validating {obj}, {api=}")
                         raise
         else:
             raise AssertionError

{aioqzone-1.9.6.dev2 → aioqzone-1.9.6.dev4}/src/aioqzone/api/login/__init__.py

@@ -183,6 +183,22 @@ class QrLoginManager(Loginable):
             log.fatal("二维码登录异常", exc_info=True)
             raise UnexpectedLoginError from e
 
+        if self.uin:
+            return cookie
+
+        # uin in qrconfig might be 0, we could get uin after login
+        for k, v in cookie.items():
+            if not k.endswith("uin"):
+                continue
+            v = v.removeprefix("o0")
+            if not v.isdigit():
+                continue
+            try:
+                self.uin = int(v)
+            except ValueError:
+                continue
+            if self.uin:
+                break
         return cookie
 
     def h5(self, enable=True, clear_cookie=True):

{aioqzone-1.9.6.dev2 → aioqzone-1.9.6.dev4}/src/qqqr/qr/__init__.py

@@ -108,7 +108,7 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
             async with self.client.get(RECENT_UIN_URL, params=params) as response:
                 dev_mid_sig = response.cookies.get("dev_mid_sig")
                 m = re.search(r"ptui_fetch_dev_uin_CB\((.*)\)", r := await response.text())
-            log.debug("pt_fetch_dev_uin response:", r)
+            log.debug(f"pt_fetch_dev_uin response: {r}")
 
             if m:
                 r = FetchDevUinResp.model_validate_json(m.group(1))
@@ -143,7 +143,7 @@ class QrLogin(LoginBase[QrSession], _QrHookMixin):
                 )
             m = re.search(r"ptui_qrcode_CB\((.*)\)", r := await r.text())
 
-        log.debug("ptqrshow(qr_push) response:", r)
+        log.debug(f"ptqrshow(qr_push) response: {r}")
         assert m
         resp = PushQrResp.model_validate_json(m.group(1))
         if qrsig and resp.code == 0: