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

p115client/tool/life.py

@@ -137,14 +137,14 @@ def iter_life_list(
                 for items in data["list"]:
                     if "items" not in items:
                         if start_time < items["update_time"] < end_time:
-                            yield Yield(items, identity=True)
+                            yield Yield(items, may_await=False)
                         continue
                     behavior_type = items["behavior_type"]
                     date = items["date"]
                     for item in items["items"]:
                         item["behavior_type"] = behavior_type
                         item["date"] = date
-                        yield Yield(item, identity=True)
+                        yield Yield(item, may_await=False)
                     if behavior_type.startswith("upload_") or items["total"] > len(items["items"]):
                         seen_items: set[str] = {item["id"] for item in items["items"]}
                         payload = {"offset": 0, "limit": 32, "type": behavior_type, "date": date}
@@ -158,7 +158,7 @@ def iter_life_list(
                                 seen_items.add(item["id"])
                                 item["behavior_type"] = behavior_type
                                 item["date"] = date
-                                yield Yield(item, identity=True)
+                                yield Yield(item, may_await=False)
                             else:
                                 if not resp["data"]["next_page"]:
                                     break
@@ -172,7 +172,7 @@ def iter_life_list(
                 else:
                     sleep(1 - diff)
             end_time = int(time())
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -262,7 +262,7 @@ def iter_life_behavior_once(
                     return
                 fid = event["file_id"]
                 if fid not in seen:
-                    yield Yield(event, identity=True)
+                    yield Yield(event, may_await=False)
                     seen_add(fid)
             offset += len(events)
             if offset >= int(resp["data"]["count"]):
@@ -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, async_=async_)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -376,8 +376,8 @@ def iter_life_behavior(
                         sub_first_loop = False
                     if not type and ignore_types and event["type"] in ignore_types:
                         continue
-                    yield Yield(event, identity=True)
-    return run_gen_step_iter(gen_step, async_=async_)
+                    yield Yield(event, may_await=False)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 
 
 @overload
@@ -468,6 +468,6 @@ def iter_life_behavior_list(
                     if not type and ignore_types and event["type"] in ignore_types:
                         continue
                     push(event)
-            yield Yield(ls, identity=True)
-    return run_gen_step_iter(gen_step, async_=async_)
+            yield Yield(ls, may_await=False)
+    return run_gen_step_iter(gen_step, simple=True, async_=async_)
 

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

@@ -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.4.dist-info → p115client-0.0.5.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p115client
-Version: 0.0.5.10.4
+Version: 0.0.5.11
 Summary: Python 115 webdisk client.
 Home-page: https://github.com/ChenyangGao/p115client
 License: MIT
@@ -23,8 +23,8 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: aiofile
 Requires-Dist: ed2k (>=0.0.2.1)
 Requires-Dist: http_response (>=0.0.2.2)
-Requires-Dist: httpx
-Requires-Dist: httpx_request (>=0.1.3)
+Requires-Dist: httpx (>=0.28)
+Requires-Dist: httpx_request (>=0.1.4)
 Requires-Dist: iter_collect (>=0.0.5.1)
 Requires-Dist: multidict
 Requires-Dist: orjson
@@ -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)
@@ -247,7 +247,7 @@ class MyCustom115Client(P115Client):
 
 ### 3. 检查响应
 
-接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `OSError` 的实例，其中大部分还是 `p115client.P115OSError` 的实例。
+接口被调用后，如果返回的是 dict 类型的数据（说明原本是 JSON），则可以用 `p115client.check_response` 执行检查。首先会查看其中名为 "state" 的键的对应值，如果为  True、1 或不存在，则原样返回被检查的数据；否则，"state" 的对应值大概是 False 或 0，说明有问题出现，会根据实际情况抛出一个异常，但都是 `p115client.P115OSError` 的实例。
 
 ```python
 from p115client import check_response

p115client-0.0.5.11.dist-info/RECORD

@@ -0,0 +1,26 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client/__init__.py,sha256=1mx7njuAlqcuEWONTjSiiGnXyyNyqOcJyNX1FMHqQ-4,214
+p115client/_upload.py,sha256=eOBCQCiRApZucMglBLFGD8n6LKW1Q36Ua00G-x4lHQA,30758
+p115client/client.py,sha256=EyWRveHMzhPFnndMTTDCEwWnelG4mNv1RSHNAnqVEvU,768952
+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=5P6Zvy8bO3DNj08Wrn7n0Ckhqj_f9gSVjfMAUhl9BPI,61646
+p115client/tool/edit.py,sha256=F8FhtyBjXRQ7TroNTM8SMG3s9TmCRoDsHId2fGalxW4,17756
+p115client/tool/export_dir.py,sha256=arLsge0C2tEIX3zx7zbgbsj8cplx6uFvg1GL1QKD080,24595
+p115client/tool/fs_files.py,sha256=uo_2x8Nq1KTagNl2YdM8jRzp97pg513OVo280BK74xU,15645
+p115client/tool/history.py,sha256=NhEx_Zc92rz8ois2OQ4b7lmGkjrACd4Of_nqQlZhEaM,7488
+p115client/tool/iterdir.py,sha256=myqQea5l033fJxuoMWqNxP84qALWI2ZXfSlYDNf4dW8,200172
+p115client/tool/life.py,sha256=bK2xZsgDfxTp1hWbxXZ6pWrnC1HmaWZv1c5q2s3CbaI,17387
+p115client/tool/pool.py,sha256=EO_dmtcGBWCnbWqgoaGMsJGhIaCUQ-rdc5qC-oaseq8,14018
+p115client/tool/request.py,sha256=rjXuQwRganE5Z-4rfgnyPFjE4jzdQSLdIs9s0cIDshU,7043
+p115client/tool/upload.py,sha256=dbvYTD8TD_3iEGChUdchOXqnV0VLHX7TJlb2zBHduNM,15932
+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.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+p115client-0.0.5.11.dist-info/METADATA,sha256=9HPewST9HgcH9KvyLMa7lDSh-8YJE8KsVcDUeTt-sBo,8236
+p115client-0.0.5.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+p115client-0.0.5.11.dist-info/RECORD,,

p115client-0.0.5.10.4.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=98Zf8CzxeSPcU-U7LUd9KMY2WON7F90kGSokbVcqqXU,727434
-p115client/const.py,sha256=AMyL3QZ172f_RaEkfh27DQxwbkXvPhqfeBWHWTrvSLY,7754
-p115client/exception.py,sha256=kQMI7lwkFIC_tRuj1HT8zqi5HGzz6fTxgK7B1aKrNTI,3447
-p115client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-p115client/tool/__init__.py,sha256=NjT9rroMhLwKI7UlpSCksSsnB3GexXzxvhfunNWzjY0,386
-p115client/tool/attr.py,sha256=u_5JM2LlWFT4IHF2zlz-DY4llgmw4mwouEKMae8BZdQ,2841
-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=Qgs1fHwfgCXb-9T_1WQfyhnfXe8LZYwZY7oMTnCz3tQ,192038
-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.4.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-p115client-0.0.5.10.4.dist-info/METADATA,sha256=-zPTpPGe0IpuPfetzVHdvKDXQ9PGxPIu--dw7MFJxns,8276
-p115client-0.0.5.10.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-p115client-0.0.5.10.4.dist-info/RECORD,,