tamar-file-hub-client 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

file_hub_client/rpc/protos/file_service.proto

@@ -22,6 +22,12 @@ service FileService {
     rpc RenameFile (RenameFileRequest) returns (File);
     rpc DeleteFile (DeleteFileRequest) returns (Empty);
     rpc ListFiles (ListFilesRequest) returns (FileListResponse);
+    
+    // 压缩服务相关API
+    rpc GetCompressionStatus (CompressionStatusRequest) returns (CompressionStatusResponse);
+    rpc GetCompressedVariants (GetVariantsRequest) returns (GetVariantsResponse);
+    rpc TriggerRecompression (RecompressionRequest) returns (RecompressionResponse);
+    rpc GenerateVariantDownloadUrl (VariantDownloadUrlRequest) returns (VariantDownloadUrlResponse);
 }
 
 // ========= 数据结构定义 =========
@@ -176,7 +182,8 @@ message BatchDownloadUrlResponse {
 message DownloadUrlInfo {
     string file_id = 1;
     string url = 2;
-    optional string error = 3;
+    string mime_type = 3;
+    optional string error = 4;
 }
 
 message GetGcsUrlResponse {
@@ -195,4 +202,64 @@ message GcsUrlInfo {
     optional string error = 4;
 }
 
+// ========= 压缩服务相关结构 =========
+
+message CompressionStatusRequest {
+    string file_id = 1;
+}
+
+message CompressionStatusResponse {
+    string status = 1;  // pending, processing, completed, failed
+    optional string error_message = 2;
+    repeated CompressedVariant variants = 3;
+}
+
+message GetVariantsRequest {
+    string file_id = 1;
+    optional string variant_type = 2;  // image, video, thumbnail
+}
+
+message GetVariantsResponse {
+    repeated CompressedVariant variants = 1;
+}
+
+message CompressedVariant {
+    string variant_name = 1;
+    string variant_type = 2;
+    string media_type = 3;
+    int32 width = 4;
+    int32 height = 5;
+    int64 file_size = 6;
+    string format = 7;
+    optional int32 quality = 8;
+    optional double duration = 9;
+    optional int64 bitrate = 10;
+    optional int32 fps = 11;
+    double compression_ratio = 12;
+    string stored_path = 13;
+}
+
+message RecompressionRequest {
+    string file_id = 1;
+    optional bool force_reprocess = 2;
+}
+
+message RecompressionResponse {
+    string task_id = 1;
+    string status = 2;
+}
+
+message VariantDownloadUrlRequest {
+    string file_id = 1;
+    string variant_name = 2;  // large/medium/small/thumbnail
+    optional int32 expire_seconds = 3;
+    optional bool is_cdn = 4;
+}
+
+message VariantDownloadUrlResponse {
+    string url = 1;
+    optional string error = 2;
+    optional CompressedVariant variant_info = 3;  // 返回变体详细信息
+}
+
 message Empty {}

file_hub_client/rpc/sync_client.py

@@ -284,8 +284,17 @@ class SyncGrpcClient:
         # 添加默认元数据
         metadata.update(self.default_metadata)
 
-        # 添加/覆盖传入的元数据
-        metadata.update(kwargs)
+        # 自动检测用户真实IP
+        from ..utils.ip_detector import get_current_user_ip
+        auto_detected_ip = get_current_user_ip()
+        if auto_detected_ip and 'x-user-ip' not in metadata:
+            # 只有在没有设置过user_ip的情况下才使用自动检测的IP
+            metadata['x-user-ip'] = auto_detected_ip
+
+        # 添加/覆盖传入的元数据，但跳过None值以避免覆盖有效的默认值
+        for k, v in kwargs.items():
+            if v is not None:
+                metadata[k] = v
 
         # 处理 request_id（优先级：显式传入 > metadata中的x-request-id > RequestContext > 自动生成）
         if request_id is not None:
@@ -317,7 +326,7 @@ class SyncGrpcClient:
         """
         self.default_metadata.update(kwargs)
 
-    def set_user_context(self, org_id: str, user_id: str, role: Role = Role.ACCOUNT, actor_id: Optional[str] = None):
+    def set_user_context(self, org_id: str, user_id: str, role: Role = Role.ACCOUNT, actor_id: Optional[str] = None, user_ip: Optional[str] = None):
         """
         设置用户上下文信息
         
@@ -326,16 +335,34 @@ class SyncGrpcClient:
             user_id: 用户ID
             role: 用户角色（默认为 ACCOUNT）
             actor_id: 操作者ID（如果不同于 user_id）
+            user_ip: 用户IP地址（实际请求用户的IP，如前端用户的IP）
         """
         self._user_context = UserContext(
             org_id=org_id,
             user_id=user_id,
             role=role,
-            actor_id=actor_id
+            actor_id=actor_id,
+            user_ip=user_ip
         )
         # 更新到默认元数据
         self.update_default_metadata(**self._user_context.to_metadata())
 
+    def set_user_ip(self, user_ip: Optional[str]):
+        """
+        设置或更新用户IP地址
+        
+        Args:
+            user_ip: 用户IP地址（实际请求用户的IP，如前端用户的IP）
+        """
+        if self._user_context:
+            self._user_context.user_ip = user_ip
+            # 先移除旧的x-user-ip（如果存在）
+            self.default_metadata.pop('x-user-ip', None)
+            # 更新到默认元数据（只有非None值会被添加）
+            self.update_default_metadata(**self._user_context.to_metadata())
+        else:
+            raise ValueError("必须先调用 set_user_context 设置用户上下文，然后才能设置用户IP")
+
     def get_user_context(self) -> Optional[UserContext]:
         """获取当前用户上下文"""
         return self._user_context

file_hub_client/schemas/__init__.py

@@ -16,6 +16,11 @@ from .file import (
     GcsUrlInfo,
     GetGcsUrlResponse,
     BatchGcsUrlResponse,
+    CompressedVariant,
+    CompressionStatusResponse,
+    GetVariantsResponse,
+    RecompressionResponse,
+    VariantDownloadUrlResponse,
 )
 from .folder import (
     FolderInfo,
@@ -73,6 +78,11 @@ __all__ = [
     "GcsUrlInfo",
     "GetGcsUrlResponse",
     "BatchGcsUrlResponse",
+    "CompressedVariant",
+    "CompressionStatusResponse",
+    "GetVariantsResponse",
+    "RecompressionResponse",
+    "VariantDownloadUrlResponse",
 
     # 文件夹相关
     "FolderInfo",

file_hub_client/schemas/context.py

@@ -1,160 +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或系统）
-    """
-    # 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等）
-
-    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格式"""
-        return {
-            'x-org-id': self.org_id,
-            'x-user-id': self.user_id,
-            'x-actor-id': self.actor_id,
-            'x-role': self.role,
-        }
-
-    @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))
-        )
-
-
-@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)
+        )