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

Populate dataset webclient #5832

Merged
merged 6 commits into from
Sep 3, 2018
Merged

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Aug 22, 2018

Summary

Previously opened as #5691, but the metadata population logic has now been filtered out of OMERO.py into an independent component which can be released in isolation (see #5831).

This change cherry-picks the changes at the Webclient level for displaying Tables on P/D/I hierarchy. Minimally, when clicking on the Tables tab on an image, two additional queries are performed to load the bulk annotations at either the Project and/or at the Dataset level.

Testing

Two IDR studies have been imported under the public user of https://web-proxy.openmicroscopy.org/east-web/webclient/: the experimentA of idr0021 and the screenB of idr0008.

For each study, the bulk annotations have been populated using the annotation.csv files under the metadata repositories (idr0021 and idr0008) and omero-metadata:0.2.2

Tables should now load when expanding the corresponding tab in the right-hand panel for:

  • Images under the idr0021 project
  • Wells under the idr0008 screen (current behavior)

@sbesson
Copy link
Member Author

sbesson commented Aug 26, 2018

Last two commits should contain a few additional fixes

@will-moore
Copy link
Member

Working fine for Project and Screen on east-web as described.
Tried locally with a Table prepared for OMERO.parade and this isn't working as parade is using capitalised Image column (https://github.com/ome/omero-parade/blob/master/omero_parade/table_filters/data_providers.py#L101) instead of lowercase image column as expected.

Since we are using query="Well" elsewhere and WellColumns are called "Well", it is more consistent to use "Image" for ImageColumns.

@sbesson
Copy link
Member Author

sbesson commented Aug 27, 2018

No personal objection to unifying towards Image- instead of image-. The consistency argument holds completely. Major concrete points to consider with regard to any long-term decisions:

  • we are currently looking at omero-metadata, omero-parade and omerowebclient. Are there other consumers relying on this semantics?
  • we should assume that current production instances like IDR already have data populated with an image column. What is the expectation for those? Are we forcing a systematic re-annotation in order to benefit from the Webclient and Parade integration? An intermediate might be to support both APIs in the meantime i.e. handle both image- and Image- queries but deprecate the former.
  • independently of the path, we need to update our metadata population tool to comply with the format specification - see ImageColumn called  omero-metadata#9

@sbesson
Copy link
Member Author

sbesson commented Aug 30, 2018

In order to test ome/omero-metadata#5 and in absence of concrete discussion and agreement, 572c319 implements the intermediate solution discussed in #5832 (comment) i.e. acknowledges the fact Project/Dataset tabular data currently exists under two forms and handle both variations.

@joshmoore
Copy link
Member

@will-moore: is this good to go?

@will-moore
Copy link
Member

Yes, this is working for me.
I guess the only question is how long we keep polling for ?query=image... and ?query=Image....

@joshmoore
Copy link
Member

Thanks, @will-moore. I'll leave you to engage that conversation, creating cards as necessary.

@joshmoore joshmoore merged commit 5ae3059 into ome:develop Sep 3, 2018
@sbesson sbesson deleted the populate_dataset_webclient branch September 3, 2018 10:36
@joshmoore joshmoore added this to the 5.4.8 milestone Sep 3, 2018
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.

4 participants