aioqzone 1.8.5.dev1__tar.gz → 1.8.6.dev1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.5.dev1
+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.5.dev1 → aioqzone-1.8.6.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.5.dev1"
+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.5.dev1 → 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):