ngio 0.2.0b1__tar.gz → 0.2.0b2__tar.gz

ngio-0.2.0b2/.github/scripts/download_data.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+# filepath: download_zarr_datasets.sh
+
+# Default download directory
+DOWNLOAD_DIR="data"
+
+# Create download directory if it doesn't exist
+mkdir -p "$DOWNLOAD_DIR"
+
+# Function to check MD5 hash
+check_md5() {
+    local file="$1"
+    local expected="$2"
+    
+    if [[ "$(uname)" == "Darwin" ]]; then
+        # macOS
+        actual=$(md5 -q "$file")
+    else
+        # Linux/Ubuntu
+        actual=$(md5sum "$file" | awk '{print $1}')
+    fi
+
+    echo "Expected: $expected"
+    echo "Actual: $actual"
+    
+    if [[ "$actual" == "$expected" ]]; then
+        return 0  # Success
+    else
+        return 1  # Failure
+    fi
+}
+
+# Function to download a file
+download_file() {
+    local url="$1"
+    local output="$2"
+    
+    echo "Downloading $url to $output..."
+    
+    if command -v curl &> /dev/null; then
+        curl -L -o "$output" "$url"
+    elif command -v wget &> /dev/null; then
+        wget -O "$output" "$url"
+    else
+        echo "Error: Neither curl nor wget is available. Please install one of them."
+        exit 1
+    fi
+}
+
+# Function to process a dataset
+process_dataset() {
+    local filename="$1"
+    local url="$2"
+    local expected_hash="$3"
+    
+    local file_path="$DOWNLOAD_DIR/$filename"
+    
+    echo "Processing $filename..."
+    
+    # Check if file exists and has the correct hash
+    if [[ -f "$file_path" ]] && check_md5 "$file_path" "$expected_hash"; then
+        echo "File exists and has the correct hash."
+    else
+        # File doesn't exist or has incorrect hash
+        if [[ -f "$file_path" ]]; then
+            echo "File exists but has incorrect hash. Redownloading..."
+        else
+            echo "File doesn't exist. Downloading..."
+        fi
+        
+        download_file "$url" "$file_path"
+        
+        # Verify the downloaded file
+        if check_md5 "$file_path" "$expected_hash"; then
+            echo "Download successful and hash verified."
+        else
+            echo "Error: Downloaded file has incorrect hash."
+            return 1
+        fi
+    fi
+    
+    echo "File is ready at $file_path"
+    return 0
+}
+
+# Process the CardioMyocyte dataset
+process_dataset "20200812-CardiomyocyteDifferentiation14-Cycle1.zarr.zip" \
+                "https://zenodo.org/records/13305156/files/20200812-CardiomyocyteDifferentiation14-Cycle1.zarr.zip" \
+                "efc21fe8d4ea3abab76226d8c166452c"
+
+process_dataset "20200812-CardiomyocyteDifferentiation14-Cycle1_mip.zarr.zip" \
+                "https://zenodo.org/records/13305316/files/20200812-CardiomyocyteDifferentiation14-Cycle1_mip.zarr.zip" \
+                "3ed3ea898e0ed42d397da2e1dbe40750"
+# To add more datasets, add more calls to process_dataset like this:
+# process_dataset "filename.zip" "download_url" "expected_md5_hash"
+
+echo "All datasets processed."

ngio-0.2.0b2/.github/workflows/build_docs.yml

@@ -0,0 +1,60 @@
+name: Build Docs
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+
+jobs:
+  download-test-ome-zarr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check and Download Artifacts
+        run: |
+          bash .github/scripts/download_data.sh
+
+  deploy:
+    name: Deploy Docs
+    needs: download-test-ome-zarr
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 🐍 Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+          cache-dependency-path: "pyproject.toml"
+          cache: "pip"
+
+      - name: Install Dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install .[dev]
+          python -m pip install .[docs]
+
+      - name: Configure Git user
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+        
+      - name: Deploy docs
+        run: |
+          VERSION=$(echo $GITHUB_REF | sed 's/refs\/tags\///' | sed 's/refs\/heads\///')
+          echo "Deploying version $VERSION"
+          # Check if the version is a stable release
+          # Meaning that starts with "v" and contains only numbers and dots
+          if [[ $GITHUB_REF == refs/tags/* ]] && [[ $VERSION =~ ^v[0-9.]+$ ]]; then
+            mike deploy --push --update-aliases $VERSION stable
+            mike set-default --push stable
+            echo "Deployed stable version"
+          else
+            mike deploy --push dev
+            echo "Deployed development version"
+          fi

{ngio-0.2.0b1 → ngio-0.2.0b2}/.github/workflows/ci.yml

@@ -26,8 +26,24 @@ jobs:
       - uses: actions/checkout@v4
       - run: pipx run check-manifest
 
+  
+  download-test-ome-zarr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check and Download Artifacts
+        run: |
+          bash .github/scripts/download_data.sh
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: data
+          path: data
+
+
   test:
     name: ${{ matrix.platform }} (${{ matrix.python-version }})
+    needs: download-test-ome-zarr
     runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
@@ -44,6 +60,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: actions/download-artifact@v4
+        with:
+          name: data
+          path: data
+
+      - name: Check Artifacts
+        run: |
+          ls -l data
+
       - name: 🐍 Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:

{ngio-0.2.0b1 → ngio-0.2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ngio
-Version: 0.2.0b1
+Version: 0.2.0b2
 Summary: Next Generation file format IO
 Project-URL: homepage, https://github.com/lorenzocerrone/ngio
 Project-URL: repository, https://github.com/lorenzocerrone/ngio
@@ -41,6 +41,7 @@ Requires-Dist: rich; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Requires-Dist: scikit-image; extra == 'dev'
 Provides-Extra: docs
+Requires-Dist: mike; extra == 'docs'
 Requires-Dist: mkdocs; extra == 'docs'
 Requires-Dist: mkdocs-autorefs; extra == 'docs'
 Requires-Dist: mkdocs-git-committers-plugin-2; extra == 'docs'
@@ -60,7 +61,7 @@ Description-Content-Type: text/markdown
 [![License](https://img.shields.io/pypi/l/ngio.svg?color=green)](https://github.com/lorenzocerrone/ngio/raw/main/LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/ngio.svg?color=green)](https://pypi.org/project/ngio)
 [![Python Version](https://img.shields.io/pypi/pyversions/ngio.svg?color=green)](https://python.org)
-[![CI](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml/badge.svg)](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml)
+[![CI](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/ngio/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/fractal-analytics-platform/ngio/graph/badge.svg?token=FkmF26FZki)](https://codecov.io/gh/fractal-analytics-platform/ngio)
 
 NGIO is a Python library to streamline OME-Zarr image analysis workflows.

{ngio-0.2.0b1 → ngio-0.2.0b2}/README.md

@@ -3,7 +3,7 @@
 [![License](https://img.shields.io/pypi/l/ngio.svg?color=green)](https://github.com/lorenzocerrone/ngio/raw/main/LICENSE)
 [![PyPI](https://img.shields.io/pypi/v/ngio.svg?color=green)](https://pypi.org/project/ngio)
 [![Python Version](https://img.shields.io/pypi/pyversions/ngio.svg?color=green)](https://python.org)
-[![CI](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml/badge.svg)](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml)
+[![CI](https://github.com/lorenzocerrone/ngio/actions/workflows/ci.yml/badge.svg)](https://github.com/fractal-analytics-platform/ngio/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/fractal-analytics-platform/ngio/graph/badge.svg?token=FkmF26FZki)](https://codecov.io/gh/fractal-analytics-platform/ngio)
 
 NGIO is a Python library to streamline OME-Zarr image analysis workflows.

{ngio-0.2.0b1 → ngio-0.2.0b2}/docs/notebooks/basic_usage.ipynb

@@ -22,11 +22,17 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from pathlib import Path\n",
+    "\n",
     "from ngio import open_omezarr_container\n",
     "from ngio.utils import download_ome_zarr_dataset\n",
     "\n",
-    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteSmallMip\")\n",
+    "# Download the dataset\n",
+    "download_dir = Path(\".\").absolute().parent.parent / \"data\"\n",
+    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteSmallMip\", download_dir=download_dir)\n",
     "image_path = hcs_path / \"B\" / \"03\" / \"0\"\n",
+    "\n",
+    "# Open the ome-zarr container\n",
     "omezarr_container = open_omezarr_container(image_path)"
    ]
   },

{ngio-0.2.0b1 → ngio-0.2.0b2}/docs/notebooks/image.ipynb

@@ -15,13 +15,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from pathlib import Path\n",
+    "\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
     "from ngio import open_omezarr_container\n",
     "from ngio.utils import download_ome_zarr_dataset\n",
     "\n",
-    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteSmallMip\")\n",
+    "# Download the dataset\n",
+    "download_dir = Path(\".\").absolute().parent.parent / \"data\"\n",
+    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteSmallMip\", download_dir=download_dir)\n",
     "image_path = hcs_path / \"B\" / \"03\" / \"0\"\n",
+    "\n",
+    "# Open the ome-zarr container\n",
     "omezarr = open_omezarr_container(image_path)"
    ]
   },

{ngio-0.2.0b1 → ngio-0.2.0b2}/docs/notebooks/processing.ipynb

@@ -33,13 +33,19 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from pathlib import Path\n",
+    "\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
     "from ngio import open_omezarr_container\n",
     "from ngio.utils import download_ome_zarr_dataset\n",
     "\n",
-    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteTiny\")\n",
+    "# Download the dataset\n",
+    "download_dir = Path(\".\").absolute().parent.parent / \"data\"\n",
+    "hcs_path = download_ome_zarr_dataset(\"CardiomyocyteTiny\", download_dir=download_dir)\n",
     "image_path = hcs_path / \"B\" / \"03\" / \"0\"\n",
+    "\n",
+    "# Open the ome-zarr container\n",
     "omezarr = open_omezarr_container(image_path)"
    ]
   },

{ngio-0.2.0b1 → ngio-0.2.0b2}/mkdocs.yml

@@ -40,6 +40,8 @@ theme:
     - search.share
 
 extra:
+  version:
+    provider: mike
   social:
     - icon: fontawesome/brands/github
       link: "https://github.com/fractal-analytics-platform/ngio"

{ngio-0.2.0b1 → ngio-0.2.0b2}/pyproject.toml

@@ -76,6 +76,7 @@ docs = [
     "mkdocs-git-revision-date-localized-plugin",
     "mkdocs-git-committers-plugin-2",
     "scikit-image",
+    "mike",
 ]
 
 

{ngio-0.2.0b1 → ngio-0.2.0b2}/src/ngio/tables/backends/_anndata_utils.py

@@ -41,6 +41,9 @@ def custom_read_zarr(
     """
     group, _ = open_group_wrapper(store=store, mode="r")
 
+    if not isinstance(group.store, zarr.DirectoryStore):
+        elem_to_read = ["X", "obs", "var"]
+
     if elem_to_read is None:
         elem_to_read = [
             "X",

{ngio-0.2.0b1 → ngio-0.2.0b2}/tests/conftest.py

@@ -6,7 +6,7 @@ import pytest
 
 from ngio.utils import download_ome_zarr_dataset
 
-zenodo_download_dir = Path("tests/data/v04/zenodo_images/")
+zenodo_download_dir = Path(__file__).parent.parent / "data"
 os.makedirs(zenodo_download_dir, exist_ok=True)
 cardiomyocyte_tiny_source_path = download_ome_zarr_dataset(
     "CardiomyocyteTiny", download_dir=zenodo_download_dir

{ngio-0.2.0b1 → ngio-0.2.0b2}/tests/unit/images/test_omezarr_container.py

@@ -152,4 +152,4 @@ def test_remote_omezarr_container():
     # ]
 
     _ = omezarr.get_label("nuclei", path="0")
-    # _ = omezarr.get_table("well_ROI_table")
+    _ = omezarr.get_table("well_ROI_table", check_type="roi_table")

ngio-0.2.0b1/.github/workflows/build_docs.yml

@@ -1,39 +0,0 @@
-name: Build Docs
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "v*"
-
-jobs:
-  deploy:
-    name: Deploy Docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: 🐍 Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          cache-dependency-path: "pyproject.toml"
-          cache: "pip"
-
-      - name: Install Dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install .[dev]
-          python -m pip install .[docs]
-
-      - name: 📚 Build Docs
-        run: mkdocs build --clean
-
-      # If something goes wrong with --pre tests, we can open an issue in the repo
-      - name: Deploy Docs
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          personal_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./site