fiuai-s3 0.3.3__tar.gz → 0.3.5__tar.gz

{fiuai_s3-0.3.3 → fiuai_s3-0.3.5}/PKG-INFO

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

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

{fiuai_s3-0.3.3 → fiuai_s3-0.3.5}/src/fiuai_s3/minio/minio_storage.py

@@ -176,17 +176,16 @@ class MinioStorage(ObjectStorage):
         上传单据文件，自动拼接存储路径并打tag
         """
         try:
-            
             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 doc_source_from:
-                tags_obj["doc_source_from"] = doc_source_from.value
-            if doc_file_type:
-                tags_obj["doc_file_type"] = doc_file_type.value
+            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,

{fiuai_s3-0.3.3 → fiuai_s3-0.3.5}/src/fiuai_s3/object_storage.py

@@ -100,8 +100,8 @@ class ObjectStorage(ABC):
     def upload_doc_file(self, 
                         filename: str, 
                         data: bytes, 
-                        doc_source_from: Optional[DocSourceFrom], 
-                        doc_file_type: Optional[DocFileType], 
+                        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:
         """