Skip to content

Fix S3 file storage import #6893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix S3 file storage import #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion label_studio/core/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@


class CustomS3Boto3Storage(StorageProxyMixin, S3Boto3Storage):
pass
def url(self, name, storage_url=False, *args, **kwargs):
if storage_url is True:
return super().url(name, *args, **kwargs)
return f"s3://{settings.AWS_STORAGE_BUCKET_NAME}/{name}"

Check warning on line 72 in label_studio/core/storage.py

View check run for this annotation

Codecov / codecov/patch

label_studio/core/storage.py#L70-L72 

Added lines #L70 - L72 were not covered by tests


class CustomAzureStorage(StorageProxyMixin, AzureStorage):
Expand Down
2 changes: 1 addition & 1 deletion label_studio/data_import/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
def read_task_from_uploaded_file(self):
logger.debug('Read 1 task from uploaded file {}'.format(self.filepath))
if settings.CLOUD_FILE_STORAGE_ENABLED:
tasks = [{'data': {settings.DATA_UNDEFINED_NAME: self.filepath}}]
tasks = [{'data': {settings.DATA_UNDEFINED_NAME: self.file.storage.url(self.file.name)}}]

Check warning on line 116 in label_studio/data_import/models.py

View check run for this annotation

Codecov / codecov/patch

label_studio/data_import/models.py#L116 

Added line #L116 was not covered by tests
else:
tasks = [{'data': {settings.DATA_UNDEFINED_NAME: self.url}}]
return tasks
Expand Down
Loading