-
Notifications
You must be signed in to change notification settings - Fork 54
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
add omero metadata to writer #261
Conversation
Thanks for the PR. I wonder if you would also want to extend the validation a bit, although some of this would be duplicating the schema validation e.g:
You could even check that the number of |
Hi @giovp - if you could merge in origin/master branch (or rebase onto it) then that should fix some of the broken jobs, thanks |
hi @will-moore apologies for getting this staled, I hope I will be able to work on it sometime next week. Will rebase as well, and keep you posted, sorry for delay. |
@will-moore am back on this and will be able to work on it. I have a question re the overwrite of names in the zarr group. is this desired? what's the logic behind? |
I think the logic there is if you've got no channels then the layer name in |
thanks a lot for the prompt reply, from the ngff specs though seems there can be both? a name and channel names? so why would that be overwritten by Omero reader? |
I think this is because the logic in ome-zarr-py was originally built as a napari plugin, so it was designed just to present the best name for each channel. But if you've got an But we only have a single place to store that data: It would certainly be an improvement for |
ok great, so would it be ok to keep
as
? |
Yes, |
Tests are failing with:
|
Codecov ReportAttention:
... and 1 file with indirect coverage changes 📢 Thoughts on this report? Let us know!. |
Failing (only on python 3.8!) with:
I think this just needs to be |
… roundtrip, fix type
thanks a lot for prompt feedback and help @will-moore ! Just wanted to clarify one thing regarding metadata: atm, neither color nor windows are mandatory , but if they are present then they should adhere to the types you outlined here: #261 (comment) therefore, just to recap the specs, they would be as follow:
is this correct? do you think it'd be worth to update the ngff specs to clarify this? |
Apologies for the nit-pick comment. Otherwise I'm happy with this. |
for more information, see https://pre-commit.ci
no problem at all, modified accordingly. Just reminder that this concerns the python implementation of this minor specs change ome/ngff#202 |
thanks - I'm away just now but happy for @joshmoore or @sbesson to merge |
bump |
tests/test_writer.py
Outdated
write_multiscales_metadata( | ||
self.root, datasets, axes="tczyx", metadata={"omero": metadata} | ||
) | ||
elif "color" in metadata["channels"][0]: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just noticed that with elif
here, you'll only test the color
validation if there is no window
metadata.
Just use if "color"..
instead.
But also I don't see that if len(color_metadata) < 6:
below is ever true, since all the color
in parametrize
above are length 6
.
@will-moore apologies getting back to this only now but it should be fix |
Hi @giovp - thanks for the update...
Also the Thanks! |
hi @will-moore , test should be fixed, passes locally, sorry again for getting back to you so late |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great, thanks - apologies for the delay. All tests passing now 👍
looks like it can be merged? |
@giovp yes, apologies we missed this at the last release. |
Anything else otherwise I'll push out a quick 0.8.4 |
Thanks Josh - No I don't see any others ready to go. There have been a couple of docs and tox/deps PRs merged recently. |
ewwww
on |
I can't work out exactly where that's coming from or how to reproduce it locally |
I wonder if the recursion error is related to similar recursion errors noted at #339 |
close #260 .
Validation before write is minimal, feedbacks welcome.