viewable_filename & native_filename harmonize

Author: JulienChampagnol

src/opengeodeweb_back/geode_functions.py

@@ -37,7 +37,7 @@ def load_geode_object(data_id: str) -> GeodeObject:
     if not data:
         flask.abort(404, f"Data with id {data_id} not found")
 
-    file_absolute_path = data_file_path(data_id, data.native_file_name)
+    file_absolute_path = data_file_path(data_id, data.native_filename)
     print("Loading file: ", file_absolute_path)
     print("File exists: ", os.path.exists(file_absolute_path))
     return geode_object_from_string(data.geode_object).load(file_absolute_path)

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -473,7 +473,7 @@ def import_project() -> flask.Response:
         with get_session() as session:
             for data in rows:
                 data_path = geode_functions.data_file_path(data.id)
-                viewable_name = data.viewable_file_name
+                viewable_name = data.viewable_filename
                 if viewable_name:
                     vpath = geode_functions.data_file_path(data.id, viewable_name)
                     if os.path.isfile(vpath):

src/opengeodeweb_back/utils_functions.py

@@ -208,15 +208,15 @@ def save_all_viewables_and_return_info(
         )
         with open(light_path, "rb") as f:
             binary_light_viewable = f.read()
-        data.native_file_name = os.path.basename(native_files[0])
-        data.viewable_file_name = os.path.basename(viewable_path)
+        data.native_filename = os.path.basename(native_files[0])
+        data.viewable_filename = os.path.basename(viewable_path)
         data.light_viewable = os.path.basename(light_path)
-        assert data.native_file_name is not None
-        assert data.viewable_file_name is not None
+        assert data.native_filename is not None
+        assert data.viewable_filename is not None
         assert data.light_viewable is not None
         return {
-            "native_file_name": data.native_file_name,
-            "viewable_file_name": data.viewable_file_name,
+            "native_filename": data.native_filename,
+            "viewable_filename": data.viewable_filename,
             "id": data.id,
             "name": geode_object.identifier.name(),
             "viewer_type": data.viewer_object,

tests/test_create_routes.py

@@ -51,10 +51,10 @@ def test_create_point(client: FlaskClient, point_data: test_utils.JsonData) -> N
 
     # Verify response data
     response_data = response.get_json()
-    assert "viewable_file_name" in response_data
+    assert "viewable_filename" in response_data
     assert "id" in response_data
     assert "name" in response_data
-    assert "native_file_name" in response_data
+    assert "native_filename" in response_data
     assert "viewer_type" in response_data
     assert "geode_object_type" in response_data
 
@@ -76,10 +76,10 @@ def test_create_aoi(client: FlaskClient, aoi_data: test_utils.JsonData) -> None:
 
     # Verify response data
     response_data = response.get_json()
-    assert "viewable_file_name" in response_data
+    assert "viewable_filename" in response_data
     assert "id" in response_data
     assert "name" in response_data
-    assert "native_file_name" in response_data
+    assert "native_filename" in response_data
     assert "viewer_type" in response_data
     assert "geode_object_type" in response_data
 

tests/test_models_routes.py

@@ -46,7 +46,7 @@ def test_extract_brep_uuids(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodeBRep.viewer_type(),
             input_file=brep_filename,
         )
-        data.native_file_name = brep_filename
+        data.native_filename = brep_filename
         session = get_session()
         if session:
             session.commit()
@@ -106,8 +106,8 @@ def test_import_project_route(client: FlaskClient, tmp_path: Path) -> None:
     temp_db = tmp_path / "temp_project.db"
     conn = sqlite3.connect(str(temp_db))
     conn.execute(
-        "CREATE TABLE datas (id TEXT PRIMARY KEY, geode_object TEXT, viewer_object TEXT, native_file_name TEXT, "
-        "viewable_file_name TEXT, light_viewable TEXT, input_file TEXT, additional_files TEXT)"
+        "CREATE TABLE datas (id TEXT PRIMARY KEY, geode_object TEXT, viewer_object TEXT, native_filename TEXT, "
+        "viewable_filename TEXT, light_viewable TEXT, input_file TEXT, additional_files TEXT)"
     )
     conn.commit()
     conn.close()
@@ -154,7 +154,7 @@ def test_save_viewable_workflow_from_file(client: FlaskClient) -> None:
 
     data_id = response.get_json()["id"]
     assert isinstance(data_id, str) and len(data_id) > 0
-    assert response.get_json()["viewable_file_name"].endswith(".vtm")
+    assert response.get_json()["viewable_filename"].endswith(".vtm")
 
     comp_resp = client.post(
         "/opengeodeweb_back/models/vtm_component_indices", json={"id": data_id}
@@ -184,4 +184,4 @@ def test_save_viewable_workflow_from_object(client: FlaskClient) -> None:
     data_id = response.get_json()["id"]
     assert isinstance(data_id, str) and len(data_id) > 0
     assert response.get_json()["geode_object_type"] == "EdgedCurve3D"
-    assert response.get_json()["viewable_file_name"].endswith(".vtp")
+    assert response.get_json()["viewable_filename"].endswith(".vtp")

tests/test_routes.py

@@ -173,10 +173,10 @@ def get_full_data() -> test_utils.JsonData:
     # Normal test with filename 'corbi.og_brep'
     response = client.post(route, json=get_full_data())
     assert response.status_code == 200
-    native_file_name = response.get_json()["native_file_name"]
-    assert type(native_file_name) is str
-    viewable_file_name = response.get_json()["viewable_file_name"]
-    assert type(viewable_file_name) is str
+    native_filename = response.get_json()["native_filename"]
+    assert type(native_filename) is str
+    viewable_filename = response.get_json()["viewable_filename"]
+    assert type(viewable_filename) is str
     id = response.get_json().get("id")
     assert type(id) is str
     object_type = response.get_json()["viewer_type"]
@@ -197,12 +197,12 @@ def test_texture_coordinates(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             input_file=file,
         )
-        data.native_file_name = file
+        data.native_filename = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
+        data_path = geode_functions.data_file_path(data.id, data.native_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(
@@ -225,12 +225,12 @@ def test_vertex_attribute_names(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             input_file=file,
         )
-        data.native_file_name = file
+        data.native_filename = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
+        data_path = geode_functions.data_file_path(data.id, data.native_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
@@ -251,12 +251,12 @@ def test_cell_attribute_names(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodeRegularGrid2D.viewer_type(),
             input_file=file,
         )
-        data.native_file_name = file
+        data.native_filename = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
+        data_path = geode_functions.data_file_path(data.id, data.native_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
@@ -277,12 +277,12 @@ def test_polygon_attribute_names(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodePolygonalSurface3D.viewer_type(),
             input_file=file,
         )
-        data.native_file_name = file
+        data.native_filename = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
+        data_path = geode_functions.data_file_path(data.id, data.native_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})
@@ -303,12 +303,12 @@ def test_polyhedron_attribute_names(client: FlaskClient, test_id: str) -> None:
             viewer_object=GeodePolyhedralSolid3D.viewer_type(),
             input_file=file,
         )
-        data.native_file_name = file
+        data.native_filename = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_file_name)
+        data_path = geode_functions.data_file_path(data.id, data.native_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         assert os.path.exists(data_path), f"File not found at {data_path}"
     response = client.post(route, json={"id": data.id})

tests/test_utils_functions.py

@@ -123,12 +123,12 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
         )
 
         assert isinstance(result, dict)
-        native_file_name = result["native_file_name"]
-        assert isinstance(native_file_name, str)
-        assert native_file_name.startswith("native.")
-        viewable_file_name = result["viewable_file_name"]
-        assert isinstance(viewable_file_name, str)
-        assert viewable_file_name.endswith(".vtm")
+        native_filename = result["native_filename"]
+        assert isinstance(native_filename, str)
+        assert native_filename.startswith("native.")
+        viewable_filename = result["viewable_filename"]
+        assert isinstance(viewable_filename, str)
+        assert viewable_filename.endswith(".vtm")
         assert isinstance(result["id"], str)
         assert len(result["id"]) == 32
         assert re.match(r"[0-9a-f]{32}", result["id"])
@@ -139,8 +139,8 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
 
         db_entry = Data.get(result["id"])
         assert db_entry is not None
-        assert db_entry.native_file_name == result["native_file_name"]
-        assert db_entry.viewable_file_name == result["viewable_file_name"]
+        assert db_entry.native_filename == result["native_filename"]
+        assert db_entry.viewable_filename == result["viewable_filename"]
         assert db_entry.geode_object == geode_object.geode_object_type()
         assert db_entry.input_file == input_file
         assert db_entry.additional_files == additional_files
@@ -169,7 +169,7 @@ def test_save_all_viewables_commits_to_db(client: FlaskClient) -> None:
         assert isinstance(data_id, str)
         db_entry_before = Data.get(data_id)
         assert db_entry_before is not None
-        assert db_entry_before.native_file_name == result["native_file_name"]
+        assert db_entry_before.native_filename == result["native_filename"]
 
 
 def test_generate_native_viewable_and_light_viewable_from_object(
@@ -186,10 +186,10 @@ def test_generate_native_viewable_and_light_viewable_from_object(
         )
 
     assert isinstance(result, dict)
-    assert isinstance(result["native_file_name"], str)
-    assert result["native_file_name"].startswith("native.")
-    assert isinstance(result["viewable_file_name"], str)
-    assert result["viewable_file_name"].endswith(".vtm")
+    assert isinstance(result["native_filename"], str)
+    assert result["native_filename"].startswith("native.")
+    assert isinstance(result["viewable_filename"], str)
+    assert result["viewable_filename"].endswith(".vtm")
     assert isinstance(result["id"], str)
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["viewer_type"], str)
@@ -207,10 +207,10 @@ def test_generate_native_viewable_and_light_viewable_from_file(
         )
 
     assert isinstance(result, dict)
-    assert isinstance(result["native_file_name"], str)
-    assert result["native_file_name"].startswith("native.")
-    assert isinstance(result["viewable_file_name"], str)
-    assert result["viewable_file_name"].endswith(".vtm")
+    assert isinstance(result["native_filename"], str)
+    assert result["native_filename"].startswith("native.")
+    assert isinstance(result["viewable_filename"], str)
+    assert result["viewable_filename"].endswith(".vtm")
     assert isinstance(result["id"], str)
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["viewer_type"], str)