tamar-file-hub-client 0.0.11__py3-none-any.whl → 0.1.0__py3-none-any.whl

file_hub_client/rpc/gen/file_service_pb2.py

@@ -26,7 +26,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__
 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x66ile_service.proto\x12\x04\x66ile\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xab\x01\n\x04\x46ile\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfolder_id\x18\x02 \x01(\t\x12\x11\n\tfile_name\x18\x03 \x01(\t\x12\x11\n\tfile_type\x18\x04 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xb7\x02\n\nUploadFile\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfolder_id\x18\x02 \x01(\t\x12\x0f\n\x07\x66ile_id\x18\x03 \x01(\t\x12\x14\n\x0cstorage_type\x18\x04 \x01(\t\x12\x13\n\x0bstored_name\x18\x05 \x01(\t\x12\x13\n\x0bstored_path\x18\x06 \x01(\t\x12\x11\n\tfile_name\x18\x07 \x01(\t\x12\x11\n\tfile_size\x18\x08 \x01(\x03\x12\x10\n\x08\x66ile_ext\x18\t \x01(\t\x12\x11\n\tmime_type\x18\n \x01(\t\x12\x0e\n\x06status\x18\x0b \x01(\t\x12.\n\ncreated_at\x18\x0c \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\r \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xdf\x01\n\x11UploadFileRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x11\n\tfile_name\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\x0c\x12\x11\n\tfile_type\x18\x04 \x01(\t\x12\x11\n\tmime_type\x18\x05 \x01(\t\x12\x19\n\x0cis_temporary\x18\x06 \x01(\x08H\x01\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x07 \x01(\x05H\x02\x88\x01\x01\x42\x0c\n\n_folder_idB\x0f\n\r_is_temporaryB\x11\n\x0f_expire_seconds\"\xf3\x01\n\x10UploadUrlRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x11\n\tfile_name\x18\x02 \x01(\t\x12\x11\n\tfile_type\x18\x03 \x01(\t\x12\x11\n\tmime_type\x18\x04 \x01(\t\x12\x11\n\tfile_size\x18\x05 \x01(\x03\x12\x11\n\tfile_hash\x18\x06 \x01(\t\x12\x19\n\x0cis_temporary\x18\x07 \x01(\x08H\x01\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x08 \x01(\x05H\x02\x88\x01\x01\x42\x0c\n\n_folder_idB\x0f\n\r_is_temporaryB\x11\n\x0f_expire_seconds\")\n\x16UploadCompletedRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"u\n\x12\x44ownloadUrlRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x13\n\x06is_cdn\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x02 \x01(\x05H\x01\x88\x01\x01\x42\t\n\x07_is_cdnB\x11\n\x0f_expire_seconds\"\xd4\x01\n\x10ShareLinkRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x11\n\tis_public\x18\x02 \x01(\x08\x12\x14\n\x0c\x61\x63\x63\x65ss_scope\x18\x03 \x01(\t\x12\x1b\n\x0e\x65xpire_seconds\x18\x04 \x01(\x05H\x00\x88\x01\x01\x12\x17\n\nmax_access\x18\x05 \x01(\x05H\x01\x88\x01\x01\x12\x1b\n\x0eshare_password\x18\x06 \x01(\tH\x02\x88\x01\x01\x42\x11\n\x0f_expire_secondsB\r\n\x0b_max_accessB\x11\n\x0f_share_password\"\x82\x01\n\x10\x46ileVisitRequest\x12\x15\n\rfile_share_id\x18\x01 \x01(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_type\x18\x02 \x01(\t\x12\x17\n\x0f\x61\x63\x63\x65ss_duration\x18\x03 \x01(\x05\x12)\n\x08metadata\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"!\n\x0eGetFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"6\n\x11RenameFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x10\n\x08new_name\x18\x02 \x01(\t\"$\n\x11\x44\x65leteFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"\x8d\x02\n\x10ListFilesRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x16\n\tfile_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x11\n\tfile_type\x18\x03 \x03(\t\x12\x1c\n\x0f\x63reated_by_role\x18\x04 \x01(\tH\x02\x88\x01\x01\x12\x17\n\ncreated_by\x18\x05 \x01(\tH\x03\x88\x01\x01\x12\x16\n\tpage_size\x18\x06 \x01(\x05H\x04\x88\x01\x01\x12\x11\n\x04page\x18\x07 \x01(\x05H\x05\x88\x01\x01\x42\x0c\n\n_folder_idB\x0c\n\n_file_nameB\x12\n\x10_created_by_roleB\r\n\x0b_created_byB\x0c\n\n_page_sizeB\x07\n\x05_page\"U\n\x12UploadFileResponse\x12\x18\n\x04\x66ile\x18\x01 \x01(\x0b\x32\n.file.File\x12%\n\x0bupload_file\x18\x02 \x01(\x0b\x32\x10.file.UploadFile\"a\n\x11UploadUrlResponse\x12\x18\n\x04\x66ile\x18\x01 \x01(\x0b\x32\n.file.File\x12%\n\x0bupload_file\x18\x02 \x01(\x0b\x32\x10.file.UploadFile\x12\x0b\n\x03url\x18\x03 \x01(\t\"\"\n\x13\x44ownloadUrlResponse\x12\x0b\n\x03url\x18\x01 \x01(\t\"*\n\x11ShareLinkResponse\x12\x15\n\rfile_share_id\x18\x01 \x01(\t\"-\n\x10\x46ileListResponse\x12\x19\n\x05\x66iles\x18\x01 \x03(\x0b\x32\n.file.File\"\x07\n\x05\x45mpty2\xbd\x05\n\x0b\x46ileService\x12?\n\nUploadFile\x12\x17.file.UploadFileRequest\x1a\x18.file.UploadFileResponse\x12\x44\n\x11GenerateUploadUrl\x12\x16.file.UploadUrlRequest\x1a\x17.file.UploadUrlResponse\x12M\n\x1aGenerateResumableUploadUrl\x12\x16.file.UploadUrlRequest\x1a\x17.file.UploadUrlResponse\x12\x43\n\x16\x43onfirmUploadCompleted\x12\x1c.file.UploadCompletedRequest\x1a\x0b.file.Empty\x12J\n\x13GenerateDownloadUrl\x12\x18.file.DownloadUrlRequest\x1a\x19.file.DownloadUrlResponse\x12\x44\n\x11GenerateShareLink\x12\x16.file.ShareLinkRequest\x1a\x17.file.ShareLinkResponse\x12\x30\n\tVisitFile\x12\x16.file.FileVisitRequest\x1a\x0b.file.Empty\x12+\n\x07GetFile\x12\x14.file.GetFileRequest\x1a\n.file.File\x12\x31\n\nRenameFile\x12\x17.file.RenameFileRequest\x1a\n.file.File\x12\x32\n\nDeleteFile\x12\x17.file.DeleteFileRequest\x1a\x0b.file.Empty\x12;\n\tListFiles\x12\x16.file.ListFilesRequest\x1a\x16.file.FileListResponseb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x66ile_service.proto\x12\x04\x66ile\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xab\x01\n\x04\x46ile\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfolder_id\x18\x02 \x01(\t\x12\x11\n\tfile_name\x18\x03 \x01(\t\x12\x11\n\tfile_type\x18\x04 \x01(\t\x12.\n\ncreated_at\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xb7\x02\n\nUploadFile\x12\n\n\x02id\x18\x01 \x01(\t\x12\x11\n\tfolder_id\x18\x02 \x01(\t\x12\x0f\n\x07\x66ile_id\x18\x03 \x01(\t\x12\x14\n\x0cstorage_type\x18\x04 \x01(\t\x12\x13\n\x0bstored_name\x18\x05 \x01(\t\x12\x13\n\x0bstored_path\x18\x06 \x01(\t\x12\x11\n\tfile_name\x18\x07 \x01(\t\x12\x11\n\tfile_size\x18\x08 \x01(\x03\x12\x10\n\x08\x66ile_ext\x18\t \x01(\t\x12\x11\n\tmime_type\x18\n \x01(\t\x12\x0e\n\x06status\x18\x0b \x01(\t\x12.\n\ncreated_at\x18\x0c \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12.\n\nupdated_at\x18\r \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xdf\x01\n\x11UploadFileRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x11\n\tfile_name\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\x0c\x12\x11\n\tfile_type\x18\x04 \x01(\t\x12\x11\n\tmime_type\x18\x05 \x01(\t\x12\x19\n\x0cis_temporary\x18\x06 \x01(\x08H\x01\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x07 \x01(\x05H\x02\x88\x01\x01\x42\x0c\n\n_folder_idB\x0f\n\r_is_temporaryB\x11\n\x0f_expire_seconds\"\xf3\x01\n\x10UploadUrlRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x11\n\tfile_name\x18\x02 \x01(\t\x12\x11\n\tfile_type\x18\x03 \x01(\t\x12\x11\n\tmime_type\x18\x04 \x01(\t\x12\x11\n\tfile_size\x18\x05 \x01(\x03\x12\x11\n\tfile_hash\x18\x06 \x01(\t\x12\x19\n\x0cis_temporary\x18\x07 \x01(\x08H\x01\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x08 \x01(\x05H\x02\x88\x01\x01\x42\x0c\n\n_folder_idB\x0f\n\r_is_temporaryB\x11\n\x0f_expire_seconds\")\n\x16UploadCompletedRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"u\n\x12\x44ownloadUrlRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x13\n\x06is_cdn\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0e\x65xpire_seconds\x18\x02 \x01(\x05H\x01\x88\x01\x01\x42\t\n\x07_is_cdnB\x11\n\x0f_expire_seconds\"\xd4\x01\n\x10ShareLinkRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x11\n\tis_public\x18\x02 \x01(\x08\x12\x14\n\x0c\x61\x63\x63\x65ss_scope\x18\x03 \x01(\t\x12\x1b\n\x0e\x65xpire_seconds\x18\x04 \x01(\x05H\x00\x88\x01\x01\x12\x17\n\nmax_access\x18\x05 \x01(\x05H\x01\x88\x01\x01\x12\x1b\n\x0eshare_password\x18\x06 \x01(\tH\x02\x88\x01\x01\x42\x11\n\x0f_expire_secondsB\r\n\x0b_max_accessB\x11\n\x0f_share_password\"\x82\x01\n\x10\x46ileVisitRequest\x12\x15\n\rfile_share_id\x18\x01 \x01(\t\x12\x13\n\x0b\x61\x63\x63\x65ss_type\x18\x02 \x01(\t\x12\x17\n\x0f\x61\x63\x63\x65ss_duration\x18\x03 \x01(\x05\x12)\n\x08metadata\x18\x04 \x01(\x0b\x32\x17.google.protobuf.Struct\"!\n\x0eGetFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"6\n\x11RenameFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\x12\x10\n\x08new_name\x18\x02 \x01(\t\"$\n\x11\x44\x65leteFileRequest\x12\x0f\n\x07\x66ile_id\x18\x01 \x01(\t\"\x8d\x02\n\x10ListFilesRequest\x12\x16\n\tfolder_id\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x16\n\tfile_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x11\n\tfile_type\x18\x03 \x03(\t\x12\x1c\n\x0f\x63reated_by_role\x18\x04 \x01(\tH\x02\x88\x01\x01\x12\x17\n\ncreated_by\x18\x05 \x01(\tH\x03\x88\x01\x01\x12\x16\n\tpage_size\x18\x06 \x01(\x05H\x04\x88\x01\x01\x12\x11\n\x04page\x18\x07 \x01(\x05H\x05\x88\x01\x01\x42\x0c\n\n_folder_idB\x0c\n\n_file_nameB\x12\n\x10_created_by_roleB\r\n\x0b_created_byB\x0c\n\n_page_sizeB\x07\n\x05_page\"U\n\x12UploadFileResponse\x12\x18\n\x04\x66ile\x18\x01 \x01(\x0b\x32\n.file.File\x12%\n\x0bupload_file\x18\x02 \x01(\x0b\x32\x10.file.UploadFile\"a\n\x11UploadUrlResponse\x12\x18\n\x04\x66ile\x18\x01 \x01(\x0b\x32\n.file.File\x12%\n\x0bupload_file\x18\x02 \x01(\x0b\x32\x10.file.UploadFile\x12\x0b\n\x03url\x18\x03 \x01(\t\"\"\n\x13\x44ownloadUrlResponse\x12\x0b\n\x03url\x18\x01 \x01(\t\"*\n\x11ShareLinkResponse\x12\x15\n\rfile_share_id\x18\x01 \x01(\t\"-\n\x10\x46ileListResponse\x12\x19\n\x05\x66iles\x18\x01 \x03(\x0b\x32\n.file.File\"g\n\x0fGetFileResponse\x12\x18\n\x04\x66ile\x18\x01 \x01(\x0b\x32\n.file.File\x12*\n\x0bupload_file\x18\x02 \x01(\x0b\x32\x10.file.UploadFileH\x00\x88\x01\x01\x42\x0e\n\x0c_upload_file\"\x07\n\x05\x45mpty2\xc8\x05\n\x0b\x46ileService\x12?\n\nUploadFile\x12\x17.file.UploadFileRequest\x1a\x18.file.UploadFileResponse\x12\x44\n\x11GenerateUploadUrl\x12\x16.file.UploadUrlRequest\x1a\x17.file.UploadUrlResponse\x12M\n\x1aGenerateResumableUploadUrl\x12\x16.file.UploadUrlRequest\x1a\x17.file.UploadUrlResponse\x12\x43\n\x16\x43onfirmUploadCompleted\x12\x1c.file.UploadCompletedRequest\x1a\x0b.file.Empty\x12J\n\x13GenerateDownloadUrl\x12\x18.file.DownloadUrlRequest\x1a\x19.file.DownloadUrlResponse\x12\x44\n\x11GenerateShareLink\x12\x16.file.ShareLinkRequest\x1a\x17.file.ShareLinkResponse\x12\x30\n\tVisitFile\x12\x16.file.FileVisitRequest\x1a\x0b.file.Empty\x12\x36\n\x07GetFile\x12\x14.file.GetFileRequest\x1a\x15.file.GetFileResponse\x12\x31\n\nRenameFile\x12\x17.file.RenameFileRequest\x1a\n.file.File\x12\x32\n\nDeleteFile\x12\x17.file.DeleteFileRequest\x1a\x0b.file.Empty\x12;\n\tListFiles\x12\x16.file.ListFilesRequest\x1a\x16.file.FileListResponseb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -67,8 +67,10 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_SHARELINKRESPONSE']._serialized_end=2226
   _globals['_FILELISTRESPONSE']._serialized_start=2228
   _globals['_FILELISTRESPONSE']._serialized_end=2273
-  _globals['_EMPTY']._serialized_start=2275
-  _globals['_EMPTY']._serialized_end=2282
-  _globals['_FILESERVICE']._serialized_start=2285
-  _globals['_FILESERVICE']._serialized_end=2986
+  _globals['_GETFILERESPONSE']._serialized_start=2275
+  _globals['_GETFILERESPONSE']._serialized_end=2378
+  _globals['_EMPTY']._serialized_start=2380
+  _globals['_EMPTY']._serialized_end=2387
+  _globals['_FILESERVICE']._serialized_start=2390
+  _globals['_FILESERVICE']._serialized_end=3102
 # @@protoc_insertion_point(module_scope)

file_hub_client/rpc/gen/file_service_pb2_grpc.py

@@ -74,7 +74,7 @@ class FileServiceStub(object):
         self.GetFile = channel.unary_unary(
                 '/file.FileService/GetFile',
                 request_serializer=file__service__pb2.GetFileRequest.SerializeToString,
-                response_deserializer=file__service__pb2.File.FromString,
+                response_deserializer=file__service__pb2.GetFileResponse.FromString,
                 _registered_method=True)
         self.RenameFile = channel.unary_unary(
                 '/file.FileService/RenameFile',
@@ -205,7 +205,7 @@ def add_FileServiceServicer_to_server(servicer, server):
             'GetFile': grpc.unary_unary_rpc_method_handler(
                     servicer.GetFile,
                     request_deserializer=file__service__pb2.GetFileRequest.FromString,
-                    response_serializer=file__service__pb2.File.SerializeToString,
+                    response_serializer=file__service__pb2.GetFileResponse.SerializeToString,
             ),
             'RenameFile': grpc.unary_unary_rpc_method_handler(
                     servicer.RenameFile,
@@ -440,7 +440,7 @@ class FileService(object):
             target,
             '/file.FileService/GetFile',
             file__service__pb2.GetFileRequest.SerializeToString,
-            file__service__pb2.File.FromString,
+            file__service__pb2.GetFileResponse.FromString,
             options,
             channel_credentials,
             insecure,

file_hub_client/rpc/protos/file_service.proto

@@ -15,7 +15,7 @@ service FileService {
     rpc GenerateDownloadUrl (DownloadUrlRequest) returns (DownloadUrlResponse);
     rpc GenerateShareLink (ShareLinkRequest) returns (ShareLinkResponse);
     rpc VisitFile (FileVisitRequest) returns (Empty);
-    rpc GetFile (GetFileRequest) returns (File);
+    rpc GetFile (GetFileRequest) returns (GetFileResponse);
     rpc RenameFile (RenameFileRequest) returns (File);
     rpc DeleteFile (DeleteFileRequest) returns (Empty);
     rpc ListFiles (ListFilesRequest) returns (FileListResponse);
@@ -145,4 +145,9 @@ message FileListResponse {
     repeated File files = 1;
 }
 
+message GetFileResponse {
+    File file = 1;
+    optional UploadFile upload_file = 2;
+}
+
 message Empty {}

file_hub_client/schemas/__init__.py

@@ -10,6 +10,7 @@ from .file import (
     FileVisitRequest,
     FileListRequest,
     FileListResponse,
+    GetFileResponse,
 )
 from .folder import (
     FolderInfo,
@@ -61,6 +62,7 @@ __all__ = [
     "FileVisitRequest",
     "FileListRequest",
     "FileListResponse",
+    "GetFileResponse",
 
     # 文件夹相关
     "FolderInfo",

file_hub_client/schemas/file.py

@@ -87,3 +87,9 @@ class FileListRequest(BaseModel):
 class FileListResponse(BaseModel):
     """文件列表响应"""
     files: List[File] = Field(default_factory=list, description="文件列表")
+
+
+class GetFileResponse(BaseModel):
+    """获取文件响应"""
+    file: File = Field(..., description="文件信息")
+    upload_file: Optional[UploadFile] = Field(None, description="上传文件信息")

file_hub_client/services/file/async_file_service.py

@@ -11,6 +11,7 @@ from ...rpc.async_client import AsyncGrpcClient
 from ...schemas import (
     File,
     FileListResponse,
+    GetFileResponse,
 )
 from ...errors import FileNotFoundError
 
@@ -120,7 +121,7 @@ class AsyncFileService(BaseFileService):
         await stub.VisitFile(request, metadata=grpc_metadata)
 
     async def get_file(self, file_id: str, request_id: Optional[str] = None,
-                       **metadata) -> File:
+                       **metadata) -> GetFileResponse:
         """
         获取文件信息
         
@@ -129,9 +130,10 @@ class AsyncFileService(BaseFileService):
             **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
             
         Returns:
-            文件信息
+            文件信息响应，包含文件信息和上传文件信息
         """
         from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+        from ...schemas.file import GetFileResponse
 
         stub = await self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
 
@@ -142,7 +144,16 @@ class AsyncFileService(BaseFileService):
 
         try:
             response = await stub.GetFile(request, metadata=grpc_metadata)
-            return self._convert_file_info(response)
+            
+            # 转换文件信息
+            file_info = self._convert_file_info(response.file)
+            
+            # 转换上传文件信息（如果存在）
+            upload_file_info = None
+            if response.HasField('upload_file'):
+                upload_file_info = self._convert_upload_file_info(response.upload_file)
+            
+            return GetFileResponse(file=file_info, upload_file=upload_file_info)
         except grpc.RpcError as e:
             if e.code() == grpc.StatusCode.NOT_FOUND:
                 raise FileNotFoundError(file_id)

file_hub_client/services/file/sync_file_service.py

@@ -9,6 +9,7 @@ from ...rpc.sync_client import SyncGrpcClient
 from ...schemas import (
     File,
     FileListResponse,
+    GetFileResponse,
 )
 from ...errors import FileNotFoundError
 
@@ -118,7 +119,7 @@ class SyncFileService(BaseFileService):
         stub.VisitFile(request, metadata=grpc_metadata)
 
     def get_file(self, file_id: str, request_id: Optional[str] = None,
-                 **metadata) -> File:
+                 **metadata) -> GetFileResponse:
         """
         获取文件信息
         
@@ -127,9 +128,10 @@ class SyncFileService(BaseFileService):
             **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
             
         Returns:
-            文件信息
+            文件信息响应，包含文件信息和上传文件信息
         """
         from ...rpc.gen import file_service_pb2, file_service_pb2_grpc
+        from ...schemas.file import GetFileResponse
 
         stub = self.client.get_stub(file_service_pb2_grpc.FileServiceStub)
 
@@ -140,7 +142,16 @@ class SyncFileService(BaseFileService):
 
         try:
             response = stub.GetFile(request, metadata=grpc_metadata)
-            return self._convert_file_info(response)
+            
+            # 转换文件信息
+            file_info = self._convert_file_info(response.file)
+            
+            # 转换上传文件信息（如果存在）
+            upload_file_info = None
+            if response.HasField('upload_file'):
+                upload_file_info = self._convert_upload_file_info(response.upload_file)
+            
+            return GetFileResponse(file=file_info, upload_file=upload_file_info)
         except grpc.RpcError as e:
             if e.code() == grpc.StatusCode.NOT_FOUND:
                 raise FileNotFoundError(file_id)

file_hub_client/services/taple/async_taple_service.py

@@ -2058,7 +2058,7 @@ class AsyncTapleService(BaseTapleService):
         """
         from ...rpc.gen import taple_service_pb2, taple_service_pb2_grpc
         from ...schemas.taple import TableViewResponse
-        from google.protobuf.struct_pb2 import ListValue
+
 
         stub = await self.client.get_stub(taple_service_pb2_grpc.TapleServiceStub)
 
@@ -2166,7 +2166,19 @@ class AsyncTapleService(BaseTapleService):
         from google.protobuf.json_format import MessageToDict
 
         # 处理 visible_columns 的转换
-        visible_columns = MessageToDict(proto_view.visible_columns) if proto_view.HasField('visible_columns') else None
+        if proto_view.HasField('visible_columns'):
+            visible_columns_dict = MessageToDict(proto_view.visible_columns)
+            # 如果服务器返回的是旧格式（包含 items 字段的结构），需要转换
+            if isinstance(visible_columns_dict, dict) and 'items' in visible_columns_dict:
+                # 旧格式：将列表转换为字典，默认所有列都显示
+                if isinstance(visible_columns_dict['items'], list):
+                    visible_columns = {col: True for col in visible_columns_dict['items']}
+                else:
+                    visible_columns = visible_columns_dict
+            else:
+                visible_columns = visible_columns_dict
+        else:
+            visible_columns = None
 
         return TableView(
             id=proto_view.id,

file_hub_client/services/taple/base_taple_service.py

@@ -159,7 +159,19 @@ class BaseTapleService(IdempotentTapleMixin):
         config = MessageToDict(proto_view.config) if proto_view.HasField('config') else {}
         filter_criteria = MessageToDict(proto_view.filter_criteria) if proto_view.HasField('filter_criteria') else None
         sort_criteria = MessageToDict(proto_view.sort_criteria) if proto_view.HasField('sort_criteria') else None
-        visible_columns = MessageToDict(proto_view.visible_columns) if proto_view.HasField('visible_columns') else None
+        if proto_view.HasField('visible_columns'):
+            visible_columns_dict = MessageToDict(proto_view.visible_columns)
+            # 如果服务器返回的是旧格式（包含 items 字段的结构），需要转换
+            if isinstance(visible_columns_dict, dict) and 'items' in visible_columns_dict:
+                # 旧格式：将列表转换为字典，默认所有列都显示
+                if isinstance(visible_columns_dict['items'], list):
+                    visible_columns = {col: True for col in visible_columns_dict['items']}
+                else:
+                    visible_columns = visible_columns_dict
+            else:
+                visible_columns = visible_columns_dict
+        else:
+            visible_columns = None
         group_criteria = MessageToDict(proto_view.group_criteria) if proto_view.HasField('group_criteria') else None
 
         return TableView(

file_hub_client/services/taple/sync_taple_service.py

@@ -2033,7 +2033,7 @@ class SyncTapleService(BaseTapleService):
         """
         from ...rpc.gen import taple_service_pb2, taple_service_pb2_grpc
         from ...schemas.taple import TableViewResponse
-        from google.protobuf.struct_pb2 import ListValue
+
         
         stub = self.client.get_stub(taple_service_pb2_grpc.TapleServiceStub)
         
@@ -2141,7 +2141,19 @@ class SyncTapleService(BaseTapleService):
         from google.protobuf.json_format import MessageToDict
         
         # 处理 visible_columns 的转换
-        visible_columns = MessageToDict(proto_view.visible_columns) if proto_view.HasField('visible_columns') else None
+        if proto_view.HasField('visible_columns'):
+            visible_columns_dict = MessageToDict(proto_view.visible_columns)
+            # 如果服务器返回的是旧格式（包含 items 字段的结构），需要转换
+            if isinstance(visible_columns_dict, dict) and 'items' in visible_columns_dict:
+                # 旧格式：将列表转换为字典，默认所有列都显示
+                if isinstance(visible_columns_dict['items'], list):
+                    visible_columns = {col: True for col in visible_columns_dict['items']}
+                else:
+                    visible_columns = visible_columns_dict
+            else:
+                visible_columns = visible_columns_dict
+        else:
+            visible_columns = None
         
         return TableView(
             id=proto_view.id,

{tamar_file_hub_client-0.0.11.dist-info → tamar_file_hub_client-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-file-hub-client
-Version: 0.0.11
+Version: 0.1.0
 Summary: A Python SDK for gRPC-based file management system
 Home-page: https://github.com/Tamar-Edge-AI/file-hub-client
 Author: Oscar Ou
@@ -695,11 +695,23 @@ async with AsyncTamarFileHubClient() as client:
     # 设置用户上下文
     client.set_user_context(org_id="123", user_id="456")
     
-    # 获取文件详细信息
-    file_info = await client.files.get_file(file_id="file-001")
+    # 获取文件详细信息（返回 GetFileResponse 对象）
+    response = await client.files.get_file(file_id="file-001")
+    
+    # 访问文件基本信息
+    file_info = response.file
+    print(f"文件ID: {file_info.id}")
     print(f"文件名: {file_info.file_name}")
-    print(f"文件大小: {file_info.file_size} bytes")
+    print(f"文件类型: {file_info.file_type}")
     print(f"创建时间: {file_info.created_at}")
+    
+    # 访问上传文件详细信息（如果存在）
+    if response.upload_file:
+        upload_info = response.upload_file
+        print(f"文件大小: {upload_info.file_size} bytes")
+        print(f"MIME类型: {upload_info.mime_type}")
+        print(f"存储类型: {upload_info.storage_type}")
+        print(f"存储路径: {upload_info.stored_path}")
 ```
 
 #### 重命名文件
@@ -1622,10 +1634,12 @@ folder = await client.folders.create_folder(
 
 # 同步客户端同样支持
 sync_client = TamarFileHubClient(user_context=user_context)
-file_info = sync_client.files.get_file(
+response = sync_client.files.get_file(
     file_id="file-123",
     request_id="debug-get-file-001"
 )
+# response.file 包含文件基本信息
+# response.upload_file 包含上传文件详细信息（可能为None）
 ```
 
 #### 请求ID优先级
@@ -1679,7 +1693,8 @@ await minimal_client.taples.create_table(name="auto_generated")
 - 所有批量操作方法
 
 **文件服务**：
-- `get_file()`, `rename_file()`, `delete_file()`, `list_files()`
+- `get_file()` - 返回 `GetFileResponse` 对象，包含 `file` 和 `upload_file` 信息
+- `rename_file()`, `delete_file()`, `list_files()`
 - `generate_share_link()`, `visit_file()`
 
 **文件夹服务**：

{tamar_file_hub_client-0.0.11.dist-info → tamar_file_hub_client-0.1.0.dist-info}/RECORD

@@ -13,35 +13,35 @@ file_hub_client/rpc/generate_grpc.py,sha256=opzstxWdW7vqR9OxrgUCSUkZe8IqgcOdruqW
 file_hub_client/rpc/interceptors.py,sha256=UeQ8u-olMiYwScXJrlzqPS-odGomH-h3xJqOwPznRUo,22071
 file_hub_client/rpc/sync_client.py,sha256=ZWBmP-TU8eeAfl2lV8sLu9nsxo_aOPAVmt9ww_T8Hwg,14054
 file_hub_client/rpc/gen/__init__.py,sha256=NJLqr9ezUXeOyy1J0sMPn3Kl_8IyGw7GAzzzewO3MIw,45
-file_hub_client/rpc/gen/file_service_pb2.py,sha256=_0OKjhzI82aW71bRji4W6RK2yYHqbFlZgYtOBL-VxVM,8425
-file_hub_client/rpc/gen/file_service_pb2_grpc.py,sha256=D-vs_udh-8YK2wxSClIKGVNdYFGg40IYMiLVkwe8QOs,20723
+file_hub_client/rpc/gen/file_service_pb2.py,sha256=i8RsHLj8Vzoj0SXBNDtAVuUG6vwj96iTqOMoHE94-24,8733
+file_hub_client/rpc/gen/file_service_pb2_grpc.py,sha256=KSf-kiA6M5YOmhySAMJIfLj3-cQamS59wEnULOP-DhI,20756
 file_hub_client/rpc/gen/folder_service_pb2.py,sha256=OPNYHThmL1k2KH1ll2L_Gj76oWBWqcymXKHu8mk1Zvk,4126
 file_hub_client/rpc/gen/folder_service_pb2_grpc.py,sha256=pOHFsVThdAu5DAKd8QK3_zQvUmFgGlh4KBqIYnYDZ_U,10411
 file_hub_client/rpc/gen/taple_service_pb2.py,sha256=8BJCFRFJ_khl_Uaw-5jWCabljWJo6zaqOYWe1368xEw,48254
 file_hub_client/rpc/gen/taple_service_pb2_grpc.py,sha256=DCL-45PlEZ0guLz1u2fFH_sDIT_awuSvp9Ak6fa2GO8,64773
-file_hub_client/rpc/protos/file_service.proto,sha256=I0Px8pYmNERwnUECIuBEe_RAe4KUByEJ4d6K_8iDFFs,3694
+file_hub_client/rpc/protos/file_service.proto,sha256=Rs57mVJ7Tl5NM2wXU8LcUBxvboHKcyzQiAhEt5_Ryq0,3799
 file_hub_client/rpc/protos/folder_service.proto,sha256=cgIbJT2slXMMRGrtrzN3kjae9-4CB1zXCmceiUgE6fI,1542
 file_hub_client/rpc/protos/taple_service.proto,sha256=0mwhyBwD3yvFhMiiSA6J3Ni6pyHc369iD4oDXXl7DIU,29765
-file_hub_client/schemas/__init__.py,sha256=kA0jUV5C3EBZxXWd80hHiMvJw0KL068EintZJx-vkJw,2100
+file_hub_client/schemas/__init__.py,sha256=IpWfQe71MJLt9lK5Bh0PDIhmWGzLAQTa9qSUWbRz3xc,2146
 file_hub_client/schemas/context.py,sha256=bs-KXGBBo_9i1KbvozY8KjYzV5ZtMbjqpPW_ssN7qMs,5516
-file_hub_client/schemas/file.py,sha256=M-iuaZE2bdW3JSZJkNAvIOuUjhaAJInTiDLZFYzqM-Y,3616
+file_hub_client/schemas/file.py,sha256=xn-5l8MqEhm78qbcddDvwAWITz9O4uuq-MJzBM_x2LQ,3829
 file_hub_client/schemas/folder.py,sha256=D7UFsLCou-7CCXCQvuRObaBQEGmETsm1cgGOG1ceSrk,1026
 file_hub_client/schemas/taple.py,sha256=LYsECsDbcioPXcvjRBcCEbh083iEB-eFCapJrGMJ8w0,17790
 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=kIsz-tGDLgmk4J5I-h95Aummz1UPo55ffy5vIAFQxaU,20578
-file_hub_client/services/file/async_file_service.py,sha256=QxVfwPoJe_oj8t7EOLHMQF3PQf4E1-HctQR7yvY9D3g,8585
+file_hub_client/services/file/async_file_service.py,sha256=wJuoy-3CiIow5Xef_4JNJRKEOoMTKfs9nxqbkaYI4Ig,9110
 file_hub_client/services/file/base_file_service.py,sha256=wTxplrTk9klfwIHOPfTL0TQd6gX4nEmkYtIhpiZ3GVo,4791
 file_hub_client/services/file/sync_blob_service.py,sha256=I2_fcdpE6jyZ4Bs7-zWzr5PhWWPMfKQLcYMuYV2cDiE,20359
-file_hub_client/services/file/sync_file_service.py,sha256=i1pLCcGNWMlWQfAW4dlhLsEiV3oc1jXKmKax35k0CGw,8439
+file_hub_client/services/file/sync_file_service.py,sha256=fMTq91dXwZzuMsPTZ1whaQBxzpyHfSP-A4W15pWSNfs,8964
 file_hub_client/services/folder/__init__.py,sha256=vGbMOlNiEBdnWZB1xE74RJtoroI28hKHCWfQV1GqKQc,210
 file_hub_client/services/folder/async_folder_service.py,sha256=uFEmtW8EXYvaKYT2JCitWbdTGR1EtHlx_eBN5P3JUZg,7293
 file_hub_client/services/folder/sync_folder_service.py,sha256=T00k1nD0txjOFQXxeIbF_ZOkNUhsBF45sDxyaDk8rf8,7167
 file_hub_client/services/taple/__init__.py,sha256=AQgYVRXgISye8cRd0J5QEK-5AoepeAw5726esFzs2Gg,199
-file_hub_client/services/taple/async_taple_service.py,sha256=uk0iLa31KIsVaujgKbOZ0nrrC7lq60D_ySmSTuUoiLw,88272
-file_hub_client/services/taple/base_taple_service.py,sha256=f44tRmuf7yTR3GGUaVm0pA_RJgOwIDwpZq9_QtkbSWM,15199
+file_hub_client/services/taple/async_taple_service.py,sha256=XZqMBN69FSJ8-n0nyIfqmjKG_ROpW57qPiB3RJ5FJK8,88859
+file_hub_client/services/taple/base_taple_service.py,sha256=m_RZjvlXD8CzsB4gtZWDKiL7TNYYtRuSeY4yrFDnGIs,15842
 file_hub_client/services/taple/idempotent_taple_mixin.py,sha256=lZeMF59dU-KVnc2p7epGrclidCv0nYg8TP_qVUezJ48,4295
-file_hub_client/services/taple/sync_taple_service.py,sha256=WTfuzrimAEW6XyIuuoPYx3ZKFuwSYFaRCHWVqpTa08Q,86805
+file_hub_client/services/taple/sync_taple_service.py,sha256=LIfpJjZjUPpee5zidrmiRD-tTXPouSlU4RpScy5kNZY,87392
 file_hub_client/utils/__init__.py,sha256=0WS1R9VEPEqIN6_ksHEbO6Eu0G1Ps6oNTuOtoDMdDMM,1832
 file_hub_client/utils/converter.py,sha256=TX69Bqk-PwNdv2hYQ07_tW6HQnQycHcJkGeRnskeF3A,3734
 file_hub_client/utils/download_helper.py,sha256=Mc8TQSWjHxIglJMkKlGy9r3LZe8e_Mwe6D3sfn6IOnY,13338
@@ -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.11.dist-info/METADATA,sha256=GPa_nnCW-rq81LzaB_8TmR34NvNiTvtbBxCcaigDGeo,64874
-tamar_file_hub_client-0.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_file_hub_client-0.0.11.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
-tamar_file_hub_client-0.0.11.dist-info/RECORD,,
+tamar_file_hub_client-0.1.0.dist-info/METADATA,sha256=nqxmyLYky2aZi1vvmHEDVE6lZDVRF0akTnreQ2_GocY,65575
+tamar_file_hub_client-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_file_hub_client-0.1.0.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
+tamar_file_hub_client-0.1.0.dist-info/RECORD,,