aioqzone 1.8.4.dev3__tar.gz → 1.8.6.dev1__tar.gz

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.4.dev3
+Version: 1.8.6.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
@@ -20,16 +20,16 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Provides-Extra: slide-captcha
-Requires-Dist: aiohttp (>=3.8.5,<4.0.0)
+Requires-Dist: aiohttp (>=3.9.0,<4.0.0)
 Requires-Dist: exceptiongroup (>=1.1.1,<2.0.0)
-Requires-Dist: pillow (>=10.0.1,<11.0.0)
-Requires-Dist: pychaosvm (>=0.3.4,<0.5.0)
-Requires-Dist: pydantic (>=2.0.3,<3.0.0)
-Requires-Dist: pydantic-settings (>=2.0.2,<3.0.0)
+Requires-Dist: pillow (>=10.1.0,<11.0.0)
+Requires-Dist: pychaosvm (>=0.4.0,<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)
 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)
+Requires-Dist: tenacity (>=8.2.3,<10.0.0)
+Requires-Dist: tylisten (>=2.1.4,<3.0.0)
 Project-URL: Bug Tracker, https://github.com/aioqzone/aioqzone/issues
 Project-URL: Documentation, https://aioqzone.github.io/aioqzone
 Project-URL: Discussion, https://t.me/aioqzone_chatroom

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.4.dev3"
+version = "1.8.6.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -28,15 +28,15 @@ exclude = ["*.js"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-aiohttp = "^3.8.5"
-pydantic = "^2.0.3"
-pydantic-settings = "^2.0.2"
+aiohttp = "^3.9.0"
+pydantic = "^2.5.0"
+pydantic-settings = "^2.2.0"
 rsa = "^4.8"
-tenacity = "^8.2.3"
+tenacity = ">=8.2.3,<10.0.0"
 exceptiongroup = "^1.1.1"
-tylisten = "^2.1.3"
-pillow = "^10.0.1"
-pychaosvm = { version = ">=0.3.4,<0.5.0", source = "aioqzone-index" }
+tylisten = "^2.1.4"
+pillow = "^10.1.0"
+pychaosvm = { version = "~0.4.0", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/src/aioqzone/api/h5/model.py

@@ -1,4 +1,5 @@
 import logging
+from os import PathLike
 
 from pydantic import ValidationError
 from tenacity import AsyncRetrying, TryAgain, after_log, stop_after_attempt
@@ -177,7 +178,7 @@ class QzoneH5API:
     async def publish_mood(
         self,
         content: str,
-        photos: t.Optional[t.List[PhotoData]] = None,
+        photos: t.Optional[t.Sequence[t.Union[PhotoData, PicInfo]]] = None,
         sync_weibo=False,
         ugc_right: UgcRight = UgcRight.all,
     ) -> PublishMoodResp:
@@ -189,21 +190,47 @@ class QzoneH5API:
         :param ugc_right: access right, default to "Available to Everyone".
         """
         photos = photos or []
-        return await self.call(PublishMoodApi(params=PublishMoodParams.model_validate(locals())))
+        return await self.call(
+            PublishMoodApi(params=PublishMoodParams.model_validate(locals(), from_attributes=True))
+        )
 
     async def upload_pic(
-        self, picture: bytes, width: int, height: int, quality: int
+        self,
+        picture: t.Union[bytes, str, PathLike, t.IO[bytes]],
+        width: t.Optional[int] = None,
+        height: t.Optional[int] = None,
+        quality: t.Union[int, float] = 70,
     ) -> UploadPicResponse:
-        return await self.call(
-            UploadPicApi(
-                params=UploadPicParams(
-                    picture=picture,
-                    hd_width=width,
-                    hd_height=height,
-                    hd_quality=quality,
-                ),
+        """
+        .. versionchanged:: 1.8.5
+
+            In version <= 1.8.4, user is responsible for compressing a image and this api
+            encode the :obj:`picture` with Base64 and send it to Qzone _ASIS_.
+
+            Since version 1.8.5, we recognize a compressed image by :obj:`width` and :obj:`height`
+            parameters. If :obj:`width` and :obj:`height` is provided, this API will keep the former
+            behavior. If not provided, the image will be compressed with the given quality.
+        """
+        if isinstance(quality, float):
+            if quality < 1:
+                quality *= 100
+            quality = int(quality)
+
+        assert 0 < quality <= 100
+
+        if isinstance(picture, (str, PathLike, t.IO)):
+            params = UploadPicParams.from_image(picture, quality)
+        elif (width is None) or (height is None):
+            params = UploadPicParams.from_bytes(picture, quality)
+        else:
+            params = UploadPicParams(
+                picture=picture,
+                hd_width=width,
+                hd_height=height,
+                hd_quality=quality,
             )
-        )
+
+        return await self.call(UploadPicApi(params=params))
 
     async def preupload_photos(
         self, upload_pics: t.List[UploadPicResponse], cur_num=0, upload_hd=False

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/src/aioqzone/model/api/feed.py

@@ -8,6 +8,7 @@ from pydantic import (
     BaseModel,
     Field,
     HttpUrl,
+    RootModel,
     field_validator,
     model_validator,
 )
@@ -97,21 +98,27 @@ class PhotoUrl(BaseModel):
             and (o.height == self.height)
         )
 
+    @property
+    def area(self):
+        return self.height * self.width
 
-class PhotoUrls(BaseModel):
-    urls: t.Set[PhotoUrl]
 
+class PhotoUrls(RootModel[t.Set[PhotoUrl]]):
     @model_validator(mode="before")
     def unpack_urls(cls, v: dict):
-        return dict(urls=list(v.values()))
+        return list(v.values())
 
     @property
     def largest(self) -> PhotoUrl:
-        return max(self.urls, key=lambda p: p.height * p.width)
+        return max(self.root, key=lambda p: p.area)
 
     @property
     def smallest(self) -> PhotoUrl:
-        return min(self.urls, key=lambda p: p.height * p.width)
+        return min(self.root, key=lambda p: p.area)
+
+    @property
+    def urls(self):
+        return self.root
 
 
 class FeedVideo(BaseModel):

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/src/aioqzone/model/api/request.py

@@ -1,9 +1,12 @@
 import typing as t
 from base64 import b64encode
+from io import BytesIO
 from math import floor
+from os import PathLike
 from time import time
 
-from pydantic import BaseModel, Field, field_serializer
+from pydantic import BaseModel, Field, field_serializer, field_validator
+from typing_extensions import Buffer
 
 from aioqzone.utils.time import time_ms
 
@@ -183,6 +186,22 @@ class UploadPicParams(QzoneRequestParams):
     def b64_picture(self, picture: t.ByteString) -> str:
         return b64encode(picture).decode()
 
+    @classmethod
+    def from_image(cls, image_file: t.Union[str, PathLike, t.IO[bytes]], quality=70):
+        import PIL.Image as image
+
+        with image.open(image_file) as f:
+            buf = BytesIO()
+            f.save(buf, "JPEG", quality=quality)
+            return cls(
+                picture=buf.getvalue(), hd_height=f.height, hd_width=f.width, hd_quality=quality
+            )
+
+    @classmethod
+    def from_bytes(cls, image_bytes: Buffer, quality=70):
+        buf = BytesIO(image_bytes)
+        return cls.from_image(buf, quality=quality)
+
 
 class PhotosPreuploadParams(QzoneRequestParams):
     uin_fields = ("uin",)

{aioqzone-1.8.4.dev3 → aioqzone-1.8.6.dev1}/src/aioqzone/model/api/response.py

@@ -33,6 +33,7 @@ __all__ = [
     "UploadPicResponse",
     "PhotosPreuploadResponse",
     "FeedData",
+    "PicInfo",
     "ProfileFeedData",
 ]
 
@@ -273,4 +274,4 @@ 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])
+        return dict(photos=[PicInfo.from_response_object(info["picinfo"]) for info in picinfos])  # type: ignore