✨ Add make_public parameter to file storage upload_file

Author: mykolasolodukha

electro/toolkit/files_storage/storage_services/_base_storage_service.py

@@ -8,10 +8,12 @@ class BaseStorageService(ABC):
     """Base class for storage services."""
 
     @abstractmethod
-    async def upload_file(self, file_io: BytesIO, content_type: str) -> str:
+    async def upload_file(self, file_io: BytesIO, content_type: str, *, make_public: bool = False) -> str:
         """Uploads an file to the storage and returns the object key.
 
         :param file_io: BytesIO object of the file to upload
+        :param content_type: MIME type of the file
+        :param make_public: If True, make the file publicly accessible (S3: sets ACL to public-read)
         :return: object key of the uploaded file
 
         """

electro/toolkit/files_storage/storage_services/azure_blob_storage_service.py

@@ -44,8 +44,13 @@ async def _ensure_container_exists(self):
             except ResourceNotFoundError:
                 await container_client.create_container()
 
-    async def upload_file(self, file_io: BytesIO, content_type: str) -> str:
-        """Upload an file to the Azure Blob Storage."""
+    async def upload_file(self, file_io: BytesIO, content_type: str, *, make_public: bool = False) -> str:
+        """Upload an file to the Azure Blob Storage.
+
+        Note: make_public is accepted for API consistency but Azure blob public access
+        is controlled at the container level. Use SAS tokens via get_file_url() for access.
+        """
+        _ = make_public  # Azure public access is container-level, not per-blob
         blob_name = f"file_{os.urandom(8).hex()}.png"
         async with await self.blob_service_client as client:
             await self._ensure_container_exists()

electro/toolkit/files_storage/storage_services/s3_service.py

@@ -63,17 +63,21 @@ async def _download_file(self, object_key: str, destination: str | BytesIO | Non
 
             return destination
 
-    async def upload_file(self, file_io: BytesIO, content_type: str) -> str:
+    async def upload_file(self, file_io: BytesIO, content_type: str, *, make_public: bool = False) -> str:
         """Uploads an file to the S3 bucket and returns the object key.
 
         :param file_io: BytesIO object of the file to upload
+        :param content_type: MIME type of the file
+        :param make_public: If True, set ACL to public-read for public access
         :return: object key of the uploaded file
 
         """
         object_key = str(uuid4())
+        extra_args = {"ContentType": content_type}
+        if make_public:
+            extra_args["ACL"] = "public-read"
         try:
-            # TODO: [2024-10-05 by Mykola] IT'S NOT ALWAYS JPEG
-            await self._upload_file(file_io, object_key, extra_args={"ContentType": content_type})
+            await self._upload_file(file_io, object_key, extra_args=extra_args)
             logger.info(f"File uploaded successfully: {object_key}")
             return object_key
         except Exception as e:

electro/toolkit/files_storage/universal_file_storage.py

@@ -17,9 +17,9 @@ def __init__(self, storage_service: BaseStorageService):
         """Initialize the UniversalFileStorage class."""
         self.storage_service = storage_service
 
-    async def upload_file(self, file_io: BytesIO, content_type: str) -> str:
+    async def upload_file(self, file_io: BytesIO, content_type: str, *, make_public: bool = False) -> str:
         """Upload an file to the storage service."""
-        return await self.storage_service.upload_file(file_io, content_type)
+        return await self.storage_service.upload_file(file_io, content_type, make_public=make_public)
 
     async def download_file(self, object_key: str) -> BytesIO:
         """Download an file from the storage service."""