type config, viewer_protocols, test_model_blocks_protocols, test_model_corners_protocols

Author: MaxNumerique

src/opengeodeweb_viewer/config.py

@@ -1,20 +1,20 @@
 import os
-import tempfile
 from shutil import copyfile, copytree
 from sys import platform
+from typing import List, Set
 
 
-def default_config():
+def default_config() -> None:
     os.environ["DEFAULT_HOST"] = "localhost"
     os.environ["DEFAULT_PORT"] = "1234"
 
 
-def prod_config():
+def prod_config() -> None:
     default_config()
     os.environ["DATA_FOLDER_PATH"] = "/data/"
 
 
-def dev_config():
+def dev_config() -> None:
     default_config()
     if platform == "linux":
         os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
@@ -29,8 +29,8 @@ def dev_config():
 def _copy_test_assets(
     src_data: str,
     tmp_data_root: str,
-    test_ids: list[str],
-    valid_exts: set[str],
+    test_ids: List[str],
+    valid_exts: Set[str],
     uploads_directory: str,
     structure_directory: str,
 ) -> None:
@@ -49,7 +49,7 @@ def _copy_test_assets(
             copyfile(src, os.path.join(uploads_directory, file))
 
 
-def test_config(path):
+def test_config(path: str) -> None:
     default_config()
     os.environ["DATA_FOLDER_PATH"] = os.path.join(
         os.path.dirname(__file__), "..", "..", "tests", "data"

src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py

@@ -1,6 +1,7 @@
 # Standard library imports
 import math
 import os
+from typing import Any, Dict, List
 
 # Third party imports
 import vtk
@@ -21,11 +22,11 @@ class VtkViewerView(VtkView):
         os.path.join(os.path.dirname(__file__), "schemas")
     )
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["reset_visualization"]["rpc"])
-    def resetVisualization(self, params):
+    def resetVisualization(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["reset_visualization"], self.viewer_prefix
         )
@@ -80,7 +81,7 @@ def resetVisualization(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_background_color"]["rpc"])
-    def setBackgroundColor(self, params):
+    def setBackgroundColor(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["set_background_color"], self.viewer_prefix
         )
@@ -98,7 +99,7 @@ def setBackgroundColor(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["reset_camera"]["rpc"])
-    def resetCamera(self, params):
+    def resetCamera(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["reset_camera"], self.viewer_prefix
         )
@@ -108,7 +109,7 @@ def resetCamera(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["take_screenshot"]["rpc"])
-    def takeScreenshot(self, params):
+    def takeScreenshot(self, params: Dict[str, Any]) -> Dict[str, Any]:
         validate_schema(
             params, self.viewer_schemas_dict["take_screenshot"], self.viewer_prefix
         )
@@ -157,7 +158,7 @@ def takeScreenshot(self, params):
         return {"blob": self.addAttachment(file_content)}
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["update_data"]["rpc"])
-    def updateData(self, params):
+    def updateData(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["update_data"], self.viewer_prefix
         )
@@ -180,7 +181,7 @@ def updateData(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["get_point_position"]["rpc"])
-    def getPointPosition(self, params):
+    def getPointPosition(self, params: Dict[str, Any]) -> Dict[str, float]:
         validate_schema(
             params, self.viewer_schemas_dict["get_point_position"], self.viewer_prefix
         )
@@ -192,7 +193,7 @@ def getPointPosition(self, params):
         ppos = picker.GetPickPosition()
         return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
 
-    def computeEpsilon(self, renderer, z):
+    def computeEpsilon(self, renderer: Any, z: float) -> float:
         renderer.SetDisplayPoint(0, 0, z)
         renderer.DisplayToWorld()
         windowLowerLeft = renderer.GetWorldPoint()
@@ -208,7 +209,7 @@ def computeEpsilon(self, renderer, z):
         return math.sqrt(epsilon) * 0.0125
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["picked_ids"]["rpc"])
-    def pickedIds(self, params):
+    def pickedIds(self, params: Dict[str, Any]) -> Dict[str, List[str]]:
         validate_schema(
             params, self.viewer_schemas_dict["picked_ids"], self.viewer_prefix
         )
@@ -233,7 +234,7 @@ def pickedIds(self, params):
         return {"array_ids": array_ids}
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["grid_scale"]["rpc"])
-    def toggleGridScale(self, params):
+    def toggleGridScale(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["grid_scale"], self.viewer_prefix
         )
@@ -244,15 +245,15 @@ def toggleGridScale(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["axes"]["rpc"])
-    def toggleAxes(self, params):
+    def toggleAxes(self, params: Dict[str, Any]) -> None:
         validate_schema(params, self.viewer_schemas_dict["axes"], self.viewer_prefix)
         id, visibility = "axes", params["visibility"]
         actor = self.get_object(id)["actor"]
         actor.SetVisibility(visibility)
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["update_camera"]["rpc"])
-    def updateCamera(self, params):
+    def updateCamera(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["update_camera"], self.viewer_prefix
         )
@@ -274,14 +275,14 @@ def updateCamera(self, params):
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["render_now"]["rpc"])
-    def renderNow(self, params):
+    def renderNow(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["render_now"], self.viewer_prefix
         )
         self.render()
 
     @exportRpc(viewer_prefix + viewer_schemas_dict["set_z_scaling"]["rpc"])
-    def setZScaling(self, params):
+    def setZScaling(self, params: Dict[str, Any]) -> None:
         validate_schema(
             params, self.viewer_schemas_dict["set_z_scaling"], self.viewer_prefix
         )

src/tests/model/blocks/test_model_blocks_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.blocks.model_blocks_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model_cube
+from ...conftest import ServerMonitor
 
 
-def test_blocks_polyhedra_visibility(server, dataset_factory):
+def test_blocks_polyhedra_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model_cube(server, dataset_factory)
 
@@ -42,7 +44,7 @@ def test_blocks_polyhedra_visibility(server, dataset_factory):
     assert server.compare_image(3, "model/blocks/visibility.jpeg") == True
 
 
-def test_blocks_polyhedra_color(server, dataset_factory):
+def test_blocks_polyhedra_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_blocks_polyhedra_visibility(server, dataset_factory)
 

src/tests/model/corners/test_model_corners_protocols.py

@@ -1,4 +1,5 @@
 # Standard library imports
+from typing import Callable
 
 # Third party imports
 from opengeodeweb_viewer.rpc.model.corners.model_corners_protocols import (
@@ -7,9 +8,10 @@
 
 # Local application imports
 from src.tests.model.test_model_protocols import test_register_model_cube
+from ...conftest import ServerMonitor
 
 
-def test_corners_points_visibility(server, dataset_factory):
+def test_corners_points_visibility(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_register_model_cube(server, dataset_factory)
 
@@ -40,7 +42,7 @@ def test_corners_points_visibility(server, dataset_factory):
     assert server.compare_image(3, "model/corners/visibility.jpeg") == True
 
 
-def test_corners_points_color(server, dataset_factory):
+def test_corners_points_color(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
 
     test_corners_points_visibility(server, dataset_factory)