Skip to content
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.

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

task/WG-211 update metadata query to support DES-2636 #175

Merged

Conversation

nathanfranklin
Copy link
Collaborator

@nathanfranklin nathanfranklin commented Jan 29, 2024

Overview:

This PR:

  • addresses WG-211/DES-2636 by searching by file name to get tapis file metadata. This mimics how DS gets tapis file metadata. All changes for this are in geoapi/utils/agave.py
  • uses tapis file metadata created by RApp during file image imports (WG-39). Previously, this was only done when scraping files and if the field were within the the Rapp subfolder. Now users can manually import files using metadata and they no longer have to be located in the Rapp subfolder for tapis-metadata to be used.

All changes in this PR (besides those in geoapi/utils/agave.py) are related to bullet point 2. With these changes, now we get tapis metadata on all images being imported and use the location information there if it exists. Otherwise, we use the image file's exif data.

Related Jira tickets:

Testing Steps:

  1. Everyone has been added to https://www.designsafe-ci.org/data/browser/projects/4193535358505521646-242ac117-0001-012/ (i.e. PRJ-4530 | TEST_WG_211_metadata)
  2. Create a generic map and then manually select files and try importing (i.e. on Map, click Assets and then "Import from DesignSafe") . Watch geoapi logs.
  3. Delete previous map
  4. Create another map and this time scrape (check "Sync Folder" button in create map modal) and link to the PRJ-4530 | TEST_WG_211_metadata (via "Select Link Save Location) - https://www.designsafe-ci.org/data/browser/projects/4193535358505521646-242ac117-0001-012/ (i.e. ). Watch geoapi logs.

Let me know if you need more data to test.

Copy link
Contributor

@tjgrafft tjgrafft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@nathanfranklin nathanfranklin changed the title Task/wg 211 update metadata query to support des 2636 task/WG-211 update metadata query to support des 2636 Feb 28, 2024
@nathanfranklin nathanfranklin changed the title task/WG-211 update metadata query to support des 2636 task/WG-211 update metadata query to support DES-2636 Feb 28, 2024
Copy link

@shayanaijaz shayanaijaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Can see the metadata logs in geoapi

Copy link
Contributor

@taoteg taoteg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I did not run this locally.

@nathanfranklin nathanfranklin merged commit 3f8264f into master Feb 28, 2024
3 checks passed
@nathanfranklin nathanfranklin deleted the task/WG-211-update-metadata-query-to-support-DES-2636 branch February 28, 2024 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants