aioqzone 1.9.2.dev2__tar.gz → 1.9.3.dev1__tar.gz

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: aioqzone
-Version: 1.9.2.dev2
+Version: 1.9.3.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 License: AGPL-3.0
 Keywords: qzone-api,autologin,asyncio-spider
@@ -22,7 +22,7 @@ Provides-Extra: slide-captcha
 Requires-Dist: aiohttp (>=3.9.0,<4.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
 Requires-Dist: pillow (>=10.1.0,<11.0.0)
-Requires-Dist: pychaosvm (>=0.4.1,<0.5.0)
+Requires-Dist: pychaosvm (>=0.4.3,<0.5.0)
 Requires-Dist: pydantic (>=2.5.0,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.2.0,<3.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.9.2.dev2"
+version = "1.9.3.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <22952836+JamzumSum@users.noreply.github.com>"]
 license = "AGPL-3.0"
@@ -36,7 +36,7 @@ tenacity = ">=8.2.3,<10.0.0"
 exceptiongroup = "^1.1.1"
 tylisten = "^2.1.4"
 pillow = "^10.1.0"
-pychaosvm = { version = "~0.4.1", source = "aioqzone-index" }
+pychaosvm = { version = "~0.4.3", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/src/aioqzone/api/h5/model.py

@@ -61,13 +61,15 @@ class QzoneH5API:
 
         async for attempt in self._relogin_retry:
             with attempt:
-                if (gtk := self.login.gtk) == 0:
-                    raise TryAgain("no login state")
-                if api.attach_token:
-                    params["g_tk"] = gtk
-                    hostuin: int = getattr(api.params, "hostuin", self.login.uin)
-                    if qzonetoken := self.qzone_tokens.get(hostuin):
-                        params["qzonetoken"] = qzonetoken
+                if api.login_required:
+                    if (gtk := self.login.gtk) == 0:
+                        raise TryAgain("no login state")
+
+                    if api.attach_token:
+                        params["g_tk"] = gtk
+                        hostuin: int = getattr(api.params, "hostuin", self.login.uin)
+                        if qzonetoken := self.qzone_tokens.get(hostuin):
+                            params["qzonetoken"] = qzonetoken
 
                 async with self.client.request(
                     api.http_method,
@@ -252,3 +254,15 @@ class QzoneH5API:
                 response=DeleteUgcResp,
             )
         )
+
+    async def avatar(self, hostuin: int, size: t.Literal[100, 640]) -> AvatarResponse:
+        """Get avatar from uin. Do not require login.
+
+        :param hostuin: the uin whose avatar to be get
+        :param size: availible sizes: `100`|`640`
+        """
+        return await self.call(
+            AvatarApi(
+                params=AvatarParams.model_validate(locals()),
+            ),
+        )

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/src/aioqzone/model/api/__init__.py

@@ -23,12 +23,13 @@ class QzoneApi(BaseModel, t.Generic[TyRequest, TyResponse]):
     referer: str = "https://h5.qzone.qq.com/"
 
     attach_token: t.ClassVar[bool] = True
+    login_required: t.ClassVar[bool] = True
     params: TyRequest = Field(default_factory=QzoneRequestParams)
     response: t.ClassVar[t.Type[TyResponse]]  # type: ignore
 
     @property
     def url(self) -> URL:
-        return URL(str(self.host)).with_path(self.path)
+        return URL(str(self.host)).with_path(self.path.format(**self.params.model_dump()))
 
 
 class IndexPageApi(QzoneApi[QzoneRequestParams, IndexPageResp]):
@@ -124,3 +125,11 @@ class PhotosPreuploadApi(QzoneApi[PhotosPreuploadParams, PhotosPreuploadResponse
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "/up/cgi-bin/upload/cgi_upload_pic_v2"
+
+
+class AvatarApi(QzoneApi[AvatarParams, AvatarResponse]):
+    response: t.ClassVar = AvatarResponse
+    login_required: t.ClassVar[bool] = False
+    http_method: t.ClassVar[TyHttpMethod] = "GET"
+    host: t.ClassVar[str] = "https://qlogo2.store.qq.com"
+    path: t.ClassVar[str] = "/qzone/{hostuin}/{hostuin}/{size}"

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/src/aioqzone/model/api/request.py

@@ -16,6 +16,7 @@ from .response import PicInfo, UploadPicResponse
 __all__ = [
     "QzoneRequestParams",
     "ActiveFeedsParams",
+    "AvatarParams",
     "GetFeedsParams",
     "ProfileParams",
     "ShuoshuoParams",
@@ -241,3 +242,8 @@ class PhotosPreuploadParams(QzoneRequestParams):
 
         params.update(md5="|".join(md5), filelen="|".join(size))
         return params
+
+
+class AvatarParams(QzoneRequestParams):
+    hostuin: int
+    size: t.Literal[100, 640] = 100

{aioqzone-1.9.2.dev2 → aioqzone-1.9.3.dev1}/src/aioqzone/model/api/response.py

@@ -44,6 +44,7 @@ __all__ = [
     "FeedData",
     "PicInfo",
     "ProfileFeedData",
+    "AvatarResponse",
 ]
 
 validate_strdict = TypeAdapter(StrDict).validate_python
@@ -288,3 +289,15 @@ class PhotosPreuploadResponse(QzoneResponse):
         picinfos = json_loads(m.group(1))
         assert isinstance(picinfos, list)
         return dict(photos=[PicInfo.from_response_object(info["picinfo"]) for info in picinfos])  # type: ignore
+
+
+class AvatarResponse(QzoneResponse):
+    _errno_key = None
+    _msg_key = None
+    _data_key = None
+
+    avatar: bytes
+
+    @classmethod
+    async def response_to_object(cls, response: ClientResponse) -> "StrDict":
+        return {"avatar": await response.content.read()}