filename -> file

Author: JulienChampagnol

src/opengeodeweb_viewer/rpc/mesh/mesh_protocols.py

@@ -38,7 +38,7 @@ def registerMesh(self, rpc_params: RpcParams) -> None:
         params = schemas.Register.from_dict(rpc_params)
         data_id = params.id
         try:
-            file_name = str(self.get_data(data_id)["viewable_filename"])
+            file_name = str(self.get_data(data_id)["viewable_file"])
             reader = vtkXMLGenericDataObjectReader()
             mapper = vtkDataSetMapper()
             mapper.SetInputConnection(reader.GetOutputPort())
@@ -108,7 +108,7 @@ def meshApplyTextures(self, rpc_params: RpcParams) -> None:
             texture_data = Data.get(texture_id)
             if texture_data is None:
                 continue
-            texture_file = texture_data.viewable_filename
+            texture_file = texture_data.viewable_file
             if not texture_file.lower().endswith(".vti"):
                 continue
             texture_file_path = self.get_data_file_path(texture_id)

src/opengeodeweb_viewer/rpc/model/model_protocols.py

@@ -38,7 +38,7 @@ def registerModel(self, rpc_params: RpcParams) -> None:
         params = schemas.Register.from_dict(rpc_params)
         data_id = params.id
         try:
-            file_name = str(self.get_data(data_id)["viewable_filename"])
+            file_name = str(self.get_data(data_id)["viewable_file"])
             reader = vtkXMLMultiBlockDataReader()
             filter = vtkGeometryFilter()
             filter.SetInputConnection(reader.GetOutputPort())

src/opengeodeweb_viewer/vtk_protocol.py

@@ -87,7 +87,7 @@ def get_data(self, data_id: str) -> dict[str, str | list[str] | None]:
 
                 return {
                     "id": data.id,
-                    "viewable_filename": data.viewable_filename,
+                    "viewable_file": data.viewable_file,
                     "viewer_object": data.viewer_object,
                 }
             except Exception as e:
@@ -97,8 +97,8 @@ def get_data(self, data_id: str) -> dict[str, str | list[str] | None]:
     def get_data_file_path(self, data_id: str, filename: str | None = None) -> str:
         if filename is None:
             data = self.get_data(data_id)
-            viewable_filename = data["viewable_filename"]
-            filename = str(viewable_filename) if viewable_filename is not None else ""
+            viewable_file = data["viewable_file"]
+            filename = str(viewable_file) if viewable_file is not None else ""
 
         data_folder_path = self.DATA_FOLDER_PATH
         if data_folder_path is None:

tests/conftest.py

@@ -208,33 +208,33 @@ def configure_test_environment() -> Generator[None, None, None]:
 
 @pytest.fixture
 def dataset_factory() -> Callable[..., str]:
-    def create_dataset(*, id: str, viewable_filename: str) -> str:
+    def create_dataset(*, id: str, viewable_file: str) -> str:
         session = get_session()
         viewer_object = (
-            "model" if viewable_filename.lower().endswith(".vtm") else "mesh"
+            "model" if viewable_file.lower().endswith(".vtm") else "mesh"
         )
 
         row = session.get(Data, id)
         if row is None:
             session.add(
                 Data(
                     id=id,
-                    viewable_filename=viewable_filename,
+                    viewable_file=viewable_file,
                     geode_object=viewer_object,
                     viewer_object=viewer_object,
                 )
             )
         else:
-            row.viewable_filename = viewable_filename
+            row.viewable_file = viewable_file
             row.geode_object = viewer_object
             row.viewer_object = viewer_object
         session.commit()
 
         data_folder = Path(os.environ["DATA_FOLDER_PATH"]) / id
         data_folder.mkdir(parents=True, exist_ok=True)
 
-        src_path = Path(__file__).parent / "data" / viewable_filename
-        dst_path = data_folder / viewable_filename
+        src_path = Path(__file__).parent / "data" / viewable_file
+        dst_path = data_folder / viewable_file
         if not dst_path.exists() or dst_path.resolve() != src_path.resolve():
             shutil.copy(src_path, dst_path)
 

tests/mesh/edges/test_mesh_edges_protocols.py

@@ -39,7 +39,7 @@ def test_edges_color(
 def test_edges_with_edged_curve(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
-    dataset_factory(id="123456789", viewable_filename="edged_curve.vtp")
+    dataset_factory(id="123456789", viewable_file="edged_curve.vtp")
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],

tests/mesh/points/test_mesh_points_protocols.py

@@ -59,7 +59,7 @@ def test_points_with_point_set(
 ) -> None:
     mesh_id = "44556677"
 
-    dataset_factory(id=mesh_id, viewable_filename="points.vtp")
+    dataset_factory(id=mesh_id, viewable_file="points.vtp")
     server.call(
         VtkMeshView.mesh_prefix
         + cast(str, VtkMeshView.mesh_schemas_dict["register"]["rpc"]),

tests/mesh/polyhedra/test_mesh_polyhedra_protocols.py

@@ -14,7 +14,7 @@
 def test_register_mesh(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
-    dataset_factory(id="123456789", viewable_filename="polyhedron_attribute.vtu")
+    dataset_factory(id="123456789", viewable_file="polyhedron_attribute.vtu")
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],

tests/mesh/test_mesh_protocols.py

@@ -6,7 +6,7 @@
 def test_register_mesh(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
-    dataset_factory(id="123456789", viewable_filename="hat.vtp")
+    dataset_factory(id="123456789", viewable_file="hat.vtp")
 
     server.call(
         VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
@@ -63,7 +63,7 @@ def test_apply_textures(
 ) -> None:
     test_register_mesh(server, dataset_factory)
     texture_entry = dataset_factory(
-        id="987654321", viewable_filename="hat_lambert2SG.vti"
+        id="987654321", viewable_file="hat_lambert2SG.vti"
     )
 
     server.call(

tests/model/test_model_protocols.py

@@ -7,7 +7,7 @@ def test_register_model(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
 
-    dataset_factory(id="123456789", viewable_filename="CrossSection.vtm")
+    dataset_factory(id="123456789", viewable_file="CrossSection.vtm")
     server.call(
         VtkModelView.model_prefix + VtkModelView.model_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],
@@ -19,7 +19,7 @@ def test_register_model_cube(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
 
-    dataset_factory(id="123456789", viewable_filename="cube.vtm")
+    dataset_factory(id="123456789", viewable_file="cube.vtm")
     server.call(
         VtkModelView.model_prefix + VtkModelView.model_schemas_dict["register"]["rpc"],
         [{"id": "123456789"}],

tests/test_generic_protocols.py

@@ -7,7 +7,7 @@ def test_register_mesh(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
     data_id = "123456789"
-    dataset_factory(id=data_id, viewable_filename="hat.vtp")
+    dataset_factory(id=data_id, viewable_file="hat.vtp")
 
     server.call(
         VtkGenericView.generic_prefix
@@ -21,7 +21,7 @@ def test_register_model(
     server: ServerMonitor, dataset_factory: Callable[..., str]
 ) -> None:
     data_id = "123456789"
-    dataset_factory(id=data_id, viewable_filename="CrossSection.vtm")
+    dataset_factory(id=data_id, viewable_file="CrossSection.vtm")
 
     server.call(
         VtkGenericView.generic_prefix