p115client 0.0.5.11.6__py3-none-any.whl → 0.0.5.11.7__py3-none-any.whl

p115client/client.py

@@ -766,7 +766,7 @@ def normalize_attr_app[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr_app[D: dict[str, Any]](
@@ -896,7 +896,7 @@ def normalize_attr_app2[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr_app2[D: dict[str, Any]](
@@ -1082,7 +1082,7 @@ def normalize_attr_simple(
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None = None, 
+    dict_cls: None, 
 ) -> dict[str, Any]:
     ...
 @overload
@@ -1091,7 +1091,7 @@ def normalize_attr_simple[D: dict[str, Any]](
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: type[D], 
+    dict_cls: type[D] = AttrDict, # type: ignore
 ) -> D:
     ...
 def normalize_attr_simple[D: dict[str, Any]](
@@ -1099,7 +1099,7 @@ def normalize_attr_simple[D: dict[str, Any]](
     /, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = None, 
+    dict_cls: None | type[D] = AttrDict, # type: ignore
 ) -> dict[str, Any] | D:
     return normalize_attr(
         info, 
@@ -2329,7 +2329,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -2342,7 +2342,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -2354,7 +2354,7 @@ class ClientRequestMixin:
     def login_with_app_id(
         cls, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         console_qrcode: bool = True, 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
@@ -5194,6 +5194,60 @@ class P115OpenClient(ClientRequestMixin):
         api = complete_proapi("/open/user/info", base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
+    @overload
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def vip_qr_url(
+        self, 
+        payload: int | dict, 
+        /, 
+        base_url: bool | str | Callable[[], str] = False, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取产品列表地址（即引导用户扫码购买 115 的 VIP 服务，以获取提成）
+
+        GET https://proapi.115.com/open/open/vip/qr_url
+
+        .. admonition:: Reference
+
+            https://www.yuque.com/115yun/open/cguk6qshgapwg4qn#oByvI
+
+        :payload:
+            - open_device: int
+            - default_product_id: int = <default> 💡 打开产品列表默认选中的产品对应的产品id，如果没有则使用默认的产品顺序。
+
+                - 月费: 5
+                - 年费: 1
+                - 尝鲜1天: 101
+                - 长期VIP(长期): 24072401
+                - 超级VIP: 24072402
+        """
+        api = complete_proapi("/open/vip/qr_url", base_url)
+        if not isinstance(payload, dict):
+            payload = {"open_device": payload}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
     download_url_open = download_url
     download_url_info_open = download_url_info
     fs_copy_open = fs_copy
@@ -5226,6 +5280,7 @@ class P115OpenClient(ClientRequestMixin):
     user_info_open = user_info
     upload_file_init_open = upload_file_init
     upload_file_open = upload_file
+    vip_qr_url_open = vip_qr_url
 
 
 class P115Client(P115OpenClient):
@@ -5902,7 +5957,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[False] = False, 
@@ -5913,7 +5968,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[True], 
@@ -5923,7 +5978,7 @@ class P115Client(P115OpenClient):
     def login_with_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         show_warning: bool = False, 
         async_: Literal[False, True] = False, 
@@ -6098,7 +6153,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[True] | Self, 
         show_warning: bool = False, 
@@ -6110,7 +6165,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[True] | Self, 
         show_warning: bool = False, 
@@ -6122,7 +6177,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[False] = False, 
         show_warning: bool = False, 
@@ -6134,7 +6189,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: Literal[False] = False, 
         show_warning: bool = False, 
@@ -6145,7 +6200,7 @@ class P115Client(P115OpenClient):
     def login_another_open(
         self, 
         /, 
-        app_id: int | str = 100195993, 
+        app_id: int | str, 
         *, 
         replace: bool | Self = False, 
         show_warning: bool = False, 
@@ -6540,7 +6595,7 @@ class P115Client(P115OpenClient):
                                 continue
                             if i or is_auth_error:
                                 raise
-                            app_id = getattr(self, "app_id", 100195993)
+                            app_id = getattr(self, "app_id")
                             yield self.login_another_open(
                                 app_id, 
                                 replace=True, 

p115client/const.py

@@ -5,18 +5,14 @@ from __future__ import annotations
 
 __author__ = "ChenyangGao <https://chenyanggao.github.io>"
 __all__ = [
-    "AVAILABLE_APP_IDS", "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", 
-    "CLIENT_API_MAP", "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
+    "AVAILABLE_APPS", "APP_TO_SSOENT", "SSOENT_TO_APP", "CLIENT_API_MAP", 
+    "CLASS_TO_TYPE", "SUFFIX_TO_TYPE", "errno", 
 ]
 
 from enum import IntEnum
 from typing import Final
 
 
-#: 可用的 AppID 列表
-AVAILABLE_APP_IDS = range(100195123, 100196845, 2)
-
-
 #: 目前可用的登录设备
 AVAILABLE_APPS: Final[tuple[str, ...]] = (
     "web", "ios", "115ios", "android", "115android", "115ipad", "tv", "qandroid", 

p115client/tool/attr.py

@@ -55,8 +55,8 @@ def get_attr(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
+        from dictattr import AttrDict
         if skim:
-            from dictattr import AttrDict
             resp = yield client.fs_file_skim(id, async_=async_, **request_kwargs)
             check_response(resp)
             info = resp["data"][0]
@@ -71,7 +71,7 @@ def get_attr(
         else:
             resp = yield client.fs_file(id, async_=async_, **request_kwargs)
             check_response(resp)
-            return normalize_attr_web(resp["data"][0])
+            return normalize_attr_web(resp["data"][0], dict_cls=AttrDict)
     return run_gen_step(gen_step, may_call=False, async_=async_)
 
 

p115client/tool/pool.py

@@ -21,7 +21,6 @@ from time import time
 
 from iterutils import run_gen_step
 from p115client import check_response, P115Client
-from p115client.const import AVAILABLE_APP_IDS
 from p115client.exception import P115OSError, AuthenticationError, LoginError
 
 from .util import get_status_code, is_timeouterror
@@ -55,7 +54,7 @@ class ComparedWithID[T]:
 
 def generate_auth_factory(
     client: str | P115Client, 
-    app_ids: Iterable[int] = AVAILABLE_APP_IDS, 
+    app_ids: Iterable[int], 
     **request_kwargs, 
 ) -> Callable:
     """利用一个已登录设备的 cookies，产生若干开放应用的 access_token
@@ -238,7 +237,7 @@ def make_pool[T](
 
 def auth_pool(
     client: str | P115Client, 
-    app_ids: Iterable[int] = AVAILABLE_APP_IDS, 
+    app_ids: Iterable[int], 
     heap: None | list[tuple[float, dict | ComparedWithID[dict]]] = None, 
     cooldown_time: int | float = 1, 
     live_time: int | float = 7000, 

{p115client-0.0.5.11.6.dist-info → p115client-0.0.5.11.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.11.6
+Version: 0.0.5.11.7
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -108,7 +108,7 @@ client = P115Client(Path("~/115-cookies.txt").expanduser(), check_for_relogin=Tr
 
 如果你有一个申请通过的开放接口的应用，则可以创建开放接口的客户端实例
 
-你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权），如果不提供 `app_id`，则使用默认值
+你可以直接从一个 `P115Client` 实例拿到授权（自动扫码登录并授权）
 
 ```python
 app_id = <开放接口应用的 AppID>

{p115client-0.0.5.11.6.dist-info → p115client-0.0.5.11.7.dist-info}/RECORD

@@ -1,12 +1,12 @@
 LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
 p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
 p115client/_upload.py,sha256=RTYpM_EDFuI3O7yf08f13NdeG0iD03o_V4H6Je6Nsr8,30754
-p115client/client.py,sha256=pkwJCBfjefUknbMkfIiSJqwGeVfJdg-EVtJvDA_xkXI,770973
-p115client/const.py,sha256=Ks8eYjHYApxlkelVCbSJlpmlCYtbk8fX80jETV72BTY,7754
+p115client/client.py,sha256=n6WswjfTrTZPYUJRpR1jZMowniPTYnmJrZgh_yJJlFc,772563
+p115client/const.py,sha256=KqDGr9KsOnSkNVM3RIdQGptCMHbidMmZ_ffyFPiniww,7654
 p115client/exception.py,sha256=O4SlfjbtI9GPjzbzJrFaFUZENJFz2qA3VDEKZfdhHbc,3590
 p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
-p115client/tool/attr.py,sha256=rSnmVXhIqkUJ7NmwTo0LR76ZC2bOh1qaZkQok10Pzt8,2899
+p115client/tool/attr.py,sha256=VRte9LuE2YG8nPIxbeetdzDJgZL5ZFVp7RzjpIXUPN4,2914
 p115client/tool/download.py,sha256=-iq2JOolc4uba00wsp-Z_I03ZTFgqM4UKrfHAWpH2QA,61368
 p115client/tool/edit.py,sha256=kRz-Ee7KuNNlHhcVi4uHdh9DSfF1ZxUREIhK9x4hNIE,17771
 p115client/tool/export_dir.py,sha256=1r2qDuYIirtDkCBQfYXh6lbm06IStRpiom-ZjtIYdbo,24502
@@ -14,13 +14,13 @@ p115client/tool/fs_files.py,sha256=XTG12a_MVwYI4p1hs-xMol-AQsa8C9pWFt0BUzlQCws,1
 p115client/tool/history.py,sha256=qquCiiOIRpxOqmyXbmdwS_qpfPkduJilM6AGuOufrYU,7462
 p115client/tool/iterdir.py,sha256=j7hZXrlUWBmg-kAgTjQ36BqY-8EiF9KLmPMM2ogHRPc,199632
 p115client/tool/life.py,sha256=ceweN2uNKYxigSOaBQ4Abo5u05zqppRm_P7k-_rHjcA,17301
-p115client/tool/pool.py,sha256=IR_ssyVhBSQYmfD--5Blyi7X3wtiPk7cLKb7YowhmEU,14033
+p115client/tool/pool.py,sha256=H65VhoNxQC6xWSL1THq_PximWnBOqB4EfU6kWBTAnlA,13946
 p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
 p115client/tool/upload.py,sha256=i6laoeG7GdNO7hvCDVBy8Yv2Is800wL7O5na6a3v70g,15971
 p115client/tool/util.py,sha256=0o9TrXdoPcljgxDDRdxRon41bq1OjuUYCWsR0XLfmPo,3357
 p115client/tool/xys.py,sha256=vU28Px2yeQzIxxGkopJIpvV6TdOnWJ5xB6NPXpTgM0Y,10306
 p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
-p115client-0.0.5.11.6.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.11.6.dist-info/METADATA,sha256=VxWxcCRCKshkjt7_Svyb4-C_8hYUO3vDiaXFp9UwX6Q,8240
-p115client-0.0.5.11.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.11.6.dist-info/RECORD,,
+p115client-0.0.5.11.7.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.11.7.dist-info/METADATA,sha256=-L7lnVcxGhddkMYhCmLYObhgB-zl9vo9Bi-ocf6U_tQ,8192
+p115client-0.0.5.11.7.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.11.7.dist-info/RECORD,,