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

file_hub_client/rpc/interceptors.py

@@ -86,8 +86,29 @@ def _sanitize_request_data(data: Any, max_string_length: int = 200, max_binary_p
         # 递归处理字典
         result = {}
         for key, value in data.items():
-            # 检查是否是常见的二进制/内容字段
-            if key.lower() in ['content', 'data', 'file', 'file_content', 'binary', 'blob', 'bytes', 'image', 'attachment']:
+            # 检查是否是需要特殊处理的字段
+            if key.lower() in ['operations'] and isinstance(value, list):
+                # 对于 operations 字段，特殊处理以显示操作类型和数量
+                if len(value) > 5:
+                    ops_summary = []
+                    # 统计操作类型
+                    op_types = {}
+                    for op in value:
+                        if isinstance(op, dict):
+                            for op_type in ['edit', 'create', 'update', 'delete', 'clear']:
+                                if op_type in op:
+                                    op_types[op_type] = op_types.get(op_type, 0) + 1
+                    
+                    # 显示前3个操作
+                    for i in range(min(3, len(value))):
+                        ops_summary.append(_sanitize_request_data(value[i], max_string_length, max_binary_preview))
+                    
+                    # 添加统计信息
+                    ops_summary.append(f"... 总计 {len(value)} 个操作: {', '.join(f'{k}={v}' for k, v in op_types.items())}")
+                    result[key] = ops_summary
+                else:
+                    result[key] = _sanitize_request_data(value, max_string_length, max_binary_preview)
+            elif key.lower() in ['content', 'data', 'file', 'file_content', 'binary', 'blob', 'bytes', 'image', 'attachment']:
                 if isinstance(value, (bytes, bytearray)):
                     # 二进制内容，显示长度和预览
                     preview = base64.b64encode(value[:max_binary_preview]).decode('utf-8')
@@ -106,8 +127,18 @@ def _sanitize_request_data(data: Any, max_string_length: int = 200, max_binary_p
                 result[key] = _sanitize_request_data(value, max_string_length, max_binary_preview)
         return result
     elif isinstance(data, list):
-        # 递归处理列表
-        return [_sanitize_request_data(item, max_string_length, max_binary_preview) for item in data]
+        # 递归处理列表，限制列表长度以避免日志过长
+        max_list_items = 10  # 最多显示10个元素
+        if len(data) > max_list_items:
+            # 显示前5个和后5个元素
+            preview_items = (
+                [_sanitize_request_data(item, max_string_length, max_binary_preview) for item in data[:5]] +
+                [f"... {len(data) - max_list_items} more items ..."] +
+                [_sanitize_request_data(item, max_string_length, max_binary_preview) for item in data[-5:]]
+            )
+            return preview_items
+        else:
+            return [_sanitize_request_data(item, max_string_length, max_binary_preview) for item in data]
     elif isinstance(data, tuple):
         # 递归处理元组
         return tuple(_sanitize_request_data(item, max_string_length, max_binary_preview) for item in data)

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

@@ -392,19 +392,19 @@ class SyncBlobService(BaseFileService):
 
         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 +412,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:
@@ -503,6 +511,7 @@ class SyncBlobService(BaseFileService):
 
         Args:
             file_id: 文件ID
+            expire_seconds: 过期时间（秒）
             request_id: 请求ID（可选，如果不提供则自动生成）
             **metadata: 额外的元数据（如 x-org-id, x-user-id 等）
 

file_hub_client/utils/logging.py

@@ -109,6 +109,10 @@ def setup_logging(
     # 防止日志传播到根日志记录器 - 保持SDK日志独立
     logger.propagate = False
     
+    # 对整个 file_hub_client 包设置隔离，确保所有子模块的日志都不会传播
+    parent_logger = logging.getLogger('file_hub_client')
+    parent_logger.propagate = False
+    
     # 初始化日志（使用JSON格式）
     if enable_grpc_logging:
         log_record = logging.LogRecord(

file_hub_client/utils/retry.py

@@ -67,10 +67,20 @@ def retry_with_backoff(
                             raise
                         
                         if attempt < max_retries:
+                            # 提取更详细的错误信息
+                            error_details = str(e)
+                            if hasattr(e, 'code') and hasattr(e, 'details'):
+                                # gRPC 错误
+                                error_details = f"gRPC {e.code().name}: {e.details()}"
+                            elif hasattr(e, 'response') and hasattr(e.response, 'status_code'):
+                                # HTTP 错误
+                                error_details = f"HTTP {e.response.status_code}: {str(e)}"
+                            
                             logger.warning(
                                 f"🔄 触发重试 | 操作: {func.__name__} | "
                                 f"尝试: {attempt + 1}/{max_retries + 1} | "
-                                f"错误: {type(e).__name__}: {str(e)} | "
+                                f"错误类型: {type(e).__name__} | "
+                                f"错误详情: {error_details} | "
                                 f"延迟: {delay:.1f}秒"
                             )
                             await asyncio.sleep(delay)
@@ -109,10 +119,20 @@ def retry_with_backoff(
                             raise
                         
                         if attempt < max_retries:
+                            # 提取更详细的错误信息
+                            error_details = str(e)
+                            if hasattr(e, 'code') and hasattr(e, 'details'):
+                                # gRPC 错误
+                                error_details = f"gRPC {e.code().name}: {e.details()}"
+                            elif hasattr(e, 'response') and hasattr(e.response, 'status_code'):
+                                # HTTP 错误
+                                error_details = f"HTTP {e.response.status_code}: {str(e)}"
+                            
                             logger.warning(
                                 f"🔄 触发重试 | 操作: {func.__name__} | "
                                 f"尝试: {attempt + 1}/{max_retries + 1} | "
-                                f"错误: {type(e).__name__}: {str(e)} | "
+                                f"错误类型: {type(e).__name__} | "
+                                f"错误详情: {error_details} | "
                                 f"延迟: {delay:.1f}秒"
                             )
                             time.sleep(delay)
@@ -162,10 +182,21 @@ def retry_on_lock_conflict(
                     if _is_lock_conflict(result):
                         last_result = result
                         if attempt < max_retries:
+                            # 提取冲突详细信息
+                            conflict_details = "lock_conflict"
+                            if isinstance(result, dict):
+                                conflict_info = result.get('conflict_info', {})
+                                if conflict_info:
+                                    conflict_details = f"{conflict_info.get('conflict_type', 'lock_conflict')}"
+                                    if 'resolution_suggestion' in conflict_info:
+                                        conflict_details += f" - {conflict_info['resolution_suggestion']}"
+                                if 'error_message' in result:
+                                    conflict_details += f" - {result['error_message']}"
+                            
                             logger.warning(
                                 f"🔒 锁冲突重试 | 操作: {func.__name__} | "
                                 f"尝试: {attempt + 1}/{max_retries + 1} | "
-                                f"冲突类型: lock_conflict | "
+                                f"冲突详情: {conflict_details} | "
                                 f"延迟: {delay:.1f}秒"
                             )
                             await asyncio.sleep(delay)
@@ -196,10 +227,21 @@ def retry_on_lock_conflict(
                     if _is_lock_conflict(result):
                         last_result = result
                         if attempt < max_retries:
+                            # 提取冲突详细信息
+                            conflict_details = "lock_conflict"
+                            if isinstance(result, dict):
+                                conflict_info = result.get('conflict_info', {})
+                                if conflict_info:
+                                    conflict_details = f"{conflict_info.get('conflict_type', 'lock_conflict')}"
+                                    if 'resolution_suggestion' in conflict_info:
+                                        conflict_details += f" - {conflict_info['resolution_suggestion']}"
+                                if 'error_message' in result:
+                                    conflict_details += f" - {result['error_message']}"
+                            
                             logger.warning(
                                 f"🔒 锁冲突重试 | 操作: {func.__name__} | "
                                 f"尝试: {attempt + 1}/{max_retries + 1} | "
-                                f"冲突类型: lock_conflict | "
+                                f"冲突详情: {conflict_details} | "
                                 f"延迟: {delay:.1f}秒"
                             )
                             time.sleep(delay)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-file-hub-client
-Version: 0.0.3
+Version: 0.0.5
 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.5.dist-info}/RECORD

@@ -10,7 +10,7 @@ file_hub_client/errors/exceptions.py,sha256=0RDkAv4t2GeVefm1H5eaXGxd6Od-drXzPIVJ
 file_hub_client/rpc/__init__.py,sha256=dhRt0D_US3j2Dam47nhd23RowVZ-nvVowhPsNFf4GZo,204
 file_hub_client/rpc/async_client.py,sha256=vMi4Aqc_Ajg2sdOgXHiLjP_4FkPtg5tDpSDPK6hg-cM,14038
 file_hub_client/rpc/generate_grpc.py,sha256=opzstxWdW7vqR9OxrgUCSUkZe8IqgcOdruqWGIzCneI,2158
-file_hub_client/rpc/interceptors.py,sha256=AkeU6PxURIUuhHrCta5LYP09oOXCKsGwD98J7dx3gJo,20258
+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=7zEL8RFMp9gcigEqWnZFREX8ylljfQzBHwg43SbKt-A,8354
@@ -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=pnUciPJ0oOLOLK1WDvigJ5gdL5lfCDw-qJX1WMGZvew,20265
 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
@@ -47,11 +47,11 @@ file_hub_client/utils/converter.py,sha256=TX69Bqk-PwNdv2hYQ07_tW6HQnQycHcJkGeRns
 file_hub_client/utils/download_helper.py,sha256=Mc8TQSWjHxIglJMkKlGy9r3LZe8e_Mwe6D3sfn6IOnY,13338
 file_hub_client/utils/file_utils.py,sha256=Ly8R5KJS_3lbgJxNZkc4sSBKuGgn-fYeh17GEY4pyy8,4359
 file_hub_client/utils/idempotency.py,sha256=zuXDlpAc9VTkTsarlnkO0VuJ77yON6j1TX0GvL9Xd9k,6029
-file_hub_client/utils/logging.py,sha256=W32_goFF7_tVN_hCfe85smPu2lHW0jPs_AGlSIYSRxY,11543
-file_hub_client/utils/retry.py,sha256=PybdlGEdYdjeCPBg5JfKoKHsRxAIy24v5oyIeYQAg9U,12693
+file_hub_client/utils/logging.py,sha256=IxcvWkA0G9s9BMiXIeFAdJX5G-Lc5-JFlS2yxOX1Swo,11741
+file_hub_client/utils/retry.py,sha256=MyEAYHEGljoHvVs4Kh1hX_Y3iDGcppVCSUvVkNGbC28,15609
 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.5.dist-info/METADATA,sha256=Ri0jUnjTvBxHIBNVmp1pc-7tSygTk3j_ff11O-Hxgxg,64873
+tamar_file_hub_client-0.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_file_hub_client-0.0.5.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
+tamar_file_hub_client-0.0.5.dist-info/RECORD,,