fix(Kill): kill rpc

Author: JulienChampagnol

.gitignore

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

package-lock.json

@@ -37,6 +37,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

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements.txt --pre requirements-internal.in requirements.in
+#    pip-compile --cert=None --client-cert=None --index-url=None --output-file=requirements.txt --pip-args=None requirements-internal.in requirements.in
 #
 aiohappyeyeballs==2.6.1
     # via aiohttp
@@ -13,50 +13,37 @@ aiosignal==1.4.0
 attrs==25.3.0
     # via aiohttp
 blinker==1.9.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 click==8.3.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 fastjsonschema==2.21.1
     # via opengeodeweb-microservice
 flask==3.1.2
-    # via
-    #   flask-sqlalchemy
-    #   opengeodeweb-microservice
+    # via flask-sqlalchemy
 flask-sqlalchemy==3.1.1
     # via opengeodeweb-microservice
 frozenlist==1.7.0
     # via
     #   aiohttp
     #   aiosignal
 greenlet==3.2.4
-    # via
-    #   opengeodeweb-microservice
-    #   sqlalchemy
+    # via sqlalchemy
 idna==3.10
     # via yarl
 itsdangerous==2.2.0
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 jinja2==3.1.6
-    # via
-    #   flask
-    #   opengeodeweb-microservice
-markupsafe==3.0.2
+    # via flask
+markupsafe==3.0.3
     # via
     #   flask
     #   jinja2
-    #   opengeodeweb-microservice
     #   werkzeug
 multidict==6.6.4
     # via
     #   aiohttp
     #   yarl
-opengeodeweb-microservice==1.*,>=1.0.1rc1
+opengeodeweb-microservice==1.0.0
     # via -r requirements-internal.in
 propcache==0.3.2
     # via
@@ -69,14 +56,11 @@ sqlalchemy==2.0.43
 typing-extensions==4.15.0
     # via
     #   aiosignal
-    #   opengeodeweb-microservice
     #   sqlalchemy
 websocket-client==1.8.0
     # via -r requirements.in
 werkzeug==3.1.3
-    # via
-    #   flask
-    #   opengeodeweb-microservice
+    # via flask
 wslink==1.12.4
     # via -r requirements.in
 yarl==1.20.1

requirements.txt

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

src/opengeodeweb_viewer/rpc/schemas/kill.json

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

src/opengeodeweb_viewer/rpc/utils_protocols.py

@@ -37,6 +37,7 @@
     VtkModelBlocksView,
 )
 from .rpc.generic.generic_protocols import VtkGenericView
+from .rpc.utils_protocols import VtkUtilsView
 
 
 # =============================================================================
@@ -78,6 +79,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())