Use file download URL as provided by the API #370
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
horheynm
previously approved these changes
Sep 26, 2023
horheynm
approved these changes
Sep 26, 2023
bfineran
reviewed
Sep 26, 2023
| # important, do not remove | ||
| if convert_to_bool(os.getenv("SPARSEZOO_TEST_MODE")): | ||
| download_url += "?increment_download=False" | ||
| delimiter = "&" if "?" in download_url else "?" |
| file["url"] = get_file_download_url( | ||
| model_id=file["model_id"], file_name=file["display_name"] | ||
| ) | ||
| file["url"] = get_file_download_url(file["download_url"]) |
There was a problem hiding this comment.
actually, never mind, see it was replacing the previous key
There was a problem hiding this comment.
The get_file_download_url function is only called from this file, I can get rid of that method and move the logic here if you like. That would look something like:
def include_file_download_url(files: List[Dict]):
for file in files:
download_url = file["download_url"]
del file["download_url"]
# important, do not remove
if convert_to_bool(os.getenv("SPARSEZOO_TEST_MODE")):
delimiter = "&" if "?" in download_url else "?"
download_url += f"{delimiter}increment_download=False"
file["url"] = download_urlThere was a problem hiding this comment.
no need, looks good thanks
| model_id=file["model_id"], file_name=file["display_name"] | ||
| ) | ||
| file["url"] = get_file_download_url(file["download_url"]) | ||
| del file["download_url"] |
There was a problem hiding this comment.
Not required, just trying to maintain the existing file dict interface of sorts. I'd think having both a url and download_url property would confuse anyone looking at the dict and trying to make sense of things
bfineran
approved these changes
Sep 26, 2023
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.
Sparsezoo shouldn't be generating file download URLs, it should use the file downloads provided by the API. The download URLs from the API are cheap and allow sparsezoo to be agnostic of where the files live on the interwebs and decoupled from whatever the current file download implementation is.