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

p115client/_upload.py

@@ -329,7 +329,7 @@ def oss_multipart_part_iter(
             if getattr(etree.find("IsTruncated"), "text") == "false":
                 break
             params["part-number-marker"] = getattr(etree.find("NextPartNumberMarker"), "text")
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -723,7 +723,7 @@ def oss_multipart_upload_part_iter(
             ))
             if part["Size"] < partsize:
                 break
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -971,5 +971,5 @@ def oss_multipart_upload(
         finally:
             if close_reporthook is not None:
                 yield close_reporthook()
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/client.py

@@ -1076,8 +1076,8 @@ def normalize_attr(
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None, 
-) -> dict[str, Any]:
+    dict_cls: None = None, 
+) -> AttrDict[str, Any]:
     ...
 @overload
 def normalize_attr[D: dict[str, Any]](
@@ -1086,7 +1086,7 @@ def normalize_attr[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: type[D] = AttrDict, # type: ignore
+    dict_cls: type[D], 
 ) -> D:
     ...
 def normalize_attr[D: dict[str, Any]](
@@ -1095,8 +1095,8 @@ def normalize_attr[D: dict[str, Any]](
     simple: bool = False, 
     keep_raw: bool = False, 
     *, 
-    dict_cls: None | type[D] = AttrDict, # type: ignore
-) -> dict[str, Any] | D:
+    dict_cls: None | type[D] = None, 
+) -> AttrDict[str, Any] | D:
     """翻译获取自罗列目录、搜索、获取文件信息等接口的数据，使之便于阅读
 
     :param info: 原始数据
@@ -1106,12 +1106,20 @@ def normalize_attr[D: dict[str, Any]](
 
     :return: 翻译后的 dict 类型数据
     """
-    if "fn" in info:
-        return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
-    elif "file_id" in info or "category_id" in info:
-        return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+    if dict_cls is None:
+        if "fn" in info:
+            return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
+        elif "file_id" in info or "category_id" in info:
+            return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
+        else:
+            return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=AttrDict)
     else:
-        return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        if "fn" in info:
+            return normalize_attr_app(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        elif "file_id" in info or "category_id" in info:
+            return normalize_attr_app2(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
+        else:
+            return normalize_attr_web(info, simple=simple, keep_raw=keep_raw, dict_cls=dict_cls)
 
 
 @overload
@@ -1577,6 +1585,9 @@ class ClientRequestMixin:
     ) -> dict | Coroutine[Any, Any, dict]:
         """授权码方式请求开放接口应用授权
 
+        .. note::
+            最多同时有 2 个授权登录，如果有新的授权加入，会先踢掉时间较早的那一个
+
         GET https://qrcodeapi.115.com/open/authorize
 
         .. admonition:: Reference
@@ -2099,6 +2110,9 @@ class ClientRequestMixin:
 
             https://www.yuque.com/115yun/open/shtpzfhewv5nag11#WzRhM
 
+        .. note::
+            最多同时有 2 个授权登录，如果有新的授权加入，会先踢掉时间较早的那一个
+
         .. note::
             code_challenge 默认用的字符串为 64 个 0，hash 算法为 md5
 
@@ -2401,7 +2415,7 @@ class ClientRequestMixin:
                 )
             else:
                 return qrcode_token
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @classmethod
@@ -2501,7 +2515,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## Upload API ##########
 
@@ -2883,7 +2897,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def read_bytes_range(
@@ -2998,7 +3012,7 @@ class ClientRequestMixin:
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
 
 class P115OpenClient(ClientRequestMixin):
@@ -3094,7 +3108,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             self.access_token = data["access_token"]
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @classmethod
     def from_token(cls, /, access_token: str, refresh_token: str) -> P115OpenClient:
@@ -3170,7 +3184,7 @@ class P115OpenClient(ClientRequestMixin):
             self.refresh_token = data["refresh_token"]
             self.access_token = data["access_token"]
             return data
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def download_url(
@@ -3925,7 +3939,7 @@ class P115OpenClient(ClientRequestMixin):
         """获取视频在线播放地址（和视频文件相关数据）
 
         GET https://proapi.115.com/open/video/play
-        
+
         .. admonition:: Reference
 
             https://www.yuque.com/115yun/open/hqglxv3cedi3p9dz
@@ -4919,7 +4933,7 @@ class P115OpenClient(ClientRequestMixin):
                 check_response(resp)
             resp["data"] = {**payload, **resp["data"], "sha1": filesha1, "cid": pid}
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file(
@@ -5264,7 +5278,7 @@ class P115OpenClient(ClientRequestMixin):
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def user_info(
@@ -5398,7 +5412,9 @@ class P115Client(P115OpenClient):
     """115 的客户端对象
 
     .. note::
-        目前允许 1 个用户同时登录多个开放平台应用（用 AppID 区别），也允许多次登录同 1 个应用
+        目前允许 1 个用户同时登录多个开放平台应用（用 AppID 区别），也允许多次授权登录同 1 个应用
+
+        目前最多同时有 2 个授权登录登录，如果有新的授权加入，会先踢掉时间较早的那一个
 
         目前不允许短时间内再次用 `refresh_token` 刷新 `access_token`，但你可以用登录的方式再次授权登录以获取 `access_token`，即可不受频率限制
 
@@ -5700,7 +5716,7 @@ class P115Client(P115OpenClient):
                     )
             setattr(self, "check_for_relogin", check_for_relogin)
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @locked_cacheproperty
     def request_lock(self, /) -> Lock:
@@ -5872,7 +5888,7 @@ class P115Client(P115OpenClient):
                 check_response(resp)
             setattr(self, "cookies", resp["data"]["cookie"])
             return self
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_with_app(
@@ -6004,7 +6020,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_without_app(
@@ -6062,7 +6078,7 @@ class P115Client(P115OpenClient):
             )
             check_response(resp)
             return uid
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_info_open(
@@ -6111,7 +6127,7 @@ class P115Client(P115OpenClient):
                 "name": tip_txt[:-10].removeprefix("\ufeff"), 
                 "icon": resp["data"]["icon"], 
             }
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_with_open(
@@ -6146,6 +6162,9 @@ class P115Client(P115OpenClient):
     ) -> dict | Coroutine[Any, Any, dict]:
         """登录某个开放接口应用
 
+        .. note::
+            同一个开放应用 id，最多同时有 2 个登入，如果有新的登录，则自动踢掉较早的那一个
+
         :param app_id: AppID
         :param show_warning: 是否显示提示信息
         :param async_: 是否异步
@@ -6163,7 +6182,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, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_another_app(
@@ -6309,7 +6328,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, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_another_open(
@@ -6403,7 +6422,7 @@ class P115Client(P115OpenClient):
                 inst.access_token = data["access_token"]
             inst.app_id = app_id
             return inst
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @classmethod
@@ -6522,7 +6541,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, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def logout(
@@ -6805,7 +6824,7 @@ class P115Client(P115OpenClient):
                     if check and isinstance(resp, dict):
                         check_response(resp)
                     return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     def request(
         self, 
@@ -7697,7 +7716,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## Download API ##########
 
@@ -9946,7 +9965,7 @@ class P115Client(P115OpenClient):
         :payload:
             - file_id: int | str
             - file_id[]: int | str
-            ...
+            - ...
             - file_id[0]: int | str
             - file_id[1]: int | str
             - ...
@@ -10553,7 +10572,7 @@ class P115Client(P115OpenClient):
 
         .. caution::
             这个接口有些问题，当 custom_order=1 时：
-            
+
                 1. 如果设定 limit=1 可能会报错
                 2. fc_mix 无论怎么设置，都和 fc_mix=0 的效果相同（即目录总是置顶），但设置为 custom_order=2 就好了
 
@@ -12152,7 +12171,7 @@ class P115Client(P115OpenClient):
             - offset: int = 0    💡 索引偏移，索引从 0 开始计算
             - is_asc: 0 | 1 = <default> 💡 是否升序排列
             - next: 0 | 1 = <default>
-            - order: str = <default> 💡 用某字段排序            
+            - order: str = <default> 💡 用某字段排序
 
               - 文件名："file_name"
               - 文件大小："file_size"
@@ -12705,6 +12724,7 @@ class P115Client(P115OpenClient):
             为单个文件或目录，设置一个不存在的标签 id，比如 1，会清空标签，但可产生事件（批量设置时无事件，可能是 bug）
 
             .. code:: python
+
                 client.fs_label_set(id, 1)
         """
         return self._fs_edit_set(payload, "file_label", label, async_=async_, **request_kwargs)
@@ -13005,9 +13025,10 @@ class P115Client(P115OpenClient):
         """新建目录
 
         .. todo::
-            - name: str 💡 目录名
             待破解
 
+            - name: str 💡 目录名
+
         POST https://proapi.115.com/android/1.0/folder/update
         """
         api = complete_proapi("/folder/update", base_url, app)
@@ -16398,7 +16419,7 @@ class P115Client(P115OpenClient):
             if device is None:
                 return None
             return device["icon"]
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def login_open_auth_detail(
@@ -16922,7 +16943,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, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def logout_by_ssoent(
@@ -21119,7 +21140,7 @@ class P115Client(P115OpenClient):
             if resp["state"]:
                 self.user_key = resp["data"]["userkey"]
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_resume(
@@ -21486,7 +21507,7 @@ class P115Client(P115OpenClient):
                 "pickcode": resp["pickcode"], 
             }
             return resp
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file_sample(
@@ -21622,7 +21643,7 @@ class P115Client(P115OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     # TODO: 分块上传时，允许一定次数的重试
     # TODO: 不妨单独为分块上传做一个封装
@@ -21984,7 +22005,7 @@ class P115Client(P115OpenClient):
                     async_=async_, # type: ignore
                     **request_kwargs, 
                 )
-        return run_gen_step(gen_step, may_call=False, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     ########## User API ##########
 

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], dict_cls=AttrDict)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 def type_of_attr(attr: Mapping, /) -> int:

p115client/tool/auth.py

@@ -58,5 +58,5 @@ def deauth_open(
                 async_=async_, 
                 **request_kwargs, 
             )
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 

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, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -228,7 +228,7 @@ def iter_url_batches(
                         is_directory=False,
                         headers=headers, 
                     ))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -403,7 +403,7 @@ def iter_files_with_url(
                         **request_kwargs, 
                     )
                 yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -561,7 +561,7 @@ def iter_images_with_url(
                             **request_kwargs, 
                         )
                 yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -746,7 +746,7 @@ def iter_subtitles_with_url(
                                 **request_kwargs, 
                             )
                         yield Yield(attr)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -836,7 +836,7 @@ def iter_subtitle_batches(
                 pass
             finally:
                 yield client.fs_delete(scid, async_=async_, **request_kwargs)
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1077,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), may_call=False, async_=async_), 
+            lambda attr: run_gen_step(save(attr), async_), 
             (iter_files if use_abspath is None else iter_files_with_path)(
                 client, 
                 cid, 
@@ -1114,7 +1114,7 @@ def make_strm(
             "ignore": ignored, 
             "remove": removed, 
         }
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -1265,7 +1265,7 @@ def iter_download_nodes(
             finally:
                 yield shutdown()
     if pickcode:
-        return run_gen_step_iter(gen_step(pickcode), may_call=False, async_=async_)
+        return run_gen_step_iter(gen_step(pickcode), async_)
     else:
         def chain():
             with with_iter_next(iterdir(
@@ -1283,12 +1283,8 @@ def iter_download_nodes(
                         yield Yield(
                             {"fid": str(attr["id"]), "pid": "0", "fn": attr["name"]}
                         )
-                    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_)
+                    yield YieldFrom(run_gen_step_iter(gen_step(attr["pickcode"]), async_))
+        return run_gen_step_iter(chain, async_)
 
 
 @overload
@@ -1435,11 +1431,7 @@ def iter_download_files(
                             **defaults, 
                         })
             for pickcode in pickcodes:
-                yield YieldFrom(run_gen_step_iter(
-                    gen_step(pickcode), 
-                    may_call=False, 
-                    async_=async_, 
-                ))
+                yield YieldFrom(run_gen_step_iter(gen_step(pickcode), async_))
             return
         if not pickcode:
             resp = yield client.fs_file_skim(cid, async_=async_, **request_kwargs)
@@ -1476,7 +1468,7 @@ def iter_download_files(
             finally:
                 ancestors_loaded = True
         if async_:
-            task: Any = create_task(run_gen_step(load_ancestors, may_call=False, async_=True))
+            task: Any = create_task(run_gen_step(load_ancestors, True))
         else:
             task = run_as_thread(run_gen_step, load_ancestors)
         cache: list[dict] = []
@@ -1510,7 +1502,7 @@ def iter_download_files(
             else:
                 task.result()
             yield YieldFrom(map(norm_attr, cache))
-    return run_gen_step_iter(gen_step, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -1586,5 +1578,5 @@ def get_remaining_open_count(
             for f in cache:
                 f.close()
             return len(cache)
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, 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, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -634,5 +634,5 @@ def batch_unstar(
             async_=async_, # type: ignore
             **request_kwargs, 
         )
-    return run_gen_step(gen_step, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 

p115client/tool/export_dir.py

@@ -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, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -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, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload
@@ -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, may_call=False, async_=async_)
+    return run_gen_step_iter(gen_step, 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, may_call=False, async_=async_)
+    return run_gen_step(gen_step, 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, may_call=False, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -645,5 +645,5 @@ def export_dir_parse_iter(
                     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_)