Merge pull request #100 from Geode-solutions/fix/db-viewer-object

fix(Data): add viewer object

Author: BotellaA

requirements.txt

@@ -38,7 +38,7 @@ numpy>=2
     #   matplotlib
 packaging==25.0
     # via matplotlib
-pillow>=11
+pillow>=12
     # via matplotlib
 propcache>=0
     # via
@@ -61,4 +61,3 @@ wslink==1.12.4
 yarl>=1
     # via aiohttp
 
-opengeodeweb-microservice==1.*,>=1.0.4

src/opengeodeweb_viewer/rpc/generic/generic_protocols.py

@@ -26,8 +26,10 @@ def register(self, params):
         validate_schema(
             params, self.generic_schemas_dict["register"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        specific_params = {"id": params["id"]}
+        data_id = str(params["id"])
+        specific_params = {"id": data_id}
+        data = self.get_data(data_id)
+        viewer_object = str(data["viewer_object"])
         if viewer_object == "mesh":
             self.mesh_protocols.registerMesh(specific_params)
         elif viewer_object == "model":
@@ -38,8 +40,10 @@ def deregister(self, params):
         validate_schema(
             params, self.generic_schemas_dict["deregister"], self.generic_prefix
         )
-        viewer_object = params["viewer_object"]
-        specific_params = {"id": params["id"]}
+        data_id = str(params["id"])
+        specific_params = {"id": data_id}
+        data = self.get_data(data_id)
+        viewer_object = str(data["viewer_object"])
         if viewer_object == "mesh":
             self.mesh_protocols.deregisterMesh(specific_params)
         elif viewer_object == "model":

src/opengeodeweb_viewer/rpc/generic/schemas/deregister.json

@@ -2,21 +2,12 @@
   "rpc": "deregister",
   "type": "object",
   "properties": {
-    "viewer_object": {
-      "type": "string",
-      "minLength": 1,
-      "enum": [
-        "mesh",
-        "model"
-      ]
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "viewer_object",
     "id"
   ],
   "additionalProperties": false

src/opengeodeweb_viewer/rpc/generic/schemas/register.json

@@ -2,21 +2,12 @@
   "rpc": "register",
   "type": "object",
   "properties": {
-    "viewer_object": {
-      "type": "string",
-      "minLength": 1,
-      "enum": [
-        "mesh",
-        "model"
-      ]
-    },
     "id": {
       "type": "string",
       "minLength": 1
     }
   },
   "required": [
-    "viewer_object",
     "id"
   ],
   "additionalProperties": false

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -113,7 +113,10 @@ def applyTextures(self, mesh_id: str, textures_info: list[dict[str, str]]) -> No
             texture_id = tex_info["id"]
             texture_name = tex_info["texture_name"]
             texture_data = Data.get(texture_id)
-            if not texture_data or texture_data.geode_object != "RasterImage2D":
+            if not texture_data:
+                continue
+            texture_file = str(texture_data.viewable_file_name)
+            if not texture_file.lower().endswith(".vti"):
                 continue
             texture_file_path = self.get_data_file_path(texture_id)
             texture_reader = vtk.vtkXMLImageDataReader()

src/opengeodeweb_viewer/vtk_protocol.py

@@ -49,12 +49,8 @@ def get_data(self, data_id: str) -> dict[str, str | list[str] | None]:
 
                 return {
                     "id": data.id,
-                    "native_file_name": data.native_file_name,
                     "viewable_file_name": data.viewable_file_name,
-                    "geode_object": data.geode_object,
-                    "light_viewable": data.light_viewable,
-                    "input_file": data.input_file,
-                    "additional_files": data.additional_files,
+                    "viewer_object": data.viewer_object,
                 }
             except Exception as e:
                 print(f"Error fetching data {data_id}: {e}")

src/tests/conftest.py

@@ -208,31 +208,26 @@ def configure_test_environment() -> Generator[None, None, None]:
 
 @pytest.fixture
 def dataset_factory() -> Callable[..., str]:
-    def create_dataset(
-        *, id: str, viewable_file_name: str, geode_object: str | None = None
-    ) -> str:
+    def create_dataset(*, id: str, viewable_file_name: str) -> str:
         session = get_session()
-        if geode_object is None:
-            geode_object = (
-                "model" if viewable_file_name.lower().endswith(".vtm") else "mesh"
-            )
+        viewer_object = (
+            "model" if viewable_file_name.lower().endswith(".vtm") else "mesh"
+        )
 
         row = session.get(Data, id)
         if row is None:
             session.add(
                 Data(
                     id=id,
-                    native_file_name="",
                     viewable_file_name=viewable_file_name,
-                    geode_object=geode_object,
-                    light_viewable=None,
-                    input_file="",
-                    additional_files=[],
+                    geode_object=viewer_object,
+                    viewer_object=viewer_object,
                 )
             )
         else:
             row.viewable_file_name = viewable_file_name
-            row.geode_object = geode_object
+            row.geode_object = viewer_object
+            row.viewer_object = viewer_object
         session.commit()
 
         data_folder = Path(os.environ["DATA_FOLDER_PATH"]) / id

src/tests/mesh/test_mesh_protocols.py

@@ -63,9 +63,7 @@ def test_apply_textures(
 ) -> None:
     test_register_mesh(server, dataset_factory)
     texture_entry = dataset_factory(
-        id="987654321",
-        viewable_file_name="hat_lambert2SG.vti",
-        geode_object="RasterImage2D",
+        id="987654321", viewable_file_name="hat_lambert2SG.vti"
     )
 
     server.call(

src/tests/test_generic_protocols.py

@@ -7,12 +7,12 @@ def test_register_mesh(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
     data_id = "123456789"
-    dataset_factory(id=data_id, viewable_file_name="hat.vtp", geode_object="mesh")
+    dataset_factory(id=data_id, viewable_file_name="hat.vtp")
 
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
-        [{"id": data_id, "viewer_object": "mesh"}],
+        [{"id": data_id}],
     )
     assert server.compare_image(3, "mesh/register.jpeg") is True
 
@@ -26,7 +26,7 @@ def test_register_model(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["register"]["rpc"],
-        [{"id": data_id, "viewer_object": "model"}],
+        [{"id": data_id}],
     )
     assert server.compare_image(3, "model/register.jpeg") is True
 
@@ -39,7 +39,7 @@ def test_deregister_mesh(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
-        [{"id": "123456789", "viewer_object": "mesh"}],
+        [{"id": "123456789"}],
     )
     assert server.compare_image(3, "mesh/deregister.jpeg") == True
 
@@ -52,6 +52,6 @@ def test_deregister_model(
     server.call(
         VtkGenericView.generic_prefix
         + VtkGenericView.generic_schemas_dict["deregister"]["rpc"],
-        [{"id": "123456789", "viewer_object": "model"}],
+        [{"id": "123456789"}],
     )
     assert server.compare_image(3, "model/deregister.jpeg") == True