fix(wasm): handle different WASM file naming for older versions

Author: jspanchu

examples/vtk/file_viewer.py

@@ -4,7 +4,7 @@
 from trame_vtklocal.widgets import vtklocal
 from trame.decorators import TrameApp, trigger
 
-from vtkmodules.vtkIOXML import vtkXMLPolyDataReader
+from vtkmodules.vtkIOXML import vtkXMLPolyDataReader, vtkXMLMultiBlockDataReader
 from vtkmodules.vtkRenderingCore import (
     vtkActor,
     vtkPolyDataMapper,
@@ -33,15 +33,25 @@ def create_vtk_pipeline(file_name):
     renderWindowInteractor.SetRenderWindow(renderWindow)
     renderWindowInteractor.GetInteractorStyle().SetCurrentStyleToTrackballCamera()
 
-    reader = vtkXMLPolyDataReader(file_name=file_name)
-
-    mapper = vtkPolyDataMapper(scalar_visibility=False)
-    mapper.SetInputConnection(reader.GetOutputPort())
-
-    actor = vtkActor()
-    actor.SetMapper(mapper)
-
-    renderer.AddActor(actor)
+    if file_name.endswith(".vtm"):
+        reader = vtkXMLMultiBlockDataReader(file_name=file_name)
+        reader.Update()
+        mbdset = reader.GetOutput()
+        for i in range(mbdset.GetNumberOfBlocks()):
+            block = mbdset.GetBlock(i)
+            mapper = vtkPolyDataMapper(scalar_visibility=False)
+            mapper.SetInputDataObject(0, block)
+            actor = vtkActor()
+            actor.SetMapper(mapper)
+            renderer.AddActor(actor)
+    else:
+        reader = vtkXMLPolyDataReader(file_name=file_name)
+        mapper = vtkPolyDataMapper(scalar_visibility=False)
+        mapper.SetInputConnection(reader.GetOutputPort())
+        actor = vtkActor()
+        actor.SetMapper(mapper)
+
+        renderer.AddActor(actor)
     renderer.SetBackground(0.1, 0.2, 0.4)
     renderer.ResetCamera()
 

src/trame_vtklocal/module/wasm.py

@@ -4,6 +4,7 @@
 import os
 import shutil
 import tarfile
+from packaging.version import parse
 
 
 def run_async(coroutine):
@@ -86,18 +87,31 @@ def register_wasm(serve_path, **kwargs):
         # get wasm version and url
         wasm_url = kwargs.get("wasm_url", wasm_url)
 
-        if (
-            not dest_directory.joinpath(f"{wasm_base_name}WebAssembly.mjs").exists()
-            or not dest_directory.joinpath(f"{wasm_base_name}WebAssembly.wasm").exists()
-            or not dest_directory.joinpath(
-                f"{wasm_base_name}WebAssemblyAsync.mjs"
-            ).exists()
-            or not dest_directory.joinpath(
-                f"{wasm_base_name}WebAssemblyAsync.wasm"
-            ).exists()
-        ):
-            # if the wasm directory does not exist, we need to download it
-            run_async(setup_wasm_directory(dest_directory, wasm_url))
+        # if the required wasm files do not exist, we need to download them
+        # Versions before 9.5.20250531 use different WASM file naming conventions.
+        # this cutoff distinguishes between old and new formats.
+        if parse(version) < parse("9.5.20250531"):
+            # For older versions, the wasm files are named differently.
+            if (
+                not dest_directory.joinpath("vtkWasmSceneManager.mjs").exists()
+                or not dest_directory.joinpath("vtkWasmSceneManager.wasm").exists()
+            ):
+                run_async(setup_wasm_directory(dest_directory, wasm_url))
+        else:
+            if (
+                not dest_directory.joinpath(f"{wasm_base_name}WebAssembly.mjs").exists()
+                or not dest_directory.joinpath(
+                    f"{wasm_base_name}WebAssembly.wasm"
+                ).exists()
+                or not dest_directory.joinpath(
+                    f"{wasm_base_name}WebAssemblyAsync.mjs"
+                ).exists()
+                or not dest_directory.joinpath(
+                    f"{wasm_base_name}WebAssemblyAsync.wasm"
+                ).exists()
+            ):
+                run_async(setup_wasm_directory(dest_directory, wasm_url))
+
     return dict(
         state={
             "__trame_vtklocal_wasm_url": BASE_URL,