prefix & schemas_dict in classes

JulienChampagnol · JulienChampagnol · commit acbbae0c7bc9 · 2024-11-25T13:19:00.000+01:00
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@geode/opengeodeweb-viewer",
   "scripts": {
-    "json": "node generate_schemas.js"
+    "json": "node generate_schemas.js",
+    "test": "npm run json && pytest"
   },
   "dependencies": {
     "glob": "^10.3.10"
diff --git a/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py b/src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py
@@ -13,15 +13,17 @@
 from opengeodeweb_viewer.utils_functions import get_schemas_dict, validate_schema
 from opengeodeweb_viewer.object.object_methods import VtkObjectView
 
-
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
 schemas_dict = get_schemas_dict(schemas_dir)
+prefix = "opengeodeweb_viewer.mesh."
 
 class VtkMeshView(VtkObjectView):
     def __init__(self):
         super().__init__()
+        self.prefix = prefix
+        self.schemas_dict = schemas_dict
 
-    @exportRpc(schemas_dict["register"]["rpc"])
+    @exportRpc(prefix + schemas_dict["register"]["rpc"])
     def registerMesh(self, params):
         print(schemas_dict["register"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["register"])
@@ -36,54 +38,54 @@ def registerMesh(self, params):
         except Exception as e:
             print("error : ", str(e), flush=True)
 
-    @exportRpc(schemas_dict["deregister"]["rpc"])
+    @exportRpc(prefix + schemas_dict["deregister"]["rpc"])
     def deregisterMesh(self, params):
         print(schemas_dict["deregister"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["deregister"])
         id = params["id"]
         self.deregister(id)
 
-    @exportRpc(schemas_dict["set_visibility"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_visibility"]["rpc"])
     def SetMeshVisibility(self, params):
         print(schemas_dict["set_visibility"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetVisibility(id, visibility)
 
-    @exportRpc(schemas_dict["set_opacity"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_opacity"]["rpc"])
     def SetMeshOpacity(self, params):
         print(schemas_dict["set_opacity"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_opacity"])
         id = params["id"]
         opacity = float(params["opacity"])
         self.SetOpacity(id, opacity)
 
-    @exportRpc(schemas_dict["set_edge_visibility"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_edge_visibility"]["rpc"])
     def setMeshEdgeVisibility(self, params):
         print(schemas_dict["set_edge_visibility"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_edge_visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetEdgeVisibility(id, visibility)
 
-    @exportRpc(schemas_dict["set_point_visibility"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_point_visibility"]["rpc"])
     def setMeshPointVisibility(self, params):
         print(schemas_dict["set_point_visibility"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_point_visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetVertexVisibility(id, visibility)
 
-    @exportRpc(schemas_dict["set_point_size"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_point_size"]["rpc"])
     def setMeshPointSize(self, params):
         print(schemas_dict["set_point_size"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_point_size"])
         id = params["id"]
         size = float(params["size"])
         self.SetPointSize(id, size)
 
-    @exportRpc(schemas_dict["set_color"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_color"]["rpc"])
     def setMeshColor(self, params):
         print(schemas_dict["set_color"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_color"])
@@ -93,7 +95,7 @@ def setMeshColor(self, params):
         blue = params["blue"]
         self.SetColor(id, red, green, blue)
 
-    @exportRpc(schemas_dict["display_vertex_attribute"]["rpc"])
+    @exportRpc(prefix + schemas_dict["display_vertex_attribute"]["rpc"])
     def setVertexAttribute(self, params):
         print(schemas_dict["display_vertex_attribute"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["display_vertex_attribute"])
@@ -108,7 +110,7 @@ def setVertexAttribute(self, params):
         mapper.SetScalarRange(points.GetScalars().GetRange())
         self.render()
 
-    @exportRpc(schemas_dict["display_polygon_attribute"]["rpc"])
+    @exportRpc(prefix + schemas_dict["display_polygon_attribute"]["rpc"])
     def setPolygonAttribute(self, params):
         print(schemas_dict["display_polygon_attribute"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["display_polygon_attribute"])
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/deregister.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/deregister.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.deregister",
+  "rpc": "deregister",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/display_polygon_attribute.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/display_polygon_attribute.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.display_polygon_attribute",
+  "rpc": "display_polygon_attribute",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/display_vertex_attribute.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/display_vertex_attribute.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.display_vertex_attribute",
+  "rpc": "display_vertex_attribute",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/register.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/register.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.register",
+  "rpc": "register",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_color.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_color.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_color",
+  "rpc": "set_color",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_edge_visibility.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_edge_visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_edge_visibility",
+  "rpc": "set_edge_visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_opacity.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_opacity.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_opacity",
+  "rpc": "set_opacity",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_point_size.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_point_size.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_point_size",
+  "rpc": "set_point_size",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_point_visibility.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_point_visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_point_visibility",
+  "rpc": "set_point_visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/mesh/schemas/set_visibility.json b/src/opengeodeweb_viewer/rpc/mesh/schemas/set_visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "mesh.set_visibility",
+  "rpc": "set_visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/model_protocols.py b/src/opengeodeweb_viewer/rpc/model/model_protocols.py
@@ -13,12 +13,15 @@
 
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
 schemas_dict = get_schemas_dict(schemas_dir)
+prefix = "opengeodeweb_viewer.model."
 
 class VtkModelView(VtkObjectView):
     def __init__(self):
         super().__init__()
+        self.prefix = prefix
+        self.schemas_dict = schemas_dict
     
-    @exportRpc(schemas_dict["register"]["rpc"])
+    @exportRpc(prefix + schemas_dict["register"]["rpc"])
     def registerModel(self, params):
         print(schemas_dict["register"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["register"])
@@ -34,30 +37,30 @@ def registerModel(self, params):
         except Exception as e:
             print("error : ", str(e), flush=True)
 
-    @exportRpc(schemas_dict["deregister"]["rpc"])
+    @exportRpc(prefix + schemas_dict["deregister"]["rpc"])
     def deregisterModel(self, params):
         print(schemas_dict["deregister"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["deregister"])
         id = params["id"]
         self.deregister(id)
 
-    @exportRpc(schemas_dict["set_mesh_visibility"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_mesh_visibility"]["rpc"])
     def SetMeshVisibility(self, params):
         print(schemas_dict["set_mesh_visibility"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_mesh_visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetEdgeVisibility(id, visibility)
 
-    @exportRpc(schemas_dict["set_components_visibility"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_components_visibility"]["rpc"])
     def SetComponentsVisibility(self, params):
         print(schemas_dict["set_components_visibility"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_components_visibility"])
         id = params["id"]
         visibility = bool(params["visibility"])
         self.SetVisibility(id, visibility)
 
-    @exportRpc(schemas_dict["set_components_color"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_components_color"]["rpc"])
     def SetComponentsColor(self, params):
         print(schemas_dict["set_components_color"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_components_color"])
@@ -67,7 +70,7 @@ def SetComponentsColor(self, params):
         blue = params["blue"]
         self.SetColor(id, red, green, blue)
 
-    @exportRpc(schemas_dict["set_corners_size"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_corners_size"]["rpc"])
     def setCornersSize(self, params):
         print(schemas_dict["set_corners_size"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_corners_size"])
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/apply_textures.json b/src/opengeodeweb_viewer/rpc/model/schemas/apply_textures.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.apply_textures",
+  "rpc": "apply_textures",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/deregister.json b/src/opengeodeweb_viewer/rpc/model/schemas/deregister.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.deregister",
+  "rpc": "deregister",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/register.json b/src/opengeodeweb_viewer/rpc/model/schemas/register.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.register",
+  "rpc": "register",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/set_components_color.json b/src/opengeodeweb_viewer/rpc/model/schemas/set_components_color.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.set_components_color",
+  "rpc": "set_components_color",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/set_components_visibility.json b/src/opengeodeweb_viewer/rpc/model/schemas/set_components_visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.set_components_visibility",
+  "rpc": "set_components_visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/set_corners_size.json b/src/opengeodeweb_viewer/rpc/model/schemas/set_corners_size.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.set_corners_size",
+  "rpc": "set_corners_size",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/model/schemas/set_mesh_visibility.json b/src/opengeodeweb_viewer/rpc/model/schemas/set_mesh_visibility.json
@@ -1,5 +1,5 @@
 {
-  "rpc": "model.set_mesh_visibility",
+  "rpc": "set_mesh_visibility",
   "type": "object",
   "properties": {
     "id": {
diff --git a/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py b/src/opengeodeweb_viewer/rpc/viewer/viewer_protocols.py
@@ -16,12 +16,15 @@
 
 schemas_dir = os.path.join(os.path.dirname(__file__), "schemas")
 schemas_dict = get_schemas_dict(schemas_dir)
+prefix = "opengeodeweb_viewer.viewer."
 
 class VtkViewerView(VtkView):
     def __init__(self):
         super().__init__()
+        self.prefix = prefix
+        self.schemas_dict = schemas_dict
 
-    @exportRpc(schemas_dict["create_visualization"]["rpc"])
+    @exportRpc(prefix + schemas_dict["create_visualization"]["rpc"])
     def createVisualization(self, params):
         print(schemas_dict["create_visualization"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["create_visualization"])
@@ -32,7 +35,7 @@ def createVisualization(self, params):
         renderWindow.Render()
         self.render()
 
-    @exportRpc(schemas_dict["set_background_color"]["rpc"])
+    @exportRpc(prefix + schemas_dict["set_background_color"]["rpc"])
     def setBackgroundColor(self, params):
         print(schemas_dict["set_background_color"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["set_background_color"])
@@ -47,7 +50,7 @@ def setBackgroundColor(self, params):
         renderWindow.Render()
         self.render()
 
-    @exportRpc(schemas_dict["reset_camera"]["rpc"])
+    @exportRpc(prefix + schemas_dict["reset_camera"]["rpc"])
     def resetCamera(self, params):
         print(schemas_dict["reset_camera"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["reset_camera"])
@@ -56,7 +59,7 @@ def resetCamera(self, params):
         renderWindow.Render()
         self.render()
 
-    @exportRpc(schemas_dict["take_screenshot"]["rpc"])
+    @exportRpc(prefix + schemas_dict["take_screenshot"]["rpc"])
     def takeScreenshot(self, params):
         print(schemas_dict["take_screenshot"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["take_screenshot"])
@@ -102,7 +105,7 @@ def takeScreenshot(self, params):
         return {"blob": self.addAttachment(file_content)}
 
 
-    @exportRpc(schemas_dict["update_data"]["rpc"])
+    @exportRpc(prefix + schemas_dict["update_data"]["rpc"])
     def updateData(self, params):
         print(schemas_dict["update_data"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["update_data"])
@@ -124,7 +127,7 @@ def updateData(self, params):
         mapper.SetScalarRange(scalars.GetRange())
         self.render()
 
-    @exportRpc(schemas_dict["get_point_position"]["rpc"])
+    @exportRpc(prefix + schemas_dict["get_point_position"]["rpc"])
     def getPointPosition(self, params):
         print(schemas_dict["get_point_position"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["get_point_position"])
@@ -136,7 +139,7 @@ def getPointPosition(self, params):
         ppos = picker.GetPickPosition()
         return {"x": ppos[0], "y": ppos[1], "z": ppos[2]}
 
-    @exportRpc(schemas_dict["reset"]["rpc"])
+    @exportRpc(prefix + schemas_dict["reset"]["rpc"])
     def reset(self, params):
         print(schemas_dict["reset"]["rpc"], params, flush=True)
         validate_schema(params, schemas_dict["reset"])
diff --git a/src/tests/test_mesh_protocols.py b/src/tests/test_mesh_protocols.py
diff --git a/src/tests/test_model_protocols.py b/src/tests/test_model_protocols.py
diff --git a/src/tests/test_viewer_protocols.py b/src/tests/test_viewer_protocols.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.deregister",`
	`2`	`+ "rpc": "deregister",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.display_polygon_attribute",`
	`2`	`+ "rpc": "display_polygon_attribute",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.display_vertex_attribute",`
	`2`	`+ "rpc": "display_vertex_attribute",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.register",`
	`2`	`+ "rpc": "register",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.set_color",`
	`2`	`+ "rpc": "set_color",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.set_edge_visibility",`
	`2`	`+ "rpc": "set_edge_visibility",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.set_opacity",`
	`2`	`+ "rpc": "set_opacity",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "rpc": "mesh.set_point_size",`
	`2`	`+ "rpc": "set_point_size",`
`3`	`3`	`"type": "object",`
`4`	`4`	`"properties": {`
`5`	`5`	`"id": {`