fiuai-s3 0.3.8__py3-none-any.whl → 0.4.1__py3-none-any.whl

fiuai_s3/__init__.py

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

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__)
 
@@ -78,7 +78,7 @@ class MinioStorage(ObjectStorage):
             object_key: 对象存储中的key
             tmppath: 临时文件路径, 如果为空，则使用默认临时目录
         """
-        _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath}/{object_key}"
+        _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:
@@ -88,7 +88,7 @@ class MinioStorage(ObjectStorage):
             object_key: 对象存储中的key
             tmppath: 临时文件路径, 如果为空，则使用默认临时目录
         """
-        _path = f"{self.config.temp_dir}/{object_key}" if not tmppath else f"{tmppath}/{object_key}"
+        _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:
@@ -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, 
@@ -199,13 +197,9 @@ class MinioStorage(ObjectStorage):
             object_key = self._build_doc_path(filename, auth_tenant_id, auth_company_id, doc_id)
             # 将tags转换为Tags对象
             tags_obj = 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
+            if tags:
+                for k, v in tags.items():
+                    tags_obj[k] = v
             
             self.client.put_object(
                 bucket_name=self.bucket_name,

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:
         """
@@ -197,7 +195,7 @@ class ObjectStorageFactory:
             endpoint=endpoint,
             access_key=access_key,
             secret_key=secret_key,
-            temp_dir=temp_dir,
+            temp_dir=temp_dir.rstrip("/").lstrip("/"),
             use_https=use_https
         )
         cls._instance = None

{fiuai_s3-0.3.8.dist-info → fiuai_s3-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai-s3
-Version: 0.3.8
+Version: 0.4.1
 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.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+fiuai_s3/__init__.py,sha256=tLlqnMEl4K7R4jg2GbvGZanRsis1vm7KFKSc5R_wRUE,421
+fiuai_s3/object_storage.py,sha256=jbXQJ8SBZNMoLQz4OXs6vWwY1cVON2d_5a3LolzcqD8,9335
+fiuai_s3/type.py,sha256=L1h3SQh7_NhWfjWPa1MMgGoxM7g6wQF26qg5WsERt6U,981
+fiuai_s3/alicloud/__init__.py,sha256=mmrCrFp5DzRF5fViJDq7_LpsqCViwTPXOPz4qoaSscI,218
+fiuai_s3/alicloud/alicloud_storage.py,sha256=d24AFYDs7RsTsfL9IiVOxYlGyLzsaUa_WUYD5VPLP4s,6035
+fiuai_s3/minio/__init__.py,sha256=hOmpUkTq8TPgYOxfeOMcWq1_YsJ2r8Zf9VTX3w_v1Lk,209
+fiuai_s3/minio/minio_storage.py,sha256=k0IKpifeUP8JwfDCry0yuFTzrnaHA9ZWYQToNhGS99s,9563
+fiuai_s3-0.4.1.dist-info/METADATA,sha256=0ye44O-YuXc3ZCwvvUBRDQdr7f-owyyp3FHQLaa5Yf4,18727
+fiuai_s3-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fiuai_s3-0.4.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fiuai_s3-0.4.1.dist-info/RECORD,,

fiuai_s3-0.3.8.dist-info/RECORD

@@ -1,11 +0,0 @@
-fiuai_s3/__init__.py,sha256=jsG1aylQ_FnU7hVXkD9gLW0wmyYl3avahiwSZPu3SDA,421
-fiuai_s3/object_storage.py,sha256=ZreKO0la1VB24GVtM5TYrndhulpEJC0RiHLtdJU7WG0,9455
-fiuai_s3/type.py,sha256=L1h3SQh7_NhWfjWPa1MMgGoxM7g6wQF26qg5WsERt6U,981
-fiuai_s3/alicloud/__init__.py,sha256=mmrCrFp5DzRF5fViJDq7_LpsqCViwTPXOPz4qoaSscI,218
-fiuai_s3/alicloud/alicloud_storage.py,sha256=d24AFYDs7RsTsfL9IiVOxYlGyLzsaUa_WUYD5VPLP4s,6035
-fiuai_s3/minio/__init__.py,sha256=hOmpUkTq8TPgYOxfeOMcWq1_YsJ2r8Zf9VTX3w_v1Lk,209
-fiuai_s3/minio/minio_storage.py,sha256=EVRSGO_2tfSY7cxWy0hdQTkazH2Cqvca6ub5Ms-97Fg,9979
-fiuai_s3-0.3.8.dist-info/METADATA,sha256=Ufv3mcto20zrI7aztK-zymiiw1BJnzR6Tqdbjxs89OI,18727
-fiuai_s3-0.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fiuai_s3-0.3.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fiuai_s3-0.3.8.dist-info/RECORD,,