test(mesh-io): add test_read_write_point_set_async

Author: thewtex

packages/mesh-io/python/itkwasm-mesh-io-emscripten/itkwasm_mesh_io_emscripten/__init__.py

@@ -27,15 +27,15 @@
 from .wasm_zstd_read_mesh_async import wasm_zstd_read_mesh_async
 from .wasm_zstd_write_mesh_async import wasm_zstd_write_mesh_async
 
-from .obj_read_mesh_async import obj_read_mesh_async
-from .obj_write_mesh_async import obj_write_mesh_async
-from .off_read_mesh_async import off_read_mesh_async
-from .off_write_mesh_async import off_write_mesh_async
-from .vtk_poly_data_read_mesh_async import vtk_poly_data_read_mesh_async
-from .vtk_poly_data_write_mesh_async import vtk_poly_data_write_mesh_async
-from .wasm_read_mesh_async import wasm_read_mesh_async
-from .wasm_write_mesh_async import wasm_write_mesh_async
-from .wasm_zstd_read_mesh_async import wasm_zstd_read_mesh_async
-from .wasm_zstd_write_mesh_async import wasm_zstd_write_mesh_async
+from .obj_read_point_set_async import obj_read_point_set_async
+from .obj_write_point_set_async import obj_write_point_set_async
+from .off_read_point_set_async import off_read_point_set_async
+from .off_write_point_set_async import off_write_point_set_async
+from .vtk_poly_data_read_point_set_async import vtk_poly_data_read_point_set_async
+from .vtk_poly_data_write_point_set_async import vtk_poly_data_write_point_set_async
+from .wasm_read_point_set_async import wasm_read_point_set_async
+from .wasm_write_point_set_async import wasm_write_point_set_async
+from .wasm_zstd_read_point_set_async import wasm_zstd_read_point_set_async
+from .wasm_zstd_write_point_set_async import wasm_zstd_write_point_set_async
 
 from ._version import __version__

packages/mesh-io/python/itkwasm-mesh-io-emscripten/itkwasm_mesh_io_emscripten/read_point_set_async.py

@@ -56,7 +56,7 @@ async def read_point_set_async(
             js_resources.web_worker = web_worker
             could_read = to_py(outputs_object_map['couldRead'])
             if could_read:
-                point_set = to_py(outputs_object_map['point_set'])
+                point_set = to_py(outputs_object_map['pointSet'])
                 return point_set
 
     if io is None:
@@ -72,7 +72,7 @@ async def read_point_set_async(
 
     js_resources.web_worker = web_worker
 
-    point_set = to_py(outputs_object_map['point_set'])
+    point_set = to_py(outputs_object_map['pointSet'])
 
     return point_set
 

packages/mesh-io/python/itkwasm-mesh-io-emscripten/itkwasm_mesh_io_emscripten/write_point_set_async.py

@@ -81,14 +81,14 @@ async def write_point_set_async(
 
     to_py(outputs_object_map['serializedPointSet'])
 
-async def point_setwrite_async(
+async def pointsetwrite_async(
     point_set: PointSet,
     serialized_point_set: os.PathLike,
     information_only: bool = False,
     use_compression: bool = False,
 ) -> None:
     return write_point_set_async(point_set, serialized_point_set, information_only=information_only, use_compression=use_compression)
 
-point_setwrite_async.__doc__ = f"""{write_point_set_async.__doc__}
+pointsetwrite_async.__doc__ = f"""{write_point_set_async.__doc__}
     Alias for write_point_set.
     """

packages/mesh-io/python/itkwasm-mesh-io-emscripten/pyproject.toml

@@ -43,6 +43,7 @@ path = "itkwasm_mesh_io_emscripten/_version.py"
 dependencies = [
   "pytest",
   "pytest-pyodide",
+  "pyodide-py",
 ]
 
 [project.urls]

packages/mesh-io/python/itkwasm-mesh-io-emscripten/test/fixtures.py

@@ -18,6 +18,7 @@ def input_data():
     input_base_path = Path('..', '..', 'test', 'data')
     test_files = [
         Path('input') / 'cow.vtk',
+        Path('input') / 'box-points.obj',
     ]
     data = {}
     for f in test_files:

packages/mesh-io/python/itkwasm-mesh-io-emscripten/test/test_read_write_point_set_async.py

@@ -0,0 +1,47 @@
+import sys
+
+if sys.version_info < (3,10):
+    pytest.skip("Skipping pyodide tests on older Python", allow_module_level=True)
+
+import pytest
+from pytest_pyodide import run_in_pyodide
+from .fixtures import package_wheel, input_data
+
+@pytest.mark.driver_timeout(30)
+@run_in_pyodide(packages=['micropip', 'numpy'])
+async def test_read_write_point_set_async(selenium, package_wheel, input_data):
+    import micropip
+    await micropip.install(package_wheel)
+    def write_input_data_to_fs(input_data, filename):
+        with open(filename, 'wb') as fp:
+            fp.write(input_data[filename])
+
+    from pathlib import Path
+
+    from itkwasm import FloatTypes, IntTypes
+    import numpy as np
+
+    from itkwasm_mesh_io_emscripten import read_point_set_async, write_point_set_async
+
+
+    def verify_point_set(point_set):
+        assert point_set.pointSetType.dimension == 3
+        assert point_set.pointSetType.pointComponentType == FloatTypes.Float32
+        assert point_set.pointSetType.pointPixelComponentType == FloatTypes.Float32
+        assert point_set.numberOfPoints == 8
+
+    test_input_file_path = 'box-points.obj'
+    test_output_file_path = "read-write-box-points-python.obj"
+    write_input_data_to_fs(input_data, test_input_file_path)
+
+    assert Path(test_input_file_path).exists()
+
+
+    point_set = await read_point_set_async(test_input_file_path)
+    verify_point_set(point_set)
+
+    use_compression = False
+    await write_point_set_async(point_set, test_output_file_path, use_compression=use_compression)
+
+    point_set = await read_point_set_async(test_output_file_path)
+    verify_point_set(point_set)

packages/mesh-io/python/itkwasm-mesh-io/itkwasm_mesh_io/__init__.py

@@ -51,4 +51,25 @@
 from .wasm_zstd_write_mesh_async import wasm_zstd_write_mesh_async
 from .wasm_zstd_write_mesh import wasm_zstd_write_mesh
 
+from .obj_read_point_set_async import obj_read_point_set_async
+from .obj_write_point_set_async import obj_write_point_set_async
+from .off_read_point_set_async import off_read_point_set_async
+from .off_write_point_set_async import off_write_point_set_async
+from .vtk_poly_data_read_point_set_async import vtk_poly_data_read_point_set_async
+from .vtk_poly_data_write_point_set_async import vtk_poly_data_write_point_set_async
+from .wasm_read_point_set_async import wasm_read_point_set_async
+from .wasm_write_point_set_async import wasm_write_point_set_async
+from .wasm_zstd_read_point_set_async import wasm_zstd_read_point_set_async
+from .wasm_zstd_write_point_set_async import wasm_zstd_write_point_set_async
+from .obj_read_point_set import obj_read_point_set
+from .obj_write_point_set import obj_write_point_set
+from .off_read_point_set import off_read_point_set
+from .off_write_point_set import off_write_point_set
+from .vtk_poly_data_read_point_set import vtk_poly_data_read_point_set
+from .vtk_poly_data_write_point_set import vtk_poly_data_write_point_set
+from .wasm_read_point_set import wasm_read_point_set
+from .wasm_write_point_set import wasm_write_point_set
+from .wasm_zstd_read_point_set import wasm_zstd_read_point_set
+from .wasm_zstd_write_point_set import wasm_zstd_write_point_set
+
 from ._version import __version__

packages/mesh-io/python/itkwasm-mesh-io/itkwasm_mesh_io/read_point_set_async.py

@@ -10,7 +10,7 @@ async def read_point_set_async(
     serialized_point_set: os.PathLike,
     information_only: bool = False,
 ) -> PointSet:
-    """Read n point set file format and convert it to the ITK-Wasm file format.
+    """Read a point set file format and convert it to the ITK-Wasm file format.
 
     :param serialized_point_set: Input point_set serialized in the file format
     :type  serialized_point_set: os.PathLike
@@ -21,7 +21,7 @@ async def read_point_set_async(
     :return: Output point_set
     :rtype:  PointSet
     """
-    func = environment_dispatch("itkwasm_point_set_io", "read_point_set_async")
+    func = environment_dispatch("itkwasm_mesh_io", "read_point_set_async")
     output = await func(serialized_point_set, information_only=information_only)
     return output
 

packages/mesh-io/python/itkwasm-mesh-io/itkwasm_mesh_io/write_point_set_async.py

@@ -26,7 +26,7 @@ async def write_point_set_async(
     :param use_compression: Use compression in the written file
     :type  use_compression: bool
     """
-    func = environment_dispatch("itkwasm_point_set_io", "write_point_set_async")
+    func = environment_dispatch("itkwasm_mesh_io", "write_point_set_async")
     await func(point_set, serialized_point_set, information_only=information_only, use_compression=use_compression)
     return
 

packages/mesh-io/python/itkwasm-mesh-io/pyproject.toml

@@ -34,7 +34,7 @@ keywords = [
 
 requires-python = ">=3.8"
 dependencies = [
-    "itkwasm >= 1.0.b145",
+    "itkwasm >= 1.0.b179",
     "itkwasm-mesh-io-wasi; sys_platform != \"emscripten\"",
     "itkwasm-mesh-io-emscripten; sys_platform == \"emscripten\"",
 
@@ -47,6 +47,7 @@ path = "itkwasm_mesh_io/_version.py"
 dependencies = [
   "pytest",
   "pytest-pyodide",
+  "pyodide-py",
 ]
 
 [project.urls]
@@ -59,7 +60,7 @@ test = [
   "pytest --dist-dir=./dist/pyodide --rt=chrome",
 ]
 download-pyodide = [
-  "curl -L https://github.com/pyodide/pyodide/releases/download/0.25.1/pyodide-0.25.1.tar.bz2 -o pyodide.tar.bz2",
+  "curl -L https://github.com/pyodide/pyodide/releases/download/0.26.2/pyodide-0.26.2.tar.bz2 -o pyodide.tar.bz2",
   "tar xjf pyodide.tar.bz2",
   "rm -rf dist/pyodide pyodide.tar.bz2",
   "mkdir -p dist",