aioqzone 1.9.8.dev1__tar.gz → 1.10.2.dev1__tar.gz

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioqzone
-Version: 1.9.8.dev1
+Version: 1.10.2.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone
@@ -15,12 +15,12 @@ Requires-Dist: pydantic-settings>=2.9.0
 Requires-Dist: rsa>=4.9.1
 Requires-Dist: tenacity>=8.2.3,<10.0.0
 Requires-Dist: tylisten>=2.2.1
-Requires-Dist: pillow>=11.3.0
+Requires-Dist: pillow>=13.0.0
 Requires-Dist: pychaosvm~=0.5.4
 Requires-Dist: slide-tc~=0.1.4 ; extra == 'slide-captcha'
 Maintainer: JamzumSum
 Maintainer-email: JamzumSum <22952836+JamzumSum@users.noreply.github.com>
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Project-URL: Homepage, https://github.com/aioqzone/aioqzone
 Project-URL: Repository, https://github.com/aioqzone/aioqzone
 Project-URL: Documentation, https://aioqzone.github.io/aioqzone

aioqzone-1.10.2.dev1/pyproject.toml

@@ -0,0 +1,102 @@
+[project]
+name = "aioqzone"
+version = "1.10.2.dev1"
+description = "A Python wrapper for Qzone login and H5 APIs."
+license = "AGPL-3.0-or-later"
+readme = "README.md"
+requires-python = ">=3.11"
+keywords = [
+    "qzone-api",
+    "autologin",
+    "asyncio-spider",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Typing :: Typed",
+]
+dependencies = [
+    "aiohttp~=3.14",
+    "pydantic~=2.12",
+    "pydantic-settings>=2.9.0",
+    "rsa>=4.9.1",
+    "tenacity>=8.2.3,<10.0.0",
+    "tylisten>=2.2.1",
+    "pillow>=13.0.0",
+    "pychaosvm~=0.5.4",
+]
+
+[[project.authors]]
+name = "aioqzone"
+
+[[project.maintainers]]
+name = "JamzumSum"
+email = "22952836+JamzumSum@users.noreply.github.com"
+
+[project.urls]
+Homepage = "https://github.com/aioqzone/aioqzone"
+Repository = "https://github.com/aioqzone/aioqzone"
+Documentation = "https://aioqzone.github.io/aioqzone"
+"Bug Tracker" = "https://github.com/aioqzone/aioqzone/issues"
+Discussion = "https://t.me/aioqzone_chatroom"
+
+[project.optional-dependencies]
+slide-captcha = ["slide-tc~=0.1.4"]
+
+[dependency-groups]
+test = [
+    "pytest>=9.0.3",
+    "pytest-asyncio~=1.1",
+]
+dev = [
+    "pre-commit",
+    "ruff",
+    "ty",
+]
+doc = [
+    "Sphinx~=9.0",
+    "autodoc-pydantic>=2.2.0",
+    "sphinx-autodoc-typehints~=3.0",
+    "furo",
+    "sphinx-intl",
+    "sphinx-inline-tabs",
+]
+
+[tool.uv]
+prerelease = "if-necessary-or-explicit"
+
+[tool.uv.sources.pychaosvm]
+index = "aioqzone-index"
+
+[tool.uv.sources.slide-tc]
+index = "aioqzone-index"
+
+[[tool.uv.index]]
+name = "aioqzone-index"
+url = "https://aioqzone.github.io/aioqzone-index/simple/"
+
+[tool.uv.build-backend]
+module-name = [
+    "aioqzone",
+    "qqqr",
+]
+
+[tool.pytest.ini_options]
+pythonpath = "src"
+log_cli = true
+log_cli_level = "WARNING"
+asyncio_default_fixture_loop_scope = "module"
+
+[tool.ruff]
+line-length = 99
+
+[tool.ruff.lint]
+ignore = [
+    "F403",
+    "F405",
+]
+
+[build-system]
+requires = ["uv_build"]
+build-backend = "uv_build"

aioqzone-1.9.8.dev1/pyproject.toml → aioqzone-1.10.2.dev1/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "aioqzone"
-version = "1.9.8.dev1"
+version = "1.10.2.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = [{ name = "aioqzone" }]
 maintainers = [
@@ -8,7 +8,7 @@ maintainers = [
 ]
 license = "AGPL-3.0-or-later"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 keywords = ["qzone-api", "autologin", "asyncio-spider"]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -25,7 +25,7 @@ dependencies = [
     "tenacity>=8.2.3,<10.0.0",
     # "exceptiongroup>=1.1.1",
     "tylisten>=2.2.1",
-    "pillow>=11.3.0",
+    "pillow>=13.0.0",
     "pychaosvm~=0.5.4",
 ]
 
@@ -37,15 +37,14 @@ Documentation = "https://aioqzone.github.io/aioqzone"
 "Discussion" = "https://t.me/aioqzone_chatroom"
 
 [dependency-groups]
-test = ["pytest>=9.0.3", "pytest-asyncio>=1.1,<1.4"]
+test = ["pytest>=9.0.3", "pytest-asyncio~=1.1"]
 dev = [
     "pre-commit",
     "ruff",
     "ty",
 ]
 doc = [
-    "Sphinx>=8.1.3; python_version=='3.10'",
-    "Sphinx~=9.0; python_version>='3.11'",
+    "Sphinx~=9.0",
     "autodoc-pydantic>=2.2.0",
     "sphinx-autodoc-typehints~=3.0",
     "furo",

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/aioqzone/api/h5/model.py

@@ -410,3 +410,29 @@ class QzoneH5API:
                 params=SetTopParams.model_validate(locals()),
             )
         )
+
+    async def get_visitor(self, page: int = 1) -> VisitorResp:
+        """Get today / total visitor count.
+
+        :param page: page number
+
+        .. note::
+
+           Contributed by hexadecimal233.
+        """
+        return await self.call(VisitorApi(params=VisitorParams.model_validate(locals())))
+
+    async def get_message_board(
+        self, hostUin: int, num: int = 10, start: int = 0
+    ) -> MessageBoardResp:
+        """Get message board messages.
+
+        :param hostUin: QQ of the profile owner
+        :param num: number of messages to fetch
+        :param start: start offset
+
+        .. note::
+
+           Contributed by hexadecimal233.
+        """
+        return await self.call(MessageBoardApi(params=MessageBoardParams.model_validate(locals())))

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/aioqzone/api/login/__init__.py

@@ -8,7 +8,14 @@ import logging
 import typing as t
 
 from aiohttp import ClientError
-from tenacity import TryAgain, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
+from tenacity import (
+    RetryCallState,
+    TryAgain,
+    retry,
+    retry_if_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
 from tylisten import FutureStore
 from typing_extensions import Self
 
@@ -31,6 +38,20 @@ __all__ = [
 ]
 
 
+def _reraise_last_attempt(retry_state: RetryCallState) -> t.NoReturn:
+    """Re-raise the last attempt exception instead of tenacity's ``RetryError``.
+
+    tenacity >= 9.2.1 unwraps ``TryAgain`` to its cause when ``reraise=True``,
+    which would surface the underlying ``ClientError`` (or ``GeneratorExit``)
+    rather than the documented :exc:`TryAgain`. Re-raising the attempt's own
+    exception keeps the public contract stable across tenacity versions.
+    """
+    outcome = retry_state.outcome
+    if outcome is None:
+        raise RuntimeError("retry outcome is unexpectedly None")
+    raise outcome.result()
+
+
 @t.final
 class ConstLoginMan(Loginable):
     """A basic login manager which uses external provided cookie."""
@@ -99,7 +120,7 @@ class UpLoginManager(Loginable):
         stop=stop_after_attempt(2),
         wait=wait_exponential(min=1, max=6),
         retry=retry_if_exception_type(TryAgain),
-        reraise=True,
+        retry_error_callback=_reraise_last_attempt,
     )
     async def _new_cookie(self) -> t.Dict[str, str]:
         """

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/aioqzone/model/api/__init__.py

@@ -197,3 +197,16 @@ class SetTopApi(QzoneApi[SetTopParams, SingleReturnResp]):
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     host: t.ClassVar[str] = "user.qzone.qq.com"
     path: t.ClassVar[str] = "proxy/domain/ic2.qzone.qq.com/cgi-bin/feeds/cgi_settopfeed"
+
+
+class VisitorApi(QzoneApi[VisitorParams, VisitorResp]):
+    response: t.ClassVar = VisitorResp
+    http_method: t.ClassVar[TyHttpMethod] = "GET"
+    path: t.ClassVar[str] = "/proxy/domain/g.qzone.qq.com/cgi-bin/friendshow/cgi_get_visitor_more"
+
+
+class MessageBoardApi(QzoneApi[MessageBoardParams, MessageBoardResp]):
+    response: t.ClassVar = MessageBoardResp
+    http_method: t.ClassVar[TyHttpMethod] = "GET"
+    host: t.ClassVar[str] = "https://user.qzone.qq.com"
+    path: t.ClassVar[str] = "/proxy/domain/m.qzone.qq.com/cgi-bin/new/get_msgb"

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/aioqzone/model/api/request.py

@@ -39,6 +39,8 @@ __all__ = [
     "UgcRight",
     "PhotoData",
     "SetTopParams",
+    "VisitorParams",
+    "MessageBoardParams",
 ]
 
 
@@ -320,3 +322,18 @@ class SetTopParams(QzoneRequestParams):
     @field_serializer("set_top", return_type=str)
     def serialize_set_top(self, set_top: bool) -> str:
         return "set" if set_top else "cancel"
+
+
+class VisitorParams(QzoneRequestParams):
+    uin_fields = ("uin",)
+    mask: int = 7
+    page: int = 1
+    fupdate: int = 1
+    clear: int = 1
+
+
+class MessageBoardParams(QzoneRequestParams):
+    uin_fields = ("uin",)
+    hostUin: int
+    num: int = 10
+    start: int = 0

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/aioqzone/model/api/response.py

@@ -15,6 +15,7 @@ from pydantic import (
     AliasChoices,
     AliasPath,
     BaseModel,
+    ConfigDict,
     Field,
     HttpUrl,
     TypeAdapter,
@@ -55,6 +56,14 @@ __all__ = [
     "PicInfo",
     "ProfileFeedData",
     "AvatarResponse",
+    "VisitorResp",
+    "VisitorUser",
+    "VisitorItem",
+    "ShuoshuoSnapshot",
+    "ReplyItem",
+    "CommentListItem",
+    "AuthorInfo",
+    "MessageBoardResp",
 ]
 
 validate_strdict = TypeAdapter(StrDict).validate_python
@@ -361,3 +370,110 @@ class AvatarResponse(QzoneResponse):
     @classmethod
     async def response_to_object(cls, response: ClientResponse) -> "StrDict":
         return {"avatar": await response.content.read()}
+
+
+class VisitorUser(BaseModel):
+    uin: int
+    src: int
+    platform_src: int
+    service_src: int
+    time: int
+    hide_from: int
+    is_hide_visit: int
+    name: str
+    yellow: int = -1
+    supervip: int = 0
+
+
+class ShuoshuoSnapshot(BaseModel):
+    model_config = ConfigDict(union_mode="left_to_right")
+
+    id: str
+    src: int
+    platform_src: int
+    service_src: int
+    vtime: int
+    url: t.Union[HttpUrl, str]
+    imgsrc: t.Union[HttpUrl, str]
+    name: str
+
+
+class VisitorItem(BaseModel):
+    uin: int
+    src: int
+    platform_src: int
+    service_src: int
+    time: int
+    hide_from: int
+    is_hide_visit: int
+    name: str
+    yellow: int = -1
+    supervip: int = 0
+    uins: t.List[VisitorUser] = []
+    shuoshuoes: t.List[ShuoshuoSnapshot] = []
+
+
+class VisitorResp(QzoneResponse):
+    Ishost: int = 0
+    page: int = 1
+    totalpage: int = 1
+    todaycount: int = 0
+    totalcount: int = 0
+    noright_todaycount: int = 0
+    noright_totalcount: int = 0
+    items: t.List[VisitorItem] = []
+
+    @classmethod
+    async def response_to_object(cls, response: ClientResponse) -> StrDict:
+        m = response_callback.search(await response.text())
+        if not m:
+            raise TryAgain("VisitorResp: callback not found")
+        return validate_strdict(json_loads(m.group(1)))
+
+
+class ReplyItem(BaseModel):
+    content: str
+    uin: int
+    time: int
+    nick: str
+
+
+class CommentListItem(BaseModel):
+    id: str
+    secret: int
+    pasterid: str
+    bmp: str
+    pubtime: str
+    modifytime: int
+    effect: int
+    type: int
+
+    uin: t.Optional[int] = None
+    nickname: t.Optional[str] = None
+    capacity: t.Optional[int] = None
+    htmlContent: t.Optional[str] = None
+    ubbContent: t.Optional[str] = None
+    signature: t.Optional[str] = None
+    replyList: t.Optional[t.List[ReplyItem]] = Field(default_factory=list)
+
+
+class AuthorInfo(BaseModel):
+    msg: str = ""
+    htmlMsg: str = ""
+    sign: str = ""
+
+
+class MessageBoardResp(QzoneResponse):
+    auditNum: t.Optional[int] = None
+    auditON: t.Optional[int] = None
+
+    total: int
+    authorInfo: AuthorInfo = Field(default_factory=AuthorInfo)
+    commentList: t.List[CommentListItem] = Field(default_factory=list)
+
+    @classmethod
+    async def response_to_object(cls, response: ClientResponse) -> StrDict:
+        m = response_callback.search(await response.text())
+        if not m:
+            raise TryAgain("MessageBoardResp: callback not found")
+        return validate_strdict(json_loads(m.group(1)))

{aioqzone-1.9.8.dev1 → aioqzone-1.10.2.dev1}/src/qqqr/utils/jsjson.py

@@ -41,10 +41,11 @@ class AstLoader:
         :return: A :obj:`JsonValue` object.
         """
         js = dedent(js).replace(r"\/", "/")
-        node = ast.parse(js, mode="eval")
+        node = ast.parse(js, filename=filename, mode="eval")
         node = ast.fix_missing_locations(cls.RewriteUndef().visit(node))
-        code = compile(node, filename, mode="eval")
-        return eval(code)
+        # Parse as a data literal only. Never compile/eval the input: it comes from
+        # remote responses and must not be executed as Python code.
+        return ast.literal_eval(node)
 
 
 def json_loads(js: str) -> JsonValue: