p115client 0.0.5.11__py3-none-any.whl → 0.0.5.11.2__py3-none-any.whl

p115client/tool/download.py

@@ -145,7 +145,7 @@ def batch_get_url(
             for id, info in resp["data"].items()
             if info["url"]
         }
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -227,8 +227,8 @@ def iter_url_batches(
                         sha1=info["sha1"], 
                         is_directory=False,
                         headers=headers, 
-                    ), may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+                    ))
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -376,8 +376,7 @@ def iter_files_with_url(
                         app=app, 
                         user_agent=user_agent, 
                         **params, # type: ignore
-                    ), 
-                    may_await=False, 
+                    )
                 )
             return
         if headers := request_kwargs.get("headers"):
@@ -386,7 +385,7 @@ def iter_files_with_url(
             request_kwargs["headers"] = {"user-agent": user_agent}
         with with_iter_next(it) as get_next:
             while True:
-                attr = yield get_next
+                attr = yield get_next()
                 if attr.get("violated", False):
                     if attr["size"] < 1024 * 1024 * 115:
                         attr["url"] = yield get_url(
@@ -403,8 +402,8 @@ def iter_files_with_url(
                         async_=async_, 
                         **request_kwargs, 
                     )
-                yield Yield(attr, may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+                yield Yield(attr)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -536,13 +535,12 @@ def iter_images_with_url(
                         suffixes=suffix, 
                         app=app, 
                         **params, # type: ignore
-                    ), 
-                    may_await=False, 
+                    )
                 )
             return
         with with_iter_next(it) as get_next:
             while True:
-                attr = yield get_next
+                attr = yield get_next()
                 try:
                     attr["url"] = reduce_image_url_layers(attr["thumb"])
                 except KeyError:
@@ -562,8 +560,8 @@ def iter_images_with_url(
                             async_=async_, 
                             **request_kwargs, 
                         )
-                yield Yield(attr, may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+                yield Yield(attr)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -689,7 +687,7 @@ def iter_subtitles_with_url(
         do_next = anext if async_ else next
         with with_iter_next(it) as get_next:
             while True:
-                items: tuple[dict] = yield get_next
+                items: tuple[dict] = yield get_next()
                 resp = yield client.fs_mkdir(
                     f"subtitle-{uuid4()}", 
                     async_=async_, 
@@ -728,7 +726,7 @@ def iter_subtitles_with_url(
                 if subtitles:
                     for attr in items:
                         attr["url"] = subtitles[attr["sha1"]]
-                        yield Yield(attr, may_await=False)
+                        yield Yield(attr)
                 else:
                     for attr in items:
                         if attr.get("violated", False):
@@ -747,8 +745,8 @@ def iter_subtitles_with_url(
                                 async_=async_, 
                                 **request_kwargs, 
                             )
-                        yield Yield(attr, may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+                        yield Yield(attr)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -832,14 +830,13 @@ def iter_subtitle_batches(
                 )
                 check_response(resp)
                 yield YieldFrom(
-                    filter(lambda info: "file_id" in info, resp["data"]["list"]), 
-                    may_await=False, 
+                    filter(lambda info: "file_id" in info, resp["data"]["list"])
                 )
             except (StopIteration, StopAsyncIteration):
                 pass
             finally:
                 yield client.fs_delete(scid, async_=async_, **request_kwargs)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -1080,7 +1077,7 @@ def make_strm(
         if use_abspath is not None:
             params["path_already"] = path_already
         yield (async_batch if async_ else thread_batch)(
-            lambda attr: run_gen_step(save(attr), simple=True, async_=async_), 
+            lambda attr: run_gen_step(save(attr), may_call=False, async_=async_), 
             (iter_files if use_abspath is None else iter_files_with_path)(
                 client, 
                 cid, 
@@ -1117,7 +1114,7 @@ def make_strm(
             "ignore": ignored, 
             "remove": removed, 
         }
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -1185,7 +1182,7 @@ def iter_download_nodes(
                 resp = yield get_nodes(payload)
                 check_response(resp)
                 data = resp["data"]
-                yield YieldFrom(data["list"], may_await=False)
+                yield YieldFrom(data["list"])
                 if not data["has_next_page"]:
                     break
     else:
@@ -1259,16 +1256,16 @@ def iter_download_nodes(
                 for i in range(n):
                     submit(run_gen_step, request(pickcode), async_=async_).add_done_callback(countdown)
                 while True:
-                    ls = yield get
+                    ls = yield get()
                     if ls is sentinel:
                         break
                     elif isinstance(ls, BaseException):
                         raise ls
-                    yield YieldFrom(ls, may_await=False)
+                    yield YieldFrom(ls)
             finally:
-                yield shutdown
+                yield shutdown()
     if pickcode:
-        return run_gen_step_iter(gen_step(pickcode), simple=True, async_=async_)
+        return run_gen_step_iter(gen_step(pickcode), may_call=False, async_=async_)
     else:
         def chain():
             with with_iter_next(iterdir(
@@ -1281,17 +1278,17 @@ def iter_download_nodes(
                 **request_kwargs, 
             )) as get_next:
                 while True:
-                    attr = yield get_next
+                    attr = yield get_next()
                     if not files:
                         yield Yield(
-                            {"fid": str(attr["id"]), "pid": "0", "fn": attr["name"]}, 
-                            may_await=False, 
+                            {"fid": str(attr["id"]), "pid": "0", "fn": attr["name"]}
                         )
-                    yield YieldFrom(
-                        run_gen_step_iter(gen_step(attr["pickcode"]), simple=True, async_=async_), 
-                        may_await=False, 
-                    )
-        return run_gen_step_iter(chain, simple=True, async_=async_)
+                    yield YieldFrom(run_gen_step_iter(
+                        gen_step(attr["pickcode"]), 
+                        may_call=False, 
+                        async_=async_, 
+                    ))
+        return run_gen_step_iter(chain, may_call=False, async_=async_)
 
 
 @overload
@@ -1427,7 +1424,7 @@ def iter_download_files(
                 **request_kwargs, 
             )) as get_next:
                 while True:
-                    attr = yield get_next
+                    attr = yield get_next()
                     if attr["is_dir"]:
                         pickcodes.append(attr["pickcode"])
                     else:
@@ -1436,12 +1433,13 @@ def iter_download_files(
                             "pickcode": attr["pickcode"], 
                             "size": attr["size"], 
                             **defaults, 
-                        }, may_await=False)
+                        })
             for pickcode in pickcodes:
-                yield YieldFrom(
-                    run_gen_step_iter(gen_step(pickcode), simple=True, async_=async_), 
-                    may_await=False, 
-                )
+                yield YieldFrom(run_gen_step_iter(
+                    gen_step(pickcode), 
+                    may_call=False, 
+                    async_=async_, 
+                ))
             return
         if not pickcode:
             resp = yield client.fs_file_skim(cid, async_=async_, **request_kwargs)
@@ -1473,12 +1471,12 @@ def iter_download_files(
                     **request_kwargs, 
                 )) as get_next:
                     while True:
-                        info = yield get_next
+                        info = yield get_next()
                         id_to_dirnode[int(info["fid"])] = DirNode(info["fn"], int(info["pid"]))
             finally:
                 ancestors_loaded = True
         if async_:
-            task: Any = create_task(run_gen_step(load_ancestors, simple=True, async_=True))
+            task: Any = create_task(run_gen_step(load_ancestors, may_call=False, async_=True))
         else:
             task = run_as_thread(run_gen_step, load_ancestors)
         cache: list[dict] = []
@@ -1493,11 +1491,11 @@ def iter_download_files(
             **request_kwargs, 
         )) as get_next:
             while True:
-                info = yield get_next
+                info = yield get_next()
                 if ancestors_loaded is None:
-                    yield Yield(norm_attr(info), may_await=False)
+                    yield Yield(norm_attr(info))
                 elif ancestors_loaded:
-                    yield YieldFrom(map(norm_attr, cache), may_await=False)
+                    yield YieldFrom(map(norm_attr, cache))
                     cache.clear()
                     if async_:
                         yield task
@@ -1511,8 +1509,8 @@ def iter_download_files(
                 yield task
             else:
                 task.result()
-            yield YieldFrom(map(norm_attr, cache), may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+            yield YieldFrom(map(norm_attr, cache))
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -1571,7 +1569,7 @@ def get_remaining_open_count(
                 **request_kwargs, 
             )) as get_next:
                 while True:
-                    info = yield get_next
+                    info = yield get_next()
                     if int(info["fs"]) <= 1024 * 1024 * 200:
                         continue
                     try:
@@ -1588,5 +1586,5 @@ def get_remaining_open_count(
             for f in cache:
                 f.close()
             return len(cache)
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 

p115client/tool/edit.py

@@ -91,7 +91,7 @@ def update_abstract(
                 chunked(ids, batch_size), 
                 max_workers=max_workers
             ))
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -634,5 +634,5 @@ def batch_unstar(
             async_=async_, # type: ignore
             **request_kwargs, 
         )
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 

p115client/tool/export_dir.py

@@ -95,7 +95,7 @@ def parse_export_dir_as_dict_iter(
                     stack[depth]["name"] += "\n" + line[:-1]
                     continue
                 else:
-                    yield Yield(stack[depth], may_await=False)
+                    yield Yield(stack[depth])
                 name = m[1]
                 depth = (len(line) - len(name)) // 2 - 1
                 item = {
@@ -110,17 +110,17 @@ def parse_export_dir_as_dict_iter(
                     push(item)
         except (StopIteration, StopAsyncIteration):
             if depth:
-                yield Yield(stack[depth], may_await=False)
+                yield Yield(stack[depth])
         finally:
             if close_file:
                 if async_:
                     if callable(aclose := getattr(file, "aclose", None)):
-                        yield aclose
+                        yield aclose()
                     elif callable(close := getattr(file, "close", None)):
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -206,7 +206,7 @@ def parse_export_dir_as_path_iter(
                     stack[depth] += "\n" + line[:-1]
                     continue
                 elif depth:
-                    yield Yield(stack[depth], may_await=False)
+                    yield Yield(stack[depth])
                 else:
                     yield "/" if root == "根目录" else root
                 name = m[1]
@@ -220,17 +220,17 @@ def parse_export_dir_as_path_iter(
                     push(path)
         except (StopIteration, StopAsyncIteration):
             if depth:
-                yield Yield(stack[depth], may_await=False)
+                yield Yield(stack[depth])
         finally:
             if close_file:
                 if async_:
                     if callable(aclose := getattr(file, "aclose", None)):
-                        yield aclose
+                        yield aclose()
                     elif callable(close := getattr(file, "close", None)):
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -298,7 +298,7 @@ def parse_export_dir_as_patht_iter(
                     stack[depth] += "\n" + line[:-1]
                     continue
                 else:
-                    yield Yield(stack[:depth+1], may_await=False)
+                    yield Yield(stack[:depth+1])
                 name = m[1]
                 depth = (len(line) - len(name)) // 2 - from_top_root
                 try:
@@ -307,17 +307,17 @@ def parse_export_dir_as_patht_iter(
                     push(name)
         except (StopIteration, StopAsyncIteration):
             if depth:
-                yield Yield(stack[:depth+1], may_await=False)
+                yield Yield(stack[:depth+1])
         finally:
             if close_file:
                 if async_:
                     if callable(aclose := getattr(file, "aclose", None)):
-                        yield aclose
+                        yield aclose()
                     elif callable(close := getattr(file, "close", None)):
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
                     close()
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -406,7 +406,7 @@ def export_dir(
             payload["layer_limit"] = layer_limit
         resp = yield client.fs_export_dir(payload, async_=async_, **request_kwargs)
         return check_response(resp)["data"]["export_id"]
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -486,7 +486,7 @@ def export_dir_result(
                 raise TimeoutError(export_id)
             if check_interval:
                 yield do_sleep(min(check_interval, remaining_seconds))
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -629,11 +629,11 @@ def export_dir_parse_iter(
                     file_wrapper: IO = AsyncTextIOWrapper(AsyncBufferedReader(file), encoding="utf-16", newline="\n")
                 else:
                     file_wrapper = TextIOWrapper(BufferedReader(file), encoding="utf-16", newline="\n")
-                yield YieldFrom(parse_iter(file_wrapper), may_await=False) # type: ignore
+                yield YieldFrom(parse_iter(file_wrapper)) # type: ignore
             finally:
                 if async_:
                     if callable(aclose := getattr(file, "aclose", None)):
-                        yield aclose
+                        yield aclose()
                     elif callable(close := getattr(file, "close", None)):
                         yield ensure_async(close, threaded=True)
                 elif callable(close := getattr(file, "close", None)):
@@ -645,5 +645,5 @@ def export_dir_parse_iter(
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 

p115client/tool/fs_files.py

@@ -145,13 +145,13 @@ def iter_fs_files(
                 return resp
     def gen_step():
         while True:
-            resp = yield run_gen_step(get_files(payload), simple=True, async_=async_)
+            resp = yield run_gen_step(get_files(payload), may_call=False, async_=async_)
             payload["limit"] = page_size
-            yield Yield(resp, may_await=False)
+            yield Yield(resp)
             payload["offset"] += len(resp["data"])
             if payload["offset"] >= count:
                 break
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 def iter_fs_files_threaded(

p115client/tool/history.py

@@ -105,7 +105,7 @@ def iter_history_list_once(
                 if from_id and event_id <= from_id or from_time and int(event["update_time"]) < from_time:
                     return
                 if event_id not in seen:
-                    yield Yield(event, may_await=False)
+                    yield Yield(event)
                     seen_add(event_id)
             offset += len(events)
             if offset >= int(resp["data"]["total"]):
@@ -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, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -214,11 +214,11 @@ def iter_history_list(
             )) as get_next:
                 sub_first_loop = True
                 while True:
-                    event = yield get_next
+                    event = yield get_next()
                     if sub_first_loop:
                         from_id = int(event["id"])
                         from_time = int(event["update_time"])
                         sub_first_loop = False
-                    yield Yield(event, may_await=False)
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+                    yield Yield(event)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)