fiuai-s3 0.4.0__tar.gz → 0.4.2__tar.gz

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai-s3
-Version: 0.4.0
+Version: 0.4.2
 Summary: 一个支持阿里云OSS和MinIO的对象存储抽象包
 Project-URL: Homepage, https://github.com/fiuai-sz/fiuai-s3
 Project-URL: Repository, https://github.com/fiuai-sz/fiuai-s3.git

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fiuai-s3"
-version = "0.4.0"
+version = "0.4.2"
 description = "一个支持阿里云OSS和MinIO的对象存储抽象包"
 readme = "README.md"
 authors = [

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/src/fiuai_s3/__init__.py

@@ -8,5 +8,5 @@
 from .object_storage import ObjectStorage, ObjectStorageFactory, StorageConfig
 from .type import DocFileObject, DocSourceFrom, DocFileType
 
-__version__ = "0.3.9"
+__version__ = "0.4.1"
 __all__ = ["ObjectStorage", "ObjectStorageFactory", "StorageConfig", "DocFileObject", "DocSourceFrom", "DocFileType"] 

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/src/fiuai_s3/alicloud/alicloud_storage.py

@@ -149,4 +149,107 @@ class AliCloudStorage(ObjectStorage):
             return files
         except Exception as e:
             logger.error(f"列出单据文件失败: {str(e)}")
-            return [] 
+            return []
+
+    def generate_presigned_url(self, object_key: str, method: str = "GET", expires_in: int = 3600, 
+                              response_headers: Optional[Dict[str, str]] = None,
+                              auth_tenant_id: Optional[str] = None, 
+                              auth_company_id: Optional[str] = None, 
+                              doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成预签名URL
+        
+        Args:
+            object_key: 对象存储中的key
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        try:
+            # 验证参数
+            if not object_key:
+                raise ValueError("object_key 不能为空")
+            
+            if method.upper() not in ["GET", "PUT", "POST", "DELETE"]:
+                raise ValueError(f"不支持的HTTP方法: {method}")
+            
+            if expires_in <= 0 or expires_in > 604800:  # 最大7天
+                raise ValueError("过期时间必须在1秒到604800秒（7天）之间")
+            
+            # 生成预签名URL
+            from datetime import datetime, timedelta
+            
+            if method.upper() == "GET":
+                url = self.bucket.sign_url(
+                    method='GET',
+                    key=object_key,
+                    expires=expires_in,
+                    headers=response_headers
+                )
+            elif method.upper() == "PUT":
+                url = self.bucket.sign_url(
+                    method='PUT',
+                    key=object_key,
+                    expires=expires_in
+                )
+            elif method.upper() == "POST":
+                url = self.bucket.sign_url(
+                    method='POST',
+                    key=object_key,
+                    expires=expires_in
+                )
+            elif method.upper() == "DELETE":
+                url = self.bucket.sign_url(
+                    method='DELETE',
+                    key=object_key,
+                    expires=expires_in
+                )
+            
+            logger.info(f"生成预签名URL成功: {object_key}, method: {method}")
+            return url
+            
+        except Exception as e:
+            logger.error(f"生成预签名URL失败: {str(e)}")
+            return None
+
+    def generate_presigned_doc_url(self, filename: str, method: str = "GET", expires_in: int = 3600,
+                                   response_headers: Optional[Dict[str, str]] = None,
+                                   auth_tenant_id: Optional[str] = None, 
+                                   auth_company_id: Optional[str] = None, 
+                                   doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成单据文件的预签名URL
+        
+        Args:
+            filename: 文件名
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        try:
+            # 构建单据文件路径
+            object_key = self._build_doc_path(filename, auth_tenant_id, auth_company_id, doc_id)
+            
+            # 调用通用预签名URL生成方法
+            return self.generate_presigned_url(
+                object_key=object_key,
+                method=method,
+                expires_in=expires_in,
+                response_headers=response_headers
+            )
+            
+        except Exception as e:
+            logger.error(f"生成单据文件预签名URL失败: {str(e)}")
+            return None 

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/src/fiuai_s3/minio/minio_storage.py

@@ -12,7 +12,7 @@ from minio import Minio
 from minio.error import S3Error
 from minio.commonconfig import Tags
 from ..object_storage import ObjectStorage, StorageConfig
-from ..type import DocFileObject, DocFileType, DocSourceFrom
+from ..type import DocFileObject
 
 logger = logging.getLogger(__name__)
 
@@ -186,8 +186,6 @@ class MinioStorage(ObjectStorage):
     def upload_doc_file(self, 
                         filename: str, 
                         data: bytes, 
-                        doc_source_from: Optional[DocSourceFrom] = None, 
-                        doc_file_type: Optional[DocFileType] = None, 
                         tags: Optional[Dict[str, str]] = None,
                         auth_tenant_id: Optional[str] = None, 
                         auth_company_id: Optional[str] = None, 
@@ -202,11 +200,6 @@ class MinioStorage(ObjectStorage):
             if tags:
                 for k, v in tags.items():
                     tags_obj[k] = v
-
-            doc_source_from = doc_source_from if doc_source_from else DocSourceFrom.OTHER
-            doc_file_type = doc_file_type if doc_file_type else DocFileType.OTHER
-            tags_obj["doc_source_from"] = doc_source_from.value
-            tags_obj["doc_file_type"] = doc_file_type.value
             
             self.client.put_object(
                 bucket_name=self.bucket_name,
@@ -264,4 +257,110 @@ class MinioStorage(ObjectStorage):
             return files
         except S3Error as e:
             logger.error(f"list doc files failed: {str(e)}")
-            return []
+            return []
+
+    def generate_presigned_url(self, object_key: str, method: str = "GET", expires_in: int = 3600, 
+                              response_headers: Optional[Dict[str, str]] = None,
+                              auth_tenant_id: Optional[str] = None, 
+                              auth_company_id: Optional[str] = None, 
+                              doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成预签名URL
+        
+        Args:
+            object_key: 对象存储中的key
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        try:
+            # 验证参数
+            if not object_key:
+                raise ValueError("object_key 不能为空")
+            
+            if method.upper() not in ["GET", "PUT", "POST", "DELETE"]:
+                raise ValueError(f"不支持的HTTP方法: {method}")
+            
+            if expires_in <= 0 or expires_in > 604800:  # 最大7天
+                raise ValueError("过期时间必须在1秒到604800秒（7天）之间")
+            
+            # 生成预签名URL
+            from datetime import timedelta
+            
+            if method.upper() == "GET":
+                url = self.client.presigned_get_object(
+                    bucket_name=self.bucket_name,
+                    object_name=object_key,
+                    expires=timedelta(seconds=expires_in),
+                    response_headers=response_headers
+                )
+            elif method.upper() == "PUT":
+                url = self.client.presigned_put_object(
+                    bucket_name=self.bucket_name,
+                    object_name=object_key,
+                    expires=timedelta(seconds=expires_in)
+                )
+            elif method.upper() == "POST":
+                url = self.client.presigned_post_policy(
+                    bucket_name=self.bucket_name,
+                    object_name=object_key,
+                    expires=timedelta(seconds=expires_in)
+                )
+            elif method.upper() == "DELETE":
+                url = self.client.presigned_delete_object(
+                    bucket_name=self.bucket_name,
+                    object_name=object_key,
+                    expires=timedelta(seconds=expires_in)
+                )
+            
+            logger.info(f"生成预签名URL成功: {object_key}, method: {method}")
+            return url
+            
+        except S3Error as e:
+            logger.error(f"生成预签名URL失败: {str(e)}")
+            return None
+        except Exception as e:
+            logger.error(f"生成预签名URL异常: {str(e)}")
+            return None
+
+    def generate_presigned_doc_url(self, filename: str, method: str = "GET", expires_in: int = 3600,
+                                   response_headers: Optional[Dict[str, str]] = None,
+                                   auth_tenant_id: Optional[str] = None, 
+                                   auth_company_id: Optional[str] = None, 
+                                   doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成单据文件的预签名URL
+        
+        Args:
+            filename: 文件名
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        try:
+            # 构建单据文件路径
+            object_key = self._build_doc_path(filename, auth_tenant_id, auth_company_id, doc_id)
+            
+            # 调用通用预签名URL生成方法
+            return self.generate_presigned_url(
+                object_key=object_key,
+                method=method,
+                expires_in=expires_in,
+                response_headers=response_headers
+            )
+            
+        except Exception as e:
+            logger.error(f"生成单据文件预签名URL失败: {str(e)}")
+            return None

{fiuai_s3-0.4.0 → fiuai_s3-0.4.2}/src/fiuai_s3/object_storage.py

@@ -120,8 +120,6 @@ class ObjectStorage(ABC):
     def upload_doc_file(self, 
                         filename: str, 
                         data: bytes, 
-                        doc_source_from: Optional[DocSourceFrom] = None, 
-                        doc_file_type: Optional[DocFileType] = None, 
                         tags: Optional[Dict[str, str]] = None,
                         auth_tenant_id: Optional[str] = None, auth_company_id: Optional[str] = None, doc_id: Optional[str] = None) -> bool:
         """
@@ -165,6 +163,52 @@ class ObjectStorage(ABC):
         """
         pass
 
+    @abstractmethod
+    def generate_presigned_url(self, object_key: str, method: str = "GET", expires_in: int = 3600, 
+                              response_headers: Optional[Dict[str, str]] = None,
+                              auth_tenant_id: Optional[str] = None, 
+                              auth_company_id: Optional[str] = None, 
+                              doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成预签名URL
+        
+        Args:
+            object_key: 对象存储中的key，如果为空则使用单据路径
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        pass
+
+    @abstractmethod
+    def generate_presigned_doc_url(self, filename: str, method: str = "GET", expires_in: int = 3600,
+                                   response_headers: Optional[Dict[str, str]] = None,
+                                   auth_tenant_id: Optional[str] = None, 
+                                   auth_company_id: Optional[str] = None, 
+                                   doc_id: Optional[str] = None) -> Optional[str]:
+        """
+        生成单据文件的预签名URL
+        
+        Args:
+            filename: 文件名
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选，若不传则用实例属性）
+            auth_company_id: 公司ID（可选，若不传则用实例属性）
+            doc_id: 单据ID（可选，若不传则用实例属性）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        pass
+
 class ObjectStorageFactory:
     """对象存储工厂类"""
     
@@ -255,6 +299,68 @@ class ObjectStorageFactory:
             return MinioStorage(config, auth_tenant_id, auth_company_id, doc_id)
         else:
             raise ValueError(f"不支持的存储提供商: {provider}")
+    
+    @classmethod
+    def generate_presigned_url(cls, object_key: str, method: str = "GET", expires_in: int = 3600, 
+                              response_headers: Optional[Dict[str, str]] = None,
+                              auth_tenant_id: Optional[str] = None, 
+                              auth_company_id: Optional[str] = None, 
+                              doc_id: Optional[str] = None) -> Optional[str]:
+        """通过工厂类生成预签名URL
+        
+        Args:
+            object_key: 对象存储中的key
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选）
+            auth_company_id: 公司ID（可选）
+            doc_id: 单据ID（可选）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        storage = cls.get_instance()
+        return storage.generate_presigned_url(
+            object_key=object_key,
+            method=method,
+            expires_in=expires_in,
+            response_headers=response_headers,
+            auth_tenant_id=auth_tenant_id,
+            auth_company_id=auth_company_id,
+            doc_id=doc_id
+        )
+    
+    @classmethod
+    def generate_presigned_doc_url(cls, filename: str, method: str = "GET", expires_in: int = 3600,
+                                   response_headers: Optional[Dict[str, str]] = None,
+                                   auth_tenant_id: Optional[str] = None, 
+                                   auth_company_id: Optional[str] = None, 
+                                   doc_id: Optional[str] = None) -> Optional[str]:
+        """通过工厂类生成单据文件的预签名URL
+        
+        Args:
+            filename: 文件名
+            method: HTTP方法，支持 GET、PUT、POST、DELETE
+            expires_in: 过期时间（秒），默认3600秒（1小时）
+            response_headers: 响应头设置
+            auth_tenant_id: 租户ID（可选）
+            auth_company_id: 公司ID（可选）
+            doc_id: 单据ID（可选）
+            
+        Returns:
+            Optional[str]: 预签名URL，失败时返回None
+        """
+        storage = cls.get_instance()
+        return storage.generate_presigned_doc_url(
+            filename=filename,
+            method=method,
+            expires_in=expires_in,
+            response_headers=response_headers,
+            auth_tenant_id=auth_tenant_id,
+            auth_company_id=auth_company_id,
+            doc_id=doc_id
+        )
 
 # 导出工厂类
 __all__ = ['ObjectStorage', 'ObjectStorageFactory', 'StorageConfig']