Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Viewer into fix/database

Author: MaxNumerique

.gitignore

@@ -6,11 +6,12 @@ __pycache__/
 .env
 /node_modules
 latest_logs
-schemas.json
 build
 /src/tests/tests_output/
 *.egg-info
 .coverage*
 .mypy_cache
 *.db
 tests/data
+
+opengeodeweb_viewer_schemas.json

package-lock.json

@@ -31,6 +31,7 @@ dependencies = { file = ["requirements.txt"] }
 where = ["src"]
 
 [tool.setuptools.package-data]
+"opengeodeweb_viewer.rpc.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.generic.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.mesh.schemas" = ["*.json"]
 "opengeodeweb_viewer.rpc.mesh.points.schemas" = ["*.json"]

pyproject.toml

@@ -22,7 +22,7 @@ frozenlist==1.8.0
     # via
     #   aiohttp
     #   aiosignal
-idna==3.10
+idna==3.11
     # via yarl
 kiwisolver==1.4.9
     # via matplotlib
@@ -61,3 +61,4 @@ wslink==1.12.4
 yarl==1.22.0
     # via aiohttp
 
+opengeodeweb-microservice==1.*,>=1.0.4rc5

requirements.txt

@@ -0,0 +1,7 @@
+{
+  "rpc": "kill",
+  "type": "object",
+  "properties": {},
+  "required": [],
+  "additionalProperties": false
+}

src/opengeodeweb_viewer/rpc/schemas/kill.json

@@ -0,0 +1,25 @@
+# type: ignore
+# Standard library imports
+import os
+
+# Third party imports
+from wslink import register as exportRpc
+
+# Local application imports
+from opengeodeweb_viewer.utils_functions import get_schemas_dict
+from opengeodeweb_viewer.vtk_protocol import VtkView
+
+
+class VtkUtilsView(VtkView):
+    ogw_prefix = "opengeodeweb_viewer."
+    ogw_schemas_dict = get_schemas_dict(
+        os.path.join(os.path.dirname(__file__), "schemas")
+    )
+
+    def __init__(self) -> None:
+        super().__init__()
+
+    @exportRpc(ogw_prefix + ogw_schemas_dict["kill"]["rpc"])
+    def kill(self) -> None:
+        print("Manual viewer kill, shutting down...", flush=True)
+        os._exit(0)

src/opengeodeweb_viewer/rpc/utils_protocols.py

@@ -15,7 +15,7 @@
 type RpcParamsWithList = dict[str, JsonPrimitive | list[str]]
 
 
-def get_schemas_dict(path):
+def get_schemas_dict(path: str) -> object:
     json_files = os.listdir(path)
     schemas_dict = {}
     for json_file in json_files:

src/opengeodeweb_viewer/utils_functions.py

@@ -3,12 +3,14 @@
 
 # Third party imports
 import vtk
-from vtk.web import protocols as vtk_protocols
+from vtk.web import protocols as vtk_protocols  # type: ignore
 
 # Local application imports
 from opengeodeweb_microservice.database.connection import get_session
 from opengeodeweb_microservice.database.data import Data
 
+# mypy: allow-untyped-defs
+
 
 class VtkView(vtk_protocols.vtkWebProtocol):
     def __init__(self) -> None:

src/opengeodeweb_viewer/vtk_protocol.py

@@ -38,6 +38,7 @@
     VtkModelBlocksView,
 )
 from .rpc.generic.generic_protocols import VtkGenericView
+from .rpc.utils_protocols import VtkUtilsView  # type: ignore
 
 
 # =============================================================================
@@ -79,6 +80,7 @@ def initialize(self):
         model_protocols = VtkModelView()
         vtk_view = VtkView()
         self.registerVtkWebProtocol(vtk_view)
+        self.registerVtkWebProtocol(VtkUtilsView())
         self.registerVtkWebProtocol(VtkViewerView())
         self.registerVtkWebProtocol(mesh_protocols)
         self.registerVtkWebProtocol(VtkMeshPointsView())