Pull in changes from py-pa/django-minio-storage#144

Author: brianhelba

isic/core/storages/minio.py

@@ -2,8 +2,11 @@
 
 import boto3
 from botocore.exceptions import ClientError
+from django.core.files import File
+import minio
 from minio_storage.files import ReadOnlySpooledTemporaryFile
-from minio_storage.storage import MinioMediaStorage
+from minio_storage.policy import Policy
+from minio_storage.storage import MinioStorage, create_minio_client_from_settings, get_setting
 
 
 class StringableReadOnlySpooledTemporaryFile(ReadOnlySpooledTemporaryFile):
@@ -24,11 +27,75 @@ def readline(self, *args, **kwargs):
         return super().readline(*args, **kwargs).decode()
 
 
-class StringableMinioMediaStorage(MinioMediaStorage):
+class FixedMinioMediaStorage(MinioStorage):
+    # From https://github.com/py-pa/django-minio-storage/pull/139
     file_class = StringableReadOnlySpooledTemporaryFile
 
-
-class MinioS3ProxyStorage(StringableMinioMediaStorage):
+    # From https://github.com/py-pa/django-minio-storage/pull/144
+    def __init__(  # noqa: C901
+        self,
+        *,
+        minio_client: minio.Minio | None = None,
+        bucket_name: str | None = None,
+        base_url: str | None = None,
+        file_class: type[File] | None = None,
+        auto_create_bucket: bool | None = None,
+        presign_urls: bool | None = None,
+        auto_create_policy: bool | None = None,
+        policy_type: Policy | None = None,
+        object_metadata: dict[str, str] | None = None,
+        backup_format: str | None = None,
+        backup_bucket: str | None = None,
+        assume_bucket_exists: bool | None = None,
+    ):
+        if minio_client is None:
+            minio_client = create_minio_client_from_settings()
+        if bucket_name is None:
+            bucket_name = get_setting("MINIO_STORAGE_MEDIA_BUCKET_NAME")
+        if base_url is None:
+            base_url = get_setting("MINIO_STORAGE_MEDIA_URL", None)
+        if auto_create_bucket is None:
+            auto_create_bucket = get_setting("MINIO_STORAGE_AUTO_CREATE_MEDIA_BUCKET", False)
+        if presign_urls is None:
+            presign_urls = get_setting("MINIO_STORAGE_MEDIA_USE_PRESIGNED", False)
+        auto_create_policy_setting = get_setting(
+            "MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY", "GET_ONLY"
+        )
+        if auto_create_policy is None:
+            auto_create_policy = (
+                True if isinstance(auto_create_policy_setting, str) else auto_create_policy_setting
+            )
+        if policy_type is None:
+            policy_type = (
+                Policy(auto_create_policy_setting)
+                if isinstance(auto_create_policy_setting, str)
+                else Policy.get
+            )
+        if object_metadata is None:
+            object_metadata = get_setting("MINIO_STORAGE_MEDIA_OBJECT_METADATA", None)
+        if backup_format is None:
+            backup_format = get_setting("MINIO_STORAGE_MEDIA_BACKUP_FORMAT", None)
+        if backup_bucket is None:
+            backup_bucket = get_setting("MINIO_STORAGE_MEDIA_BACKUP_BUCKET", None)
+        if assume_bucket_exists is None:
+            assume_bucket_exists = get_setting("MINIO_STORAGE_ASSUME_MEDIA_BUCKET_EXISTS", False)
+        super().__init__(
+            minio_client,
+            bucket_name,
+            base_url=base_url,
+            file_class=file_class,
+            auto_create_bucket=auto_create_bucket,
+            presign_urls=presign_urls,
+            auto_create_policy=auto_create_policy,
+            policy_type=policy_type,
+            object_metadata=object_metadata,
+            backup_format=backup_format,
+            backup_bucket=backup_bucket,
+            assume_bucket_exists=assume_bucket_exists,
+        )
+
+
+class MinioS3ProxyStorage(FixedMinioMediaStorage):
     """
     A storage backend that proxies to S3 if the file doesn't exist in Minio.
 

isic/settings/development.py

@@ -86,7 +86,7 @@
 MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY = "READ_WRITE"
 MINIO_STORAGE_MEDIA_USE_PRESIGNED = True
 
-STORAGES["default"]["BACKEND"] = "isic.core.storages.minio.StringableMinioMediaStorage"  # noqa: F405
+STORAGES["default"]["BACKEND"] = "isic.core.storages.minio.FixedMinioMediaStorage"  # noqa: F405
 
 ISIC_PLACEHOLDER_IMAGES = True
 # Use the MinioS3ProxyStorage for local development with ISIC_PLACEHOLDER_IMAGES

isic/settings/testing.py

@@ -39,7 +39,7 @@
 ZIP_DOWNLOAD_BASIC_AUTH_TOKEN = "insecuretestzipdownloadauthtoken"  # noqa: S105
 ZIP_DOWNLOAD_WILDCARD_URLS = False
 
-STORAGES["default"] = {"BACKEND": "isic.core.storages.minio.StringableMinioMediaStorage"}  # noqa: F405
+STORAGES["default"] = {"BACKEND": "isic.core.storages.minio.FixedMinioMediaStorage"}  # noqa: F405
 
 
 MINIO_STORAGE_ENDPOINT = os.environ["DJANGO_MINIO_STORAGE_ENDPOINT"]