PyPI - tamar-file-hub-client - Versions diffs - 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl - Mend

tamar-file-hub-client 0.1.6py3-none-any.whl → 0.1.7py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

file_hub_client/schemas/context.py CHANGED Viewed

@@ -1,171 +1,171 @@
-"""
-用户上下文和请求上下文相关的Schema定义
-"""
-from dataclasses import dataclass, field
-from typing import Optional, Dict, Any
-from datetime import datetime
-from file_hub_client.enums import Role
-@dataclass
-class UserContext:
-    """
-    用户上下文信息
-    包含两大类信息：
-    1. ownership（所有权）: org_id, user_id - 表示资源归属
-    2. operator（操作者）: actor_id, role - 表示实际操作者（可能是用户、agent或系统）
-    3. request info（请求信息）: user_ip - 表示请求来源IP（用于审计和安全）
-    """
-    # Ownership - 资源所有权信息
-    org_id: str  # 组织ID
-    user_id: str  # 用户ID
-    # Operator - 操作者信息
-    actor_id: Optional[str] = None  # 实际操作者ID（如果为空，默认使用user_id）
-    role: Role = Role.ACCOUNT  # 操作者角色（ACCOUNT, AGENT, SYSTEM等）
-    # Request info - 请求信息
-    user_ip: Optional[str] = None  # 用户IP地址（请求来源IP）
-    def __post_init__(self):
-        """初始化后处理，如果actor_id为空，默认使用user_id"""
-        if self.actor_id is None:
-            self.actor_id = self.user_id
-    def to_metadata(self) -> Dict[str, str]:
-        """转换为gRPC metadata格式"""
-        metadata = {
-            'x-org-id': self.org_id,
-            'x-user-id': self.user_id,
-            'x-actor-id': self.actor_id,
-            'x-role': self.role,
-        }
-        # 只有当user_ip不为None时才添加x-user-ip
-        if self.user_ip is not None:
-            metadata['x-user-ip'] = self.user_ip
-        return metadata
-    @classmethod
-    def from_metadata(cls, metadata: Dict[str, str]) -> Optional['UserContext']:
-        """从metadata中解析用户上下文"""
-        org_id = metadata.get('x-org-id')
-        user_id = metadata.get('x-user-id')
-        if not org_id or not user_id:
-            return None
-        return cls(
-            org_id=org_id,
-            user_id=user_id,
-            actor_id=metadata.get('x-actor-id'),
-            role=Role(metadata.get('x-role', Role.ACCOUNT)),
-            user_ip=metadata.get('x-user-ip')
-        )
-@dataclass
-class RequestContext:
-    """
-    请求上下文信息
-    包含请求相关的元数据，如客户端信息、请求追踪等
-    """
-    request_id: Optional[str] = None  # 请求ID，用于追踪
-    client_ip: Optional[str] = None  # 客户端IP地址
-    client_version: Optional[str] = None  # 客户端版本
-    client_type: Optional[str] = None  # 客户端类型（web, mobile, desktop, cli等）
-    user_agent: Optional[str] = None  # User-Agent信息
-    timestamp: Optional[datetime] = field(default_factory=datetime.now)  # 请求时间戳
-    extra: Dict[str, Any] = field(default_factory=dict)  # 其他扩展信息
-    def to_metadata(self) -> Dict[str, str]:
-        """转换为gRPC metadata格式"""
-        metadata = {}
-        if self.request_id:
-            metadata['x-request-id'] = self.request_id
-        if self.client_ip:
-            metadata['x-client-ip'] = self.client_ip
-        if self.client_version:
-            metadata['x-client-version'] = self.client_version
-        if self.client_type:
-            metadata['x-client-type'] = self.client_type
-        if self.user_agent:
-            metadata['x-user-agent'] = self.user_agent
-        if self.timestamp:
-            metadata['x-timestamp'] = self.timestamp.isoformat()
-        # 添加扩展信息
-        for key, value in self.extra.items():
-            metadata[f'x-{key}'] = str(value)
-        return metadata
-    @classmethod
-    def from_metadata(cls, metadata: Dict[str, str]) -> 'RequestContext':
-        """从metadata中解析请求上下文"""
-        # 提取标准字段
-        request_id = metadata.get('x-request-id')
-        client_ip = metadata.get('x-client-ip')
-        client_version = metadata.get('x-client-version')
-        client_type = metadata.get('x-client-type')
-        user_agent = metadata.get('x-user-agent')
-        # 解析时间戳
-        timestamp = None
-        if 'x-timestamp' in metadata:
-            try:
-                timestamp = datetime.fromisoformat(metadata['x-timestamp'])
-            except:
-                pass
-        # 提取扩展字段
-        extra = {}
-        for key, value in metadata.items():
-            if key.startswith('x-') and key not in [
-                'x-request-id', 'x-client-ip', 'x-client-version',
-                'x-client-type', 'x-user-agent', 'x-timestamp',
-                'x-org-id', 'x-user-id', 'x-actor-id', 'x-role'
-            ]:
-                extra[key[2:]] = value  # 去掉 'x-' 前缀
-        return cls(
-            request_id=request_id,
-            client_ip=client_ip,
-            client_version=client_version,
-            client_type=client_type,
-            user_agent=user_agent,
-            timestamp=timestamp,
-            extra=extra
-        )
-@dataclass
-class FullContext:
-    """完整的上下文信息，包含用户上下文和请求上下文"""
-    user_context: Optional[UserContext] = None
-    request_context: Optional[RequestContext] = None
-    def to_metadata(self) -> Dict[str, str]:
-        """转换为gRPC metadata格式"""
-        metadata = {}
-        if self.user_context:
-            metadata.update(self.user_context.to_metadata())
-        if self.request_context:
-            metadata.update(self.request_context.to_metadata())
-        return metadata
-    @classmethod
-    def from_metadata(cls, metadata: Dict[str, str]) -> 'FullContext':
-        """从metadata中解析完整上下文"""
-        return cls(
-            user_context=UserContext.from_metadata(metadata),
-            request_context=RequestContext.from_metadata(metadata)
-        )
+"""
+用户上下文和请求上下文相关的Schema定义
+"""
+from dataclasses import dataclass, field
+from typing import Optional, Dict, Any
+from datetime import datetime
+from file_hub_client.enums import Role
+@dataclass
+class UserContext:
+    """
+    用户上下文信息
+    包含两大类信息：
+    1. ownership（所有权）: org_id, user_id - 表示资源归属
+    2. operator（操作者）: actor_id, role - 表示实际操作者（可能是用户、agent或系统）
+    3. request info（请求信息）: user_ip - 表示请求来源IP（用于审计和安全）
+    """
+    # Ownership - 资源所有权信息
+    org_id: str  # 组织ID
+    user_id: str  # 用户ID
+    # Operator - 操作者信息
+    actor_id: Optional[str] = None  # 实际操作者ID（如果为空，默认使用user_id）
+    role: Role = Role.ACCOUNT  # 操作者角色（ACCOUNT, AGENT, SYSTEM等）
+    # Request info - 请求信息
+    user_ip: Optional[str] = None  # 用户IP地址（请求来源IP）
+    def __post_init__(self):
+        """初始化后处理，如果actor_id为空，默认使用user_id"""
+        if self.actor_id is None:
+            self.actor_id = self.user_id
+    def to_metadata(self) -> Dict[str, str]:
+        """转换为gRPC metadata格式"""
+        metadata = {
+            'x-org-id': self.org_id,
+            'x-user-id': self.user_id,
+            'x-actor-id': self.actor_id,
+            'x-role': self.role,
+        }
+        # 只有当user_ip不为None时才添加x-user-ip
+        if self.user_ip is not None:
+            metadata['x-user-ip'] = self.user_ip
+        return metadata
+    @classmethod
+    def from_metadata(cls, metadata: Dict[str, str]) -> Optional['UserContext']:
+        """从metadata中解析用户上下文"""
+        org_id = metadata.get('x-org-id')
+        user_id = metadata.get('x-user-id')
+        if not org_id or not user_id:
+            return None
+        return cls(
+            org_id=org_id,
+            user_id=user_id,
+            actor_id=metadata.get('x-actor-id'),
+            role=Role(metadata.get('x-role', Role.ACCOUNT)),
+            user_ip=metadata.get('x-user-ip')
+        )
+@dataclass
+class RequestContext:
+    """
+    请求上下文信息
+    包含请求相关的元数据，如客户端信息、请求追踪等
+    """
+    request_id: Optional[str] = None  # 请求ID，用于追踪
+    client_ip: Optional[str] = None  # 客户端IP地址
+    client_version: Optional[str] = None  # 客户端版本
+    client_type: Optional[str] = None  # 客户端类型（web, mobile, desktop, cli等）
+    user_agent: Optional[str] = None  # User-Agent信息
+    timestamp: Optional[datetime] = field(default_factory=datetime.now)  # 请求时间戳
+    extra: Dict[str, Any] = field(default_factory=dict)  # 其他扩展信息
+    def to_metadata(self) -> Dict[str, str]:
+        """转换为gRPC metadata格式"""
+        metadata = {}
+        if self.request_id:
+            metadata['x-request-id'] = self.request_id
+        if self.client_ip:
+            metadata['x-client-ip'] = self.client_ip
+        if self.client_version:
+            metadata['x-client-version'] = self.client_version
+        if self.client_type:
+            metadata['x-client-type'] = self.client_type
+        if self.user_agent:
+            metadata['x-user-agent'] = self.user_agent
+        if self.timestamp:
+            metadata['x-timestamp'] = self.timestamp.isoformat()
+        # 添加扩展信息
+        for key, value in self.extra.items():
+            metadata[f'x-{key}'] = str(value)
+        return metadata
+    @classmethod
+    def from_metadata(cls, metadata: Dict[str, str]) -> 'RequestContext':
+        """从metadata中解析请求上下文"""
+        # 提取标准字段
+        request_id = metadata.get('x-request-id')
+        client_ip = metadata.get('x-client-ip')
+        client_version = metadata.get('x-client-version')
+        client_type = metadata.get('x-client-type')
+        user_agent = metadata.get('x-user-agent')
+        # 解析时间戳
+        timestamp = None
+        if 'x-timestamp' in metadata:
+            try:
+                timestamp = datetime.fromisoformat(metadata['x-timestamp'])
+            except:
+                pass
+        # 提取扩展字段
+        extra = {}
+        for key, value in metadata.items():
+            if key.startswith('x-') and key not in [
+                'x-request-id', 'x-client-ip', 'x-client-version',
+                'x-client-type', 'x-user-agent', 'x-timestamp',
+                'x-org-id', 'x-user-id', 'x-actor-id', 'x-role'
+            ]:
+                extra[key[2:]] = value  # 去掉 'x-' 前缀
+        return cls(
+            request_id=request_id,
+            client_ip=client_ip,
+            client_version=client_version,
+            client_type=client_type,
+            user_agent=user_agent,
+            timestamp=timestamp,
+            extra=extra
+        )
+@dataclass
+class FullContext:
+    """完整的上下文信息，包含用户上下文和请求上下文"""
+    user_context: Optional[UserContext] = None
+    request_context: Optional[RequestContext] = None
+    def to_metadata(self) -> Dict[str, str]:
+        """转换为gRPC metadata格式"""
+        metadata = {}
+        if self.user_context:
+            metadata.update(self.user_context.to_metadata())
+        if self.request_context:
+            metadata.update(self.request_context.to_metadata())
+        return metadata
+    @classmethod
+    def from_metadata(cls, metadata: Dict[str, str]) -> 'FullContext':
+        """从metadata中解析完整上下文"""
+        return cls(
+            user_context=UserContext.from_metadata(metadata),
+            request_context=RequestContext.from_metadata(metadata)
+        )

file_hub_client/services/file/async_blob_service.py CHANGED Viewed

@@ -453,18 +453,33 @@ class AsyncBlobService(BaseFileService):
             # 使用下载的内容作为file参数
             file = downloaded_content
-            # 基于文件名计算MIME类型
-            mime_type = get_file_mime_type(Path(file_name))
+            # MIME类型优先级：用户指定 > 内容检测 > URL文件名推断
+            if mime_type:
+                # 用户明确提供的MIME类型优先级最高，无需进行内容检测
+                final_mime_type = mime_type
+            else:
+                # 用户未提供MIME类型，进行内容检测和文件名推断
+                content_detected_mime = self._detect_mime_from_content(downloaded_content)
+                url_filename_mime = get_file_mime_type(Path(file_name))
+                if content_detected_mime != "application/octet-stream":
+                    # 内容检测到了具体的MIME类型，使用内容检测的
+                    final_mime_type = content_detected_mime
+                else:
+                    # 内容检测失败，使用从URL文件名推断的MIME类型
+                    final_mime_type = url_filename_mime
-            # 提取文件信息，传入MIME类型用于推断扩展名
-            _, content, file_size, _, _, file_hash = self._extract_file_info(file, mime_type)
+            # 提取文件信息，传入最终确定的MIME类型
+            _, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(file, final_mime_type)
             # file_name已经在上面设置了（要么是用户指定的，要么是从URL提取的）
             extracted_file_name = file_name
+            # 使用最终确定的MIME类型
+            mime_type = final_mime_type
-            # 基于文件名计算文件类型
-            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
-                extracted_file_name).suffix else 'dat'
+            # 基于最终MIME类型计算文件扩展名
+            file_type = extract_file_type
         else:
             # 解析文件参数，提取文件信息
             # 如果用户指定了文件名，先从文件名推断MIME类型，然后传给_extract_file_info
@@ -485,7 +500,9 @@ class AsyncBlobService(BaseFileService):
                 # 没有指定文件名，传入用户提供的MIME类型（如果有）
                 extracted_file_name, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(
                     file, mime_type)
-                mime_type = extract_mime_type
+                # 如果用户指定了MIME类型，使用用户指定的，否则使用检测的
+                if not mime_type:
+                    mime_type = extract_mime_type
                 file_type = extract_file_type
         # 根据文件大小自动选择上传模式

file_hub_client/services/file/sync_blob_service.py CHANGED Viewed

@@ -452,18 +452,33 @@ class SyncBlobService(BaseFileService):
             # 使用下载的内容作为file参数
             file = downloaded_content
-            # 基于文件名计算MIME类型
-            mime_type = get_file_mime_type(Path(file_name))
+            # MIME类型优先级：用户指定 > 内容检测 > URL文件名推断
+            if mime_type:
+                # 用户明确提供的MIME类型优先级最高，无需进行内容检测
+                final_mime_type = mime_type
+            else:
+                # 用户未提供MIME类型，进行内容检测和文件名推断
+                content_detected_mime = self._detect_mime_from_content(downloaded_content)
+                url_filename_mime = get_file_mime_type(Path(file_name))
+                if content_detected_mime != "application/octet-stream":
+                    # 内容检测到了具体的MIME类型，使用内容检测的
+                    final_mime_type = content_detected_mime
+                else:
+                    # 内容检测失败，使用从URL文件名推断的MIME类型
+                    final_mime_type = url_filename_mime
-            # 提取文件信息，传入MIME类型用于推断扩展名
-            _, content, file_size, _, _, file_hash = self._extract_file_info(file, mime_type)
+            # 提取文件信息，传入最终确定的MIME类型
+            _, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(file, final_mime_type)
             # file_name已经在上面设置了（要么是用户指定的，要么是从URL提取的）
             extracted_file_name = file_name
+            # 使用最终确定的MIME类型
+            mime_type = final_mime_type
-            # 基于文件名计算文件类型
-            file_type = Path(extracted_file_name).suffix.lstrip('.').lower() if Path(
-                extracted_file_name).suffix else 'dat'
+            # 基于最终MIME类型计算文件扩展名
+            file_type = extract_file_type
         else:
             # 解析文件参数，提取文件信息
             # 如果用户指定了文件名，先从文件名推断MIME类型，然后传给_extract_file_info
@@ -484,7 +499,9 @@ class SyncBlobService(BaseFileService):
                 # 没有指定文件名，传入用户提供的MIME类型（如果有）
                 extracted_file_name, content, file_size, extract_mime_type, extract_file_type, file_hash = self._extract_file_info(
                     file, mime_type)
-                mime_type = extract_mime_type
+                # 如果用户指定了MIME类型，使用用户指定的，否则使用检测的
+                if not mime_type:
+                    mime_type = extract_mime_type
                 file_type = extract_file_type
         # 根据文件大小自动选择上传模式

{tamar_file_hub_client-0.1.6.dist-info → tamar_file_hub_client-0.1.7.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-file-hub-client
-Version: 0.1.6
+Version: 0.1.7
 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.1.6.dist-info → tamar_file_hub_client-0.1.7.dist-info}/RECORD RENAMED Viewed

@@ -23,16 +23,16 @@ file_hub_client/rpc/protos/file_service.proto,sha256=KuayH0TNEJENI77LG6VUyUHPpFZ
 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=oaXrODfBI-Oe-MyAyL6bKDZ1mPRC_IyMmxzGic4BbEU,2692
-file_hub_client/schemas/context.py,sha256=E4TKqUJBaq9s31cGIRsztS-mQBUYAKyyLK8knVgWNb8,5805
+file_hub_client/schemas/context.py,sha256=tSbzb7ESLqc323h4GBiel38hXc6dxTAWLpJDzxAaz6g,5976
 file_hub_client/schemas/file.py,sha256=KaF7XaZLkIlomEPaC1G9Qsbzen6VfChwVrXFRydWowA,6709
 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=J8u1DCaeGgqGHB6ss7QB3nDypFHUQEIlHB2rqkS1BHk,36461
+file_hub_client/services/file/async_blob_service.py,sha256=r9-Yk1oFKe7sjhmzdrHqXO-dhWj6ELok2TG3IsAorhE,37439
 file_hub_client/services/file/async_file_service.py,sha256=lFMfnHKsbTIOpMAdFvER4B2JqVGz9SNzgxlmA1kY3Js,17197
 file_hub_client/services/file/base_file_service.py,sha256=21C-z8zU2ooZp31YBTOAzvUJKbC5zUQ7T0pSmFA8iRs,16144
-file_hub_client/services/file/sync_blob_service.py,sha256=HArzV6EhNf1N5Fnl_BNSw_UU3tiha0nIT-qy1GMuIBw,36108
+file_hub_client/services/file/sync_blob_service.py,sha256=1lNN7___OTUYcbj99OoiJXEByzRWCIIwg7FBCOH9_Pk,37086
 file_hub_client/services/file/sync_file_service.py,sha256=3VEgFiWYfoWD4iZObJ8uylUtNmK08snXWUaVEosUPDo,16979
 file_hub_client/services/folder/__init__.py,sha256=vGbMOlNiEBdnWZB1xE74RJtoroI28hKHCWfQV1GqKQc,210
 file_hub_client/services/folder/async_folder_service.py,sha256=uFEmtW8EXYvaKYT2JCitWbdTGR1EtHlx_eBN5P3JUZg,7293
@@ -53,7 +53,7 @@ file_hub_client/utils/mime_extension_mapper.py,sha256=jZhgKJcp-xFVDtaFBgUYaGcY4-
 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=mOnb_FGn-JLS-1uiC_LvDMOH0Y9-xvVo9QAJxid-GvI,23071
-tamar_file_hub_client-0.1.6.dist-info/METADATA,sha256=QaSIumQwrxDpcocngxhwVZNA48J09RoJ8CLF_nqebPk,80363
-tamar_file_hub_client-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_file_hub_client-0.1.6.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
-tamar_file_hub_client-0.1.6.dist-info/RECORD,,
+tamar_file_hub_client-0.1.7.dist-info/METADATA,sha256=Gn-BdOWGkuPHdnS8-vBGw2k68QSGcsWx5o_fV2V7ezM,80363
+tamar_file_hub_client-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_file_hub_client-0.1.7.dist-info/top_level.txt,sha256=9wcR7hyAJQdJg_kuH6WR3nmpJ8O-j8aJNK8f_kcFy6U,16
+tamar_file_hub_client-0.1.7.dist-info/RECORD,,

{tamar_file_hub_client-0.1.6.dist-info → tamar_file_hub_client-0.1.7.dist-info}/WHEEL RENAMED Viewed

File without changes

{tamar_file_hub_client-0.1.6.dist-info → tamar_file_hub_client-0.1.7.dist-info}/top_level.txt RENAMED Viewed

File without changes

tamar-file-hub-client 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

tamar-file-hub-client 0.1.6py3-none-any.whl → 0.1.7py3-none-any.whl