aioqzone 1.8.3.dev1__tar.gz → 1.8.4.dev3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.3.dev1
+Version: 1.8.4.dev3
 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.4.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.3.dev1"
+version = "1.8.4.dev3"
 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.4.dev3}/src/aioqzone/model/api/request.py

@@ -3,8 +3,7 @@ from base64 import b64encode
 from math import floor
 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
 
 from aioqzone.utils.time import time_ms
 
@@ -164,7 +163,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 +179,10 @@ 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()
+
 
 class PhotosPreuploadParams(QzoneRequestParams):
     uin_fields = ("uin",)

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

@@ -39,7 +39,7 @@ __all__ = [
 
 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 +55,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 +207,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 +238,8 @@ class DeleteUgcResp(QzoneResponse):
 
 
 class UploadPicResponse(QzoneResponse):
-    _errno_key = None
+    _data_key = None
+
     filelen: int
     filemd5: str
 
@@ -250,7 +250,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 +263,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])

{aioqzone-1.8.3.dev1 → aioqzone-1.8.4.dev3}/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.4.dev3}/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__(