add WebAtlas pipeline 0.5.3#1794
Conversation
|
I have 2 docker containers containing the dependencies and python scripts of webatlas (1 container specifically for build_config and 1 container for all other tools). Where should I put/upload them? |
…_config.xml accordingly
…texts, added tool descriptions, added/fixed tests
…ry zipping for efficiency, adjusted tests
|
Hi, please add a |
pavanvidem
left a comment
There was a problem hiding this comment.
I will review the remaining tools later.
Co-authored-by: Pavankumar Videm <pavanvidem@gmail.com>
nilchia
left a comment
There was a problem hiding this comment.
Great work! @dannyspadaro
| <import>macros.xml</import> | ||
| </macros> | ||
| <requirements> | ||
| <container type="docker">dannyspadaro/webatlas-pipeline-build-config:0.5.3-galaxy</container> |
There was a problem hiding this comment.
Is there a link to the DockerFile?
Maybe you can add a comment to the repo.
There was a problem hiding this comment.
Currently you can find the Dockerfile here: https://github.com/dannyspadaro/webatlas-pipeline/tree/update_dependencies
You can build it by running /envs/build-docker-imgs.sh
I will replace the container once PR usegalaxy-eu/docker-webatlas#1 is done
| <option value="spaceranger">SpaceRanger output archive (ZIP)</option> | ||
| <option value="xenium">Xenium output archive (ZIP)</option> | ||
| <option value="merscope">MERSCOPE output archive (ZIP)</option> |
There was a problem hiding this comment.
ZIP files will be error-prone and will fail if an specific input is not in the ZIP.
Alternatively, Maybe you can use and SpatialData object (output of spatialdata_io tool) which is already a ZARR file and extract the AnnData ZARR from it?
There was a problem hiding this comment.
Would users necessarily (want to) run spatialdata_io beforehand?
Trying/implementing this now would complicate the work on my thesis a lot I think, so I'd like to postpone it if that's okay.
| <option value="spaceranger">SpaceRanger output archive (ZIP)</option> | ||
| <option value="xenium">Xenium output archive (ZIP)</option> | ||
| <option value="merscope">MERSCOPE output archive (ZIP)</option> | ||
| <!-- Currently there is no usecase for this option. It can be implemented on request --> |
There was a problem hiding this comment.
ZIP files will be error-prone and will fail if an specific input is not in the ZIP.
Alternatively, Maybe you can use and SpatialData object (output of spatialdata_io tool) which is already a ZARR file and extract the AnnData ZARR from it?
same for generate_image.xml
| <param name="input_label_img" type="data" format="tif,tiff" optional="true" label="Label image TIFF" help="Optional label TIFF image to include in the SpatialData Zarr."/> | ||
| </inputs> | ||
| <outputs> | ||
| <data name="output_zarr" format="zarr.zip" label="${tool.name} on ${on_string}: ZIP-compressed SpatialData Zarr output"/> |
There was a problem hiding this comment.
| <data name="output_zarr" format="zarr.zip" label="${tool.name} on ${on_string}: ZIP-compressed SpatialData Zarr output"/> | |
| <data name="output_zarr" format="spatialdata.zip" label="${tool.name} on ${on_string}: ZIP-compressed SpatialData Zarr output"/> |
There was a problem hiding this comment.
The output of write_spatialdata.py is actually a Zarr, so this should also be Zarr I think?
| <param name="input_label_img" location="https://zenodo.org/records/19053876/files/visium-breast-cancer-label.tif"/> | ||
| <output name="output_zarr"> | ||
| <assert_contents> | ||
| <has_archive_member path="visium-breast-cancer-spatialdata.zarr/.zgroup"/> |
There was a problem hiding this comment.
You can also assert the file contents. You can take a look at spatialdata too suite on tools IUC repo
|
Hi @dannyspadaro, Thanks for the great work! Two other points from my side:
One minor point: pleasae add "webatlas_" to the xml files here. please check the best practive here: https://galaxy-iuc-standards.readthedocs.io/en/latest/best_practices/tool_xml.html#tool-ids |
|
Please also run |
| <param name="stem" value="visium-breast-cancer"/> | ||
| <param name="image_type" value="label"/> | ||
| <output name="output_zarr"> | ||
| <extra_files type="file" name="visium-breast-cancer-label.zarr/OME/METADATA.ome.xml" location="https://zenodo.org/records/19461849/files/consolidate_expected_ome_label_metadata_contains.txt" compare="contains"/> |
There was a problem hiding this comment.
I am not sure whether compare="contains" works for extra_files. Here anyways you want to check the file in the zarr is same as the file you provided. Please use compare="sim_size" with a small delta.
| <param name="stem" value="visium-breast-cancer"/> | ||
| <param name="image_type" value="raw"/> | ||
| <output name="output_zarr"> | ||
| <extra_files type="file" name="visium-breast-cancer-raw.zarr/OME/METADATA.ome.xml" location="https://zenodo.org/records/19461849/files/consolidate_expected_ome_raw_metadata_contains.txt" compare="contains"/> |
There was a problem hiding this comment.
same as above, use compare="sim_size"
| </section> | ||
| </conditional> | ||
| <output name="output_zarr"> | ||
| <extra_files type="file" name="h5ad-anndata.zarr/.zmetadata" location="https://zenodo.org/records/19461849/files/h5ad_var_subset_expected_zmetadata_contains.txt" compare="contains"/> |
There was a problem hiding this comment.
please replace the contains with sim_size. Also for all extra_files comparison in other tests too
…, add macros, fix citation, remove filters
Co-authored-by: Pavankumar Videm <pavanvidem@gmail.com>
|
Tests are not running, the shed.yml file is missing. |
|
Added shed.yml. The tests still might fail because there is no required Docker container. Please review it here: usegalaxy-eu/docker-webatlas#2 |
|
Commented, in the Docker one. You need to create a tagged release to get a new contianer. |
| </macros> | ||
| <expand macro="requirements"/> | ||
| <command detect_errors="exit_code"><![CDATA[ | ||
| if tiffinfo $input_image | grep "Compression Scheme:" | grep -wq "JPEG"; |
| </macros> | ||
| <expand macro="requirements"/> | ||
| <command detect_errors="exit_code"><![CDATA[ | ||
| if tiffinfo $input_image | grep "Compression Scheme:" | grep -wq "JPEG"; |
There was a problem hiding this comment.
What is this doing? Can we not make decisions based on Galaxy metadata of those datasets?
There was a problem hiding this comment.
checks if it is a JPEG compressed TIFF image. I don't think this information is stored in the metadata.
Co-authored-by: Björn Grüning <bjoern@gruenings.eu>
FOR CONTRIBUTOR:
There are two labels that allow to ignore specific (false positive) tool linter errors:
skip-version-check: Use it if only a subset of the tools has been updated in a suite.skip-url-check: Use it if github CI sees 403 errors, but the URLs work.