p115client 0.0.5.10.7__tar.gz → 0.0.5.10.9__tar.gz

{p115client-0.0.5.10.7 → p115client-0.0.5.10.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.10.7
+Version: 0.0.5.10.9
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -23,8 +23,8 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: aiofile
 Requires-Dist: ed2k (>=0.0.2.1)
 Requires-Dist: http_response (>=0.0.2.2)
-Requires-Dist: httpx
-Requires-Dist: httpx_request (>=0.1.3)
+Requires-Dist: httpx (>=0.28)
+Requires-Dist: httpx_request (>=0.1.4)
 Requires-Dist: iter_collect (>=0.0.5.1)
 Requires-Dist: multidict
 Requires-Dist: orjson

{p115client-0.0.5.10.7 → p115client-0.0.5.10.9}/p115client/client.py

@@ -181,7 +181,7 @@ def complete_proapi(
 ) -> str:
     if path and not path.startswith("/"):
         path = "/" + path
-    if app == "open":
+    if app in ("open", "aps", "web"):
         app = "android"
     if app and not app.startswith("/"):
         app = "/" + app
@@ -616,9 +616,6 @@ def normalize_attr_web(
         if "te" in info:
             attr["mtime"] = int(info["te"])
     else:
-        attr["labels"] = info["fl"]
-        if "score" in info:
-            attr["score"] = int(info.get("score") or 0)
         attr["ico"] = info.get("ico", "folder" if is_directory else "")
         if "te" in info:
             attr["mtime"] = attr["user_utime"] = int(info["te"])
@@ -651,12 +648,14 @@ def normalize_attr_web(
             ("c", "violated"), 
             ("c", "is_collect"), 
             ("sh", "is_share"), 
+            ("score", "score"), 
             #("d", "has_desc"), 
             #("p", "has_pass"), 
         ):
             if key in info:
                 attr[name] = int(info[key] or 0)
         for key, name in (
+            ("fl", "labels"), 
             ("dp", "dir_path"), 
             ("style", "style"), 
             ("ns", "name_show"), 
@@ -744,10 +743,7 @@ def normalize_attr_app(
         if "upt" in info:
             attr["mtime"] = int(info["upt"])
     else:
-        attr["labels"] = info["fl"]
         attr["ico"] = info.get("ico", "folder" if attr["is_dir"] else "")
-        if "ftype" in info:
-            attr["file_type"] = int(info["ftype"] or 0)
         if "thumb" in info:
             thumb = info["thumb"]
             if thumb.startswith("?"):
@@ -763,6 +759,7 @@ def normalize_attr_app(
             ("aid", "area_id"), 
             ("fatr", "audio_play_long"), 
             ("fta", "status"), 
+            ("ftype", "file_type"), 
             ("ism", "star"), 
             ("ism", "is_mark"), 
             ("is_top", "is_top"), 
@@ -784,6 +781,7 @@ def normalize_attr_app(
             ("fco", "cover"), 
             ("fco", "folder_cover"), 
             ("fdesc", "desc"), 
+            ("fl", "labels"), 
             ("flabel", "fflabel"), 
             ("multitrack", "multitrack"), 
             ("play_long", "play_long"), 
@@ -838,18 +836,28 @@ def normalize_attr_app2(
         else:
             dict_cls = AttrDict
     attr: dict[str, Any] = dict_cls()
-    is_directory = attr["is_dir"] = "file_id" not in info
-    if not simple:
-        attr["is_directory"] = is_directory
-    if is_directory:
+    if "file_id" in info and "parent_id" in info:
+        if "file_category" in info:
+            is_directory = not int(info["file_category"])
+        else:
+            is_directory = bool(info.get("sha1") or info.get("file_sha1"))
         attr["id"] = int(info["file_id"])
-        attr["parent_id"] = int(info["category_id"])
+        attr["parent_id"] = int(info["parent_id"])
         attr["name"] = info["file_name"]
     else:
-        attr["id"] = int(info["category_id"])
-        attr["parent_id"] = int(info["parent_id"])
-        attr["name"] = info["category_name"]
-    attr["sha1"] = info.get("sha1") or ""
+        is_directory = "file_id" not in info
+        if is_directory:
+            attr["id"] = int(info["file_id"])
+            attr["parent_id"] = int(info["category_id"])
+            attr["name"] = info["file_name"]
+        else:
+            attr["id"] = int(info["category_id"])
+            attr["parent_id"] = int(info["parent_id"])
+            attr["name"] = info["category_name"]
+    attr["is_dir"] = is_directory
+    if not simple:
+        attr["is_directory"] = is_directory
+    attr["sha1"] = info.get("sha1") or info.get("file_sha1") or ""
     attr["size"] = int(info.get("file_size") or 0)
     if "pick_code" in info:
         attr["pickcode"] = info["pick_code"]
@@ -890,7 +898,8 @@ def normalize_attr_app2(
             if "utime" in info:
                 attr["utime"] = int(info["utime"])
         attr["ico"] = info.get("ico", "folder" if attr["is_dir"] else "")
-        attr["labels"] = info["fl"]
+        if "fl" in info:
+            attr["labels"] = info["fl"]
         for key, name in (
             ("area_id", "area_id"), 
             ("has_desc", "has_desc"), 
@@ -1158,13 +1167,17 @@ class ClientRequestMixin:
             "user-agent": "Mozilla/5.0 AppleWebKit/600 Safari/600 Chrome/124.0.0.0", 
         })
 
+    @locked_cacheproperty
+    def request_kwargs(self, /) -> dict:
+        return {}
+
     def close(self, /) -> None:
         """删除 session 和 async_session 属性，如果它们未被引用，则应该会被自动清理
         """
         self.__dict__.pop("session", None)
         self.__dict__.pop("async_session", None)
 
-    def request(
+    def _request(
         self, 
         /, 
         url: str, 
@@ -1282,120 +1295,252 @@ class ClientRequestMixin:
         request_kwargs.setdefault("parse", default_parse)
         return request(url=url, method=method, **request_kwargs)
 
+    def request(
+        self, 
+        /, 
+        url: str, 
+        method: str = "GET", 
+        params = None, 
+        data = None, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ):
+        """帮助函数：可执行同步和异步的网络请求
+
+        :param url: HTTP 的请求链接
+        :param method: HTTP 的请求方法
+        :param params: 查询参数
+        :param ecdh_encrypt: 使用 ecdh 算法进行加密（返回值也要解密）
+        :param async_: 说明 `request` 是同步调用还是异步调用
+        :param request: HTTP 请求调用，如果为 None，则默认用 httpx 执行请求
+            如果传入调用，则必须至少能接受以下几个关键词参数：
+
+            - url:     HTTP 的请求链接
+            - method:  HTTP 的请求方法
+            - headers: HTTP 的请求头
+            - data:    HTTP 的请求体
+            - parse:   解析 HTTP 响应的方法，默认会构建一个 Callable，会把响应的字节数据视为 JSON 进行反序列化解析
+
+                - 如果为 None，则直接把响应对象返回
+                - 如果为 ...(Ellipsis)，则把响应对象关闭后将其返回
+                - 如果为 True，则根据响应头来确定把响应得到的字节数据解析成何种格式（反序列化），请求也会被自动关闭
+                - 如果为 False，则直接返回响应得到的字节数据，请求也会被自动关闭
+                - 如果为 Callable，则使用此调用来解析数据，接受 1-2 个位置参数，并把解析结果返回给 `request` 的调用者，请求也会被自动关闭
+                    - 如果只接受 1 个位置参数，则把响应对象传给它
+                    - 如果能接受 2 个位置参数，则把响应对象和响应得到的字节数据（响应体）传给它
+
+        :param request_kwargs: 其余的请求参数，会被传给 `request`
+
+        :return: 直接返回 `request` 执行请求后的返回值
+
+        .. note:: 
+            `request` 可以由不同的请求库来提供，下面是封装了一些模块
+
+            1. `httpx_request <https://pypi.org/project/httpx_request/>`_，由 `httpx <https://pypi.org/project/httpx/>`_ 封装，支持同步和异步调用，本模块默认用的就是这个封装
+
+                .. code:: python
+
+                    from httpx_request import request
+
+            2. `python-urlopen <https://pypi.org/project/python-urlopen/>`_，由 `urllib.request.urlopen <https://docs.python.org/3/library/urllib.request.html#urllib.request.urlopen>`_ 封装，支持同步调用，性能相对最差
+
+                .. code:: python
+
+                    from urlopen import request
+
+            3. `urllib3_request <https://pypi.org/project/urllib3_request/>`_，由 `urllib3 <https://pypi.org/project/urllib3/>`_ 封装，支持同步调用，性能相对较好，推荐使用
+
+                .. code:: python
+
+                    from urllib3_request import request
+
+            4. `requests_request <https://pypi.org/project/requests_request/>`_，由 `requests <https://pypi.org/project/requests/>`_ 封装，支持同步调用
+
+                .. code:: python
+
+                    from requests_request import request
+
+            5. `aiohttp_client_request <https://pypi.org/project/aiohttp_client_request/>`_，由 `aiohttp <https://pypi.org/project/aiohttp/>`_ 封装，支持异步调用，异步并发能力最强，推荐使用
+
+                .. code:: python
+
+                    from aiohttp_client_request import request
+
+            6. `blacksheep_client_request <https://pypi.org/project/blacksheep_client_request/>`_，由 `blacksheep <https://pypi.org/project/blacksheep/>`_ 封装，支持异步调用
+
+                .. code:: python
+
+                    from blacksheep_client_request import request
+        """
+        kwargs = {**self.request_kwargs, **request_kwargs}
+        return self._request(url, method, params, data, async_=async_, **kwargs)
+
     ########## Qrcode API ##########
 
+    @overload
+    def login_authorize_open(
+        self, 
+        payload: dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def login_authorize_open(
+        self, 
+        payload: dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def login_authorize_open(
+        self, 
+        payload: dict, 
+        /, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """授权码方式请求开放接口应用授权
+
+        GET https://qrcodeapi.115.com/open/authorize
+
+        .. admonition:: Reference
+
+            https://www.yuque.com/115yun/open/okr2cq0wywelscpe#EiOrD
+
+        :payload:
+            - client_id: int | str 💡 AppID
+            - redirect_uri: str 💡 授权成功后重定向到指定的地址并附上授权码 code，需要先到 https://open.115.com/ 应用管理应用域名设置
+            - response_type: str = "code" 💡 授权模式，固定为 code，表示授权码模式
+            - state: int | str = <default> 💡 随机值，会通过 redirect_uri 原样返回，可用于验证以防 MITM 和 CSRF
+        """
+        api = complete_api("/open/authorize", base_url=base_url)
+        payload = {"response_type": "code", **payload}
+        return self.request(url=api, params=payload, async_=async_, **request_kwargs)
+
     @overload
     @staticmethod
-    def login_qrcode(
-        payload: str | dict, 
+    def login_authorize_access_token_open(
+        payload: dict, 
         /, 
         request: None | Callable = None, 
-        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
-    ) -> bytes:
+    ) -> dict:
         ...
     @overload
     @staticmethod
-    def login_qrcode(
-        payload: str | dict, 
+    def login_authorize_access_token_open(
+        payload: dict, 
         /, 
         request: None | Callable = None, 
-        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
-    ) -> Coroutine[Any, Any, bytes]:
+    ) -> Coroutine[Any, Any, dict]:
         ...
     @staticmethod
-    def login_qrcode(
-        payload: str | dict, 
+    def login_authorize_access_token_open(
+        payload: dict, 
         /, 
         request: None | Callable = None, 
-        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
-    ) -> bytes | Coroutine[Any, Any, bytes]:
-        """下载登录二维码图片
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用授权码获取开放接口应用的 access_token
 
-        GET https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode
+        POST https://qrcodeapi.115.com/open/authCodeToToken
 
-        :params uid: 二维码的 uid
+        .. admonition:: Reference
 
-        :return: 图片的二进制数据（PNG 图片）
+            https://www.yuque.com/115yun/open/okr2cq0wywelscpe#JnDgl
+
+        :payload:
+            - client_id: int | str 💡 AppID
+            - client_secret: str 💡 AppSecret
+            - code: str 💡 授权码，/open/authCodeToToken 重定向地址里面
+            - redirect_uri: str 💡 与 /open/authCodeToToken 传的 redirect_uri 一致，可用于验证以防 MITM 和 CSRF
+            - grant_type: str = "authorization_code" 💡 授权类型，固定为 authorization_code，表示授权码类型
         """
-        api = complete_api(f"/api/1.0/{app}/1.0/qrcode", base_url=base_url)
-        if isinstance(payload, str):
-            payload = {"uid": payload}
-        request_kwargs.setdefault("parse", False)
+        api = complete_api("/open/authCodeToToken", base_url=base_url)
+        payload = {"grant_type": "authorization_code", **payload}
+        request_kwargs.setdefault("parse", default_parse)
         if request is None:
-            return get_default_request()(url=api, params=payload, async_=async_, **request_kwargs)
+            return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
         else:
-            return request(url=api, params=payload, **request_kwargs)
+            return request(url=api, method="POST", data=payload, **request_kwargs)
 
     @overload
     @staticmethod
-    def login_qrcode_access_token_open(
+    def login_qrcode(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False] = False, 
         **request_kwargs, 
-    ) -> dict:
+    ) -> bytes:
         ...
     @overload
     @staticmethod
-    def login_qrcode_access_token_open(
+    def login_qrcode(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[True], 
         **request_kwargs, 
-    ) -> Coroutine[Any, Any, dict]:
+    ) -> Coroutine[Any, Any, bytes]:
         ...
     @staticmethod
-    def login_qrcode_access_token_open(
+    def login_qrcode(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
+        app: str = "web", 
         base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
         *, 
         async_: Literal[False, True] = False, 
         **request_kwargs, 
-    ) -> dict | Coroutine[Any, Any, dict]:
-        """绑定扫码并获取开放平台应用的 access_token 和 refresh_token
-
-        POST https://qrcodeapi.115.com/open/deviceCodeToToken
+    ) -> bytes | Coroutine[Any, Any, bytes]:
+        """下载登录二维码图片
 
-        .. admonition:: Reference
+        GET https://qrcodeapi.115.com/api/1.0/web/1.0/qrcode
 
-            https://www.yuque.com/115yun/open/shtpzfhewv5nag11#QCCVQ
+        :params uid: 二维码的 uid
 
-        :payload:
-            - uid: str
-            - code_verifier: str = <default> 💡 默认字符串是 64 个 "0"
+        :return: 图片的二进制数据（PNG 图片）
         """
-        api = complete_api("/open/deviceCodeToToken", base_url=base_url)
+        api = complete_api(f"/api/1.0/{app}/1.0/qrcode", base_url=base_url)
         if isinstance(payload, str):
-            payload = {"uid": payload, "code_verifier": _default_code_verifier}
-        request_kwargs.setdefault("parse", default_parse)
+            payload = {"uid": payload}
+        request_kwargs.setdefault("parse", False)
         if request is None:
-            return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+            return get_default_request()(url=api, params=payload, async_=async_, **request_kwargs)
         else:
-            return request(url=api, method="POST", data=payload, **request_kwargs)
+            return request(url=api, params=payload, **request_kwargs)
 
     @overload
     @staticmethod
-    def login_qrcode_refresh_token_open(
+    def login_qrcode_access_token_open(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
@@ -1407,7 +1552,7 @@ class ClientRequestMixin:
         ...
     @overload
     @staticmethod
-    def login_qrcode_refresh_token_open(
+    def login_qrcode_access_token_open(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
@@ -1418,7 +1563,7 @@ class ClientRequestMixin:
     ) -> Coroutine[Any, Any, dict]:
         ...
     @staticmethod
-    def login_qrcode_refresh_token_open(
+    def login_qrcode_access_token_open(
         payload: str | dict, 
         /, 
         request: None | Callable = None, 
@@ -1427,20 +1572,21 @@ class ClientRequestMixin:
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """用一个 refresh_token 去获取新的 access_token 和 refresh_token，然后原来的 refresh_token 作废
+        """绑定扫码并获取开放平台应用的 access_token 和 refresh_token
 
-        POST https://qrcodeapi.115.com/open/refreshToken
+        POST https://qrcodeapi.115.com/open/deviceCodeToToken
 
         .. admonition:: Reference
 
-            https://www.yuque.com/115yun/open/shtpzfhewv5nag11#ve54x
+            https://www.yuque.com/115yun/open/shtpzfhewv5nag11#QCCVQ
 
         :payload:
-            - refresh_token: str
+            - uid: str
+            - code_verifier: str = <default> 💡 默认字符串是 64 个 "0"
         """
-        api = complete_api("/open/refreshToken", base_url=base_url)
+        api = complete_api("/open/deviceCodeToToken", base_url=base_url)
         if isinstance(payload, str):
-            payload = {"refresh_token": payload}
+            payload = {"uid": payload, "code_verifier": _default_code_verifier}
         request_kwargs.setdefault("parse", default_parse)
         if request is None:
             return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
@@ -1766,7 +1912,7 @@ class ClientRequestMixin:
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
-        """获取开放平台的登录二维码，扫码可用
+        """获取开放平台的登录二维码，扫码可用，采用 PKCE (Proof Key for Code Exchange)
 
         POST https://qrcodeapi.115.com/open/authDeviceCode
 
@@ -1806,6 +1952,62 @@ class ClientRequestMixin:
         else:
             return request(url=api, method="POST", data=payload, **request_kwargs)
 
+    @overload
+    @staticmethod
+    def login_refresh_token_open(
+        payload: str | dict, 
+        /, 
+        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    @staticmethod
+    def login_refresh_token_open(
+        payload: str | dict, 
+        /, 
+        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    @staticmethod
+    def login_refresh_token_open(
+        payload: str | dict, 
+        /, 
+        request: None | Callable = None, 
+        base_url: str | Callable[[], str] = "https://qrcodeapi.115.com", 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用一个 refresh_token 去获取新的 access_token 和 refresh_token，然后原来的 refresh_token 作废
+
+        POST https://qrcodeapi.115.com/open/refreshToken
+
+        .. admonition:: Reference
+
+            https://www.yuque.com/115yun/open/shtpzfhewv5nag11#ve54x
+
+            https://www.yuque.com/115yun/open/opnx8yezo4at2be6
+
+        :payload:
+            - refresh_token: str
+        """
+        api = complete_api("/open/refreshToken", base_url=base_url)
+        if isinstance(payload, str):
+            payload = {"refresh_token": payload}
+        request_kwargs.setdefault("parse", default_parse)
+        if request is None:
+            return get_default_request()(url=api, method="POST", data=payload, async_=async_, **request_kwargs)
+        else:
+            return request(url=api, method="POST", data=payload, **request_kwargs)
+
     @overload
     @classmethod
     def login_with_qrcode(
@@ -2668,7 +2870,7 @@ class P115OpenClient(ClientRequestMixin):
                 app_id_or_refresh_token.startswith("0") or 
                 app_id_or_refresh_token.strip(digits)
             ):
-                resp = yield self.login_qrcode_refresh_token_open(
+                resp = yield self.login_refresh_token_open(
                     app_id_or_refresh_token, 
                     async_=async_, 
                     **request_kwargs, 
@@ -2743,7 +2945,7 @@ class P115OpenClient(ClientRequestMixin):
         """更新 access_token 和 refresh_token （⚠️ 目前是 7200 秒内就要求刷新一次）
         """
         def gen_step():
-            resp = yield self.login_qrcode_refresh_token_open(
+            resp = yield self.login_refresh_token_open(
                 self.refresh_token, 
                 async_=async_, 
                 **request_kwargs, 
@@ -5420,7 +5622,7 @@ class P115Client(P115OpenClient):
                 return None
         return self.logout_by_ssoent(ssoent, async_=async_, **request_kwargs)
 
-    def request(
+    def _request(
         self, 
         /, 
         url: str, 
@@ -5662,6 +5864,90 @@ class P115Client(P115OpenClient):
                     return resp
         return run_gen_step(gen_step, async_=async_)
 
+    def request(
+        self, 
+        /, 
+        url: str, 
+        method: str = "GET", 
+        params = None, 
+        data = None, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ):
+        """帮助函数：可执行同步和异步的网络请求
+
+        :param url: HTTP 的请求链接
+        :param method: HTTP 的请求方法
+        :param params: 查询参数
+        :param check: 是否用 `check_response` 函数检查返回值
+        :param ecdh_encrypt: 使用 ecdh 算法进行加密（返回值也要解密）
+        :param fetch_cert_headers: 调用以获取认证信息头
+        :param revert_cert_headers: 调用以退还认证信息头
+        :param async_: 说明 `request` 是同步调用还是异步调用
+        :param request: HTTP 请求调用，如果为 None，则默认用 httpx 执行请求
+            如果传入调用，则必须至少能接受以下几个关键词参数：
+
+            - url:     HTTP 的请求链接
+            - method:  HTTP 的请求方法
+            - headers: HTTP 的请求头
+            - data:    HTTP 的请求体
+            - parse:   解析 HTTP 响应的方法，默认会构建一个 Callable，会把响应的字节数据视为 JSON 进行反序列化解析
+
+                - 如果为 None，则直接把响应对象返回
+                - 如果为 ...(Ellipsis)，则把响应对象关闭后将其返回
+                - 如果为 True，则根据响应头来确定把响应得到的字节数据解析成何种格式（反序列化），请求也会被自动关闭
+                - 如果为 False，则直接返回响应得到的字节数据，请求也会被自动关闭
+                - 如果为 Callable，则使用此调用来解析数据，接受 1-2 个位置参数，并把解析结果返回给 `request` 的调用者，请求也会被自动关闭
+                    - 如果只接受 1 个位置参数，则把响应对象传给它
+                    - 如果能接受 2 个位置参数，则把响应对象和响应得到的字节数据（响应体）传给它
+
+        :param request_kwargs: 其余的请求参数，会被传给 `request`
+
+        :return: 直接返回 `request` 执行请求后的返回值
+
+        .. note:: 
+            `request` 可以由不同的请求库来提供，下面是封装了一些模块
+
+            1. `httpx_request <https://pypi.org/project/httpx_request/>`_，由 `httpx <https://pypi.org/project/httpx/>`_ 封装，支持同步和异步调用，本模块默认用的就是这个封装
+
+                .. code:: python
+
+                    from httpx_request import request
+
+            2. `python-urlopen <https://pypi.org/project/python-urlopen/>`_，由 `urllib.request.urlopen <https://docs.python.org/3/library/urllib.request.html#urllib.request.urlopen>`_ 封装，支持同步调用，性能相对最差
+
+                .. code:: python
+
+                    from urlopen import request
+
+            3. `urllib3_request <https://pypi.org/project/urllib3_request/>`_，由 `urllib3 <https://pypi.org/project/urllib3/>`_ 封装，支持同步调用，性能相对较好，推荐使用
+
+                .. code:: python
+
+                    from urllib3_request import request
+
+            4. `requests_request <https://pypi.org/project/requests_request/>`_，由 `requests <https://pypi.org/project/requests/>`_ 封装，支持同步调用
+
+                .. code:: python
+
+                    from requests_request import request
+
+            5. `aiohttp_client_request <https://pypi.org/project/aiohttp_client_request/>`_，由 `aiohttp <https://pypi.org/project/aiohttp/>`_ 封装，支持异步调用，异步并发能力最强，推荐使用
+
+                .. code:: python
+
+                    from aiohttp_client_request import request
+
+            6. `blacksheep_client_request <https://pypi.org/project/blacksheep_client_request/>`_，由 `blacksheep <https://pypi.org/project/blacksheep/>`_ 封装，支持异步调用
+
+                .. code:: python
+
+                    from blacksheep_client_request import request
+        """
+        kwargs = {**self.request_kwargs, **request_kwargs}
+        return self._request(url, method, params, data, async_=async_, **kwargs)
+
     ########## Activity API ##########
 
     @overload
@@ -15047,6 +15333,13 @@ class P115Client(P115OpenClient):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
+        """获取某个开放应用的授权信息
+
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/user/getAppAuthDetail
+
+        :payload:
+            - auth_id: int | str 💡 授权 id
+        """
         api = complete_api(f"/app/1.0/{app}/1.0/user/getAppAuthDetail", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {"auth_id": payload}
@@ -15083,6 +15376,10 @@ class P115Client(P115OpenClient):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
+        """获取所有授权的开放应用的列表
+
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/user/getAppAuthList
+        """
         api = complete_api(f"/app/1.0/{app}/1.0/user/getAppAuthList", base_url=base_url)
         return self.request(url=api, async_=async_, **request_kwargs)
 
@@ -15120,6 +15417,13 @@ class P115Client(P115OpenClient):
         async_: Literal[False, True] = False, 
         **request_kwargs, 
     ) -> dict | Coroutine[Any, Any, dict]:
+        """取消某个开放应用的授权
+
+        GET https://qrcodeapi.115.com/app/1.0/web/1.0/user/deauthApp
+
+        :payload:
+            - auth_id: int | str 💡 授权 id
+        """
         api = complete_api(f"/app/1.0/{app}/1.0/user/deauthApp", base_url=base_url)
         if isinstance(payload, (int, str)):
             payload = {"auth_id": payload}

{p115client-0.0.5.10.7 → p115client-0.0.5.10.9}/p115client/tool/iterdir.py

@@ -13,6 +13,7 @@ __all__ = [
     "iter_selected_nodes_using_edit", "iter_selected_nodes_using_star_event", 
     "iter_selected_dirs_using_star", "iter_files_with_dirname", "iter_files_with_path", 
     "iter_files_with_path_by_export_dir", "iter_parents_3_level", "iter_dir_nodes", 
+    "search_for_any_file", 
 ]
 __doc__ = "这个模块提供了一些和目录信息罗列有关的函数"
 
@@ -5096,3 +5097,82 @@ def iter_dir_nodes(
                     )
     return run_gen_step_iter(gen_step(cid or 0), async_=async_)
 
+
+@overload
+def search_for_any_file(
+    client: str | P115Client, 
+    cid: int = 0, 
+    search_value: str = ".", 
+    suffix: str = "", 
+    type: int = 99, 
+    app: str = "web", 
+    *, 
+    async_: Literal[False] = False, 
+    **request_kwargs, 
+) -> bool:
+    ...
+@overload
+def search_for_any_file(
+    client: str | P115Client, 
+    cid: int = 0, 
+    search_value: str = ".", 
+    suffix: str = "", 
+    type: int = 99, 
+    app: str = "web", 
+    *, 
+    async_: Literal[True], 
+    **request_kwargs, 
+) -> Coroutine[Any, Any, bool]:
+    ...
+def search_for_any_file(
+    client: str | P115Client, 
+    cid: int = 0, 
+    search_value: str = ".", 
+    suffix: str = "", 
+    type: int = 99, 
+    app: str = "web", 
+    *, 
+    async_: Literal[False, True] = False, 
+    **request_kwargs, 
+) -> bool | Coroutine[Any, Any, bool]:
+    """搜索以判断是否存在某种文件
+
+    :param client: 115 客户端或 cookies
+    :param cid: 目录 id
+    :param search_value: 搜索关键词，搜索到的文件名必须包含这个字符串
+    :param suffix: 后缀名（优先级高于 type）
+    :param type: 文件类型
+
+        - 1: 文档
+        - 2: 图片
+        - 3: 音频
+        - 4: 视频
+        - 5: 压缩包
+        - 6: 应用
+        - 7: 书籍
+        - 99: 仅文件
+
+    :param app: 使用某个 app （设备）的接口
+    :param async_: 是否异步
+    :param request_kwargs: 其它请求参数
+
+    :return: 是否存在某种文件
+    """
+    if isinstance(client, str):
+        client = P115Client(client, check_for_relogin=True)
+    if not isinstance(client, P115Client) or app == "open":
+        fs_search: Callable = client.fs_search_open
+    elif app in ("", "web", "desktop", "harmony"):
+        fs_search = partial(client.fs_search, app=app)
+    else:
+        fs_search = client.fs_search_app
+    def gen_step():
+        resp = yield fs_search(
+            {"cid": cid, "limit": 1, "search_value": search_value, "suffix": suffix, "type": type}, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+        check_response(resp)
+        return bool(resp["data"])
+    return run_gen_step(gen_step, async_=async_)
+

{p115client-0.0.5.10.7 → p115client-0.0.5.10.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.10.7"
+version = "0.0.5.10.9"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -31,8 +31,8 @@ python = "^3.12"
 aiofile = "*"
 ed2k = ">=0.0.2.1"
 http_response = ">=0.0.2.2"
-httpx = "*"
-httpx_request = ">=0.1.3"
+httpx = ">=0.28"
+httpx_request = ">=0.1.4"
 iter_collect = ">=0.0.5.1"
 multidict = "*"
 orjson = "*"