tamar-file-hub-client 0.0.8__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,

{tamar_file_hub_client-0.0.8.dist-info → tamar_file_hub_client-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-file-hub-client
-Version: 0.0.8
+Version: 0.0.9
 Summary: A Python SDK for gRPC-based file management system
 Home-page: https://github.com/Tamar-Edge-AI/file-hub-client
 Author: Oscar Ou

{tamar_file_hub_client-0.0.8.dist-info → tamar_file_hub_client-0.0.9.dist-info}/RECORD

@@ -29,10 +29,10 @@ file_hub_client/schemas/folder.py,sha256=D7UFsLCou-7CCXCQvuRObaBQEGmETsm1cgGOG1c
 file_hub_client/schemas/taple.py,sha256=qoH458xMAdYg8_jKdYqHJy5-gZ1ZFzOAkSPFROQuhQI,18172
 file_hub_client/services/__init__.py,sha256=yh5mir0dKB_LtJMk2hTpQI9WSlguaxtVD2KomMnzxdM,514
 file_hub_client/services/file/__init__.py,sha256=aJygo_AzYk5NN-ezp-a9YlugJ82wVIP9e5e54fl0UsI,342
-file_hub_client/services/file/async_blob_service.py,sha256=x4Xmxc5FqeiYZ7yKb5_fDjJhgxpq79g7dJuGbHIWMow,20484
+file_hub_client/services/file/async_blob_service.py,sha256=ccpEBKf5GOE3RxR9hSWcCn5SpQi1oTVxMpcIV4uUHt8,20478
 file_hub_client/services/file/async_file_service.py,sha256=QxVfwPoJe_oj8t7EOLHMQF3PQf4E1-HctQR7yvY9D3g,8585
 file_hub_client/services/file/base_file_service.py,sha256=wTxplrTk9klfwIHOPfTL0TQd6gX4nEmkYtIhpiZ3GVo,4791
-file_hub_client/services/file/sync_blob_service.py,sha256=pnUciPJ0oOLOLK1WDvigJ5gdL5lfCDw-qJX1WMGZvew,20265
+file_hub_client/services/file/sync_blob_service.py,sha256=WPfpuQ5-3b5crmgjqdxsGKqz5SvX_P0Iy_8TfO2X6BU,20259
 file_hub_client/services/file/sync_file_service.py,sha256=i1pLCcGNWMlWQfAW4dlhLsEiV3oc1jXKmKax35k0CGw,8439
 file_hub_client/services/folder/__init__.py,sha256=vGbMOlNiEBdnWZB1xE74RJtoroI28hKHCWfQV1GqKQc,210
 file_hub_client/services/folder/async_folder_service.py,sha256=uFEmtW8EXYvaKYT2JCitWbdTGR1EtHlx_eBN5P3JUZg,7293
@@ -51,7 +51,7 @@ file_hub_client/utils/logging.py,sha256=IxcvWkA0G9s9BMiXIeFAdJX5G-Lc5-JFlS2yxOX1
 file_hub_client/utils/retry.py,sha256=A2MBdJCEY-Ks0guq8dd5wXX22sD27N30Qy3nQIW1B_s,18019
 file_hub_client/utils/smart_retry.py,sha256=RjBhyG6SNDfMXxNxKU_qayWDD6Ihp7ow6_BPjhgflM0,16465
 file_hub_client/utils/upload_helper.py,sha256=gEtn9OXVJiGUpVev_fqrDnRQ6AFiiP9goLzFrVpqXmU,22569
-tamar_file_hub_client-0.0.8.dist-info/METADATA,sha256=v5SKeND4uUT_klNENHC9rnYi0gR3MFvdTe6OZVP6B3M,64873
-tamar_file_hub_client-0.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_file_hub_client-0.0.8.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
-tamar_file_hub_client-0.0.8.dist-info/RECORD,,
+tamar_file_hub_client-0.0.9.dist-info/METADATA,sha256=9YI1K_AMsIfOeiwYrIeSAwB5NvXzrQlbT7sPCXDTygw,64873
+tamar_file_hub_client-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_file_hub_client-0.0.9.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
+tamar_file_hub_client-0.0.9.dist-info/RECORD,,