aioqzone 1.9.4.dev7__tar.gz → 1.9.4.dev9__tar.gz

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioqzone
-Version: 1.9.4.dev7
+Version: 1.9.4.dev9
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Project-URL: Homepage, https://github.com/aioqzone/aioqzone
 Project-URL: Repository, https://github.com/aioqzone/aioqzone

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aioqzone"
-version = "1.9.4.dev7"
+version = "1.9.4.dev9"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = [{ name = "aioqzone" }]
 maintainers = [
@@ -37,7 +37,7 @@ Documentation = "https://aioqzone.github.io/aioqzone"
 "Discussion" = "https://t.me/aioqzone_chatroom"
 
 [dependency-groups]
-test = ["pytest>=8.2.0", "pytest-asyncio~=1.1.0"]
+test = ["pytest>=8.2.0", "pytest-asyncio>=1.1,<1.3"]
 dev = ["pre-commit", "ruff"]
 doc = [
     "Sphinx>=7.0.1; python_version>='3.9' and python_version<'3.11'",

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/src/aioqzone/api/login/__init__.py

@@ -10,6 +10,7 @@ import typing as t
 from aiohttp import ClientError
 from tenacity import TryAgain, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
 from tylisten import FutureStore
+from typing_extensions import Self
 
 from aioqzone.exception import UnexpectedLoginError
 from aioqzone.model import QrLoginConfig, UpLoginConfig
@@ -30,6 +31,7 @@ __all__ = [
 ]
 
 
+@t.final
 class ConstLoginMan(Loginable):
     """A basic login manager which uses external provided cookie."""
 
@@ -46,6 +48,19 @@ class ConstLoginMan(Loginable):
     async def _new_cookie(self) -> t.Dict[str, str]:
         return self.cookie
 
+    @classmethod
+    def from_loginable(cls, loginable: Loginable) -> Self:
+        """Create a :class:`.ConstLoginMan` from another :class:`.Loginable` instance.
+
+        :param loginable: any :class:`.Loginable` instance
+        :return: a :class:`.ConstLoginMan` instance
+
+        .. versionadded:: 1.9.4.dev8
+        """
+        return cls(
+            loginable.uin, cookie=loginable.cookie, ch_login_notify=loginable.ch_login_notify
+        )
+
 
 class UpLoginManager(Loginable):
     def __init__(

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/src/aioqzone/api/login/_base.py

@@ -14,12 +14,15 @@ class Loginable(ABC):
 
     last_login: float = 0
     """Last login time stamp. 0 represents no login since created."""
+    cookie: Dict[str, str]
+    """Cached cookie."""
+    ch_login_notify: FutureStore
+    """Future Store for emit login events."""
 
     def __init__(self, uin: int, ch_login_notify: Optional[FutureStore] = None) -> None:
         super().__init__()
         self.uin = uin
         self.cookie: Dict[str, str] = {}
-        """Cached cookie."""
         self.lock = asyncio.Lock()
         self.ch_login_notify = ch_login_notify or FutureStore()
 
@@ -33,7 +36,7 @@ class Loginable(ABC):
         :meta public:
         :return: cookie dict
         """
-        return
+        return {}
 
     async def new_cookie(self) -> bool:
         """Get a new cookie dict, which means cached cookie is not allowed.

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/src/aioqzone/model/api/feed.py

@@ -29,21 +29,24 @@ class RightInfo(BaseModel):
     allow_uins: t.List = Field(default_factory=list)
 
 
-class FeedCommon(BaseModel):
+class ContentCommon(BaseModel):
     time: int
     appid: int
     typeid: int = Field(alias="feedstype")
     curkey: t.Union[HttpUrl, str] = Field(alias="curlikekey", union_mode="left_to_right")
     orgkey: t.Union[HttpUrl, str] = Field(alias="orglikekey", union_mode="left_to_right")
+
+    subid: int = 0
+    originaltype: int = 0
+
+
+class FeedCommon(ContentCommon):
     ugckey: str
     """an underscore-joined string including `uin`, `appid`, `ugcrightkey`"""
     ugcrightkey: str
     """an identifier, for most 311 feeds, it equals to cellid (fid)."""
-    right_info: RightInfo
-    wup_feeds_type: int
-
-    subid: int = 0
-    originaltype: int = 0
+    right_info: RightInfo = Field(default_factory=RightInfo)
+    wup_feeds_type: int = 0
 
 
 class UserInfo(BaseModel):
@@ -224,8 +227,10 @@ class ShareInfo(BaseModel):
     #     return v
 
 
-class Share(HasCommon):
-    common: FeedCommon = Field(validation_alias="cell_comm")
+class Share(BaseModel):
+    common: t.Union[FeedCommon, ContentCommon] = Field(
+        validation_alias="cell_comm", union_mode="left_to_right"
+    )
 
 
 class FeedOriginal(HasFid, HasCommon, HasUserInfo, HasSummary, HasMedia):

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/src/qqqr/constant.py

@@ -7,7 +7,8 @@ from enum import IntEnum
 from .type import APPID, Proxy
 
 UA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 Edg/119.0.0.0"
-AndroidUA = "Mozilla/5.0 (Linux; Android 13; SM-G981B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Mobile Safari/537.36 Edg/119.0.0.0"
+AndroidUA = "Mozilla/5.0 (Linux; Android 13; SM-G981B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Mobile Safari/537.36 Edg/140.0.0.0"
+IOS_UA = "Mozilla/5.0 (iPhone; CPU iPhone OS 18_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.5 Mobile/15E148 Safari/604.1 Edg/140.0.0.0"
 
 QzoneProxy = Proxy(
     "https://qzs.qzone.qq.com/qzone/v5/loginsucc.html?para=izone",

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/src/qqqr/utils/net.py

@@ -1,4 +1,6 @@
 from http.cookies import SimpleCookie
+from random import random
+from secrets import token_hex
 from typing import Dict
 
 from aiohttp import ClientResponse as Response
@@ -33,7 +35,7 @@ def get_all_cookie(response: Response) -> Dict[str, str]:
     """An adapter to get all response cookies from a response object."""
     cookies = SimpleCookie()
     for i in response.headers.getall("Set-Cookie"):
-        if not "=;" in i:
+        if "=;" not in i:
             cookies.load(i)
     return {k: v.value for k, v in cookies.items() if v.value}
 
@@ -42,3 +44,10 @@ def use_mobile_ua(client: ClientAdapter):
     from ..constant import AndroidUA
 
     client.headers["User-Agent"] = AndroidUA
+    client.cookie_jar.update_cookies(
+        {
+            "_qimei_fingerprint": token_hex(32),
+            "_qimei_uuid42": token_hex(42),
+            "_qpsvr_localtk": f"{random():.16f}",
+        }
+    )

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/test/api/test_loginman.py

@@ -20,7 +20,6 @@ from qqqr.exception import TencentLoginError, UserBreak
 from qqqr.utils.net import ClientAdapter
 
 if TYPE_CHECKING:
-    from qqqr.utils.net import ClientAdapter
     from test.conftest import test_env
 
 pytestmark = pytest.mark.asyncio(loop_scope="module")
@@ -119,3 +118,19 @@ class TestQR:
         assert qr.uin == pool[0]
         assert qr.cookie
         assert qr.gtk > 0
+
+
+@skip_ci
+async def test_const(client: ClientAdapter, qr: QrLoginManager):
+    from aioqzone.api.h5 import QzoneH5API
+    from aioqzone.api.login import ConstLoginMan
+
+    api = QzoneH5API(client, qr)
+    resp1 = await api.index()
+    assert resp1.qzonetoken
+    assert qr.cookie
+    api = QzoneH5API(client, ConstLoginMan.from_loginable(qr), retry_if_login_expire=False)
+    assert isinstance(api.login, ConstLoginMan)
+    assert api.login.cookie
+    resp2 = await api.index()
+    assert resp2.vFeeds

{aioqzone-1.9.4.dev7 → aioqzone-1.9.4.dev9}/uv.lock

@@ -116,7 +116,7 @@ wheels = [
 
 [[package]]
 name = "aioqzone"
-version = "1.9.4.dev6"
+version = "1.9.4.dev9"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },
@@ -184,7 +184,7 @@ doc = [
 ]
 test = [
     { name = "pytest", specifier = ">=8.2.0" },
-    { name = "pytest-asyncio", specifier = "~=1.1.0" },
+    { name = "pytest-asyncio", specifier = ">=1.1,<1.3" },
 ]
 
 [[package]]