Feature/thumbnails #11
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
added 6 commits
May 2, 2024 14:56
This adds an environment config for thumbnail filetypes, so we know which files to ship and treat as thumbnails in the science archive.
Pull Request Test Coverage Report for Build 9355323460Details
💛 - Coveralls |
added 3 commits
May 17, 2024 15:05
Remove mapping in settings, update filestore path, etc...
…tem/ocs_archive into feature/thumbnails
Also add a couple of tests for thumbnail files
jnation3406
approved these changes
May 17, 2024
ocs_archive/settings/settings.py
Outdated
| @@ -44,6 +44,9 @@ def get_tuple_from_environment(variable_name, default): | |||
| # Fits headers that must be present | |||
| REQUIRED_HEADERS = get_tuple_from_environment('REQUIRED_HEADERS', 'PROPID,DATE-OBS,INSTRUME,SITEID,TELID,OBSTYPE,BLKUID') | |||
|
|
|||
| # Metadata that must be present when ingesting a thumbnail | |||
| REQUIRED_THUMBNAIL_METADATA = get_tuple_from_environment('REQUIRED_THUMBNAIL_METADATA', 'frame_basename,size') | |||
There was a problem hiding this comment.
I think we also need the site_id, instrument_id, and observation_day to be required so we know where to store/retrieve the thumbnails in the daydirs. Actually looking above I think we need to require observation_day for LCO fits files too since its required for that path!
added 13 commits
May 21, 2024 15:29
This is so that the archive can call this function in the thumbnail model without making an extra join to get all of the header information from the associated frame. Rather, it can provide a set of metadata to simply build the correct file path.
We keep the same interface for get_filestore_path so that the ingester can utilize it, but add a static method that takes a subset of frame metadata to also generate a filestore path so that we don't have to pull the entire frame header from another table in the archive. Add thumbnail file and test for ingesting to filestore
Break out the INTEGER_TYPES from the fits file to the settings module
This is to address the 422 errors we ocassionally get from coveralls
…e in the runner environment.
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.
These are the changes needed to support the ingester and science archive in storing thumbnails. Here we just add some validation to make sure some additional thumbnail metadata is included in the payload. Also add a set of thumbnail filetypes which the ingester uses to know where to send the file.