waiting room for refacto web server from Vease-Back

Author: MaxNumerique

requirements.txt

@@ -44,7 +44,7 @@ propcache~=0.3
     # via
     #   aiohttp
     #   yarl
-pyparsing~=3.3
+pyparsing~=3.2
     # via matplotlib
 python-dateutil==2.9.0.post0
     # via matplotlib

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -23,36 +23,23 @@ def __init__(self, mesh_protocols, model_protocols):
 
     @exportRpc(generic_prefix + generic_schemas_dict["register"]["rpc"])
     def register(self, params):
+        print(f"{self.generic_schemas_dict["register"]}", flush=True)
         validate_schema(
             params, self.generic_schemas_dict["register"], self.generic_prefix
         )
-        data_id = params["id"]
-        data = self.get_data(data_id)
-        enhanced_params = {
-            **params,
-            "file_name": data["viewable_file_name"],
-            "viewer_object": data["geode_object"],
-        }
-        viewer_object = self.get_viewer_object_type(data_id)
+        viewer_object = self.get_viewer_object_type(params["id"])
         if viewer_object == "mesh":
-            self.mesh_protocols.registerMesh(enhanced_params)
+            self.mesh_protocols.registerMesh(params)
         elif viewer_object == "model":
-            self.model_protocols.registerModel(enhanced_params)
+            self.model_protocols.registerModel(params)
 
     @exportRpc(generic_prefix + generic_schemas_dict["deregister"]["rpc"])
     def deregister(self, params):
         validate_schema(
             params, self.generic_schemas_dict["deregister"], self.generic_prefix
         )
-        data_id = params["id"]
-        data = self.get_data(data_id)
-        enhanced_params = {
-            **params,
-            "file_name": data["viewable_file_name"],
-            "viewer_object": data["geode_object"],
-        }
-        viewer_object = self.get_viewer_object_type(data_id)
+        viewer_object = self.get_viewer_object_type(params["id"])
         if viewer_object == "mesh":
-            self.mesh_protocols.deregisterMesh(enhanced_params)
+            self.mesh_protocols.deregisterMesh(params)
         elif viewer_object == "model":
-            self.model_protocols.deregisterModel(enhanced_params)
+            self.model_protocols.deregisterModel(params)

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -28,6 +28,7 @@ def __init__(self) -> None:
 
     @exportRpc(mesh_prefix + mesh_schemas_dict["register"]["rpc"])
     def registerMesh(self, params: RpcParams) -> None:
+        print(f"{self.mesh_schemas_dict["register"]}", flush=True)
         validate_schema(params, self.mesh_schemas_dict["register"], self.mesh_prefix)
         data_id = str(params["id"])
         try: