-
Notifications
You must be signed in to change notification settings - Fork 92
Add downloadable cells dataset via scverse-misc #1149
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
Open
timtreis
wants to merge
12
commits into
main
Choose a base branch
from
add-cells-dataset
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+124
−2
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
74deacc
Add downloadable cells dataset via scverse-misc
timtreis c453909
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 49d0309
Fix mypy no-any-return in cells()
timtreis a48e66d
Bump scverse-misc pin to >=0.1.0 (first released datasets version)
timtreis bd6a031
Merge branch 'main' into add-cells-dataset
timtreis 1e50d1f
Merge branch 'main' into add-cells-dataset
timtreis 5944eda
Add license and attribution to cells dataset registry
timtreis 6db5d5c
Merge branch 'main' into add-cells-dataset
timtreis de3d7ad
Merge branch 'main' into add-cells-dataset
timtreis d62ede0
refactor(datasets): address review on cells()
timtreis 8fbefb1
Merge branch 'main' into add-cells-dataset
timtreis b226ab9
fix(datasets): satisfy mypy no-any-return in _shipped_registry
timtreis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Registry of downloadable example datasets for ``spatialdata.datasets``. | ||
| # | ||
| # Parsed by ``scverse_misc.datasets.parse_registry`` and fetched (downloaded, | ||
| # hash-verified, cached and loaded) via ``scverse_misc.datasets.fetch``. | ||
| # | ||
| # type: spatialdata -> a .zip that extracts to a single .zarr store | ||
| # | ||
| # Every dataset must list its ``license``; datasets under a license that requires | ||
| # attribution must also carry an ``attribution`` string crediting the original source. | ||
| base_url: https://exampledata.scverse.org/spatialdata/ | ||
| datasets: | ||
| cells: | ||
| type: spatialdata | ||
| doc_header: Cells dataset as a SpatialData object. | ||
| license: CC BY 4.0 | ||
| attribution: >- | ||
| Derived from the 10x Genomics Xenium Prime Cervical Cancer FFPE dataset | ||
| (https://www.10xgenomics.com/datasets/xenium-prime-ffpe-human-cervical-cancer), | ||
| subset to a small tissue region. Licensed under CC BY 4.0. | ||
| files: | ||
| - name: cells.zip | ||
| s3_key: cells.zip | ||
| sha256: dc9613cb9e16fd2cd8d83f3a9586eeda4af5ba8ba366f1066efb51305820c5fb |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,12 @@ | ||
| from __future__ import annotations | ||
|
|
||
| from spatialdata.datasets import blobs, raccoon | ||
| from pathlib import Path | ||
|
|
||
| import pooch | ||
| import pytest | ||
|
|
||
| from spatialdata import SpatialData | ||
| from spatialdata.datasets import _cache_dir, _shipped_registry, blobs, cells, raccoon | ||
|
|
||
|
|
||
| def test_datasets() -> None: | ||
|
|
@@ -26,3 +32,41 @@ def test_datasets() -> None: | |
| assert sdata_raccoon.images["raccoon"].shape == (3, 768, 1024) | ||
| assert sdata_raccoon.labels["segmentation"].shape == (768, 1024) | ||
| _ = str(sdata_raccoon) | ||
|
|
||
|
|
||
| def test_cells_registry() -> None: | ||
| # Network-free: the shipped registry parses and exposes the cells dataset. | ||
| base_url, datasets = _shipped_registry() | ||
|
|
||
| assert base_url == "https://exampledata.scverse.org/spatialdata/" | ||
| entry = datasets["cells"] | ||
| assert entry.type == "spatialdata" | ||
| file = entry.file(name="cells.zip") | ||
| assert file.sha256 == "dc9613cb9e16fd2cd8d83f3a9586eeda4af5ba8ba366f1066efb51305820c5fb" | ||
| assert file.resolve_url(base_url) == "https://exampledata.scverse.org/spatialdata/cells.zip" | ||
|
|
||
|
|
||
| def test_cache_dir() -> None: | ||
| # Network-free: both branches of the cache-directory resolution. | ||
| assert _cache_dir("/tmp/example") == Path("/tmp/example") | ||
| assert _cache_dir(None) == Path(pooch.os_cache("spatialdata")) | ||
|
|
||
|
|
||
| @pytest.mark.slow | ||
| def test_cells_download(tmp_path) -> None: | ||
| # Downloads ~3 MB from the scverse example data bucket; opt out with `-m "not slow"`. | ||
| sdata = cells(path=str(tmp_path)) | ||
| assert isinstance(sdata, SpatialData) | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In case we want to write tests based on this dataset, it would be good if this test would verify some particular of the dataset similar to |
||
|
|
||
| assert set(sdata.images) == {"he_aligned", "he_image", "morphology_focus"} | ||
| assert sdata.images["he_aligned"]["scale0"]["image"].shape == (3, 430, 540) | ||
| assert sdata.images["he_image"]["scale0"]["image"].shape == (3, 423, 339) | ||
| assert sdata.images["morphology_focus"]["scale0"]["image"].shape == (4, 430, 540) | ||
|
|
||
| assert set(sdata.labels) == {"cell_labels", "nucleus_labels", "tissue_labels"} | ||
| assert sdata.labels["cell_labels"]["scale0"]["image"].shape == (430, 540) | ||
|
|
||
| assert len(sdata.shapes["cell_boundaries"]) == 94 | ||
| assert len(sdata.shapes["nucleus_boundaries"]) == 94 | ||
| assert len(sdata.points["transcripts"].compute()) == 19479 | ||
| assert sdata.tables["table"].shape == (94, 5101) | ||
Oops, something went wrong.
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.
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.
It would be good to include a brief description of what this dataset contains, to help developers adopt it.