Skip to content

Commit

Permalink
feat: add Google Cloud Storage support (GCS)
Browse files Browse the repository at this point in the history
  • Loading branch information
shadinaif committed Jun 7, 2024
1 parent 8b320d6 commit e41bab5
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 1 deletion.
4 changes: 3 additions & 1 deletion openassessment/fileupload/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from django.conf import settings

from . import django_storage, filesystem, s3, swift
from . import django_storage, filesystem, gcs, s3, swift


def get_backend():
Expand All @@ -18,6 +18,8 @@ def get_backend():
return filesystem.Backend()
elif backend_setting == "swift":
return swift.Backend()
elif backend_setting == "gcs":
return gcs.Backend()

Check warning on line 22 in openassessment/fileupload/backends/__init__.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/__init__.py#L22

Added line #L22 was not covered by tests
elif backend_setting == "django":
return django_storage.Backend()
else:
Expand Down
70 changes: 70 additions & 0 deletions openassessment/fileupload/backends/gcs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
"""GCS Bucket File Upload Backend."""
import functools
import logging

from ..exceptions import FileUploadInternalError
from .base import BaseBackend

log = logging.getLogger("openassessment.fileupload.api") # pylint: disable=invalid-name


def catch_broad_exception(method):
"""Decorator to catch broad exceptions, log them, and raise a FileUploadInternalError."""
@functools.wraps(method)
def wrapper(*args, **kwargs):
try:
return method(*args, **kwargs)
except Exception as ex: # pylint: disable=broad-except
log.exception(

Check warning on line 18 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L15-L18

Added lines #L15 - L18 were not covered by tests
f"Internal exception occurred while executing ora2 file-upload backend gcs.{method.__name__}: {str(ex)}"
)
raise FileUploadInternalError(ex) from ex

Check warning on line 21 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L21

Added line #L21 was not covered by tests
return wrapper


class Backend(BaseBackend):
""" GCS Bucket File Upload Backend. """

@catch_broad_exception
def get_upload_url(self, key, content_type):
"""Get a signed URL for uploading a file to GCS"""
bucket_name, key_name = self._retrieve_parameters(key)
blob = get_blob_object(bucket_name, key_name)
return blob.generate_signed_url(

Check warning on line 33 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L31-L33

Added lines #L31 - L33 were not covered by tests
version="v4",
expiration=self.UPLOAD_URL_TIMEOUT,
method="PUT",
content_type=content_type,
)

@catch_broad_exception
def get_download_url(self, key):
"""Get a signed URL for downloading a file from GCS"""
bucket_name, key_name = self._retrieve_parameters(key)
blob = get_blob_object(bucket_name, key_name)

Check warning on line 44 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L43-L44

Added lines #L43 - L44 were not covered by tests
if not blob.exists():
return ""
return blob.generate_signed_url(

Check warning on line 47 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L46-L47

Added lines #L46 - L47 were not covered by tests
version="v4",
expiration=self.DOWNLOAD_URL_TIMEOUT,
method="GET",
)

@catch_broad_exception
def remove_file(self, key):
"""Remove a file from GCS"""
bucket_name, key_name = self._retrieve_parameters(key)
blob = get_blob_object(bucket_name, key_name)

Check warning on line 57 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L56-L57

Added lines #L56 - L57 were not covered by tests
if blob.exists():
blob.delete()
return True
return False

Check warning on line 61 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L59-L61

Added lines #L59 - L61 were not covered by tests


def get_blob_object(bucket_name, key_name):
"""Get a blob object from GCS"""
# By default; avoid the need of google-cloud-storage library. It will be only needed if gcs backend is used.
from google.cloud import storage # pylint: disable=import-outside-toplevel, import-error

Check warning on line 67 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L67

Added line #L67 was not covered by tests

client = storage.Client()
return client.bucket(bucket_name).blob(key_name)

Check warning on line 70 in openassessment/fileupload/backends/gcs.py

View check run for this annotation

Codecov / codecov/patch

openassessment/fileupload/backends/gcs.py#L69-L70

Added lines #L69 - L70 were not covered by tests

0 comments on commit e41bab5

Please sign in to comment.