diff --git a/src/trame_vtk/modules/vtk/serializers/data.py b/src/trame_vtk/modules/vtk/serializers/data.py index ac806ae..59508cc 100644 --- a/src/trame_vtk/modules/vtk/serializers/data.py +++ b/src/trame_vtk/modules/vtk/serializers/data.py @@ -6,11 +6,11 @@ vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules") sys.modules["vtk_module"] = importlib.import_module(vtk_module_name) +from vtk_module.vtkCommonCore import vtkIdTypeArray # noqa: E402 from vtk_module.vtkFiltersGeometry import ( # noqa: E402 vtkCompositeDataGeometryFilter, vtkDataSetSurfaceFilter, ) -from vtkmodules.vtkCommonCore import vtkIdTypeArray # noqa: E402 from .helpers import extract_required_fields, get_array_description # noqa: E402 from .registry import class_name # noqa: E402 diff --git a/src/trame_vtk/modules/vtk/serializers/serialize.py b/src/trame_vtk/modules/vtk/serializers/serialize.py index e3dcc72..80c832e 100644 --- a/src/trame_vtk/modules/vtk/serializers/serialize.py +++ b/src/trame_vtk/modules/vtk/serializers/serialize.py @@ -1,10 +1,16 @@ +import importlib import logging +import os +import sys -import vtk +vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules") +sys.modules["vtk_module"] = importlib.import_module(vtk_module_name) -from .cache import remove_from_cache -from .registry import SERIALIZERS, class_name -from .widgets import handle_widget +from vtk_module.vtkCommonCore import vtkCommand # noqa: E402 + +from .cache import remove_from_cache # noqa: E402 +from .registry import SERIALIZERS, class_name # noqa: E402 +from .widgets import handle_widget # noqa: E402 __all__ = ["serialize", "serialize_widget"] @@ -20,7 +26,7 @@ def serialize(parent, instance, instance_id, context, depth): serializer = SERIALIZERS.get(instance_type, None) if instance_id not in DELETE_CALLBACKS: instance.AddObserver( - vtk.vtkCommand.DeleteEvent, lambda *_a, **_k: remove(instance_id) + vtkCommand.DeleteEvent, lambda *_a, **_k: remove(instance_id) ) DELETE_CALLBACKS.append(instance_id) diff --git a/src/trame_vtk/modules/vtk/serializers/utils.py b/src/trame_vtk/modules/vtk/serializers/utils.py index 7b47372..a252645 100644 --- a/src/trame_vtk/modules/vtk/serializers/utils.py +++ b/src/trame_vtk/modules/vtk/serializers/utils.py @@ -1,7 +1,13 @@ import base64 import hashlib +import importlib +import os +import sys -from vtkmodules.util import numpy_support +vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules") +sys.modules["vtk_module"] = importlib.import_module(vtk_module_name) + +from vtk_module.util import numpy_support # noqa: E402 def rgb_float_to_hex(r, g, b):