aioqzone 1.8.3.dev1__tar.gz → 1.8.5.dev1__tar.gz

{aioqzone-1.8.3.dev1 → aioqzone-1.8.5.dev1}/PKG-INFO

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

{aioqzone-1.8.3.dev1 → aioqzone-1.8.5.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.3.dev1"
+version = "1.8.5.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"

{aioqzone-1.8.3.dev1 → aioqzone-1.8.5.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.3.dev1 → aioqzone-1.8.5.dev1}/src/aioqzone/model/api/request.py

@@ -1,10 +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 Base64Encoder, BaseModel, EncodedBytes, Field, field_serializer
-from typing_extensions import Annotated
+from pydantic import BaseModel, Field, field_serializer, field_validator
+from typing_extensions import Buffer
 
 from aioqzone.utils.time import time_ms
 
@@ -164,7 +166,7 @@ class DeleteUgcParams(QzoneRequestParams):
 
 class UploadPicParams(QzoneRequestParams):
     uin_fields = ("uin",)
-    picture: Annotated[bytes, EncodedBytes(Base64Encoder)]
+    picture: bytes
     hd_height: int
     hd_width: int
     hd_quality: int = 70
@@ -180,6 +182,26 @@ class UploadPicParams(QzoneRequestParams):
     Exif_CameraModel: str = ""
     Exif_Time: str = ""
 
+    @field_serializer("picture", return_type=str)
+    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.3.dev1 → aioqzone-1.8.5.dev1}/src/aioqzone/model/api/response.py

@@ -33,13 +33,14 @@ __all__ = [
     "UploadPicResponse",
     "PhotosPreuploadResponse",
     "FeedData",
+    "PicInfo",
     "ProfileFeedData",
 ]
 
 
 class QzoneResponse(BaseModel):
     _errno_key: t.ClassVar[t.Union[str, AliasPath, AliasChoices, None]] = AliasChoices(
-        "code", "ret", "err"
+        "code", "ret", "err", "error"
     )
     _msg_key: t.ClassVar[t.Union[str, AliasPath, AliasChoices, None]] = AliasChoices(
         "message", "msg"
@@ -55,18 +56,17 @@ class QzoneResponse(BaseModel):
 
         :return: Self
         """
-        if cls._errno_key and cls._msg_key:
 
-            class response_header(BaseModel):
-                status: int = Field(validation_alias=cls._errno_key)
-                message: str = Field(default="", validation_alias=cls._msg_key)
+        class response_header(BaseModel):
+            status: int = Field(default=0, validation_alias=cls._errno_key)
+            message: str = Field(default="", validation_alias=cls._msg_key)
 
-            header = response_header.model_validate(obj)
-            if header.status != 0:
-                if header.message:
-                    raise QzoneError(header.status, header.message, robj=header)
-                else:
-                    raise QzoneError(header.status, robj=header)
+        header = response_header.model_validate(obj)
+        if header.status != 0:
+            if header.message:
+                raise QzoneError(header.status, header.message, robj=obj)
+            else:
+                raise QzoneError(header.status, robj=obj)
 
         if cls._data_key is None:
             return cls.model_validate(obj)
@@ -208,7 +208,7 @@ class ProfilePagePesp(QzoneResponse):
         return cls(
             info=QzoneInfo.from_response_object(obj["info"]),  # type: ignore
             feedpage=ProfileResp.from_response_object(obj["feedpage"]),  # type: ignore
-            qzonetoken=obj["qzonetoken"],
+            qzonetoken=obj["qzonetoken"],  # type: ignore
         )
 
 
@@ -239,7 +239,8 @@ class DeleteUgcResp(QzoneResponse):
 
 
 class UploadPicResponse(QzoneResponse):
-    _errno_key = None
+    _data_key = None
+
     filelen: int
     filemd5: str
 
@@ -250,7 +251,9 @@ class UploadPicResponse(QzoneResponse):
         return json_loads(m.group(1))
 
 
-class PicInfo(BaseModel):
+class PicInfo(QzoneResponse):
+    _data_key = None
+
     pre: HttpUrl
     url: HttpUrl
     sloc: str
@@ -261,11 +264,14 @@ class PicInfo(BaseModel):
 
 
 class PhotosPreuploadResponse(QzoneResponse):
-    _errno_key = None
+    _data_key = None
     photos: t.List[PicInfo] = Field(default_factory=list)
 
     @classmethod
     async def response_to_object(cls, response: ClientResponse):
         m = response_callback.search(await response.text())
         assert m
-        return dict(photos=json_loads(m.group(1)))
+
+        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

{aioqzone-1.8.3.dev1 → aioqzone-1.8.5.dev1}/src/aioqzone/utils/regex.py

@@ -5,7 +5,7 @@ some patterns for matching html and so on.
 import re
 
 # use this to match qzone api response
-response_callback = re.compile(r"callback\(\s*(\{.*\})\s*\)", re.S | re.I)
+response_callback = re.compile(r"callback\(\s*([\{\[].*[\}\]])\s*\)", re.S | re.I)
 # use this to get unikey & curkey of a html
 uni_cur_key = re.compile(r'data-unikey="([^"]*)"[^d]*data-curkey="([^"]*)"')
 

{aioqzone-1.8.3.dev1 → aioqzone-1.8.5.dev1}/src/qqqr/up/web.py

@@ -104,15 +104,10 @@ class _UpHookMixin:
 
 class UpWebLogin(LoginBase[UpWebSession], _UpHookMixin):
     """
-    .. versionchanged:: 0.12.4
-
-        `TeaEncoder` is used as the default password encoder. A `legacy_encoder` paramater is added to force
-        using the former `NodeEncoder`. It can also be configured by set :envvar:`AIOQZONE_PWDENCODER` to "node".
-        Note that the paramater in code, i.e. `legacy_encoder`, takes precedence.
-
     .. versionchanged:: 0.13.0.dev1
 
-        `TeaEncoder` is the only encoder. ``NodeEncoder`` is removed.
+        :class:`~qqqr.up.encrypt.TeaEncoder` is the unique :class:`~qqqr.up.encrypt.PasswdEncoder`.
+        ``NodeEncoder`` is removed.
     """
 
     def __init__(