p115client 0.0.5.10.9__py3-none-any.whl → 0.0.5.11.1__py3-none-any.whl

p115client/tool/pool.py

@@ -88,7 +88,7 @@ def generate_auth_factory(
                     "authorization": "Bearer " + resp["data"]["access_token"], 
                     "app_id": str(app_id), 
                 }
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, simple=True, async_=async_)
     return make_cookies
 
 
@@ -142,7 +142,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, async_=async_)
+        return run_gen_step(gen_step, simple=True, async_=async_)
     return make_cookies
 
 
@@ -165,7 +165,7 @@ def generate_client_factory(
         def gen_step():
             headers = yield call(async_=async_)
             return cls(headers["cookie"])
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, simple=True, async_=async_)
     return make_client
 
 
@@ -215,7 +215,7 @@ def make_pool[T](
                     value = generate()
                 val = ComparedWithID(value)
             return value, partial(heappush, heap_, (time(), val))
-        return run_gen_step(call, async_=async_)
+        return run_gen_step(call, simple=True, async_=async_)
     if not lock:
         setattr(get_value, "heap", heap_)
         return get_value
@@ -377,7 +377,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, async_=async_)
+        return run_gen_step(gen_step, simple=True, async_=async_)
     return update_wrapper(wrapper, func)
 
 

p115client/tool/upload.py

@@ -348,7 +348,7 @@ def iter_115_to_115_resume(
                         **request_kwargs, 
                     )) as get_next:
                         while True:
-                            attr = yield get_next
+                            attr = yield get_next()
                             if attr["name"] == name:
                                 to_cid = attr["id"]
                                 break
@@ -418,12 +418,12 @@ def iter_115_to_115_resume(
         if async_:
             return YieldFrom(
                 taskgroup_map(upload, from_files, arg_func=get_pid, max_workers=max_workers), 
-                identity=True, 
+                may_await=False, 
             )
         else:
             return YieldFrom(
                 threadpool_map(upload, from_files, arg_func=get_pid, max_workers=max_workers), 
-                identity=True, 
+                may_await=False, 
             )
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 

p115client/tool/xys.py

@@ -59,7 +59,7 @@ def wish_info(
         )
         check_response(resp)
         return resp["data"]
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -110,7 +110,7 @@ def wish_make(
         )
         check_response(resp)
         return P115StrID(resp["data"]["xys_id"], resp["data"])
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -146,6 +146,9 @@ def wish_answer(
 ) -> P115StrID | Coroutine[Any, Any, P115StrID]:
     """许愿树活动：创建助愿（助愿创建后需要等审核）
 
+    .. note::
+        如果从未调用过 `wish_info(client, wish_id)`，请先调用，否则会报参数错误
+
     :param client: 115 客户端或 cookies
     :param wish_id: 许愿 id
     :param content: 助愿内容
@@ -167,7 +170,7 @@ def wish_answer(
         )
         check_response(resp)
         return P115StrID(resp["data"]["aid_id"], resp["data"])
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -323,11 +326,11 @@ def wish_iter(
             )
             check_response(resp)
             ls = resp["data"]["list"]
-            yield YieldFrom(ls, identity=True)
+            yield YieldFrom(ls, may_await=False)
             if not ls:
                 break
             payload["page"] += 1
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -382,11 +385,11 @@ def wish_aid_iter(
             )
             check_response(resp)
             ls = resp["data"]["list"]
-            yield YieldFrom(ls, identity=True)
+            yield YieldFrom(ls, may_await=False)
             if not ls:
                 break
             payload["page"] += 1
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 
 
 # TODO: 再实现一个漂流瓶

{p115client-0.0.5.10.9.dist-info → p115client-0.0.5.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.10.9
+Version: 0.0.5.11.1
 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.1.11)
+Requires-Dist: python-iterutils (>=0.2)
 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.dist-info/RECORD

@@ -0,0 +1,26 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
+p115client/_upload.py,sha256=mcg6BAJi49Mq_jE5ql3FUdUbIokLqT8WFgSnkQtQdxw,30762
+p115client/client.py,sha256=Imc9m8Al9hj-Lq0AzO8bFzcn20ubnguqyCi4e9F_qFs,770852
+p115client/const.py,sha256=Ks8eYjHYApxlkelVCbSJlpmlCYtbk8fX80jETV72BTY,7754
+p115client/exception.py,sha256=O4SlfjbtI9GPjzbzJrFaFUZENJFz2qA3VDEKZfdhHbc,3590
+p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
+p115client/tool/attr.py,sha256=MoLSDaa53nlvkDQOgX1Nq7CaCeO3I4tTkR9oq62dBGI,2896
+p115client/tool/download.py,sha256=7pJIkRx5M8GSeqiZFpvay0_MwZRsFizkU4nee9aLIBI,61666
+p115client/tool/edit.py,sha256=F8FhtyBjXRQ7TroNTM8SMG3s9TmCRoDsHId2fGalxW4,17756
+p115client/tool/export_dir.py,sha256=om2b6At1jnaBD0Qw5TeEfD7wJlSL5PC2JGtJDN4Vh9U,24603
+p115client/tool/fs_files.py,sha256=uo_2x8Nq1KTagNl2YdM8jRzp97pg513OVo280BK74xU,15645
+p115client/tool/history.py,sha256=2i6k5Wvo7IVaUO0GDT5nHNV5qQFk_Q_1qY2ZF2MxLsE,7490
+p115client/tool/iterdir.py,sha256=idSTl7lKbCewhfgMQMyMRE5sx3Pxn_Y2V5_95yoS6JE,200191
+p115client/tool/life.py,sha256=C2n4nvf5xUc8KGl2R0yatWc-5CmwgkONOX1pxUP5ZSQ,17391
+p115client/tool/pool.py,sha256=EO_dmtcGBWCnbWqgoaGMsJGhIaCUQ-rdc5qC-oaseq8,14018
+p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
+p115client/tool/upload.py,sha256=qzXgMXf8MfeZIQbylVeh77o_ItKI7kMaIgwuppprfeM,15934
+p115client/tool/util.py,sha256=0o9TrXdoPcljgxDDRdxRon41bq1OjuUYCWsR0XLfmPo,3357
+p115client/tool/xys.py,sha256=NVwXXB1ZvFKQKcar1kQdDzlUN7xilGheO_eEeoMxjMw,10325
+p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
+p115client-0.0.5.11.1.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.11.1.dist-info/METADATA,sha256=kfxL11eFcfcyYXqowRiAtQGFbzoPTWYW_Ecx6_hd7Bg,8238
+p115client-0.0.5.11.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.11.1.dist-info/RECORD,,

p115client-0.0.5.10.9.dist-info/RECORD

@@ -1,26 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
-p115client/_upload.py,sha256=DOckFLU_P7Fl0BNu_0-2od6pPsCnzroYY6zZE5_EMnM,30735
-p115client/client.py,sha256=OV6XeA36L8PxpHB-27hhpz_Zv_XMAuMR2GuNDNuy6uo,749032
-p115client/const.py,sha256=Ks8eYjHYApxlkelVCbSJlpmlCYtbk8fX80jETV72BTY,7754
-p115client/exception.py,sha256=O4SlfjbtI9GPjzbzJrFaFUZENJFz2qA3VDEKZfdhHbc,3590
-p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
-p115client/tool/attr.py,sha256=9xN99lgFxE-48nqiIOSuuo3R0D9lcvuJvcRbJzPKKiw,2883
-p115client/tool/download.py,sha256=3zoxkLPf4Jya-wYowZJmZR65sR3GWNWNmnevKrrgvQY,60509
-p115client/tool/edit.py,sha256=eRlR1UZMpfGnoetpqSAAx5bPBOEiSlx7HPkpOSs5agk,17739
-p115client/tool/export_dir.py,sha256=iMnKtnESi8HKvW9WhIvOdEoMXSBpAnhFlGeyKXHpQbE,24545
-p115client/tool/fs_files.py,sha256=jY57L4nhB9t-2kT_1j3mdiwOdPZKsimN3eN5mUJAqMI,15745
-p115client/tool/history.py,sha256=2S26BH7uBNfVHlbYFNy-aNOLMcM-HrlR7TLHAZacUJI,7458
-p115client/tool/iterdir.py,sha256=ei1VddAc96DD0QSSZm7c3ivcCjiP_y6tuSJr5zcpqvg,199695
-p115client/tool/life.py,sha256=X6Bp0GYKwnZeWlttE2DIVw5iOCXM5QzIkM6Zuj24c5Y,17323
-p115client/tool/pool.py,sha256=K-ALC-JEwik3DYCr5Eckok15oQnHRe6yznKIuJ9jyyM,13953
-p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
-p115client/tool/upload.py,sha256=qK1OQYxP-Faq2eMDhc5sBXJiSr8m8EZ_gb0O_iA2TrI,15915
-p115client/tool/util.py,sha256=0o9TrXdoPcljgxDDRdxRon41bq1OjuUYCWsR0XLfmPo,3357
-p115client/tool/xys.py,sha256=WMTisCyN4eYyv4A14yYOpjud2mBhQvBcUHOp6pJUQeA,10140
-p115client/type.py,sha256=7kOp98uLaYqcTTCgCrb3DRcl8ukMpn7ibsnVvtw2nG8,6250
-p115client-0.0.5.10.9.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.10.9.dist-info/METADATA,sha256=Ih2qnVhmpJ4wtSYYLN-tU0LK4l4idH5uT9lnUzHUXRk,8241
-p115client-0.0.5.10.9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.10.9.dist-info/RECORD,,