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

file_hub_client/services/file/async_blob_service.py

@@ -401,12 +401,12 @@ class AsyncBlobService(BaseFileService):
         # 参数验证：必须提供 file 或 url 之一
         if file is None and not url:
             raise ValidationError("必须提供 file 或 url 参数之一")
-        
+
         # 如果提供了URL，先下载文件
         if url:
             # 下载文件到内存
             downloaded_content = await self.http_downloader.download(url)
-            
+
             # 如果没有指定文件名，从URL中提取
             if not file_name:
                 from urllib.parse import urlparse
@@ -414,22 +414,32 @@ class AsyncBlobService(BaseFileService):
                 parsed_url = urlparse(url)
                 url_path = PathLib(parsed_url.path)
                 file_name = url_path.name if url_path.name else f"download_{hashlib.md5(url.encode()).hexdigest()[:8]}"
-            
+
             # 使用下载的内容作为file参数
             file = downloaded_content
-            
+
             # 提取文件信息（bytes会返回默认的MIME类型，我们稍后会基于文件名重新计算）
-            extracted_file_name, content, file_size, _, _, file_hash = self._extract_file_info(file)
-            
+            _, content, file_size, _, _, file_hash = self._extract_file_info(file)
+
             # file_name已经在上面设置了（要么是用户指定的，要么是从URL提取的）
             extracted_file_name = file_name
-            
+
             # 基于文件名计算文件类型和MIME类型
-            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(extracted_file_name).suffix else 'dat'
+            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
+                extracted_file_name).suffix else 'dat'
             mime_type = get_file_mime_type(Path(extracted_file_name))
         else:
             # 解析文件参数，提取文件信息
-            extracted_file_name, content, file_size, mime_type, file_type, file_hash = self._extract_file_info(file)
+            extracted_file_name, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(
+                file)
+            if file_name:
+                extracted_file_name = file_name
+                mime_type = get_file_mime_type(file_name)
+                file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
+                    extracted_file_name).suffix else 'dat'
+            else:
+                mime_type = extract_mime_type
+                file_type = extract_file_type
 
         # 根据文件大小自动选择上传模式
         if mode == UploadMode.NORMAL:

file_hub_client/services/file/sync_blob_service.py

@@ -387,24 +387,25 @@ class SyncBlobService(BaseFileService):
             expire_seconds: 过期秒数
             url: 要下载并上传的URL（可选）
             file_name: 当使用url参数时指定的文件名（可选）
+            mime_type: 文件mine-type，当传入的是二进制内容时必传
             request_id: 请求ID（可选，如果不提供则自动生成）
             **metadata: 额外的元数据
 
         Returns:
             文件信息
-            
+
         Note:
             必须提供 file 或 url 参数之一
         """
         # 参数验证：必须提供 file 或 url 之一
         if file is None and not url:
             raise ValidationError("必须提供 file 或 url 参数之一")
-        
+
         # 如果提供了URL，先下载文件
         if url:
             # 下载文件到内存
             downloaded_content = self.http_downloader.download(url)
-            
+
             # 如果没有指定文件名，从URL中提取
             if not file_name:
                 from urllib.parse import urlparse
@@ -412,24 +413,32 @@ class SyncBlobService(BaseFileService):
                 parsed_url = urlparse(url)
                 url_path = PathLib(parsed_url.path)
                 file_name = url_path.name if url_path.name else f"download_{hashlib.md5(url.encode()).hexdigest()[:8]}"
-            
+
             # 使用下载的内容作为file参数
             file = downloaded_content
-            
+
             # 提取文件信息（bytes会返回默认的MIME类型，我们稍后会基于文件名重新计算）
-            extracted_file_name, content, file_size, _, _, file_hash = self._extract_file_info(file)
-            
+            _, content, file_size, _, _, file_hash = self._extract_file_info(file)
+
             # file_name已经在上面设置了（要么是用户指定的，要么是从URL提取的）
             extracted_file_name = file_name
-            
+
             # 基于文件名计算文件类型和MIME类型
-            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(extracted_file_name).suffix else 'dat'
+            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
+                extracted_file_name).suffix else 'dat'
             mime_type = get_file_mime_type(Path(extracted_file_name))
         else:
             # 解析文件参数，提取文件信息
-            extracted_file_name, content, file_size, mime_type, file_type, file_hash = self._extract_file_info(file)
-            if not file_name:
-                mime_type = get_file_mime_type(extracted_file_name)
+            extracted_file_name, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(
+                file)
+            if file_name:
+                extracted_file_name = file_name
+                mime_type = get_file_mime_type(file_name)
+                file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
+                    extracted_file_name).suffix else 'dat'
+            else:
+                mime_type = extract_mime_type
+                file_type = extract_file_type
 
         # 根据文件大小自动选择上传模式
         if mode == UploadMode.NORMAL:

{tamar_file_hub_client-0.0.3.dist-info → tamar_file_hub_client-0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-file-hub-client
-Version: 0.0.3
+Version: 0.0.4
 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.3.dist-info → tamar_file_hub_client-0.0.4.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=jcuQm6mBTZI82PxGNxYDf0q-K1GgiPnncnP0TQrK0lM,20129
+file_hub_client/services/file/async_blob_service.py,sha256=x4Xmxc5FqeiYZ7yKb5_fDjJhgxpq79g7dJuGbHIWMow,20484
 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=mN3YAjaOx7zliU6Nf2jMpHXiTOiDlAHHUKtZ7WgCKww,19970
+file_hub_client/services/file/sync_blob_service.py,sha256=ZHNEwoB97G3mQrGOCJ491xxrPS7XMa2kSPDpKU18WKE,20296
 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=W32_goFF7_tVN_hCfe85smPu2lHW0jPs_AGlSIYS
 file_hub_client/utils/retry.py,sha256=PybdlGEdYdjeCPBg5JfKoKHsRxAIy24v5oyIeYQAg9U,12693
 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.3.dist-info/METADATA,sha256=lin3JH7pNTue4fenGtEu9NjJav5zacn8h1_bohhuOQI,64873
-tamar_file_hub_client-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_file_hub_client-0.0.3.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
-tamar_file_hub_client-0.0.3.dist-info/RECORD,,
+tamar_file_hub_client-0.0.4.dist-info/METADATA,sha256=Xonh4NRJcoFB5vbw7bK64RpZSC2OZRbB2p-_lyQtIa8,64873
+tamar_file_hub_client-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_file_hub_client-0.0.4.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
+tamar_file_hub_client-0.0.4.dist-info/RECORD,,