revert

Author: MaxNumerique

src/opengeodeweb_viewer/rpc/mesh/points/mesh_points_protocols.py

@@ -23,15 +23,15 @@ class VtkMeshPointsView(VtkMeshView):
     def __init__(self) -> None:
         super().__init__()
 
-    @exportRpc(mesh_points_prefix + str(mesh_points_schemas_dict["visibility"]["rpc"]))
+    @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["visibility"]["rpc"])
     def setMeshPointsVisibility(self, params: RpcParams) -> None:
         validate_schema(
             params, self.mesh_points_schemas_dict["visibility"], self.mesh_points_prefix
         )
         id, visibility = params["id"], params["visibility"]
         self.SetPointsVisibility(id, visibility)
 
-    @exportRpc(mesh_points_prefix + str(mesh_points_schemas_dict["color"]["rpc"]))
+    @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["color"]["rpc"])
     def setMeshPointsColor(self, params: RpcParamsWithColor) -> None:
         validate_schema(
             params, self.mesh_points_schemas_dict["color"], self.mesh_points_prefix
@@ -44,17 +44,15 @@ def setMeshPointsColor(self, params: RpcParamsWithColor) -> None:
         )
         self.SetPointsColor(id, red, green, blue)
 
-    @exportRpc(mesh_points_prefix + str(mesh_points_schemas_dict["size"]["rpc"]))
+    @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["size"]["rpc"])
     def setMeshPointsSize(self, params: RpcParams) -> None:
         validate_schema(
             params, self.mesh_points_schemas_dict["size"], self.mesh_points_prefix
         )
         id, size = params["id"], params["size"]
         self.SetPointsSize(id, size)
 
-    @exportRpc(
-        mesh_points_prefix + str(mesh_points_schemas_dict["vertex_attribute"]["rpc"])
-    )
+    @exportRpc(mesh_points_prefix + mesh_points_schemas_dict["vertex_attribute"]["rpc"])
     def setMeshPointsVertexAttribute(self, params: RpcParams) -> None:
         validate_schema(
             params,

src/opengeodeweb_viewer/utils_functions.py

@@ -14,13 +14,10 @@
 type RpcParamsWithColor = dict[str, JsonPrimitive | ColorDict]
 type RpcParamsWithList = dict[str, JsonPrimitive | list[str]]
 
-type SchemaDict = dict[str, JsonValue]
-type SchemasDict = dict[str, SchemaDict]
 
-
-def get_schemas_dict(path: str) -> SchemasDict:
+def get_schemas_dict(path: str) -> object:
     json_files = os.listdir(path)
-    schemas_dict: SchemasDict = {}
+    schemas_dict = {}
     for json_file in json_files:
         last_point = json_file.rfind(".")
         filename = json_file[: -len(json_file) + last_point]
@@ -30,7 +27,9 @@ def get_schemas_dict(path: str) -> SchemasDict:
     return schemas_dict
 
 
-def validate_schema(params: RpcParams, schema: SchemaDict, prefix: str = "") -> None:
+def validate_schema(
+    params: RpcParams, schema: dict[str, JsonValue], prefix: str = ""
+) -> None:
     print(f"{prefix}{schema['rpc']}", f"{params=}", flush=True)
     try:
         validate = fastjsonschema.compile(schema)