aioqzone 1.7.5.dev1__tar.gz → 1.8.1.dev1__tar.gz

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.7.5.dev1
+Version: 1.8.1.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -19,17 +19,15 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Provides-Extra: captcha
+Provides-Extra: slide-captcha
 Requires-Dist: aiohttp (>=3.8.5,<4.0.0)
-Requires-Dist: cssselect (>=1.1.0,<2.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
-Requires-Dist: lxml (>=4.9.1,<5.0.0)
 Requires-Dist: pillow (>=10.0.1,<11.0.0)
-Requires-Dist: pychaosvm (>=0.3.2,<0.4.0)
+Requires-Dist: pychaosvm (>=0.3.3,<0.4.0)
 Requires-Dist: pydantic (>=2.0.3,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.0.2,<3.0.0)
 Requires-Dist: rsa (>=4.8,<5.0)
-Requires-Dist: slide-tc (>=0.1.1,<0.2.0) ; extra == "captcha"
+Requires-Dist: slide-tc (>=0.1.1,<0.2.0) ; extra == "slide-captcha"
 Requires-Dist: tenacity (>=8.2.3,<9.0.0)
 Requires-Dist: tylisten (>=2.1.3,<3.0.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.7.5.dev1"
+version = "1.8.1.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -32,17 +32,15 @@ aiohttp = "^3.8.5"
 pydantic = "^2.0.3"
 pydantic-settings = "^2.0.2"
 rsa = "^4.8"
-lxml = "^4.9.1"
-cssselect = "^1.1.0"
 tenacity = "^8.2.3"
 exceptiongroup = "^1.1.1"
 tylisten = "^2.1.3"
 pillow = "^10.0.1"
-pychaosvm = { version = "~0.3.2", source = "aioqzone-index" }
+pychaosvm = { version = "~0.3.3", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
-captcha = ["slide-tc"]
+slide-captcha = ["slide-tc"]
 
 # dependency groups
 [tool.poetry.group.test]

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/src/aioqzone/api/h5/model.py

@@ -95,7 +95,7 @@ class QzoneH5API:
         :raise `RuntimeError`: if any failure occurs in data parsing.
         """
 
-        r = await self.call(IndexPageApi(response=IndexPageResp, attach_token=False))
+        r = await self.call(IndexPageApi())
         self.qzone_tokens[self.login.uin] = r.qzonetoken
         log.debug(f"qzonetoken[{self.login.uin}] = {r.qzonetoken}")
         return r
@@ -106,12 +106,7 @@ class QzoneH5API:
         :param hostuin: uin of the user
         :param start_time: timestamp in seconds, default as current time.
         """
-        r = await self.call(
-            UserProfileApi(
-                params=ProfileParams(hostuin=hostuin, starttime=int(1e3 * start_time)),
-                response=ProfilePagePesp,
-            )
-        )
+        r = await self.call(UserProfileApi(params=ProfileParams.model_validate(locals())))
         self.qzone_tokens[hostuin] = r.qzonetoken
         log.debug(f"qzonetoken[{hostuin}] = {r.qzonetoken}")
         return r
@@ -127,90 +122,57 @@ class QzoneH5API:
         if not self.qzone_tokens.get(self.login.uin) or not attach_info:
             return await self.index()
 
-        return await self.call(
-            FeedPageApi(
-                params=ActiveFeedsParams(attach_info=attach_info),
-                response=FeedPageResp,
-            )
-        )
+        return await self.call(FeedPageApi(params=ActiveFeedsParams.model_validate(locals())))
 
-    async def get_feeds(self, uin: int, attach_info: t.Optional[str] = None) -> ProfileResp:
+    async def get_feeds(self, hostuin: int, attach_info: t.Optional[str] = None) -> ProfileResp:
         """Get next page of the given :obj:`uin`.
         If :obj:`.qzone_tokens` has not cached qzonetoken of given :obj:`uin` or :obj:`attach_info` is empty,
         it will call :meth:`.profile` and return its :obj:`~ProfileResp.feedpage` field.
 
-        :param uin: uin of the user
+        :param hostuin: uin of the user
         :param attach_info: The ``attach_info`` field from last call.
             Pass an empty string equals to call :meth:`.index`.
         :return: If success, the ``data`` field of the response.
         """
-        if not self.qzone_tokens.get(uin) or not attach_info:
-            return (await self.profile(uin)).feedpage
+        if not self.qzone_tokens.get(hostuin) or not attach_info:
+            return (await self.profile(hostuin)).feedpage
 
-        return await self.call(
-            GetFeedsApi(
-                params=GetFeedsParams(
-                    hostuin=uin,
-                    res_attach=attach_info,
-                ),
-                response=ProfileResp,
-            )
-        )
+        return await self.call(GetFeedsApi(params=GetFeedsParams.model_validate(locals())))
 
     async def shuoshuo(self, fid: str, uin: int, appid=311, busi_param: str = "") -> DetailResp:
         """This can be used to get the detailed summary of a feed.
 
-        :param fid: aka. ``cellid``
-        :param hostuin: uin of the owner of the given feed
-        :param appid: appid of the given feed, default as 311
+        :param fid: :term:`fid`
+        :param uin: uin of the owner of the given feed
+        :param appid: :term:`appid`
         :param busi_param: optional encoded params
         """
-        return await self.call(
-            ShuoshuoApi(
-                params=ShuoshuoParams(fid=fid, uin=uin, appid=appid, busi_param=busi_param),
-                response=DetailResp,
-            )
-        )
+        return await self.call(ShuoshuoApi(params=ShuoshuoParams.model_validate(locals())))
 
     async def mfeeds_get_count(self) -> FeedCount:
         """Get new feeds count. This is also the "keep-alive" signal of the cookie."""
-        return await self.call(
-            GetCountApi(params=GetCountParams(), response=FeedCount),
-        )
+        return await self.call(GetCountApi())
 
     async def internal_dolike_app(
         self, appid: int, unikey: str, curkey: str, like=True
     ) -> SingleReturnResp:
         """Like or unlike."""
-        if like:
-            path = "/proxy/domain/w.qzone.qq.com/cgi-bin/likes/internal_dolike_app"
-        else:
-            path = "/proxy/domain/w.qzone.qq.com/cgi-bin/likes/internal_unlike_app"
+        cls = LikeApi if like else UnlikeApi
 
-        return await self.call(
-            DoLikeApi(
-                path=path,
-                params=DolikeParam(appid=appid, unikey=unikey, curkey=curkey),
-                response=SingleReturnResp,
-            )
-        )
+        return await self.call(cls(params=DolikeParam.model_validate(locals())))
 
     async def add_comment(
-        self, owner_uin: int, fid: str, appid: int, content: str, private=False
+        self, ownuin: int, fid: str, appid: int, content: str, private=False
     ) -> AddCommentResp:
-        """Comment a feed."""
-        return await self.call(
-            AddCommentApi(
-                params=AddCommentParams(
-                    ownuin=owner_uin,
-                    fid=fid,
-                    private=private,
-                    content=content,
-                    appid=appid,
-                ),
-                response=AddCommentResp,
-            )
-        )
+        """Comment a feed.
+
+        :param ownuin: Feed owner uin
+        :param fid: :term:`fid`
+        :param appid: :term:`appid`
+        :param content: comment content
+        :param private: is private comment
+        """
+        return await self.call(AddCommentApi(params=AddCommentParams.model_validate(locals())))
 
     async def publish_mood(
         self,
@@ -219,17 +181,15 @@ class QzoneH5API:
         sync_weibo=False,
         ugc_right: UgcRight = UgcRight.all,
     ) -> PublishMoodResp:
-        return await self.call(
-            PublishMoodApi(
-                params=PublishMoodParams(
-                    content=content,
-                    photos=photos or [],
-                    issyncweibo=sync_weibo,
-                    ugc_right=ugc_right,
-                ),
-                response=PublishMoodResp,
-            )
-        )
+        """Publish a feed.
+
+        :param content: feed content
+        :param photos:
+        :param sync_weibo: sync to weibo, default to false
+        :param ugc_right: access right, default to "Available to Everyone".
+        """
+        photos = photos or []
+        return await self.call(PublishMoodApi(params=PublishMoodParams.model_validate(locals())))
 
     async def upload_pic(
         self, picture: bytes, width: int, height: int, quality: int
@@ -242,29 +202,26 @@ class QzoneH5API:
                     hd_height=height,
                     hd_quality=quality,
                 ),
-                response=UploadPicResponse,
             )
         )
 
     async def preupload_photos(
-        self, photos: t.List[UploadPicResponse], cur_num=0, hd=False
+        self, upload_pics: t.List[UploadPicResponse], cur_num=0, upload_hd=False
     ) -> PhotosPreuploadResponse:
-        assert photos
+        assert upload_pics
         return await self.call(
-            PhotosPreuploadApi(
-                params=PhotosPreuploadParams(
-                    upload_pics=photos,
-                    currnum=cur_num,
-                    upload_hd=int(hd),
-                ),
-                response=PhotosPreuploadResponse,
-            )
+            PhotosPreuploadApi(params=PhotosPreuploadParams.model_validate(locals()))
         )
 
     async def delete_ugc(self, fid: str, appid: int) -> DeleteUgcResp:
+        """Delete a feed.
+
+        :param fid: :term:`fid`
+        :param appid: :term:`appid`
+        """
         return await self.call(
             AddOperationApi(
-                params=DeleteUgcParams(fid=fid, appid=appid),
+                params=DeleteUgcParams.model_validate(locals()),
                 response=DeleteUgcResp,
             )
         )

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/src/aioqzone/model/api/__init__.py

@@ -14,15 +14,15 @@ TyHttpMethod = t.Union[t.Literal["GET"], t.Literal["POST"]]
 class QzoneApi(BaseModel, t.Generic[TyRequest, TyResponse]):
     host: t.ClassVar[str] = "https://h5.qzone.qq.com"
     http_method: t.ClassVar[TyHttpMethod]
-    path: str
+    path: t.ClassVar[str]
 
-    keep_alive: bool = True
-    accept: t.Optional[str] = None
+    keep_alive: t.ClassVar[bool] = True
+    accept: t.ClassVar[t.Optional[str]] = None
     referer: str = "https://h5.qzone.qq.com/"
 
-    attach_token: bool = True
+    attach_token: t.ClassVar[bool] = True
     params: TyRequest = Field(default_factory=QzoneRequestParams)
-    response: t.Type[TyResponse]
+    response: t.ClassVar[t.Type[TyResponse]]  # type: ignore
 
     @property
     def url(self) -> URL:
@@ -30,47 +30,62 @@ class QzoneApi(BaseModel, t.Generic[TyRequest, TyResponse]):
 
 
 class IndexPageApi(QzoneApi[QzoneRequestParams, IndexPageResp]):
+    response: t.ClassVar = IndexPageResp
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     path: t.ClassVar[str] = "/mqzone/index"
-    keep_alive: bool = False
-    attach_token: bool = False
+    keep_alive: t.ClassVar[bool] = False
+    attach_token: t.ClassVar[bool] = False
 
 
 class UserProfileApi(QzoneApi[ProfileParams, ProfilePagePesp]):
+    response: t.ClassVar = ProfilePagePesp
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     path: t.ClassVar[str] = "/mqzone/profile"
-    keep_alive: bool = False
-    attach_token: bool = False
+    keep_alive: t.ClassVar[bool] = False
+    attach_token: t.ClassVar[bool] = False
 
 
 class FeedPageApi(QzoneApi[ActiveFeedsParams, FeedPageResp]):
+    response: t.ClassVar = FeedPageResp
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     path: t.ClassVar[str] = "/webapp/json/mqzone_feeds/getActiveFeeds"
 
 
 class ShuoshuoApi(QzoneApi[ShuoshuoParams, DetailResp]):
+    response: t.ClassVar = DetailResp
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     path: t.ClassVar[str] = "/webapp/json/mqzone_detail/shuoshuo"
 
 
 class GetFeedsApi(QzoneApi[GetFeedsParams, ProfileResp]):
+    response: t.ClassVar = ProfileResp
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "/get_feeds"
 
 
 class GetCountApi(QzoneApi[GetCountParams, FeedCount]):
+    response: t.ClassVar = FeedCount
+    params: GetCountParams = Field(default_factory=GetCountParams)
+
     http_method: t.ClassVar[TyHttpMethod] = "GET"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "/feeds/mfeeds_get_count"
-    accept: str = "application/json"
+    accept: t.ClassVar[str] = "application/json"
 
 
-class DoLikeApi(QzoneApi[DolikeParam, SingleReturnResp]):
+class LikeApi(QzoneApi[DolikeParam, SingleReturnResp]):
+    response: t.ClassVar = SingleReturnResp
     http_method: t.ClassVar[TyHttpMethod] = "POST"
+    path: t.ClassVar[str] = "/proxy/domain/w.qzone.qq.com/cgi-bin/likes/internal_dolike_app"
+
+
+class UnlikeApi(LikeApi):
+    path: t.ClassVar[str] = "/proxy/domain/w.qzone.qq.com/cgi-bin/likes/internal_unlike_app"
 
 
 class AddCommentApi(QzoneApi[AddCommentParams, AddCommentResp]):
+    response: t.ClassVar = AddCommentResp
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     path: t.ClassVar[str] = "/webapp/json/qzoneOperation/addComment"
 
@@ -82,24 +97,28 @@ class ListFriendApi(QzoneApi):
 
 
 class PublishMoodApi(QzoneApi[PublishMoodParams, PublishMoodResp]):
+    response: t.ClassVar = PublishMoodResp
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "/mood/publish_mood"
 
 
 class AddOperationApi(QzoneApi):
+    response: t.Type[QzoneResponse]
     http_method: t.ClassVar[TyHttpMethod] = "POST"
     host: t.ClassVar[str] = "https://mobile.qzone.qq.com"
     path: t.ClassVar[str] = "operation/operation_add"
 
 
 class UploadPicApi(QzoneApi[UploadPicParams, UploadPicResponse]):
+    response: t.ClassVar = UploadPicResponse
     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 PhotosPreuploadApi(QzoneApi[PhotosPreuploadParams, PhotosPreuploadResponse]):
+    response: t.ClassVar = 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"

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/src/aioqzone/model/api/request.py

@@ -48,7 +48,7 @@ class ActiveFeedsParams(QzoneRequestParams):
 
 class GetFeedsParams(QzoneRequestParams):
     hostuin: int
-    res_attach: str = ""
+    attach_info: str = Field(default="", serialization_alias="res_attach")
 
     res_type: int = 2
     refresh_type: int = 2
@@ -57,9 +57,13 @@ class GetFeedsParams(QzoneRequestParams):
 
 class ProfileParams(QzoneRequestParams):
     hostuin: int
-    starttime: int = 0
+    start_time: float = Field(default=0, serialization_alias="starttime")
     ts_fields = ("starttime",)
 
+    @field_serializer("start_time")
+    def ms(self, start_time: float):
+        return int(1e3 * start_time)
+
 
 class ShuoshuoParams(QzoneRequestParams):
     fid: str = Field(serialization_alias="cellid")
@@ -132,7 +136,9 @@ class PublishMoodParams(QzoneRequestParams):
     uin_fields = ("res_uin",)
     content: str = Field(min_length=1, max_length=2000)
     photos: t.List[PhotoData] = Field(default_factory=list, serialization_alias="richval")
-    issyncweibo: int = Field(default=False, validate_default=True)
+    sync_weibo: int = Field(
+        default=False, validate_default=True, serialization_alias="issyncweibo"
+    )
     ugc_right: UgcRight = UgcRight.all
 
     opr_type: str = "publish_shuoshuo"
@@ -179,7 +185,7 @@ class PhotosPreuploadParams(QzoneRequestParams):
     uin_fields = ("uin",)
     upload_pics: t.List[UploadPicResponse] = Field(exclude=True)
 
-    currnum: int = 0
+    cur_num: int = Field(default=0, serialization_alias="currnum")
     upload_hd: int = 0
 
     # defaults

{aioqzone-1.7.5.dev1 → aioqzone-1.8.1.dev1}/src/aioqzone/model/api/response.py

@@ -11,11 +11,13 @@ from typing_extensions import Self
 from aioqzone.exception import QzoneError
 from aioqzone.utils.regex import entire_closing, response_callback
 from qqqr.utils.iter import firstn
-from qqqr.utils.jsjson import json_loads
+from qqqr.utils.jsjson import JsonValue, json_loads
 
 from .feed import FeedData
 from .profile import ProfileFeedData, QzoneProfile
 
+StrDict = t.Dict[str, JsonValue]
+
 __all__ = [
     "QzoneResponse",
     "FeedPageResp",
@@ -34,11 +36,6 @@ __all__ = [
     "ProfileFeedData",
 ]
 
-if t.TYPE_CHECKING:
-    from qqqr.utils.jsjson import JsonValue
-
-    StrDict = t.Dict[str, JsonValue]
-
 
 class QzoneResponse(BaseModel):
     _errno_key: t.ClassVar[t.Union[str, AliasPath, AliasChoices, None]] = AliasChoices(