aioqzone 1.8.5.dev1__tar.gz → 1.9.0.dev1__tar.gz

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

@@ -1,35 +1,35 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.8.5.dev1
+Version: 1.9.0.dev1
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone
 Author-email: zzzzss990315@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 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.1,<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
@@ -43,7 +43,7 @@ aioqzone封装了一些Qzone接口。
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
+[![discuss](https://img.shields.io/endpoint?label=Discuss&style=social&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
 
 [English](README_en.md) | 简体中文
 
@@ -98,7 +98,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2023 aioqzone.
+Copyright (C) 2022-2024 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

{aioqzone-1.8.5.dev1 → aioqzone-1.9.0.dev1}/README.md

@@ -5,7 +5,7 @@ aioqzone封装了一些Qzone接口。
 [![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]
 [![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]
 [![style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![discuss](https://img.shields.io/badge/dynamic/xml?style=social&logo=telegram&label=Discuss&query=%2F%2Fdiv%5B%40class%3D%22tgme_page_extra%22%5D&url=https%3A%2F%2Ft.me%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
+[![discuss](https://img.shields.io/endpoint?label=Discuss&style=social&url=https%3A%2F%2Ftg.sumanjay.workers.dev%2Faioqzone_chatroom)](https://t.me/aioqzone_chatroom)
 
 [English](README_en.md) | 简体中文
 
@@ -60,7 +60,7 @@ __在做了:__
 ## 许可证
 
 ```
-Copyright (C) 2022-2023 aioqzone.
+Copyright (C) 2022-2024 aioqzone.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.8.5.dev1"
+version = "1.9.0.dev1"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -27,16 +27,16 @@ exclude = ["*.js"]
 "Discussion" = "https://t.me/aioqzone_chatroom"
 
 [tool.poetry.dependencies]
-python = "^3.8"
-aiohttp = "^3.8.5"
-pydantic = "^2.0.3"
-pydantic-settings = "^2.0.2"
+python = "^3.9"
+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.1", source = "aioqzone-index" }
 slide-tc = {version = "~0.1.1", optional = true, source = "aioqzone-index" }
 
 [tool.poetry.extras]
@@ -94,8 +94,8 @@ line_length = 99
 
 [tool.black]
 line-length = 99
-target-version = ['py38']
+target-version = ['py39']
 
 [tool.pyright]
-pythonVersion = "3.8"
+pythonVersion = "3.9"
 pythonPlatform = "All"

{aioqzone-1.8.5.dev1 → aioqzone-1.9.0.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.5.dev1 → aioqzone-1.9.0.dev1}/src/qqqr/type.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 
 from pydantic import BaseModel
 
-if sys.version_info >= (3, 9):
+if sys.version_info >= (3, 10):
     frozen_args = dict(frozen=True, slots=True)
 else:
     frozen_args = dict(frozen=True)