p115client 0.0.5.11.1__tar.gz → 0.0.5.11.2__tar.gz

{p115client-0.0.5.11.1 → p115client-0.0.5.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.11.1
+Version: 0.0.5.11.2
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -40,7 +40,7 @@ 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.2)
-Requires-Dist: python-iterutils (>=0.2)
+Requires-Dist: python-iterutils (>=0.2.1)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: python-startfile (>=0.0.2)
 Requires-Dist: python-undefined (>=0.0.3)

{p115client-0.0.5.11.1 → p115client-0.0.5.11.2}/p115client/_upload.py

@@ -281,11 +281,11 @@ def oss_multipart_part_iter(
                 **request_kwargs, 
             )
             for el in etree.iterfind("Part"):
-                yield Yield({sel.tag: maybe_integer(sel.text) for sel in el}, may_await=False)
+                yield Yield({sel.tag: maybe_integer(sel.text) for sel in el})
             if getattr(etree.find("IsTruncated"), "text") == "false":
                 break
             params["part-number-marker"] = getattr(etree.find("NextPartNumberMarker"), "text")
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -679,7 +679,7 @@ def oss_multipart_upload_part_iter(
             ))
             if part["Size"] < partsize:
                 break
-    return run_gen_step_iter(gen_step, simple=True, async_=async_)
+    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
 
 
 @overload
@@ -927,7 +927,7 @@ def oss_multipart_upload(
         finally:
             if close_reporthook is not None:
                 yield close_reporthook()
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 # class MultipartUploader:

{p115client-0.0.5.11.1 → p115client-0.0.5.11.2}/p115client/client.py

@@ -1101,7 +1101,7 @@ def normalize_attr_simple[D: dict[str, Any]](
     *, 
     dict_cls: None | type[D] = None, 
 ) -> dict[str, Any] | D:
-    return normalize_attr(info, simple=True, keep_raw=keep_raw, dict_cls=dict_cls)
+    return normalize_attr(info, may_call=False, keep_raw=keep_raw, dict_cls=dict_cls)
 
 
 class IgnoreCaseDict[V](dict[str, V]):
@@ -2317,7 +2317,7 @@ class ClientRequestMixin:
                 )
             else:
                 return qrcode_token
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     @classmethod
@@ -2417,7 +2417,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     ########## Upload API ##########
 
@@ -2800,7 +2800,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def read_bytes_range(
@@ -2915,7 +2915,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 class P115OpenClient(ClientRequestMixin):
@@ -3011,7 +3011,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             self.access_token = data["access_token"]
             return self
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @classmethod
     def from_token(cls, /, access_token: str, refresh_token: str) -> P115OpenClient:
@@ -3078,7 +3078,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             access_token = self.access_token = data["access_token"]
             return access_token
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def download_url(
@@ -4804,7 +4804,7 @@ class P115OpenClient(ClientRequestMixin):
                 check_response(resp)
             resp["data"] = {**payload, **resp["data"], "sha1": filesha1, "cid": pid}
             return resp
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def upload_file(
@@ -5148,7 +5148,7 @@ class P115OpenClient(ClientRequestMixin):
                     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_)
 
     @overload
     def user_info(
@@ -5529,7 +5529,7 @@ class P115Client(P115OpenClient):
                     )
             setattr(self, "check_for_relogin", check_for_relogin)
             return self
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @locked_cacheproperty
     def request_lock(self, /) -> Lock:
@@ -5701,7 +5701,7 @@ class P115Client(P115OpenClient):
                 check_response(resp)
             setattr(self, "cookies", resp["data"]["cookie"])
             return self
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_with_app(
@@ -5833,7 +5833,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_without_app(
@@ -5891,7 +5891,7 @@ class P115Client(P115OpenClient):
             )
             check_response(resp)
             return uid
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_with_open(
@@ -5943,7 +5943,7 @@ class P115Client(P115OpenClient):
             resp = yield self.login_qrcode_scan_confirm(login_uid, async_=async_, **request_kwargs)
             check_response(resp)
             return self.login_qrcode_access_token_open(login_uid, async_=async_, **request_kwargs)
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_another_app(
@@ -6087,7 +6087,7 @@ class P115Client(P115OpenClient):
             if self is not inst and ssoent == inst.login_ssoent:
                 warn(f"login with the same ssoent {ssoent!r}, {self!r} will expire within 60 seconds", category=P115Warning)
             return inst
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_another_open(
@@ -6181,7 +6181,7 @@ class P115Client(P115OpenClient):
                 inst.access_token = data["access_token"]
             inst.app_id = app_id
             return inst
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     @classmethod
@@ -6300,7 +6300,7 @@ class P115Client(P115OpenClient):
             resp = yield cls.login_qrcode_scan_result(uid, app, async_=async_, **request_kwargs)
             cookies = check_response(resp)["data"]["cookie"]
             return cls(cookies, check_for_relogin=check_for_relogin)
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def logout(
@@ -6575,7 +6575,7 @@ class P115Client(P115OpenClient):
                     if check and isinstance(resp, dict):
                         check_response(resp)
                     return resp
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     def request(
         self, 
@@ -7434,7 +7434,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     ########## Download API ##########
 
@@ -16009,7 +16009,7 @@ class P115Client(P115OpenClient):
             if device is None:
                 return None
             return device["icon"]
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def login_open_auth_detail(
@@ -16533,7 +16533,7 @@ class P115Client(P115OpenClient):
                 return get_default_request()(url=api, async_=async_, **request_kwargs)
             else:
                 return request(url=api, **request_kwargs)
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def logout_by_ssoent(
@@ -20427,7 +20427,7 @@ class P115Client(P115OpenClient):
             if resp["state"]:
                 self.user_key = resp["data"]["userkey"]
             return resp
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def upload_resume(
@@ -20794,7 +20794,7 @@ class P115Client(P115OpenClient):
                 "pickcode": resp["pickcode"], 
             }
             return resp
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload
     def upload_file_sample(
@@ -20930,7 +20930,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, simple=True, async_=async_)
+        return run_gen_step(gen_step, may_call=False, async_=async_)
 
     @overload # type: ignore
     def upload_file(
@@ -21289,7 +21289,7 @@ class P115Client(P115OpenClient):
                     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_)
 
     ########## User API ##########
 

{p115client-0.0.5.11.1 → p115client-0.0.5.11.2}/p115client/tool/attr.py

@@ -72,7 +72,7 @@ def get_attr(
             resp = yield client.fs_file(id, async_=async_, **request_kwargs)
             check_response(resp)
             return normalize_attr_web(resp["data"][0])
-    return run_gen_step(gen_step, simple=True, async_=async_)
+    return run_gen_step(gen_step, may_call=False, async_=async_)
 
 
 def type_of_attr(attr: Mapping, /) -> int:

{p115client-0.0.5.11.1 → p115client-0.0.5.11.2}/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"):
@@ -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,8 +535,7 @@ def iter_images_with_url(
                         suffixes=suffix, 
                         app=app, 
                         **params, # type: ignore
-                    ), 
-                    may_await=False, 
+                    )
                 )
             return
         with with_iter_next(it) as get_next:
@@ -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
@@ -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:
@@ -1264,11 +1261,11 @@ def iter_download_nodes(
                         break
                     elif isinstance(ls, BaseException):
                         raise ls
-                    yield YieldFrom(ls, may_await=False)
+                    yield YieldFrom(ls)
             finally:
                 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(
@@ -1284,14 +1281,14 @@ def iter_download_nodes(
                     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
@@ -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)
@@ -1478,7 +1476,7 @@ def iter_download_files(
             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] = []
@@ -1495,9 +1493,9 @@ def iter_download_files(
             while True:
                 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
@@ -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-0.0.5.11.1 → p115client-0.0.5.11.2}/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-0.0.5.11.1 → p115client-0.0.5.11.2}/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,7 +110,7 @@ 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_:
@@ -120,7 +120,7 @@ def parse_export_dir_as_dict_iter(
                         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,7 +220,7 @@ 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_:
@@ -230,7 +230,7 @@ def parse_export_dir_as_path_iter(
                         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,7 +307,7 @@ 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_:
@@ -317,7 +317,7 @@ def parse_export_dir_as_patht_iter(
                         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,7 +629,7 @@ 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)):
@@ -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-0.0.5.11.1 → p115client-0.0.5.11.2}/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-0.0.5.11.1 → p115client-0.0.5.11.2}/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
@@ -219,6 +219,6 @@ def iter_history_list(
                         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_)