Fix: Can't use curl to download a single manifest in one invocation (#5918) #6099
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
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
2 times, most recently
from
8b62dbc
to
830a1e4
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #6099 +/- ##
===========================================
- Coverage 85.38% 85.36% -0.02%
===========================================
Files 155 155
Lines 20735 20773 +38
===========================================
+ Hits 17704 17733 +29
- Misses 3031 3040 +9 ☔ View full report in Codecov by Sentry. |
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
2 times, most recently
from
da860a5
to
b81d052
Compare
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
5 times, most recently
from
9fb4dbb
to
391cedb
Compare
|
Successful use of curl to download a manifest in one invocation: (Unabridged version: 6099_manifest_invocation_unabridged.txt) |
nadove-ucsc
requested changes
Apr 1, 2024
lambdas/service/app.py
Outdated
| @@ -1273,14 +1273,16 @@ def get_summary(): | |||
| authentication=request.authentication) | |||
|
|
|||
|
|
|||
| def manifest_route(*, fetch: bool, initiate: bool): | |||
| def manifest_route(*, fetch: bool, method: str): | |||
| initiate = method in ['PUT', 'POST'] | |||
There was a problem hiding this comment.
Suggested change
| initiate = method in ['PUT', 'POST'] | |
| initiate = method in {'PUT', 'POST'} |
lambdas/service/app.py
Outdated
| def fetch_file_manifest_with_token(token: str): | ||
| return _file_manifest(fetch=True, token_or_key=token) | ||
|
|
||
|
|
||
| def _file_manifest(fetch: bool, token_or_key: Optional[str] = None): | ||
| request = app.current_request | ||
| require(request.method != 'POST' or request.raw_body.decode() == '', |
There was a problem hiding this comment.
This is the same as
Suggested change
| require(request.method != 'POST' or request.raw_body.decode() == '', | |
| require(request.method != 'POST' or request.raw_body == b'', |
Right?
|
Added #6003 as a blocker due to overlapping changes to the IT |
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
from
600eb8b
to
81a4905
Compare
nadove-ucsc
reviewed
Apr 4, 2024
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
from
81a4905
to
ff39020
Compare
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
from
7ef53d5
to
465414d
Compare
hannes-ucsc
requested changes
Aug 21, 2024
src/azul/chalice.py
Outdated
| @@ -617,3 +618,25 @@ def lambda_context(self) -> LambdaContext: | |||
| @property | |||
| def current_request(self) -> AzulRequest: | |||
| return self.app.current_request | |||
|
|
|||
| def server_side_sleep(self, max_seconds: int | float) -> float: | |||
There was a problem hiding this comment.
Suggested change
| def server_side_sleep(self, max_seconds: int | float) -> float: | |
| def server_side_sleep(self, max_seconds: float) -> float: |
Time in Python is always a float. Supporting int may seem like a convenience but just leads to sloppy use of this function.
|
|
||
| :return: The actual amount of time slept in seconds | ||
| """ | ||
| remaining_time = self.lambda_context.get_remaining_time_in_millis() / 1000 |
There was a problem hiding this comment.
Add validation of type and range of the argument.
| retry_after = body.get('Retry-After') | ||
| if retry_after is not None: | ||
| time_slept = self.server_side_sleep(retry_after) | ||
| body['Retry-After'] = round(retry_after - time_slept) |
There was a problem hiding this comment.
Suggested change
| body['Retry-After'] = round(retry_after - time_slept) | |
| body['Retry-After'] = ceil(retry_after - time_slept) |
Comment on lines
363
to
364
| if wait is None: | ||
| azul_url.args['wait'] = '0' |
There was a problem hiding this comment.
This indicates that Azul now yields a URL with wait set to the default. I'd prefer not to do that.
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
2 times, most recently
from
de14d18
to
db304df
Compare
hannes-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
from
ec5f5cc
to
cb02ca7
Compare
hannes-ucsc
requested changes
Sep 4, 2024
| @@ -263,7 +266,7 @@ def download_file(self, | |||
| pass | |||
| elif wait == '1': | |||
| time_slept = self.server_side_sleep(float(retry_after)) | |||
| retry_after = round(retry_after - time_slept) | |||
| retry_after = ceil(retry_after - time_slept) | |||
There was a problem hiding this comment.
The change from round to ceil is currently in a commit labeled "Add a default value for the /repository/files wait parameter". Please explain why going from round to ceil is related to adding a default or isolate that change in its own commit.
Comment on lines
-1060
to
+1070
| as a property of a JSON object in the body of the request. This can be | ||
| useful in case the value of the `filters` query parameter causes the URL | ||
| to exceed the maximum length of 8192 characters, resulting in a 413 | ||
| Request Entity Too Large response. | ||
| as a property of a JSON object in the body of the request. This is | ||
| referred to as *parameter hoisting* and can be useful in case the value | ||
| of the `filters` query parameter causes the URL to exceed the maximum | ||
| length of 8192 characters, resulting in a 413 Request Entity Too Large | ||
| response. | ||
|
|
||
| The request `%s %s?filters={…}`, for example, is equivalent to `%s %s` | ||
| with the body `{"filters": "{…}"}` in which any double quotes or | ||
| backslash characters inside `…` are escaped with another backslash. That | ||
| escaping is the requisite procedure for embedding one JSON structure | ||
| inside another. | ||
| with a `Content-Type` header of `application/json` and the body | ||
| `{"filters": "{…}"}` in which any double quotes or backslash characters | ||
| inside `…` are escaped with another backslash. That escaping is the | ||
| requisite procedure for embedding one JSON structure inside another. |
There was a problem hiding this comment.
Correct me if I am wrong but it seems like these two hunks are unrelated documentation improvement that I requested at some point, but that have nothing to do with "Add[ing] support for POST requests to the manifest endpoint", as is the title of the commit the hunks are part of.
Fixes regression from fb58b01. The problem manifested as an error with the `app` property in an AppController subclass, and this wasn't noticed until now due to the `app` property not being accessed in a controller that had this problem, namely ManifestController.
…vocation (#5918) Add support for POST requests to the manifest endpoint
…vocation (#5918) Add a wait parameter option to the manifest endpoint
dsotirho-ucsc
force-pushed
the
issues/dsotirho-ucsc/5918-manifest-post
branch
from
cb02ca7
to
f1a03b6
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.
Connected issues: #5918
Checklist
Author
developissues/<GitHub handle of author>/<issue#>-<slug>1 when the issue title describes a problem, the corresponding PR
title is
Fix:followed by the issue titleAuthor (partiality)
ptag to titles of partial commitspartialor completely resolves all connected issuespartiallabelAuthor (chains)
baseor this PR is not chained to another PRchainedor is not chained to another PRAuthor (reindex, API changes)
rtag to commit title or the changes introduced by this PR will not require reindexing of any deploymentreindex:devor the changes introduced by it will not require reindexing ofdevreindex:anvildevor the changes introduced by it will not require reindexing ofanvildevreindex:anvilprodor the changes introduced by it will not require reindexing ofanvilprodreindex:prodor the changes introduced by it will not require reindexing ofprodreindex:partialand its description documents the specific reindexing procedure fordev,anvildev,anvilprodandprodor requires a full reindex or carries none of the labelsreindex:dev,reindex:anvildev,reindex:anvilprodandreindex:prodAPIor this PR does not modify a REST APIa(A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST APIapp.pyor this PR does not modify a REST APIAuthor (upgrading deployments)
make image_manifests.jsonand committed the resulting changes or this PR does not modifyazul_docker_images, or any other variables referenced in the definition of that variableutag to commit title or this PR does not require upgrading deploymentsupgradeor does not require upgrading deploymentsdeploy:sharedor does not modifyimage_manifests.json, and does not require deploying thesharedcomponent for any other reasondeploy:gitlabor does not require deploying thegitlabcomponentdeploy:runneror does not require deploying therunnerimageAuthor (hotfixes)
Ftag to main commit title or this PR does not include permanent fix for a temporary hotfixanvilprodandprod) have temporary hotfixes for any of the issues connected to this PRAuthor (before every review)
develop, squashed old fixupsmake requirements_updateor this PR does not modifyrequirements*.txt,common.mk,MakefileandDockerfileRtag to commit title or this PR does not modifyrequirements*.txtreqsor does not modifyrequirements*.txtmake integration_testpasses in personal deployment or this PR does not modify functionality that could affect the IT outcomePeer reviewer (after approval)
System administrator (after approval)
demoorno demono demono sandboxN reviewslabel is accurateOperator (before pushing merge the commit)
reindex:…labels andrcommit title tagno demodevelop_select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlab_select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unusedor this PR is not labeleddeploy:shared_select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab applyor this PR is not labeleddeploy:gitlabdeploy:gitlabdeploy:gitlabSystem administrator
dev.gitlabare complete or this PR is not labeleddeploy:gitlabanvildev.gitlabare complete or this PR is not labeleddeploy:gitlabOperator (before pushing merge the commit)
_select dev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runner_select anvildev.gitlab && make -C terraform/gitlab/runneror this PR is not labeleddeploy:runnersandboxlabel or PR is labeledno sandboxdevor PR is labeledno sandboxanvildevor PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxdeployment or PR is labeledno sandboxanvilboxdeployment or PR is labeledno sandboxsandboxor this PR does not remove catalogs or otherwise causes unreferenced indices indevanvilboxor this PR does not remove catalogs or otherwise causes unreferenced indices inanvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevsandboxor this PR is not labeledreindex:devanvilboxor this PR is not labeledreindex:anvildevpif the PR is also labeledpartialOperator (chain shortening)
developor this PR is not labeledbasechainedlabel from the blocked PR or this PR is not labeledbasebasebaselabel from this PR or this PR is not labeledbaseOperator (after pushing the merge commit)
devanvildevdevdevanvildevanvildev_select dev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shared_select anvildev.shared && make -C terraform/shared applyor this PR is not labeleddeploy:shareddevanvildevOperator (reindex)
devor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR is neither labeledreindex:partialnorreindex:devanvildevor this PR is neither labeledreindex:partialnorreindex:anvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevdevor this PR does not require reindexingdevanvildevor this PR does not require reindexinganvildevOperator
deploy:shared,deploy:gitlab,deploy:runner,reindex:partial,reindex:anvilprodandreindex:prodlabels to the next promotion PRs or this PR carries none of these labelsdeploy:shared,deploy:gitlab,deploy:runner,reindex:partial,reindex:anvilprodandreindex:prodlabels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labelsShorthand for review comments
Lline is too longWline wrapping is wrongQbad quotesFother formatting problem