Support upload to S3 bucket #287
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gregorjerse
force-pushed
the
feature/upload
branch
5 times, most recently
from
a51ab3f
to
fae3b30
Compare
dblenkus
reviewed
Apr 12, 2022
src/resdk/uploader.py
Outdated
| """The uploader class. | ||
|
|
||
| It is used to upload the file to the Genialis platform. Is supports | ||
| uploading files directly to the server and also directly to the S3 bucket. |
There was a problem hiding this comment.
Remove "directly" in front of "to the server".
src/resdk/uploader.py
Outdated
| try: | ||
| self._upload_config = self.resolwe.api.upload_config.get() | ||
| except ResolweServerError: | ||
| self._upload_config = {"type": "LOCAL"} |
| try: | ||
| return UploadType[self.upload_config["type"]] | ||
| except KeyError: | ||
| return UploadType.default() |
gregorjerse
force-pushed
the
feature/upload
branch
2 times, most recently
from
2458630
to
8f22270
Compare
JureZmrzlikar
approved these changes
Apr 12, 2022
src/resdk/uploader.py
Outdated
| """ | ||
|
|
||
| def __init__(self, resolwe: "Resolwe"): | ||
| """Store the .""" |
src/resdk/uploader.py
Outdated
| UploadType.S3: self._upload_s3, | ||
| } | ||
| # Use the following upload type if one can not be determined. | ||
| self._default_upload_type = UploadType.LOCAL |
There was a problem hiding this comment.
Maybe rather UploadType.default()?
There was a problem hiding this comment.
I have removed this line. It is not needed anymore since the default has been moved to the enum.
src/resdk/uploader.py
Outdated
| self._upload_config = self.resolwe.api.upload_config.get() | ||
| except ResolweServerError: | ||
| self.resolwe.logger.exception("Upload config could not be retrieved.") | ||
| self._upload_config = {"type": "LOCAL"} |
There was a problem hiding this comment.
Maybe rather {"type": UploadType.default()} ?
There was a problem hiding this comment.
Almost: UploadType.default().name to return the compatible config.
tests/unit/test_resolwe.py
Outdated
| @@ -387,7 +393,8 @@ def test_always_ok(self, resolwe_mock): | |||
| status_code=200, **{"json.return_value": requests_response} | |||
| ) | |||
|
|
|||
| response = Resolwe._upload_file(resolwe_mock, self.file_path) | |||
| response = Uploader(resolwe_mock)._upload_local(self.file_path) | |||
| # response = Resolwe._upload_file(resolwe_mock, self.file_path) | |||
| @@ -398,14 +405,16 @@ def test_always_bad(self, resolwe_mock, requests_mock): | |||
| # Immitate response form server - always status 400 | |||
| requests_mock.post.return_value = MagicMock(status_code=400) | |||
|
|
|||
| response = Resolwe._upload_file(resolwe_mock, self.file_path) | |||
| response = Uploader(resolwe_mock)._upload_local(self.file_path) | |||
| # response = Resolwe._upload_file(resolwe_mock, self.file_path) | |||
gregorjerse
force-pushed
the
feature/upload
branch
from
8f22270
to
80622c0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EXP-370