p123client 0.0.6.6__tar.gz → 0.0.6.8__tar.gz

{p123client-0.0.6.6 → p123client-0.0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p123client
-Version: 0.0.6.6
+Version: 0.0.6.8
 Summary: Python 123 webdisk client.
 Home-page: https://github.com/ChenyangGao/p123client
 License: MIT
@@ -31,7 +31,7 @@ Requires-Dist: python-filewrap (>=0.2.6.1)
 Requires-Dist: python-hashtools (>=0.0.3.3)
 Requires-Dist: python-http_request (>=0.0.7)
 Requires-Dist: python-httpfile (>=0.0.5)
-Requires-Dist: python-iterutils (>=0.2)
+Requires-Dist: python-iterutils (>=0.2.4.1)
 Requires-Dist: python-property (>=0.0.3)
 Requires-Dist: yarl
 Project-URL: Repository, https://github.com/ChenyangGao/p123client

{p123client-0.0.6.6 → p123client-0.0.6.8}/p123client/client.py

@@ -374,7 +374,7 @@ class P123OpenClient:
             check_response(resp)
             self.token = resp["data"]["accessToken"]
             return resp
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @staticmethod
@@ -2860,7 +2860,7 @@ class P123OpenClient:
                     "duplicate": duplicate, 
                     "slice_size": slice_size, 
                 }) from e
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def share_create(
@@ -4216,7 +4216,7 @@ class P123OpenClient:
                     "duplicate": duplicate, 
                     "slice_size": slice_size, 
                 }) from e
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def user_info(
@@ -4418,7 +4418,7 @@ class P123Client(P123OpenClient):
             check_response(resp)
             self.token = resp["data"]["token"]
             return resp
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     @staticmethod
@@ -4459,6 +4459,45 @@ class P123Client(P123OpenClient):
             request_kwargs["async_"] = async_
         return request(**request_kwargs)
 
+    @overload
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    @staticmethod
+    def app_server_time(
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        request: None | Callable = None, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取 123 网盘的服务器时间戳
+
+        GET https://www.123pan.com/api/get/server/time
+        """
+        request_kwargs["url"] = complete_url("/api/get/server/time", base_url)
+        request_kwargs.setdefault("parse", default_parse)
+        if request is None:
+            request = get_default_request()
+            request_kwargs["async_"] = async_
+        return request(**request_kwargs)
+
     @overload
     def download_info(
         self, 
@@ -4551,7 +4590,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def download_info_batch(
@@ -4712,7 +4751,7 @@ class P123Client(P123OpenClient):
                 )
                 check_response(resp)
                 return resp["data"]["downloadUrl"]
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def fs_copy(
@@ -4788,7 +4827,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def fs_detail(
@@ -5151,7 +5190,7 @@ class P123Client(P123OpenClient):
             - next: int = 0    💡 下一批拉取开始的 id
             - orderBy: str = "file_id" 💡 排序依据
 
-                - "file_id": 文件 id
+                - "fileId": 文件 id
                 - "file_name": 文件名
                 - "size":  文件大小
                 - "create_at": 创建时间
@@ -5160,7 +5199,7 @@ class P123Client(P123OpenClient):
                 - ...
 
             - orderDirection: "asc" | "desc" = "asc" 💡 排序顺序
-            - Page: int = <default> 💡 第几页，从 1 开始，可以是 0
+            - Page: int = 1 💡 第几页，从 1 开始
             - parentFileId: int | str = 0 💡 父目录 id
             - trashed: "false" | "true" = <default> 💡 是否查看回收站的文件
             - inDirectSpace: "false" | "true" = "false"
@@ -5171,8 +5210,13 @@ class P123Client(P123OpenClient):
                 - "syncFileList": 同步空间
 
             - operateType: int | str = <default> 💡 操作类型，如果在同步空间，则需要指定为 "SyncSpacePage"
+
+                .. note::
+                    这个值似乎不影响结果，所以可以忽略。我在浏览器中，看到罗列根目录为 1，搜索（指定 `SearchData`）为 2，同步空间的根目录为 3，罗列其它目录大多为 4，偶尔为 8，也可能是其它值
+
             - SearchData: str = <default> 💡 搜索关键字（将无视 `parentFileId` 参数）
-            - OnlyLookAbnormalFile: int = <default>
+            - OnlyLookAbnormalFile: int = 0 💡 大概可传入 0 或 1
+            - RequestSource: int = <default> 💡 浏览器中，在同步空间中为 1
         """
         if isinstance(payload, (int, str)):
             payload = {"parentFileId": payload}
@@ -5185,6 +5229,8 @@ class P123Client(P123OpenClient):
             "parentFileId": 0, 
             "inDirectSpace": "false", 
             "event": event, 
+            "OnlyLookAbnormalFile": 0, 
+            "Page": 1, 
         })
         if not payload.get("trashed"):
             match payload["event"]:
@@ -5322,6 +5368,50 @@ class P123Client(P123OpenClient):
             **request_kwargs, 
         )
 
+    @overload
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def fs_fresh(
+        self, 
+        payload: dict = {}, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """刷新列表和直链缓存
+
+        POST https://www.123pan.com/api/restful/goapi/v1/cdnLink/cache/refresh
+        """
+        return self.request(
+            "restful/goapi/v1/cdnLink/cache/refresh", 
+            "POST", 
+            json=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
     @overload # type: ignore
     def fs_rename(
         self, 
@@ -5378,6 +5468,56 @@ class P123Client(P123OpenClient):
             **request_kwargs, 
         )
 
+    @overload
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def fs_sync_log(
+        self, 
+        payload: dict | int = 1, 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """获取同步空间的操作记录
+
+        GET https://www.123pan.com/api/restful/goapi/v1/sync-disk/file/log
+
+        :payload:
+            - page: int = 1               💡 第几页
+            - pageSize: int = 100         💡 每页大小
+            - searchData: str = <default> 💡 搜索关键字
+        """
+        if not isinstance(payload, dict):
+            payload = {"page": payload, "pageSize": 100}
+        return self.request(
+            "restful/goapi/v1/sync-disk/file/log", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
     @overload # type: ignore
     def fs_trash(
         self, 
@@ -5433,6 +5573,8 @@ class P123Client(P123OpenClient):
                 - "recycleRestore": 移出回收站
 
             - operation: bool = <default>
+            - operatePlace: int = <default>
+            - RequestSource: int = <default>
         """
         if isinstance(payload, (int, str)):
             payload = {"fileTrashInfoList": [{"FileId": payload}]}
@@ -7102,7 +7244,7 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
 
     @overload
     def upload_file_fast(
@@ -7263,7 +7405,56 @@ class P123Client(P123OpenClient):
                 async_=async_, 
                 **request_kwargs, 
             )
-        return run_gen_step(gen_step, async_=async_)
+        return run_gen_step(gen_step, async_)
+
+    @overload
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def user_device_list(
+        self, 
+        payload: dict | str = "deviceManagement", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用户设备列表
+
+        GET https://www.123pan.com/api/user/device_list
+
+        :payload:
+            - event: str = "deviceManagement" 💡 事件类型，"deviceManagement" 为管理登录设备列表
+            - operateType: int = <default>
+        """
+        if not isinstance(payload, dict):
+            payload = {"event": payload}
+        return self.request(
+            "user/device_list", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
 
     @overload
     def user_info(
@@ -7357,6 +7548,54 @@ class P123Client(P123OpenClient):
             request_kwargs["async_"] = async_
         return request(url=api, method="POST", json=payload, **request_kwargs)
 
+    @overload
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False] = False, 
+        **request_kwargs, 
+    ) -> dict:
+        ...
+    @overload
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[True], 
+        **request_kwargs, 
+    ) -> Coroutine[Any, Any, dict]:
+        ...
+    def user_use_history(
+        self, 
+        payload: dict | str = "loginRecord", 
+        /, 
+        base_url: str | Callable[[], str] = DEFAULT_BASE_URL, 
+        *, 
+        async_: Literal[False, True] = False, 
+        **request_kwargs, 
+    ) -> dict | Coroutine[Any, Any, dict]:
+        """用户使用记录
+
+        GET https://www.123pan.com/api/user/use_history
+
+        :payload:
+            - event: str = "loginRecord" 💡 事件类型，"loginRecord" 为登录记录
+        """
+        if not isinstance(payload, dict):
+            payload = {"event": payload}
+        return self.request(
+            "user/use_history", 
+            params=payload, 
+            base_url=base_url, 
+            async_=async_, 
+            **request_kwargs, 
+        )
+
 # TODO: 添加扫码登录接口，以及通过扫码登录的方法
 # TODO: 添加 同步空间 和 直链空间 的操作接口
 # TODO: 添加 图床 的操作接口

{p123client-0.0.6.6 → p123client-0.0.6.8}/p123client/tool/__init__.py

@@ -73,7 +73,7 @@ def make_uri(
         size = info["Size"]
         s3_key_flag = info["S3KeyFlag"]
         return f"123://{name}|{size}|{md5}?{s3_key_flag}"
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -213,7 +213,7 @@ def get_downurl(
         resp = yield client.download_info(payload, async_=async_, **request_kwargs)
         check_response(resp)
         return resp["data"]["DownloadUrl"]
-    return run_gen_step(gen_step, async_=async_)
+    return run_gen_step(gen_step, async_)
 
 
 @overload
@@ -333,7 +333,7 @@ def _iterdir(
                     break
                 if next_id := resp["data"]["Next"]:
                     payload["next"] = next_id
-    return run_gen_step_iter(gen_step, async_=async_)
+    return run_gen_step_iter(gen_step, async_)
 
 
 @overload

{p123client-0.0.6.6 → p123client-0.0.6.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p123client"
-version = "0.0.6.6"
+version = "0.0.6.8"
 description = "Python 123 webdisk client."
 authors = ["ChenyangGao <wosiwujm@gmail.com>"]
 license = "MIT"
@@ -37,7 +37,7 @@ python-encode_uri = ">=0.0.3"
 python-property = ">=0.0.3"
 python-hashtools = ">=0.0.3.3"
 python-httpfile = ">=0.0.5"
-python-iterutils = ">=0.2"
+python-iterutils = ">=0.2.4.1"
 python-filewrap = ">=0.2.6.1"
 python-http_request = ">=0.0.7"
 yarl = "*"