Skip to content

Commit f33c5fd

Browse files
committed
ci(pre-commit): put right import order back
Ref: #108 (comment)
1 parent 42d2a9a commit f33c5fd

7 files changed

Lines changed: 33 additions & 32 deletions

File tree

src/trame_vtk/modules/vtk/protocols/mouse_handler.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
import os
44
import sys
55

6-
from vtk_module.vtkWebCore import vtkWebInteractionEvent
7-
from wslink import register as export_rpc
8-
9-
from .web_protocol import vtkWebProtocol
10-
116
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
127
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
138

9+
from vtk_module.vtkWebCore import vtkWebInteractionEvent # noqa: E402
10+
from wslink import register as export_rpc # noqa: E402
11+
12+
from .web_protocol import vtkWebProtocol # noqa: E402
13+
1414

1515
def apply_modifiers(event, interactor):
1616
interactor.SetShiftKey(1 if event.get("shiftKey") else 0)

src/trame_vtk/modules/vtk/serializers/data.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
import os
44
import sys
55

6-
from vtk_module.vtkFiltersGeometry import (
6+
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
7+
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
8+
9+
from vtk_module.vtkFiltersGeometry import ( # noqa: E402
710
vtkCompositeDataGeometryFilter,
811
vtkDataSetSurfaceFilter,
912
)
1013

11-
from .helpers import extract_required_fields, get_array_description
12-
from .registry import class_name
13-
from .serialize import serialize
14-
from .utils import get_js_array_type, reference_id, wrap_id
15-
16-
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
17-
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
14+
from .helpers import extract_required_fields, get_array_description # noqa: E402
15+
from .registry import class_name # noqa: E402
16+
from .serialize import serialize # noqa: E402
17+
from .utils import get_js_array_type, reference_id, wrap_id # noqa: E402
1818

1919
logger = logging.getLogger(__name__)
2020

src/trame_vtk/modules/vtk/serializers/lookup_tables.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import sys
44
from contextlib import suppress
55

6-
from vtk_module.vtkRenderingCore import vtkColorTransferFunction
7-
86
from .cache import cache_properties
97
from .helpers import data_table_to_list, linspace
108
from .registry import class_name
@@ -13,6 +11,8 @@
1311
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
1412
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
1513

14+
from vtk_module.vtkRenderingCore import vtkColorTransferFunction # noqa: E402
15+
1616

1717
def lookup_table_serializer(parent, lookup_table, lookup_table_id, context, _depth):
1818
# No children in this case, so no additions to bindings and return empty list

src/trame_vtk/modules/vtk/serializers/mappers.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
import os
44
import sys
55

6-
from vtk_module.vtkFiltersGeometry import vtkDataSetSurfaceFilter
7-
86
from .cache import cache_properties
97
from .registry import class_name
108
from .serialize import serialize
119
from .utils import reference_id, wrap_id
1210

1311
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
1412
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
13+
14+
from vtk_module.vtkFiltersGeometry import vtkDataSetSurfaceFilter # noqa: E402
15+
1516
logger = logging.getLogger(__name__)
1617

1718

src/trame_vtk/modules/vtk/serializers/mesh.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
import sys
55

66
import numpy as np
7-
from vtk_module.util.numpy_support import vtk_to_numpy
8-
from vtk_module.vtkFiltersGeometry import vtkDataSetSurfaceFilter
97

108
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
119
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
1210

11+
from vtk_module.util.numpy_support import vtk_to_numpy # noqa: E402
12+
from vtk_module.vtkFiltersGeometry import vtkDataSetSurfaceFilter # noqa: E402
13+
1314

1415
def mesh(dataset, field_to_keep=None, point_arrays=None, cell_arrays=None):
1516
"""Expect any dataset and extract its surface into a dash_vtk.Mesh state property"""
@@ -83,17 +84,10 @@ def mesh(dataset, field_to_keep=None, point_arrays=None, cell_arrays=None):
8384

8485

8586
def mesh_array(array):
86-
if not array:
87-
msg = "array cannot be None or empty"
88-
raise ValueError(msg)
8987
return b64_encode_numpy(vtk_to_numpy(array.GetData()))
9088

9189

9290
def data_array(data_array, location="PointData", name=None):
93-
if not data_array:
94-
msg = "data array cannot be None or empty"
95-
raise ValueError(msg)
96-
9791
data_range = data_array.GetRange(-1)
9892
nb_comp = data_array.GetNumberOfComponents()
9993
values = vtk_to_numpy(data_array)

src/trame_vtk/modules/vtk/serializers/synchronization_context.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
import time
77
import zipfile
88

9-
from vtk_module.vtkCommonCore import vtkDoubleArray, vtkFloatArray, vtkTypeUInt32Array
10-
119
from .utils import base64_encode, wrap_id
1210

1311
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
1412
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
13+
14+
from vtk_module.vtkCommonCore import ( # noqa: E402
15+
vtkDoubleArray,
16+
vtkFloatArray,
17+
vtkTypeUInt32Array,
18+
)
19+
1520
logger = logging.getLogger(__name__)
1621

1722
JS_VTK_ARRAY = {

src/trame_vtk/modules/vtk/widget.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
from typing import Callable, Optional
66

77
from vtk_module.vtkCommonCore import vtkCommand
8-
from vtk_module.vtkInteractionWidgets import (
9-
vtkAbstractWidget,
10-
vtkWidgetRepresentation,
11-
)
128

139
vtk_module_name = os.environ.get("VTK_MODULE_NAME", "vtkmodules")
1410
sys.modules["vtk_module"] = importlib.import_module(vtk_module_name)
1511

12+
from vtk_module.vtkInteractionWidgets import ( # noqa: E402
13+
vtkAbstractWidget,
14+
vtkWidgetRepresentation,
15+
)
16+
1617
EventCallback = Callable[[vtkCommand.EventIds, Optional["VtkWidget"]], None]
1718

1819

0 commit comments

Comments
 (0)