tamar-file-hub-client 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

file_hub_client/services/file/async_blob_service.py

@@ -29,85 +29,6 @@ class AsyncBlobService(BaseFileService):
         self.http_uploader = AsyncHttpUploader()
         self.http_downloader = AsyncHttpDownloader()
 
-    async def _generate_resumable_upload_url(
-            self,
-            file_name: str,
-            file_size: int,
-            folder_id: Optional[str] = None,
-            file_type: str = "dat",
-            mime_type: Optional[str] = None,
-            file_hash: Optional[str] = None,
-            is_temporary: Optional[bool] = False,
-            expire_seconds: Optional[int] = None,
-            request_id: Optional[str] = None,
-            **metadata
-    ) -> UploadUrlResponse:
-        """
-        生成断点续传URL
-
-        Args:
-            file_name: 文件名
-            file_size: 文件大小
-            folder_id: 文件夹ID
-            file_type: 文件类型
-            mime_type: MIME类型
-            file_hash: 文件哈希
-            is_temporary: 是否为临时文件
-            expire_seconds: 过期秒数
-            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
-
-        Returns:
-            上传URL响应
-        """
-        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
-
-        stub = await self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
-
-        request = file_service_pb2.UploadUrlRequest(
-            file_name=file_name,
-            file_size=file_size,
-            file_type=file_type,
-            mime_type=mime_type or "application/octet-stream",
-            file_hash=file_hash,
-            is_temporary=is_temporary,
-            expire_seconds=expire_seconds if is_temporary and expire_seconds else None,
-        )
-
-        if folder_id:
-            request.folder_id = folder_id
-
-        # 构建元数据
-        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
-
-        response = await stub.GenerateResumableUploadUrl(request, metadata=grpc_metadata)
-
-        return UploadUrlResponse(
-            file=self._convert_file_info(response.file),
-            upload_file=self._convert_upload_file_info(response.upload_file),
-            upload_url=response.url
-        )
-
-    async def _confirm_upload_completed(self, file_id: str, request_id: Optional[str] = None,
-                                        **metadata) -> None:
-        """
-        确认上传完成
-
-        Args:
-            file_id: 文件ID
-            request_id: 请求ID（可选，如果不提供则自动生成）
-            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
-        """
-        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
-
-        stub = await self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
-
-        request = file_service_pb2.UploadCompletedRequest(file_id=file_id)
-
-        # 构建元数据
-        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
-
-        await stub.ConfirmUploadCompleted(request, metadata=grpc_metadata)
-
     @retry_with_backoff(max_retries=3)
     async def _upload_file(
             self,
@@ -228,7 +149,7 @@ class AsyncBlobService(BaseFileService):
         )
 
         # 确认上传完成
-        await self._confirm_upload_completed(
+        await self.confirm_upload_completed(
             file_id=upload_url_resp.file.id,
             request_id=request_id,
             **metadata
@@ -256,7 +177,7 @@ class AsyncBlobService(BaseFileService):
     ) -> FileUploadResponse:
         """断点续传实现"""
         # 获取断点续传URL，以及对应的文件和上传文件信息
-        upload_url_resp = await self._generate_resumable_upload_url(
+        upload_url_resp = await self.generate_resumable_upload_url(
             file_name=file_name,
             file_size=file_size,
             folder_id=folder_id,
@@ -292,7 +213,7 @@ class AsyncBlobService(BaseFileService):
         )
 
         # 确认上传完成
-        await self._confirm_upload_completed(
+        await self.confirm_upload_completed(
             file_id=upload_url_resp.file.id,
             request_id=request_id,
             **metadata
@@ -304,6 +225,85 @@ class AsyncBlobService(BaseFileService):
             upload_file=upload_url_resp.upload_file
         )
 
+    async def confirm_upload_completed(self, file_id: str, request_id: Optional[str] = None,
+                                       **metadata) -> None:
+        """
+        确认上传完成
+
+        Args:
+            file_id: 文件ID
+            request_id: 请求ID（可选，如果不提供则自动生成）
+            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
+        """
+        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+
+        stub = await self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
+
+        request = file_service_pb2.UploadCompletedRequest(file_id=file_id)
+
+        # 构建元数据
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
+
+        await stub.ConfirmUploadCompleted(request, metadata=grpc_metadata)
+
+    async def generate_resumable_upload_url(
+            self,
+            file_name: str,
+            file_size: int,
+            folder_id: Optional[str] = None,
+            file_type: str = "dat",
+            mime_type: Optional[str] = None,
+            file_hash: Optional[str] = None,
+            is_temporary: Optional[bool] = False,
+            expire_seconds: Optional[int] = None,
+            request_id: Optional[str] = None,
+            **metadata
+    ) -> UploadUrlResponse:
+        """
+        生成断点续传URL
+
+        Args:
+            file_name: 文件名
+            file_size: 文件大小
+            folder_id: 文件夹ID
+            file_type: 文件类型
+            mime_type: MIME类型
+            file_hash: 文件哈希
+            is_temporary: 是否为临时文件
+            expire_seconds: 过期秒数
+            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
+
+        Returns:
+            上传URL响应
+        """
+        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+
+        stub = await self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
+
+        request = file_service_pb2.UploadUrlRequest(
+            file_name=file_name,
+            file_size=file_size,
+            file_type=file_type,
+            mime_type=mime_type or "application/octet-stream",
+            file_hash=file_hash,
+            is_temporary=is_temporary,
+            expire_seconds=expire_seconds if is_temporary and expire_seconds else None,
+        )
+
+        if folder_id:
+            request.folder_id = folder_id
+
+        # 构建元数据
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
+
+        response = await stub.GenerateResumableUploadUrl(request, metadata=grpc_metadata)
+
+        return UploadUrlResponse(
+            file=self._convert_file_info(response.file),
+            upload_file=self._convert_upload_file_info(response.upload_file),
+            upload_url=response.url
+        )
+
     async def generate_upload_url(
             self,
             file_name: str,

file_hub_client/services/file/sync_blob_service.py

@@ -27,85 +27,6 @@ class SyncBlobService(BaseFileService):
         self.http_uploader = HttpUploader()
         self.http_downloader = HttpDownloader()
 
-    def _generate_resumable_upload_url(
-            self,
-            file_name: str,
-            file_size: int,
-            folder_id: Optional[str] = None,
-            file_type: str = "dat",
-            mime_type: str = None,
-            file_hash: str = None,
-            is_temporary: Optional[bool] = False,
-            expire_seconds: Optional[int] = None,
-            request_id: Optional[str] = None,
-            **metadata
-    ) -> UploadUrlResponse:
-        """
-        生成断点续传URL
-
-        Args:
-            file_name: 文件名
-            file_size: 文件大小
-            folder_id: 文件夹ID
-            file_type: 文件类型
-            mime_type: MIME类型
-            file_hash: 文件哈希
-            is_temporary: 是否为临时文件
-            expire_seconds: 过期秒数
-            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
-
-        Returns:
-            上传URL响应
-        """
-        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
-
-        stub = self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
-
-        request = file_service_pb2.UploadUrlRequest(
-            file_name=file_name,
-            file_size=file_size,
-            file_type=file_type,
-            mime_type=mime_type or "application/octet-stream",
-            file_hash=file_hash,
-            is_temporary=is_temporary,
-            expire_seconds=expire_seconds if is_temporary and expire_seconds else None,
-        )
-
-        if folder_id:
-            request.folder_id = folder_id
-
-        # 构建元数据
-        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
-
-        response = stub.GenerateResumableUploadUrl(request, metadata=grpc_metadata)
-
-        return UploadUrlResponse(
-            file=self._convert_file_info(response.file),
-            upload_file=self._convert_upload_file_info(response.upload_file),
-            upload_url=response.url
-        )
-
-    def _confirm_upload_completed(self, file_id: str, request_id: Optional[str] = None,
-                                  **metadata) -> None:
-        """
-        确认上传完成
-
-        Args:
-            file_id: 文件ID
-            request_id: 请求ID（可选，如果不提供则自动生成）
-            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
-        """
-        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
-
-        stub = self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
-
-        request = file_service_pb2.UploadCompletedRequest(file_id=file_id)
-
-        # 构建元数据
-        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
-
-        stub.ConfirmUploadCompleted(request, metadata=grpc_metadata)
-
     @retry_with_backoff(max_retries=3)
     def _upload_file(
             self,
@@ -225,7 +146,7 @@ class SyncBlobService(BaseFileService):
         )
 
         # 确认上传完成
-        self._confirm_upload_completed(
+        self.confirm_upload_completed(
             file_id=upload_url_resp.file.id,
             request_id=request_id,
             **metadata
@@ -253,7 +174,7 @@ class SyncBlobService(BaseFileService):
     ) -> FileUploadResponse:
         """断点续传实现"""
         # 获取断点续传URL，以及对应的文件和上传文件信息
-        upload_url_resp = self._generate_resumable_upload_url(
+        upload_url_resp = self.generate_resumable_upload_url(
             file_name=file_name,
             file_size=file_size,
             folder_id=folder_id,
@@ -290,7 +211,7 @@ class SyncBlobService(BaseFileService):
         )
 
         # 确认上传完成
-        self._confirm_upload_completed(
+        self.confirm_upload_completed(
             file_id=upload_url_resp.file.id,
             request_id=request_id,
             **metadata
@@ -302,6 +223,85 @@ class SyncBlobService(BaseFileService):
             upload_file=upload_url_resp.upload_file
         )
 
+    def confirm_upload_completed(self, file_id: str, request_id: Optional[str] = None,
+                                 **metadata) -> None:
+        """
+        确认上传完成
+
+        Args:
+            file_id: 文件ID
+            request_id: 请求ID（可选，如果不提供则自动生成）
+            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
+        """
+        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+
+        stub = self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
+
+        request = file_service_pb2.UploadCompletedRequest(file_id=file_id)
+
+        # 构建元数据
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
+
+        stub.ConfirmUploadCompleted(request, metadata=grpc_metadata)
+
+    def generate_resumable_upload_url(
+            self,
+            file_name: str,
+            file_size: int,
+            folder_id: Optional[str] = None,
+            file_type: str = "dat",
+            mime_type: str = None,
+            file_hash: str = None,
+            is_temporary: Optional[bool] = False,
+            expire_seconds: Optional[int] = None,
+            request_id: Optional[str] = None,
+            **metadata
+    ) -> UploadUrlResponse:
+        """
+        生成断点续传URL
+
+        Args:
+            file_name: 文件名
+            file_size: 文件大小
+            folder_id: 文件夹ID
+            file_type: 文件类型
+            mime_type: MIME类型
+            file_hash: 文件哈希
+            is_temporary: 是否为临时文件
+            expire_seconds: 过期秒数
+            **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
+
+        Returns:
+            上传URL响应
+        """
+        from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+
+        stub = self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
+
+        request = file_service_pb2.UploadUrlRequest(
+            file_name=file_name,
+            file_size=file_size,
+            file_type=file_type,
+            mime_type=mime_type or "application/octet-stream",
+            file_hash=file_hash,
+            is_temporary=is_temporary,
+            expire_seconds=expire_seconds if is_temporary and expire_seconds else None,
+        )
+
+        if folder_id:
+            request.folder_id = folder_id
+
+        # 构建元数据
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
+
+        response = stub.GenerateResumableUploadUrl(request, metadata=grpc_metadata)
+
+        return UploadUrlResponse(
+            file=self._convert_file_info(response.file),
+            upload_file=self._convert_upload_file_info(response.upload_file),
+            upload_url=response.url
+        )
+
     def generate_upload_url(
             self,
             file_name: str,