p115client 0.0.5.12.1__py3-none-any.whl → 0.0.5.12.2__py3-none-any.whl

p115client/tool/fs_files.py

@@ -7,18 +7,19 @@ __doc__ = "这个模块利用 P115Client.fs_files 方法做了一些封装"
 
 from asyncio import shield, wait_for, Task, TaskGroup
 from collections import deque
-from collections.abc import AsyncIterator, Callable, Iterator
+from collections.abc import AsyncIterator, Awaitable, Callable, Iterator
 from concurrent.futures import Future, ThreadPoolExecutor
 from copy import copy
 from errno import EBUSY, ENOENT, ENOTDIR
 from functools import partial
 from inspect import isawaitable
 from itertools import cycle
+from sys import exc_info
 from time import time
-from typing import overload, Any, Final, Literal
+from typing import cast, overload, Any, Final, Literal
 from warnings import warn
 
-from iterutils import run_gen_step, run_gen_step_iter, Yield
+from iterutils import as_gen_step, run_gen_step_iter, Yield
 from p115client import check_response, P115Client, P115OpenClient
 from p115client.client import get_status_code
 from p115client.exception import BusyOSError, DataError, P115Warning
@@ -95,6 +96,16 @@ def iter_fs_files(
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
         page_size = 10_000
+    if not isinstance(client, P115Client) or app == "open":
+        page_size = min(page_size, 1150)
+        fs_files = partial(client.fs_files_open, **request_kwargs)
+    elif app in ("", "web", "desktop", "harmony"):
+        page_size = min(page_size, 1150)
+        request_kwargs.setdefault("base_url", get_webapi_origin)
+        fs_files = partial(client.fs_files, **request_kwargs)
+    else:
+        request_kwargs.setdefault("base_url", get_proapi_origin)
+        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
     if first_page_size <= 0:
         first_page_size = page_size
     if isinstance(payload, (int, str)):
@@ -104,14 +115,7 @@ def iter_fs_files(
         "limit": first_page_size, "show_dir": 1, **payload, 
     }
     cid = int(payload["cid"])
-    if not isinstance(client, P115Client) or app == "open":
-        fs_files = partial(client.fs_files_open, **request_kwargs)
-    elif app in ("", "web", "desktop", "harmony"):
-        request_kwargs.setdefault("base_url", get_webapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
-    else:
-        request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
+    @as_gen_step
     def get_files(payload: dict, /):
         nonlocal count
         while True:
@@ -145,13 +149,13 @@ def iter_fs_files(
                 return resp
     def gen_step():
         while True:
-            resp = yield run_gen_step(get_files(payload), may_call=False, async_=async_)
+            resp = yield get_files(payload)
             payload["limit"] = page_size
             yield Yield(resp)
             payload["offset"] += len(resp["data"])
             if payload["offset"] >= count:
                 break
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 def iter_fs_files_threaded(
@@ -187,14 +191,7 @@ def iter_fs_files_threaded(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
-        page_size = 7_000
-    if isinstance(payload, (int, str)):
-        payload = {"cid": payload}
-    payload = {
-        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
-        "limit": page_size, "show_dir": 1, **payload, 
-    }
-    cid = int(payload["cid"])
+        page_size = 10_000
     if not isinstance(client, P115Client) or app == "open":
         page_size = min(page_size, 1150)
         fs_files = partial(client.fs_files_open, **request_kwargs)
@@ -205,6 +202,13 @@ def iter_fs_files_threaded(
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
         fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
+    if isinstance(payload, (int, str)):
+        payload = {"cid": payload}
+    payload = {
+        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
+        "limit": page_size, "show_dir": 1, **payload, 
+    }
+    cid = int(payload["cid"])
     def get_files(payload: dict, /):
         nonlocal count
         resp = fs_files(payload)
@@ -302,27 +306,41 @@ async def iter_fs_files_asynchronized(
     if isinstance(client, str):
         client = P115Client(client, check_for_relogin=True)
     if page_size <= 0:
-        page_size = 7_000
-    if isinstance(payload, (int, str)):
-        payload = {"cid": payload}
-    payload = {
-        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
-        "limit": page_size, "show_dir": 1, **payload, 
-    }
-    cid = int(payload["cid"])
+        page_size = 10_000
+    fs_files: Callable[..., Awaitable[dict]]
     if not isinstance(client, P115Client) or app == "open":
         page_size = min(page_size, 1150)
-        fs_files = partial(client.fs_files_open, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files_open, 
+            async_=True, 
+            **request_kwargs, 
+        ))
     elif app in ("", "web", "desktop", "harmony"):
         page_size = min(page_size, 1150)
         request_kwargs.setdefault("base_url", get_webapi_origin)
-        fs_files = partial(client.fs_files, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files, 
+            async_=True, 
+            **request_kwargs, 
+        ))
     else:
         request_kwargs.setdefault("base_url", get_proapi_origin)
-        fs_files = partial(client.fs_files_app, app=app, **request_kwargs)
+        fs_files = cast(Callable, partial(
+            client.fs_files_app, 
+            app=app, 
+            async_=True, 
+            **request_kwargs, 
+        ))
+    if isinstance(payload, (int, str)):
+        payload = {"cid": payload}
+    payload = {
+        "asc": 1, "cid": 0, "fc_mix": 1, "o": "user_ptime", "offset": 0, 
+        "limit": page_size, "show_dir": 1, **payload, 
+    }
+    cid = int(payload["cid"])
     async def get_files(payload: dict, /):
         nonlocal count
-        resp = await fs_files(payload, async_=True) # type: ignore
+        resp = await fs_files(payload)
         check_response(resp)
         if cid and int(resp["path"][-1]["cid"]) != cid:
             if count < 0:
@@ -390,7 +408,5 @@ async def iter_fs_files_asynchronized(
     finally:
         for t in tuple(tg._tasks):
             t.cancel()
-        await tg.__aexit__(None, None, None)
-
+        await tg.__aexit__(*exc_info())
 
-# TODO: 以上的数据获取方式某种程度上应该是通用的，只要是涉及到 offset 和 count，因此可以总结出一个更抽象的函数

p115client/tool/history.py

@@ -119,7 +119,7 @@ def iter_history_list_once(
             ts_last_call = time()
             resp = yield history_list(payload, async_=async_)
             events = check_response(resp)["data"]["list"]
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -220,5 +220,5 @@ def iter_history_list(
                         from_time = int(event["update_time"])
                         sub_first_loop = False
                     yield Yield(event)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 

p115client/tool/iterdir.py

@@ -40,9 +40,9 @@ from weakref import WeakValueDictionary
 from asynctools import async_chain, async_filter, async_map, to_list
 from concurrenttools import run_as_thread, taskgroup_map, threadpool_map
 from iterutils import (
-    as_gen_step, bfs_gen, chunked, ensure_aiter, foreach, 
-    flatten, iter_unique, run_gen_step, run_gen_step_iter, through, 
-    async_through, with_iter_next, Yield, YieldFrom, 
+    bfs_gen, chunked, ensure_aiter, foreach, flatten, iter_unique, 
+    run_gen_step, run_gen_step_iter, through, async_through, with_iter_next, 
+    Yield, YieldFrom, 
 )
 from iter_collect import iter_keyed_dups, SupportsLT
 from orjson import loads
@@ -238,7 +238,7 @@ def get_path_to_cid(
             return "/" + path
         else:
             return path
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -370,7 +370,7 @@ def get_file_count(
                     node = DirNode(info["file_name"], pid)
                     id_to_dirnode[(pid := int(info["file_id"]))] = node
             return int(resp["count"]) - int(resp.get("folder_count") or 0)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -590,7 +590,7 @@ def get_ancestors(
                 if not resp.get("sha1") and id_to_dirnode is not ...:
                     id_to_dirnode[ans["id"]] = DirNode(ans["name"], ans["parent_id"])
         return ancestors
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -692,7 +692,7 @@ def get_ancestors_to_cid(
             parts.append({"id": 0, "name": "", "parent_id": 0})
             parts.reverse()
         return parts
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 # TODO: 使用 search 接口以在特定目录之下搜索某个名字，以便减少风控
@@ -887,7 +887,7 @@ def get_id_to_path(
                     if ensure_file is None or ensure_file ^ attr["is_dir"]:
                         return P115ID(attr["id"], attr, about="path")
         raise error
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -941,7 +941,7 @@ def get_id_to_pickcode(
         check_response(resp)
         data = resp["data"]
         return P115ID(data["file_id"], data, about="pickcode")
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -1001,7 +1001,7 @@ def get_id_to_sha1(
             else:
                 raise FileNotFoundError(ENOENT, file_sha1)
         return P115ID(data["file_id"], data, about="sha1", file_sha1=file_sha1)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -1054,7 +1054,7 @@ def iter_nodes_skim(
             for a in resp["data"]:
                 a["file_name"] = unescape_115_charref(a["file_name"])
             yield YieldFrom(resp["data"])
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1203,7 +1203,7 @@ def _iter_fs_files(
                         yield Yield(info)
         except (StopAsyncIteration, StopIteration):
             pass
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1593,7 +1593,7 @@ def ensure_attr_path[D: dict](
                 attr.setdefault("ancestors", None)
                 attr.setdefault("path", "")
             yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2078,7 +2078,7 @@ def iterdir(
             yield YieldFrom(do_map(process, it)) # type: ignore
         else:
             yield YieldFrom(do_map(normalize_attr, it)) # type: ignore
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 def iterdir_limited(
@@ -2187,7 +2187,7 @@ def iterdir_limited(
                 attr["path"] = dirname + name
             yield attr
     def gen_step():
-        resp: dict = yield run_gen_step(request, may_call=False, async_=async_)
+        resp: dict = yield run_gen_step(request, async_)
         yield YieldFrom(iter_attrs(resp))
         count = int(resp["count"])
         count_fetched = len(resp["data"])
@@ -2239,7 +2239,7 @@ def iterdir_limited(
                     yield YieldFrom(iter_attrs(resp))
                     if diff := count_files - len(seen_files):
                         warn(f"lost {diff} files: cid={cid}", category=P115Warning)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2609,7 +2609,7 @@ def iter_files(
                 async_=async_, # type: ignore
                 **request_kwargs, 
             ))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2814,7 +2814,7 @@ def traverse_files(
                         type_of_attr(attr) == type
                     ):
                         yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -2885,7 +2885,6 @@ def iter_dirs(
     it = do_map(project, it)
     if with_pickcode:
         file_skim = client.fs_file_skim
-        @as_gen_step(async_=async_)
         def batch_load_pickcode(batch: Sequence[dict], /):
             resp = yield file_skim(
                 (a["id"] for a in batch), 
@@ -2901,14 +2900,14 @@ def iter_dirs(
         def gen_step(iterable):
             batch_map = taskgroup_map if async_ else threadpool_map
             with with_iter_next(batch_map(
-                batch_load_pickcode, 
+                lambda batch: run_gen_step(batch_load_pickcode(batch), async_), 
                 chunked(iterable, 3000), 
                 max_workers=max_workers, 
             )) as get_next:
                 while True:
                     batch = yield get_next()
                     yield YieldFrom(batch)
-        it = run_gen_step_iter(gen_step(it), may_call=False, async_=async_)
+        it = run_gen_step_iter(gen_step(it), async_)
     return it
 
 
@@ -3160,7 +3159,7 @@ def iter_image_files(
             if offset >= count:
                 break
             payload["offset"] = offset
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -3273,7 +3272,7 @@ def share_iterdir(
             payload["offset"] += page_size # type: ignore
             if payload["offset"] >= count: # type: ignore
                 break
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -3376,7 +3375,7 @@ def share_iter_files(
                     yield Yield({k: attr[k] for k in ("id", "sha1", "name", "size", "path")})
         except (StopIteration, StopAsyncIteration):
             pass
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -3546,7 +3545,7 @@ def share_get_id_to_path(
                     if ensure_file is None or ensure_file ^ attr["is_dir"]:
                         return P115ID(attr["id"], attr, about="path")
         raise error
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -4088,7 +4087,7 @@ def iter_selected_nodes_using_star_event(
                         break
         except (StopIteration, StopAsyncIteration):
             pass
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -4188,7 +4187,7 @@ def iter_selected_dirs_using_star(
                         break
         except (StopIteration, StopAsyncIteration):
             pass
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -4362,7 +4361,7 @@ def iter_files_with_dirname(
             it = iter_parents_3_level(
                 client, 
                 iter_unique((async_map if async_ else map)( 
-                    get_pid, run_gen_step_iter(gen_step, may_call=False, async_=async_))), # type: ignore
+                    get_pid, run_gen_step_iter(gen_step, async_))), # type: ignore
                 async_=async_, # type: ignore
                 **request_kwargs, 
             )
@@ -4376,8 +4375,8 @@ def iter_files_with_dirname(
             for attr in files:
                 attr["parents"] = (attr["dir_name"], *id_to_parents[attr["parent_id"]])
                 yield Yield(attr)
-        return run_gen_step_iter(gen_step2, may_call=False, async_=async_)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+        return run_gen_step_iter(gen_step2, async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -4550,7 +4549,7 @@ def iter_files_with_path(
                 )) as get_next:
                     while True:
                         attr = yield get_next()
-                        yield run_gen_step(fetch_dirs(attr["pickcode"]), may_call=False, async_=async_)
+                        yield run_gen_step(fetch_dirs(attr["pickcode"]), async_)
     if with_ancestors:
         id_to_ancestors: dict[int, list[dict]] = {}
         def get_ancestors(id: int, attr: dict | tuple[str, int] | DirNode, /) -> list[dict]:
@@ -4597,7 +4596,7 @@ def iter_files_with_path(
         add_to_cache = cache.append
         if not path_already:
             if async_:
-                task: Any = create_task(run_gen_step(fetch_dirs(cid), may_call=False, async_=True))
+                task: Any = create_task(run_gen_step(fetch_dirs(cid), True))
             else:
                 task = run_as_thread(run_gen_step, fetch_dirs(cid))
             task.add_done_callback(set_path_already)
@@ -4641,7 +4640,7 @@ def iter_files_with_path(
             else:
                 task.result()
             yield YieldFrom(map(update_path, cache))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -4898,7 +4897,7 @@ def iter_files_with_path_by_export_dir(
                     name = escape(name)
                 attr["path"] = dir_path + name
                 yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -4989,7 +4988,7 @@ def iter_parents_3_level(
     ids = (async_filter if async_ else filter)(None, ids) # type: ignore
     return flatten(
         batch_map(
-            lambda ids, /: run_gen_step(get_parents(ids), may_call=False, async_=async_), 
+            lambda ids, /: run_gen_step(get_parents(ids), async_), 
             chunked(ids, 1150), 
             max_workers=max_workers, 
         ), 
@@ -5088,12 +5087,8 @@ def iter_dir_nodes(
                             "name": attr["name"], 
                         }
                     )
-                    yield YieldFrom(run_gen_step_iter(
-                        gen_step(attr["pickcode"]), 
-                        may_call=False, 
-                        async_=async_, 
-                    ))
-    return run_gen_step_iter(gen_step(cid or 0), may_call=False, async_=async_)
+                    yield YieldFrom(run_gen_step_iter(gen_step(attr["pickcode"]), async_))
+    return run_gen_step_iter(gen_step(cid or 0), async_)
 
 
 @overload
@@ -5172,5 +5167,5 @@ def search_for_any_file(
         )
         check_response(resp)
         return bool(resp["data"])
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/tool/life.py

@@ -172,7 +172,7 @@ def iter_life_list(
                 else:
                     sleep(1 - diff)
             end_time = int(time())
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -276,7 +276,7 @@ def iter_life_behavior_once(
             ts_last_call = time()
             resp = yield life_behavior_detail(payload, async_=async_)
             events = check_response(resp)["data"]["list"]
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -377,7 +377,7 @@ def iter_life_behavior(
                     if not type and ignore_types and event["type"] in ignore_types:
                         continue
                     yield Yield(event)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -469,5 +469,5 @@ def iter_life_behavior_list(
                         continue
                     push(event)
             yield Yield(ls)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 

p115client/tool/offline.py

@@ -128,7 +128,7 @@ def offline_iter(
                 yield YieldFrom(resp["tasks"])
             if len(tasks) < 30 or page >= resp["page_count"]:
                 break
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -192,5 +192,5 @@ def offline_restart_iter(
             )
             resp["task"] = task
             yield Yield(resp)
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 

p115client/tool/pool.py

@@ -87,7 +87,7 @@ def generate_auth_factory(
                     "authorization": "Bearer " + resp["data"]["access_token"], 
                     "app_id": str(app_id), 
                 }
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
     return make_cookies
 
 
@@ -141,7 +141,7 @@ def generate_cookies_factory(
                     "cookie": "; ".join(f"{k}={v}" for k, v in resp["data"]["cookie"].items()), 
                     "app": app, 
                 }
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
     return make_cookies
 
 
@@ -164,7 +164,7 @@ def generate_client_factory(
         def gen_step():
             headers = yield call(async_=async_)
             return cls(headers["cookie"])
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
     return make_client
 
 
@@ -214,7 +214,7 @@ def make_pool[T](
                     value = generate()
                 val = ComparedWithID(value)
             return value, partial(heappush, heap_, (time(), val))
-        return run_gen_step(call, may_call=False, async_=async_)
+        return run_gen_step(call, async_)
     if not lock:
         setattr(get_value, "heap", heap_)
         return get_value
@@ -376,7 +376,7 @@ def call_wrap_with_pool(get_cert_headers: Callable, /, func: Callable) -> Callab
                     if not isinstance(e, (AuthenticationError, LoginError)) and get_status_code(e) != 405:
                         revert()
                         raise
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
     return update_wrapper(wrapper, func)
 
 

p115client/tool/upload.py

@@ -98,9 +98,9 @@ def iter_115_to_115(
 
     :return: 迭代器，产生转移结果，有 3 种类型："good"、"fail" 和 "skip"
     """
-    @as_gen_step(async_=async_)
+    @as_gen_step
     def upload(attr: dict, pid: int, /):
-        @as_gen_step(async_=async_)
+        @as_gen_step
         def read_range_bytes_or_hash(sign_check: str, /):
             if attr["is_collect"]:
                 url = yield from_client.download_url(
@@ -163,7 +163,7 @@ def iter_115_to_115(
             else:
                 return {"type": "fail", "attr": attr, "resp": None, "exc": e}
     key_of_id = "id" if with_root else "parent_id"
-    @as_gen_step(async_=async_)
+    @as_gen_step
     def get_pid(attr: dict, /):
         if use_iter_files:
             if attr["is_collect"] and attr["size"] >= 1024 * 1024 * 115:
@@ -268,9 +268,9 @@ def iter_115_to_115_resume(
 
     :return: 迭代器，产生转移结果，有 3 种类型："good"、"fail" 和 "skip"
     """
-    @as_gen_step(async_=async_)
+    @as_gen_step
     def upload(attr: dict, pid: int, /):
-        @as_gen_step(async_=async_)
+        @as_gen_step
         def read_range_bytes_or_hash(sign_check: str, /):
             if attr["is_collect"]:
                 url = yield from_client.download_url(
@@ -316,7 +316,7 @@ def iter_115_to_115_resume(
                 return {"type": "fail", "attr": attr, "resp": None, "exc": e}
     dirt_to_cid: dict[tuple[str, ...], int] = {}
     key_of_id = "id" if with_root else "parent_id"
-    @as_gen_step(async_=async_)
+    @as_gen_step
     def get_pid(attr: dict, /):
         if attr["is_collect"] and attr["size"] >= 1024 * 1024 * 115:
             return Return({"type": "skip", "attr": attr, "resp": None})
@@ -456,7 +456,7 @@ def iter_115_to_115_resume(
                 arg_func=get_pid, 
                 max_workers=max_workers, 
             ))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -716,7 +716,7 @@ def multipart_upload_init(
             upload_data["parts"] = []
         upload_data["_upload_"] = None
         return upload_data
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 def multipart_upload_url(
@@ -865,5 +865,5 @@ def multipart_upload_complete(
             async_=async_, 
             **request_kwargs, 
         )
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)