p115client 0.0.5.6.9__tar.gz → 0.0.5.7__tar.gz

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.6.9
+Version: 0.0.5.7
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -24,7 +24,7 @@ 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.2)
+Requires-Dist: httpx_request (>=0.1.3)
 Requires-Dist: iter_collect (>=0.0.5.1)
 Requires-Dist: multidict
 Requires-Dist: orjson
@@ -36,10 +36,10 @@ Requires-Dist: python-concurrenttools (>=0.0.8.2)
 Requires-Dist: python-cookietools (>=0.0.2.1)
 Requires-Dist: python-dictattr (>=0.0.4)
 Requires-Dist: python-encode_uri (>=0.0.1)
-Requires-Dist: python-filewrap (>=0.2.7.1)
+Requires-Dist: python-filewrap (>=0.2.8)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.6)
-Requires-Dist: python-httpfile (>=0.0.5.1)
+Requires-Dist: python-httpfile (>=0.0.5.2)
 Requires-Dist: python-iterutils (>=0.1.8)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/download.py

@@ -97,7 +97,7 @@ def batch_get_url(
 
     :return: 字典，key 是文件 id，value 是下载链接，自动忽略所有无效项目
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if headers := request_kwargs.get("headers"):
         request_kwargs["headers"] = dict(headers, **{"User-Agent": user_agent})
@@ -207,7 +207,7 @@ def iter_url_batches(
 
     :return: 字典，key 是文件 id，value 是下载链接，自动忽略所有无效项目
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if headers := request_kwargs.get("headers"):
         request_kwargs["headers"] = dict(headers, **{"User-Agent": user_agent})
@@ -342,7 +342,7 @@ def iter_files_with_url(
 
     :return: 迭代器，产生文件信息，并增加一个 "url" 作为下载链接
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     params = dict(
         cur=cur, 
@@ -494,7 +494,7 @@ def iter_images_with_url(
 
     :return: 迭代器，产生文件信息，并增加一个 "url" 作为下载链接
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     params = dict(
         cur=cur, 
@@ -654,7 +654,7 @@ def iter_subtitles_with_url(
 
     :return: 迭代器，产生文件信息，并增加一个 "url" 作为下载链接
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         nonlocal suffixes
@@ -791,7 +791,7 @@ def iter_subtitle_batches(
 
     :return: 迭代器，产生文件信息，并增加一个 "url" 作为下载链接，文件信息中的 file_id 是复制所得的文件信息，不是原来文件的 id
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if batch_size <= 0:
         batch_size = 1_000
@@ -953,7 +953,7 @@ def make_strm(
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     user_id = client.user_id
     origin = origin.rstrip("/")
@@ -1128,7 +1128,7 @@ def iter_download_nodes(
 
     :return: 迭代器，产生文件或者目录的简略信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if files:
         method = client.download_files
@@ -1296,7 +1296,7 @@ def iter_download_files(
 
     :return: 迭代器，产生文件的简略信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/edit.py

@@ -70,7 +70,7 @@ def update_abstract(
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if max_workers is None or max_workers <= 0:
         max_workers = 20 if async_ else None
@@ -559,7 +559,7 @@ def batch_unstar(
     :param async_: 是否异步
     :param request_kwargs: 其它请求参数
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def get_id(info: dict, /) -> int:
         for k in ("file_id", "category_id", "fid", "cid"):

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/export_dir.py

@@ -493,7 +493,7 @@ def export_dir_result(
 def export_dir_parse_iter(
     client: str | P115Client, 
     export_file_ids: int | str | Iterable[int | str] = 0, 
-    export_id: int = 0, 
+    export_id: int | str = 0, 
     target_pid: int | str = 0, 
     layer_limit: int = 0, 
     parse_iter: None | Callable[[IO[bytes]], Iterator] = None, 
@@ -511,7 +511,7 @@ def export_dir_parse_iter(
 def export_dir_parse_iter(
     client: str | P115Client, 
     export_file_ids: int | str | Iterable[int | str] = 0, 
-    export_id: int = 0, 
+    export_id: int | str = 0, 
     target_pid: int | str = 0, 
     layer_limit: int = 0, 
     parse_iter: None | Callable[[IO[bytes]], AsyncIterator] = None, 
@@ -528,7 +528,7 @@ def export_dir_parse_iter(
 def export_dir_parse_iter(
     client: str | P115Client, 
     export_file_ids: int | str | Iterable[int | str] = 0, 
-    export_id: int = 0, 
+    export_id: int | str = 0, 
     target_pid: int | str = 0, 
     layer_limit: int = 0, 
     parse_iter: None | Callable[[IO[bytes]], Iterator] | Callable[[IO[bytes]], AsyncIterator] = None, 
@@ -545,11 +545,11 @@ def export_dir_parse_iter(
 
     :param client: 115 客户端或 cookies
     :param export_file_ids: 待导出的目录 id 或 路径（如果有多个，需传入可迭代对象）
-    :param export_id: 优先级高于 `export_file_ids`，之前提交的 `export_dir` 任务的 id
+    :param export_id: 优先级高于 `export_file_ids`，之前提交的 `export_dir` 任务的 id，如果是 str，则视为导出的目录树文件的提取码（因此无需导出）
     :param target_pid: 导出到的目标目录 id 或 路径
     :param layer_limit: 层级深度，小于等于 0 时不限
     :param parse_iter: 解析打开的二进制文件，返回可迭代对象
-    :param delete: 最终删除目录树文件
+    :param delete: 最终删除目录树文件（如果 export_id 为 str（即提取码），则这个值不生效，必不删除）
     :param timeout: 导出任务的超时秒数，如果为 None 或 小于等于 0，则相当于 float("inf")，即永不超时
     :param check_interval: 导出任务的状态，两次轮询之间的等待秒数，如果 <= 0，则不等待
     :param show_clock: 是否在等待导出目录树时，显示时钟。如果为 True，则显示默认的时钟，如果为 Callable，则作为自定义时钟进行调用（无参数）
@@ -577,37 +577,42 @@ def export_dir_parse_iter(
                 async_=async_, 
                 **request_kwargs, 
             )
-        if not show_clock:
-            result: dict = yield export_dir_result(
-                client, 
-                export_id, 
-                timeout=timeout, 
-                check_interval=check_interval, 
-                async_=async_, 
-                **request_kwargs, 
-            )
-        else:
-            result = yield context(
-                lambda *a: export_dir_result(
+        if isinstance(export_id, int):
+            if not show_clock:
+                result: dict = yield export_dir_result(
                     client, 
                     export_id, 
                     timeout=timeout, 
                     check_interval=check_interval, 
                     async_=async_, 
                     **request_kwargs, 
-                ), 
-                backgroud_loop(
-                    None if show_clock is True else show_clock, 
-                    interval=clock_interval, 
+                )
+            else:
+                result = yield context(
+                    lambda *a: export_dir_result(
+                        client, 
+                        export_id, 
+                        timeout=timeout, 
+                        check_interval=check_interval, 
+                        async_=async_, 
+                        **request_kwargs, 
+                    ), 
+                    backgroud_loop(
+                        None if show_clock is True else show_clock, 
+                        interval=clock_interval, 
+                        async_=async_, # type: ignore
+                    ), 
                     async_=async_, # type: ignore
-                ), 
-                async_=async_, # type: ignore
-            )
+                )
+            pickcode = result["pick_code"]
+        else:
+            pickcode = export_id
+            delete = False
         try:
             try:
                 url: str = yield partial(
                     client.download_url, 
-                    result["pick_code"], 
+                    pickcode, 
                     use_web_api=True, 
                     async_=async_, 
                     **request_kwargs, 
@@ -615,7 +620,7 @@ def export_dir_parse_iter(
             except OSError:
                 url = yield partial(
                     client.download_url, 
-                    result["pick_code"], 
+                    pickcode, 
                     async_=async_, 
                     **request_kwargs, 
                 )

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/iterdir.py

@@ -266,7 +266,7 @@ def get_path_to_cid(
 
     :return: 目录对应的绝对路径或相对路径
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -349,7 +349,7 @@ def get_file_count(
 
     :return: 目录内的文件总数（不包括目录）
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -481,7 +481,7 @@ def get_ancestors(
                 "name": str, # 名字
             }
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -626,7 +626,7 @@ def get_ancestors_to_cid(
                 "name": str, # 名字
             }
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -723,7 +723,7 @@ def get_id_to_path(
 
     :return: 文件或目录的 id
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -931,7 +931,7 @@ def get_id_to_pickcode(
 ) -> P115ID | Coroutine[Any, Any, P115ID]:
     if not 17 <= len(pickcode) <= 18 or not pickcode.isalnum():
         raise ValueError(f"bad pickcode: {pickcode!r}")
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         resp = yield client.download_url_web(pickcode, base_url=True, async_=async_, **request_kwargs)
@@ -970,7 +970,7 @@ def get_id_to_sha1(
 ) -> P115ID | Coroutine[Any, Any, P115ID]:
     if len(sha1) != 40 or sha1.strip(hexdigits):
         raise ValueError(f"bad sha1: {sha1!r}")
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         resp = yield client.fs_shasearch(sha1, base_url=True, async_=async_, **request_kwargs)
@@ -1018,7 +1018,7 @@ def iter_nodes_skim(
 
     :return: 迭代器，获取节点的简略信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         file_skim = client.fs_file_skim
@@ -1119,7 +1119,7 @@ def _iter_fs_files(
         payload["nf"] = 1
     if payload.get("type") == 99:
         payload.pop("type", None)
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -1457,7 +1457,7 @@ def ensure_attr_path[D: dict](
             return iter(attrs)
     if make_up_missing and not isinstance(attrs, Collection):
         attrs = tuple(attrs)
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 10_000
@@ -1638,7 +1638,7 @@ def ensure_attr_path_by_category_get[D: dict](
         if async_:
             return ensure_aiter(attrs)
         return attrs # type: ignore
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -1982,7 +1982,7 @@ def iterdir(
 
     :return: 迭代器，返回此目录内的文件信息（文件和目录）
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -2091,7 +2091,7 @@ def iterdir_limited(
 
     :return: 迭代器，返回此目录内的文件信息（文件和目录）
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -2466,7 +2466,7 @@ def iter_files(
 
     :return: 迭代器，返回此目录内的（仅文件）文件信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -2697,7 +2697,7 @@ def traverse_files(
         raise ValueError("please set the non-zero value of suffix or type")
     if suffix:
         suffix = "." + suffix.lower()
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3007,7 +3007,7 @@ def iter_image_files(
         attr["id"] = attr["file_id"]
         attr["name"] = attr["file_name"]
         return attr
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 8192
@@ -3124,7 +3124,7 @@ def share_iterdir(
 
     :return: 迭代器，被打上星标的目录信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size < 0:
         page_size = 10_000
@@ -3221,7 +3221,7 @@ def share_iter_files(
             }
 
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         payload: dict = cast(dict, share_extract_payload(share_link))
@@ -3310,7 +3310,7 @@ def iter_selected_nodes(
 
     :return: 迭代器，产生详细的信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3407,7 +3407,7 @@ def iter_selected_nodes_by_pickcode(
 
     :return: 迭代器，产生详细的信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3514,7 +3514,7 @@ def iter_selected_nodes_using_edit(
 
     :return: 迭代器，产生详细的信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3601,7 +3601,7 @@ def iter_selected_nodes_using_category_get(
 
     :return: 迭代器，产生详细的信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3715,7 +3715,7 @@ def iter_selected_nodes_using_star_event(
                 "type": int, 
             }
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]
@@ -3856,7 +3856,7 @@ def iter_selected_dirs_using_star(
 
     :return: 迭代器，产生详细的信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         nonlocal ids
@@ -4006,7 +4006,7 @@ def iter_files_with_dirname(
         payload["suffix"] = suffix
     elif type != 99:
         payload["type"] = type
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     request_kwargs.update(
         page_size=page_size, 
@@ -4209,7 +4209,7 @@ def iter_files_with_path(
     suffix = suffix.strip(".")
     if not (type or suffix):
         raise ValueError("please set the non-zero value of suffix or type")
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -4408,7 +4408,7 @@ def iter_files_with_path_by_export_dir(
     :return: 迭代器，返回此目录内的（仅文件）文件信息
     """
     from .export_dir import export_dir, export_dir_parse_iter, parse_export_dir_as_patht_iter
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if isinstance(escape, bool):
         if escape:
@@ -4647,7 +4647,7 @@ def iter_parents_3_level(
 
     :return: 迭代器，产生 id 和 最近 3 级目录名的元组的 2 元组
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def fix_overflow(t: tuple[str, ...], /) -> tuple[str, ...]:
         try:
@@ -4747,7 +4747,7 @@ def iter_dir_nodes(
 
     :return: 迭代器，返回此目录内的（仅目录）文件信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if id_to_dirnode is None:
         id_to_dirnode = ID_TO_DIRNODE_CACHE[client.user_id]

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/life.py

@@ -73,7 +73,7 @@ def life_show(
 
     :return: 接口返回值
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     return client.life_calendar_setoption(async_=async_, **request_kwargs)
 
@@ -121,7 +121,7 @@ def iter_life_list(
 
     :return: 迭代器，产生 115 生活操作事件日志数据字典
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     life_list = partial(client.life_list, app=app, **request_kwargs)
     life_behavior_detail = partial(client.life_behavior_detail_app, **request_kwargs)
@@ -238,7 +238,7 @@ def iter_life_behavior_once(
 
     :return: 迭代器，产生 115 生活操作事件日志数据字典
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if app in ("", "web", "desktop", "harmony"):
         life_behavior_detail = partial(client.life_behavior_detail, **request_kwargs)
@@ -342,7 +342,7 @@ def iter_life_behavior(
 
     :return: 迭代器，产生 115 生活操作事件日志数据字典
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         nonlocal from_time, from_id
@@ -442,7 +442,7 @@ def iter_life_behavior_list(
 
     :return: 迭代器，产生 115 生活操作事件日志数据字典
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     def gen_step():
         nonlocal from_time, from_id

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/pool.py

@@ -61,7 +61,7 @@ def generate_cookies_factory(
 
     :return: 函数，调用以返回一个 cookies
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if app:
         if APP_TO_SSOENT.get(app) == client.login_ssoent:
@@ -96,7 +96,7 @@ def generate_client_factory(
 
     :return: 函数，调用以返回一个 client
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if app:
         if APP_TO_SSOENT.get(app) == client.login_ssoent:

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/p115client/tool/xys.py

@@ -22,7 +22,7 @@ def wish_make(
 
     :return: 许愿 id
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client)
     return check_response(client.act_xys_wish(
         {"rewardSpace": size, "content": content}
@@ -44,7 +44,7 @@ def wish_answer(
 
     :return: 助愿 id
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client)
     if not isinstance(file_ids, (int, str)):
         file_ids = ",".join(map(str, file_ids))
@@ -68,7 +68,7 @@ def wish_list(
 
     :return: 许愿列表
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client)
     payload: dict = {"type": type, "limit": 1000, "page": 1}
     ls = adds = check_response(client.act_xys_my_desire(payload))["data"]["list"]
@@ -90,7 +90,7 @@ def wish_aid_list(
 
     :return: 助愿列表
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client)
     payload: dict = {"id": wish_id, "limit": 1000, "page": 1}
     ls = adds = check_response(client.act_xys_desire_aid_list(payload))["data"]["list"]
@@ -116,7 +116,7 @@ def wish_adopt(
 
     :return: 返回信息
     """
-    if not isinstance(client, P115Client):
+    if isinstance(client, str):
         client = P115Client(client)
     return check_response(client.act_xys_adopt({"did": wish_id, "aid": aid_id, "to_cid": to_cid}))
 

{p115client-0.0.5.6.9 → p115client-0.0.5.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p115client"
-version = "0.0.5.6.9"
+version = "0.0.5.7"
 description = "Python 115 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -32,7 +32,7 @@ aiofile = "*"
 ed2k = ">=0.0.2.1"
 http_response = ">=0.0.2.2"
 httpx = "*"
-httpx_request = ">=0.1.2"
+httpx_request = ">=0.1.3"
 iter_collect = ">=0.0.5.1"
 multidict = "*"
 orjson = "*"
@@ -44,9 +44,9 @@ python-concurrenttools = ">=0.0.8.2"
 python-cookietools = ">=0.0.2.1"
 python-dictattr = ">=0.0.4"
 python-encode_uri = ">=0.0.1"
-python-filewrap = ">=0.2.7.1"
+python-filewrap = ">=0.2.8"
 python-hashtools = ">=0.0.3.3"
-python-httpfile = ">=0.0.5.1"
+python-httpfile = ">=0.0.5.2"
 python-http_request = ">=0.0.6"
 python-iterutils = ">=0.1.8"
 python-property = ">=0.0.3"