build(compare-images): add python pixi configuration

Also add missing spatial_tolerance to emscripten package.

Author: thewtex

packages/compare-images/.gitignore

@@ -4,4 +4,4 @@ dist/
 test/
 package-lock.json
 typescript/test/browser/demo-app/public
-micromamba/
+pyodide/

packages/compare-images/environment.yml

@@ -23,26 +23,24 @@
     "build:emscripten:debug": "itk-wasm pnpm-script build:emscripten:debug",
     "build:wasi": "itk-wasm pnpm-script build:wasi",
     "build:wasi:debug": "itk-wasm pnpm-script build:wasi:debug",
-    "build:python:wasi": "itk-wasm pnpm-script build:python:wasi",
+    "build:python:wasi": "echo 'No build:python:wasi script required with pixi'",
     "bindgen:typescript": "itk-wasm pnpm-script bindgen:typescript",
     "bindgen:python": "itk-wasm pnpm-script bindgen:python",
     "build:gen:typescript": "itk-wasm pnpm-script build:gen:typescript",
-    "build:gen:python": "itk-wasm pnpm-script build:gen:python",
-    "build:micromamba": "itk-wasm pnpm-script build:micromamba",
+    "build:gen:python": "pnpm build:wasi && pnpm bindgen:python",
     "build:python:versionSync": "itk-wasm pnpm-script build:python:versionSync",
     "publish:python": "itk-wasm pnpm-script publish:python",
     "test": "pnpm test:data:download && pnpm build:gen:python && pnpm test:python",
     "test:data:download": "dam download test/data test/data.tar.gz bafybeiafli6egtmkcgany65po64w67hpqnmgwr5utqo6ycbbz7k5l33llu https://github.com/InsightSoftwareConsortium/ITK-Wasm/releases/download/itk-wasm-v1.0.0-b.171/compare-images-test-data.tar.gz",
     "test:data:pack": "dam pack test/data test/data.tar.gz",
-    "test:python:wasi": "itk-wasm pnpm-script test:python:wasi",
-    "test:python:emscripten": "itk-wasm pnpm-script test:python:emscripten",
-    "test:python:dispatch": "itk-wasm pnpm-script test:python:emscripten",
-    "test:python": "itk-wasm pnpm-script test:python"
+    "test:python:wasi": "pixi run test-wasi",
+    "test:python:emscripten": "pixi run test-emscripten",
+    "test:python:dispatch": "pixi run test-dispatch",
+    "test:python": "pixi run test-python"
   },
   "license": "Apache-2.0",
   "devDependencies": {
     "@itk-wasm/dam": "^1.1.0",
-    "@thewtex/setup-micromamba": "^1.9.7",
     "itk-wasm": "workspace:^",
     "@itk-wasm/image-io-build": "workspace:^"
   }

packages/compare-images/package.json

@@ -0,0 +1,85 @@
+[project]
+authors = ["Matt McCormick <[email protected]>"]
+channels = ["conda-forge"]
+description = "Compare images with a tolerance for regression testing."
+name = "compare-images"
+platforms = ["win-64", "linux-64", "linux-aarch64", "osx-arm64"]
+version = "0.1.0"
+
+[tasks]
+
+[dependencies]
+python = "3.12.*"
+pnpm = ">=9.12.1,<10"
+
+[feature.python.dependencies]
+pytest = ">=8.3.3,<9"
+pip = ">=24.2,<25"
+
+[feature.python.pypi-dependencies]
+hatch = ">=1.13.0, <2"
+itkwasm-compare-images-wasi = { path = "python/itkwasm-compare-images-wasi", editable = true }
+itkwasm-compare-images = { path = "python/itkwasm-compare-images", editable = true }
+pyodide-py = ">=0.26.3, <0.27"
+pytest-pyodide = ">=0.58.3, <0.59"
+itk-webassemblyinterface = ">=1.0b175, <2"
+itkwasm-image-io = ">=1.3.0, <2"
+
+[feature.python.tasks.test-wasi]
+cmd = "pytest"
+cwd = "python/itkwasm-compare-images-wasi"
+description = "Run tests for itkwasm-compare-images-wasi"
+
+[feature.python.tasks.download-pyodide]
+cmd = '''curl -L https://github.com/pyodide/pyodide/releases/download/0.26.3/pyodide-0.26.3.tar.bz2 -o pyodide.tar.bz2 &&
+  tar xjf pyodide.tar.bz2 &&
+  rm pyodide.tar.bz2'''
+outputs = ["pyodide"]
+description = "Download Pyodide"
+
+[feature.python.tasks.test-emscripten]
+cmd = '''mkdir -p dist/pyodide &&
+  cp -r ../../pyodide dist/ &&
+  hatch build -t wheel ./dist/pyodide/ &&
+  pytest --dist-dir=./dist/pyodide --rt=chrome'''
+cwd = "python/itkwasm-compare-images-emscripten"
+depends-on = ["download-pyodide"]
+description = "Run tests for itkwasm-compare-images-emscripten"
+
+[feature.python.tasks.serve-emscripten]
+cmd = '''mkdir -p dist/pyodide &&
+  cp -r ../../pyodide dist/ &&
+  hatch build -t wheel ./dist/pyodide/ &&
+  echo \"\nVisit http://localhost:8877/console.html\n\" &&
+  python -m http.server --directory=./dist/pyodide 8877'''
+cwd = "python/itkwasm-compare-images-emscripten"
+depends-on = ["download-pyodide"]
+description = "Serve itkwasm-compare-images-emscripten for development"
+
+[feature.python.tasks.test-dispatch]
+cmd = '''mkdir -p dist/pyodide &&
+  cp -r ../../pyodide dist/ &&
+  hatch build -t wheel ./dist/pyodide/ &&
+  cp ../itkwasm-compare-images-emscripten/dist/pyodide/itkwasm_compare_images_emscripten*.whl ./dist/pyodide/ &&
+  pytest --dist-dir=./dist/pyodide --rt=chrome'''
+cwd = "python/itkwasm-compare-images"
+depends-on = ["download-pyodide"]
+description = "Run tests for itkwasm-compare-images"
+
+[feature.python.tasks.serve-dispatch]
+cmd = '''mkdir -p dist/pyodide &&
+  cp -r ../../pyodide dist/ &&
+  hatch build -t wheel ./dist/pyodide/ &&
+  echo \"\nVisit http://localhost:8877/console.html\n\" &&
+  python -m http.server --directory=./dist/pyodide 8877'''
+cwd = "python/itkwasm-compare-images"
+depends-on = ["download-pyodide"]
+description = "Serve itkwasm-compare-images for development"
+
+[feature.python.tasks.test-python]
+cmd = "echo 'Testing all Python packages'"
+depends-on = ["test-wasi", "test-emscripten", "test-dispatch"]
+description = "Run tests for all Python packages"
+
+[environments]
+python = ["python"]

packages/compare-images/pixi.lock

@@ -18,6 +18,7 @@ async def compare_double_images_async(
     test_image: Image,
     baseline_images: List[Image] = [],
     difference_threshold: float = 0,
+    spatial_tolerance: float = 1e-08,
     radius_tolerance: int = 0,
     number_of_pixels_tolerance: int = 0,
     ignore_boundary_pixels: bool = False,
@@ -33,6 +34,9 @@ async def compare_double_images_async(
     :param difference_threshold: Intensity difference for pixels to be considered different.
     :type  difference_threshold: float
 
+    :param spatial_tolerance: Tolerance for comparing spatial overlap (origin and direction matrix).
+    :type  spatial_tolerance: float
+
     :param radius_tolerance: Radius of the neighborhood around a pixel to search for similar intensity values.
     :type  radius_tolerance: int
 
@@ -59,6 +63,8 @@ async def compare_double_images_async(
         kwargs["baselineImages"] = to_js(baseline_images)
     if difference_threshold:
         kwargs["differenceThreshold"] = to_js(difference_threshold)
+    if spatial_tolerance:
+        kwargs["spatialTolerance"] = to_js(spatial_tolerance)
     if radius_tolerance:
         kwargs["radiusTolerance"] = to_js(radius_tolerance)
     if number_of_pixels_tolerance:

packages/compare-images/pixi.toml

@@ -11,6 +11,10 @@
 def package_wheel():
     return f"itkwasm_compare_images-{test_package_version}-py3-none-any.whl"
 
+@pytest.fixture
+def emscripten_package_wheel():
+    return f"itkwasm_compare_images_emscripten-{test_package_version}-py3-none-any.whl"
+
 @pytest.fixture
 def input_data():
     from pathlib import Path

packages/compare-images/python/itkwasm-compare-images-emscripten/itkwasm_compare_images_emscripten/compare_double_images_async.py

@@ -4,11 +4,12 @@
     pytest.skip("Skipping pyodide tests on older Python", allow_module_level=True)
 
 from pytest_pyodide import run_in_pyodide
-from .fixtures import package_wheel, input_data
+from .fixtures import emscripten_package_wheel, package_wheel, input_data
 
 @run_in_pyodide(packages=['micropip', 'numpy'])
-async def test_compare_double_images_async(selenium, package_wheel, input_data):
+async def test_compare_double_images_async(selenium, emscripten_package_wheel, package_wheel, input_data):
     import micropip
+    await micropip.install(emscripten_package_wheel)
     await micropip.install(package_wheel)
     await micropip.install('itkwasm-image-io-emscripten')
     def write_input_data_to_fs(input_data, filename):
@@ -42,8 +43,9 @@ def write_input_data_to_fs(input_data, filename):
     assert difference_image_rendering.imageType.componentType == 'uint8'
 
 @run_in_pyodide(packages=['micropip', 'numpy'])
-async def test_compare_images_async(selenium, package_wheel, input_data):
+async def test_compare_images_async(selenium, emscripten_package_wheel, package_wheel, input_data):
     import micropip
+    await micropip.install(emscripten_package_wheel)
     await micropip.install(package_wheel)
     await micropip.install('itkwasm-image-io-emscripten')
     def write_input_data_to_fs(input_data, filename):
@@ -110,8 +112,8 @@ def write_input_data_to_fs(input_data, filename):
     assert metrics['numberOfPixelsWithDifferences'] == 26477
     assert metrics['minimumDifference'] == 0.002273026683894841
     assert metrics['maximumDifference'] == 312.2511648746159
-    assert metrics['totalDifference'] == 3121703.1639738297
-    assert metrics['meanDifference'] == 117.90244982338746
+    assert (abs(metrics['totalDifference'] - 3121703.1639738297) < 100)
+    assert (abs(metrics['meanDifference'] - 117.90244982338746) < 1)
 
     assert difference_image.imageType.componentType == 'float64'
     assert difference_image_rendering.imageType.componentType == 'uint8'