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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai-s3
-Version: 0.4.2
+Version: 0.4.3
 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.2 → fiuai_s3-0.4.3}/pyproject.toml

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

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

@@ -7,7 +7,7 @@
 
 import os
 import logging
-from typing import List, Optional
+from typing import List, Optional, Dict
 import oss2
 from ..object_storage import ObjectStorage, StorageConfig
 from oss2.headers import OSS_OBJECT_TAGGING
@@ -37,6 +37,32 @@ class AliCloudStorage(ObjectStorage):
             bucket_name=config.bucket_name
         )
         
+    def upload_temp_file(self, object_key: str, data: bytes, tmppath: str = None) -> bool:
+        """上传临时文件到阿里云OSS
+        
+        Args:
+            object_key: 对象存储中的key
+            data: 文件数据
+            tmppath: 临时文件路径, 如果为空，则使用默认临时目录
+        Returns:
+            bool: 是否上传成功
+        """
+        _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath.rstrip('/')}/{object_key}"
+        return self.upload_file(_path, data)
+
+    def download_temp_file(self, object_key: str, tmppath: str = None) -> bytes:
+        """从阿里云OSS下载临时文件
+        
+        Args:
+            object_key: 对象存储中的key
+            tmppath: 临时文件路径, 如果为空，则使用默认临时目录
+            
+        Returns:
+            bytes: 文件内容，失败时返回None
+        """
+        _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath.rstrip('/')}/{object_key}"
+        return self.download_file(_path)
+
     def upload_file(self, object_key: str, data: bytes) -> bool:
         """上传文件到阿里云OSS
         

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

@@ -81,12 +81,15 @@ class MinioStorage(ObjectStorage):
         _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath.rstrip('/')}/{object_key}"
         return self.upload_file(_path, data)
 
-    def download_temp_file(self, object_key: str, tmppath: str = None) -> bool:
+    def download_temp_file(self, object_key: str, tmppath: str = None) -> bytes:
         """下载临时文件
         
         Args:
             object_key: 对象存储中的key
             tmppath: 临时文件路径, 如果为空，则使用默认临时目录
+            
+        Returns:
+            bytes: 文件内容，失败时返回None
         """
         _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath.rstrip('/')}/{object_key}"
         return self.download_file(_path)

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

@@ -58,12 +58,15 @@ class ObjectStorage(ABC):
         pass
 
     @abstractmethod
-    def download_temp_file(self, object_key: str, tmppath: str = None) -> bool:
+    def download_temp_file(self, object_key: str, tmppath: str = None) -> bytes:
         """下载临时文件
         
         Args:
             object_key: 对象存储中的key
             tmppath: 临时文件路径, 如果为空，则使用默认临时目录
+            
+        Returns:
+            bytes: 文件内容，失败时返回None
         """
         pass