aioqzone 0.13.0.dev1__tar.gz → 0.13.0.dev2__tar.gz

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 0.13.0.dev1
+Version: 0.13.0.dev2
 Summary: Python wrapper for Qzone login and Qzone HTTP APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "0.13.0.dev1"
+version = "0.13.0.dev2"
 description = "Python wrapper for Qzone login and Qzone HTTP APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -33,10 +33,10 @@ pydantic = "^1.10.4"
 rsa = "^4.8"
 lxml = "^4.9.1"
 cssselect = "^1.1.0"
-exceptiongroup = { version = "^1.1.1", python = "<3.11", source = "PyPI" }
+exceptiongroup = { version = "^1.1.1", python = "<3.11"}
 
-numpy = { version = "^1.22.3", optional = true, source = "PyPI" }
-pillow = { version = "^9.4.0", optional = true, source = "PyPI" }
+numpy = { version = "^1.22.3", optional = true}
+pillow = { version = "^9.4.0", optional = true}
 pychaosvm = { version = "^0.2.3", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
@@ -47,7 +47,7 @@ captcha = ["numpy", "pillow", "pychaosvm"]
 optional = false
 
 [tool.poetry.group.test.dependencies]
-pytest = "^7.2.1"
+pytest = "^7.4.0"
 pytest-asyncio = "~0.21.0"
 
 [tool.poetry.group.dev]
@@ -62,17 +62,16 @@ isort = "*"
 optional = true
 
 [tool.poetry.group.docs.dependencies]
-Sphinx = "^6.1.3"
+Sphinx = "^7.0.1"
 autodoc-pydantic = "*"
 sphinx-autodoc-typehints = "^1.19.5"
-sphinx-rtd-theme = "*"
+furo = "*"
 sphinx-intl = "*"
 
 [[tool.poetry.source]]
 name = "aioqzone-index"
 url = "https://aioqzone.github.io/aioqzone-index/simple"
-priority = "primary"
-
+priority = "supplemental"
 
 [[tool.poetry.source]]
 name = "PyPI"

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/aioqzone/api/h5/raw.py

@@ -9,6 +9,7 @@ from aioqzone.api.loginman import Loginable
 from aioqzone.exception import QzoneError
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import entire_closing, response_callback
+from qqqr.utils.iter import firstn
 from qqqr.utils.jsjson import JsonValue, json_loads
 from qqqr.utils.net import ClientAdapter
 
@@ -102,7 +103,8 @@ class QzoneH5RawAPI:
             """
 
             with QzoneErrorDispatch() as qze, HTTPStatusErrorDispatch() as hse:
-                qze.dispatch(-3000, suppress=lambda e: "登录" in e.msg)  # -3000: 请先登录
+                # NOTE: 尽管只有“-3000: 请先登录”明确要求重新登录，但似乎任何原因的-3000错误值都意味着cookie过期。因此移除了对message的校验
+                qze.dispatch(-3000)
                 qze.dispatch(-10000)
                 hse.dispatch(302, 403)
                 return await func(*args, **kwds)
@@ -150,13 +152,13 @@ class QzoneH5RawAPI:
 
         assert isinstance(r, dict)
 
-        err = next(filter(lambda i: i is not None, (r.get(i) for i in errno_key)), None)
+        err = firstn((r.get(i) for i in errno_key), lambda i: i is not None)
         assert err is not None, f"no {errno_key} in {r.keys()}"
         assert isinstance(err, (int, str))
         err = int(err)
 
         if err != 0:
-            msg = next(filter(None, (r.get(i) for i in msg_key)), None)
+            msg = firstn((r.get(i) for i in msg_key), lambda i: i is not None)
             if msg:
                 raise QzoneError(err, msg, rdict=r)
             else:
@@ -183,7 +185,7 @@ class QzoneH5RawAPI:
             raise RuntimeError("script tag not found")
 
         texts: List[str] = [s.text for s in scripts]
-        script = next(filter(lambda s: "shine0callback" in s, texts), None)
+        script = firstn(texts, lambda s: "shine0callback" in s)
         if not script:
             raise RuntimeError("data script not found")
 

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/aioqzone/api/web/raw.py

@@ -17,7 +17,7 @@ from aioqzone.type.internal import AlbumData, LikeData
 from aioqzone.utils.catch import HTTPStatusErrorDispatch, QzoneErrorDispatch
 from aioqzone.utils.regex import response_callback
 from aioqzone.utils.time import time_ms
-from qqqr.utils.daug import du
+from qqqr.utils.iter import firstn
 from qqqr.utils.jsjson import JsonValue, json_loads
 from qqqr.utils.net import ClientAdapter, raise_for_status
 
@@ -156,13 +156,13 @@ class QzoneWebRawAPI:
         r = json_loads(rtext)
         assert isinstance(r, dict)
 
-        err = next(filter(lambda i: i is not None, (r.get(i) for i in errno_key)), None)
+        err = firstn((r.get(i) for i in errno_key), lambda i: i is not None)
         assert err is not None, f"no {errno_key} in {r.keys()}"
         assert isinstance(err, (int, str))
         err = int(err)
 
         if err != 0:
-            msg = next(filter(None, (r.get(i) for i in msg_key)), None)
+            msg = firstn((r.get(i) for i in msg_key), lambda i: i is not None)
             if msg:
                 raise QzoneError(err, msg, rdict=r)
             else:
@@ -238,10 +238,11 @@ class QzoneWebRawAPI:
             "usertime": time_ms(),
             "externparam": external,
         }
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.feeds3_html_more, du(default, query)) as r:
+            async with self.host_get(const.feeds3_html_more, query) as r:
                 r.raise_for_status()
                 rtext = r.text
 
@@ -288,11 +289,12 @@ class QzoneWebRawAPI:
             "tid": tid,
             "feedsType": feedstype,
         }
-        logger.debug("emotion_getcomments post data:", body)
+        logger.debug(f"emotion_getcomments post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_getcomments, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_getcomments, data=body) as r:
                 r.raise_for_status()
                 rtext = r.text
 
@@ -326,10 +328,11 @@ class QzoneWebRawAPI:
             "need_private_comment": 1,
         }
         query = {"uin": owner, "tid": fid}
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.emotion_msgdetail, params=du(default, query)) as r:
+            async with self.host_get(const.emotion_msgdetail, params=query) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -387,12 +390,14 @@ class QzoneWebRawAPI:
             "abstime": likedata.abstime,
             "fid": likedata.fid,
         }
-        logger.debug("like_app post data:", body)
+        logger.debug(f"like_app post data: {body}")
+
+        body.update(default)
         url = const.internal_dolike_app if like else const.internal_unlike_app
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(url, data=du(default, body)) as r:
+            async with self.host_post(url, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text, errno_key=("code", "ret"))
 
@@ -454,10 +459,11 @@ class QzoneWebRawAPI:
             "t": randint(int(1e8), int(1e9 - 1))
             # The distribution is not consistent with photo.js; but the format is.
         }
+        query.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.floatview_photo_list, du(default, query)) as r:
+            async with self.host_get(const.floatview_photo_list, query) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -506,9 +512,12 @@ class QzoneWebRawAPI:
             "need_private_comment": 1,
         }
 
+        if pos:
+            param.update(add)
+
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_get(const.emotion_msglist, du(param, add) if pos else param) as r:
+            async with self.host_get(const.emotion_msglist, param) as r:
                 r.raise_for_status()
                 rtext = r.text
             return self._rtext_handler(rtext)
@@ -551,11 +560,12 @@ class QzoneWebRawAPI:
             "feedversion": 1,
             "hostuin": self.login.uin,
         }
-        logger.debug("emotion_publish post data:", body)
+        logger.debug(f"emotion_publish post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_publish, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_publish, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -649,11 +659,12 @@ class QzoneWebRawAPI:
             "hostuin": uin or self.login.uin,
             # 'pic_bo': ''
         }
-        logger.debug("emotion_update post data:", body)
+        logger.debug(f"emotion_update post data: {body}")
+        body.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_update, data=du(default, body)) as r:
+            async with self.host_post(const.emotion_update, data=body) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 
@@ -706,11 +717,12 @@ class QzoneWebRawAPI:
             private=int(is_private),
             paramstr=1,
         )
-        logger.debug("emotion_re_feeds post data:", data)
+        logger.debug(f"emotion_re_feeds post data: {data}")
+        data.update(default)
 
         @self._relogin_retry
         async def retry_closure():
-            async with self.host_post(const.emotion_re_feeds, data=du(default, data)) as r:
+            async with self.host_post(const.emotion_re_feeds, data=data) as r:
                 r.raise_for_status()
                 return self._rtext_handler(r.text)
 

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/aioqzone/utils/html.py

@@ -7,12 +7,13 @@ Use this module to get some data from Qzone html feed.
 """
 import logging
 import re
+from contextlib import suppress
 from typing import Iterable, List, Optional, Union, cast
 
 from lxml.html import HtmlElement, fromstring
-from pydantic import BaseModel, HttpUrl
+from pydantic import BaseModel, HttpUrl, ValidationError
 
-from qqqr.utils.daug import di
+from qqqr.utils.iter import firstn
 
 from ..type.entity import ConEntity
 from ..type.internal import AlbumData
@@ -81,7 +82,7 @@ class HtmlContent(BaseModel):
         img_data = lambda a: {k[5:]: v for k, v in a.attrib.items() if k.startswith("data-")}
 
         def load_src(a: Iterable[HtmlElement]) -> Optional[HttpUrl]:
-            o: Optional[HtmlElement] = next(filter(lambda i: i.tag == "img", a), None)
+            o = firstn(a, lambda i: i.tag == "img")
             if o is None:
                 return
             src: str = o.get("src", "")
@@ -101,11 +102,11 @@ class HtmlContent(BaseModel):
 
         finfo: HtmlElement = mxsafe(root.cssselect("div.f-info"))
         lia: List[HtmlElement] = root.cssselect("div.f-ct a.img-item")
+        (d := img_data(lia[0]))["hostuin"] = hostuin
 
-        try:
-            album = AlbumData.parse_obj(di(img_data(lia[0]), hostuin=hostuin))
-        except:
-            album = None
+        album = None
+        with suppress(ValidationError):
+            album = AlbumData.parse_obj(d)
 
         pic = [
             PicRep(

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/qr/__init__.py

@@ -11,7 +11,6 @@ from ..constant import StatusCode
 from ..event import Emittable, hook_guard
 from ..event.login import QrEvent
 from ..exception import UserBreak
-from ..utils.daug import du
 from ..utils.encrypt import hash33
 
 log = logging.getLogger(__name__)
@@ -86,7 +85,7 @@ class QrLogin(LoginBase[QrSession], Emittable[QrEvent]):
             "daid": self.app.daid,
         }
 
-        async with self.client.get(POLL_QR, params=du(data, const)) as r:
+        async with self.client.get(POLL_QR, params=data.update(const) or data) as r:
             r.raise_for_status()
             rl = re.findall(r"'(.*?)'[,\)]", r.text)
 

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/up/captcha/__init__.py

@@ -3,6 +3,7 @@ import base64
 import json
 import logging
 import re
+from contextlib import suppress
 from hashlib import md5
 from ipaddress import IPv4Address
 from random import random
@@ -13,7 +14,6 @@ from chaosvm import prepare
 from chaosvm.proxy.dom import TDC
 from httpx import URL
 
-from ...utils.daug import du
 from ...utils.iter import first
 from ...utils.net import ClientAdapter
 from ..type import PrehandleResp, VerifyResp
@@ -165,7 +165,7 @@ class Captcha:
             "subsid": 1,
             "callback": CALLBACK,
         }
-        async with self.client.get(PREHANDLE_URL, params=du(const, data)) as r:
+        async with self.client.get(PREHANDLE_URL, params=data.update(const) or data) as r:
             r.raise_for_status()
             m = re.search(CALLBACK + r"\((\{.*\})\)", r.text)
 
@@ -189,11 +189,9 @@ class Captcha:
             # BUG: should always bypass client's proxy settings
             async with self.client.get("https://" + api) as r:
                 cand = r.text.strip()
-                try:
+                with suppress(ValueError):
                     IPv4Address(cand)
                     return cand
-                except ValueError:
-                    continue
         return ""
 
     async def get_captcha_problem(self, sess: TcaptchaSession):

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/up/encrypt.py

@@ -4,6 +4,7 @@ import base64
 import struct
 from abc import ABC, abstractmethod
 from binascii import hexlify
+from contextlib import suppress
 from hashlib import md5
 from random import randint
 from typing import Union
@@ -121,11 +122,9 @@ class TeaEncoder(PasswdEncoder):
         """
         e = []
         for i in range(0, len(s), 2):
-            try:
+            with suppress(ValueError):
                 e.append(int(s[i : i + 2], 16))
                 continue
-            except ValueError:
-                pass
             try:
                 e.append(int(s[i : i + 1], 16))
             except ValueError:

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/up/h5.py

@@ -4,7 +4,6 @@ import re
 from httpx import URL
 
 from qqqr.constant import StatusCode
-from qqqr.utils.daug import du
 
 from .type import CheckResp, LoginResp
 from .web import UpWebLogin, UpWebSession
@@ -93,7 +92,8 @@ class UpH5Login(UpWebLogin):
             data["pt_sms_code"] = sess.sms_code
         self.referer = "https://xui.ptlogin2.qq.com/"
 
-        async with self.client.get(LOGIN_URL, params=du(data, const)) as response:
+        data.update(const)
+        async with self.client.get(LOGIN_URL, params=data) as response:
             response.raise_for_status()
 
         rl = re.findall(r"'(.*?)'[,\)]", response.text)

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/up/web.py

@@ -13,7 +13,6 @@ from qqqr.event import Emittable
 from qqqr.event.login import UpEvent
 from qqqr.exception import TencentLoginError
 from qqqr.type import APPID, PT_QR_APP, Proxy
-from qqqr.utils.daug import du
 from qqqr.utils.net import ClientAdapter
 
 from .encrypt import PasswdEncoder, TeaEncoder
@@ -230,7 +229,8 @@ class UpWebLogin(LoginBase[UpWebSession], Emittable[UpEvent]):
             data["pt_sms_code"] = sess.sms_code
         self.referer = sess.login_referer
 
-        async with self.client.get(LOGIN_URL, params=du(data, const)) as response:
+        data.update(const)
+        async with self.client.get(LOGIN_URL, params=data) as response:
             response.raise_for_status()
 
         rl = re.findall(r"'(.*?)'[,\)]", response.text)

{aioqzone-0.13.0.dev1 → aioqzone-0.13.0.dev2}/src/qqqr/utils/iter.py

@@ -20,6 +20,10 @@ def first(
     it: Iterable[T], pred: Optional[Callable[[T], Union[object, None]]] = None, *, default: D = ...
 ) -> Union[T, D]:
     f = filter(pred, it)
-    if default == ...:
+    if default is ...:
         return next(f)
     return next(f, default)
+
+
+def firstn(it: Iterable[T], pred: Optional[Callable[[T], Union[object, None]]] = None):
+    return first(it, pred, default=None)

aioqzone-0.13.0.dev1/src/qqqr/utils/daug.py

@@ -1,25 +0,0 @@
-"""Augment python `dict` since we cannot use py37+ features...
-
-Maybe these are user-defined syntax-sugars?
-"""
-
-from itertools import chain
-from typing import Dict, Hashable, Iterable, Mapping, MutableMapping, Tuple, TypeVar
-
-K = TypeVar("K", bound=Hashable)
-V = TypeVar("V")
-
-
-def u_(*dicts: Mapping[K, V]) -> Iterable[Tuple[K, V]]:
-    return chain(*(i.items() for i in dicts))
-
-
-def du(*dicts: Mapping[K, V]) -> Dict[K, V]:
-    """returns union of these dict."""
-    return dict(u_(*dicts))
-
-
-def di(d: MutableMapping[K, V], **kw) -> MutableMapping[K, V]:
-    """insert kw into this dict."""
-    d.update(**kw)
-    return d