tamar-file-hub-client 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

file_hub_client/services/file/async_file_service.py

@@ -36,6 +36,7 @@ class AsyncFileService(BaseFileService):
             expire_seconds: int = 86400,
             max_access: Optional[int] = None,
             share_password: Optional[str] = None,
+            request_id: Optional[str] = None,
             **metadata
     ) -> str:
         """
@@ -70,7 +71,7 @@ class AsyncFileService(BaseFileService):
             request.share_password = share_password
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
 
         response = await stub.GenerateShareLink(request, metadata=grpc_metadata)
 
@@ -82,6 +83,7 @@ class AsyncFileService(BaseFileService):
             access_type: str = "view",
             access_duration: int = 0,
             metadata: Optional[Dict[str, Any]] = None,
+            request_id: Optional[str] = None,
             **extra_metadata
     ) -> None:
         """
@@ -113,11 +115,12 @@ class AsyncFileService(BaseFileService):
         )
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**extra_metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **extra_metadata)
 
         await stub.VisitFile(request, metadata=grpc_metadata)
 
-    async def get_file(self, file_id: str, **metadata) -> File:
+    async def get_file(self, file_id: str, request_id: Optional[str] = None,
+                       **metadata) -> File:
         """
         获取文件信息
         
@@ -135,7 +138,7 @@ class AsyncFileService(BaseFileService):
         request = file_service_pb2.GetFileRequest(file_id=file_id)
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
 
         try:
             response = await stub.GetFile(request, metadata=grpc_metadata)
@@ -145,13 +148,15 @@ class AsyncFileService(BaseFileService):
                 raise FileNotFoundError(file_id)
             raise
 
-    async def rename_file(self, file_id: str, new_name: str, **metadata) -> File:
+    async def rename_file(self, file_id: str, new_name: str, request_id: Optional[str] = None,
+                          **metadata) -> File:
         """
         重命名文件
         
         Args:
             file_id: 文件ID
             new_name: 新文件名
+            request_id: 请求ID（可选，如果不提供则自动生成）
             **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
             
         Returns:
@@ -167,7 +172,7 @@ class AsyncFileService(BaseFileService):
         )
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
 
         try:
             response = await stub.RenameFile(request, metadata=grpc_metadata)
@@ -177,12 +182,14 @@ class AsyncFileService(BaseFileService):
                 raise FileNotFoundError(file_id)
             raise
 
-    async def delete_file(self, file_id: str, **metadata) -> None:
+    async def delete_file(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
@@ -192,7 +199,7 @@ class AsyncFileService(BaseFileService):
         request = file_service_pb2.DeleteFileRequest(file_id=file_id)
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
 
         try:
             await stub.DeleteFile(request, metadata=grpc_metadata)
@@ -210,6 +217,7 @@ class AsyncFileService(BaseFileService):
             created_by: Optional[str] = None,
             page_size: int = 20,
             page: int = 1,
+            request_id: Optional[str] = None,
             **metadata
     ) -> FileListResponse:
         """
@@ -223,6 +231,7 @@ class AsyncFileService(BaseFileService):
             created_by: 创建者过滤
             page_size: 每页大小
             page: 页码
+            request_id: 请求ID（可选，如果不提供则自动生成）
             **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
             
         Returns:
@@ -248,7 +257,7 @@ class AsyncFileService(BaseFileService):
             request.created_by = created_by
 
         # 构建元数据
-        grpc_metadata = self.client.build_metadata(**metadata)
+        grpc_metadata = self.client.build_metadata(request_id=request_id, **metadata)
 
         response = await stub.ListFiles(request, metadata=grpc_metadata)
 

file_hub_client/services/file/base_file_service.py

@@ -24,8 +24,10 @@ class BaseFileService:
         """
 
         def get_file_type_and_mime(file_path: Path) -> Tuple[str, str]:
+            # 获取文件扩展名，如果没有扩展名则默认为 'dat'
+            file_ext = file_path.suffix.lstrip('.').lower() if file_path.suffix else 'dat'
             return (
-                file_path.suffix.lstrip('.').lower() if file_path.suffix else '',
+                file_ext,
                 get_file_mime_type(file_path)
             )
 
@@ -53,19 +55,30 @@ class BaseFileService:
         # Case 2: 原始字节流
         elif isinstance(file, bytes):
             sha256 = hashlib.sha256(file).hexdigest()
-            return None, file, len(file), "application/octet-stream", '', sha256
+            # 为字节流生成默认文件名
+            file_name = f"upload_{sha256[:8]}.dat"
+            return file_name, file, len(file), "application/octet-stream", 'dat', sha256
 
         # Case 3: 可读文件对象
         elif hasattr(file, 'read'):
             file_name = getattr(file, 'name', None)
-            file_type = Path(file_name).suffix.lstrip('.').lower() if file_name else ''
-            mime_type = get_file_mime_type(Path(file_name)) if file_name else "application/octet-stream"
-
+            
             if hasattr(file, 'seek'):
                 file.seek(0)
             content, file_hash = calculate_sha256_and_bytes(file)
             file_size = len(content)
-            return Path(file_name).name if file_name else None, content, file_size, mime_type, file_type, file_hash
+            
+            # 如果没有文件名，生成一个默认的
+            if not file_name:
+                file_name = f"upload_{file_hash[:8]}.dat"
+                file_type = 'dat'
+                mime_type = "application/octet-stream"
+            else:
+                file_type = Path(file_name).suffix.lstrip('.').lower()
+                mime_type = get_file_mime_type(Path(file_name))
+                file_name = Path(file_name).name
+            
+            return file_name, content, file_size, mime_type, file_type, file_hash
 
         else:
             raise ValidationError(f"不支持的文件类型: {type(file)}")