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

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

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

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

{fiuai_s3-0.3.8 → fiuai_s3-0.4.0}/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.8"
+__version__ = "0.3.9"
 __all__ = ["ObjectStorage", "ObjectStorageFactory", "StorageConfig", "DocFileObject", "DocSourceFrom", "DocFileType"] 

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

@@ -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:
@@ -199,8 +199,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
+            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

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

@@ -197,7 +197,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