filename -> file

Author: JulienChampagnol

src/opengeodeweb_back/geode_functions.py

@@ -2,11 +2,8 @@
 import os
 
 # Third party imports
-import opengeode_geosciences as og_gs
-import opengeode as og
 import werkzeug
 import flask
-from typing import Any
 
 # Local application imports
 from .geode_objects import geode_objects
@@ -15,9 +12,7 @@
     geode_object_type,
 )
 from .geode_objects.geode_object import GeodeObject
-from . import utils_functions
 from opengeodeweb_microservice.database.data import Data
-from opengeodeweb_microservice.database.connection import get_session
 
 
 def data_file_path(data_id: str, filename: str | None = None) -> str:
@@ -37,7 +32,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_filename)
+    file_absolute_path = data_file_path(data_id, data.native_file)
     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

@@ -237,7 +237,7 @@ def save_viewable_file() -> flask.Response:
     return flask.make_response(
         utils_functions.generate_native_viewable_and_light_viewable_from_file(
             geode_object_type=geode_object_type(params.geode_object_type),
-            input_filename=params.filename,
+            input_file=params.filename,
         ),
         200,
     )
@@ -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_filename
+                viewable_name = data.viewable_file
                 if viewable_name:
                     vpath = geode_functions.data_file_path(data.id, viewable_name)
                     if os.path.isfile(vpath):

src/opengeodeweb_back/utils_functions.py

@@ -1,11 +1,10 @@
 # Standard library imports
-import json
 import os
 import threading
 import time
 import zipfile
 from collections.abc import Callable
-from concurrent.futures import ThreadPoolExecutor, Future
+from concurrent.futures import ThreadPoolExecutor
 
 # Third party imports
 import flask
@@ -208,15 +207,15 @@ def save_all_viewables_and_return_info(
         )
         with open(light_path, "rb") as f:
             binary_light_viewable = f.read()
-        data.native_filename = os.path.basename(native_files[0])
-        data.viewable_filename = os.path.basename(viewable_path)
+        data.native_file = os.path.basename(native_files[0])
+        data.viewable_file = os.path.basename(viewable_path)
         data.light_viewable = os.path.basename(light_path)
-        assert data.native_filename is not None
-        assert data.viewable_filename is not None
+        assert data.native_file is not None
+        assert data.viewable_file is not None
         assert data.light_viewable is not None
         return {
-            "native_filename": data.native_filename,
-            "viewable_filename": data.viewable_filename,
+            "native_file": data.native_file,
+            "viewable_file": data.viewable_file,
             "id": data.id,
             "name": geode_object.identifier.name(),
             "viewer_type": data.viewer_object,
@@ -239,20 +238,20 @@ def generate_native_viewable_and_light_viewable_from_object(
 
 
 def generate_native_viewable_and_light_viewable_from_file(
-    geode_object_type: GeodeObjectType, input_filename: str
+    geode_object_type: GeodeObjectType, input_file: str
 ) -> dict[str, str | list[str]]:
     generic_geode_object = geode_objects[geode_object_type]
     data = Data.create(
         geode_object=geode_object_type,
         viewer_object=generic_geode_object.viewer_type(),
-        input_file=input_filename,
+        input_file=input_file,
     )
 
     data_path = create_data_folder_from_id(data.id)
 
-    full_input_filename = geode_functions.upload_file_path(input_filename)
+    full_input_filename = geode_functions.upload_file_path(input_file)
     copied_full_path = os.path.join(
-        data_path, werkzeug.utils.secure_filename(input_filename)
+        data_path, werkzeug.utils.secure_filename(input_file)
     )
     shutil.copy2(full_input_filename, copied_full_path)
 

tests/test_create_routes.py

@@ -1,5 +1,4 @@
 # Standard library imports
-import os
 import uuid
 
 # Third party imports
@@ -51,10 +50,10 @@ def test_create_point(client: FlaskClient, point_data: test_utils.JsonData) -> N
 
     # Verify response data
     response_data = response.get_json()
-    assert "viewable_filename" in response_data
+    assert "viewable_file" in response_data
     assert "id" in response_data
     assert "name" in response_data
-    assert "native_filename" in response_data
+    assert "native_file" in response_data
     assert "viewer_type" in response_data
     assert "geode_object_type" in response_data
 
@@ -76,10 +75,10 @@ def test_create_aoi(client: FlaskClient, aoi_data: test_utils.JsonData) -> None:
 
     # Verify response data
     response_data = response.get_json()
-    assert "viewable_filename" in response_data
+    assert "viewable_file" in response_data
     assert "id" in response_data
     assert "name" in response_data
-    assert "native_filename" in response_data
+    assert "native_file" 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_filename = brep_filename
+        data.native_file = 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_filename TEXT, "
-        "viewable_filename TEXT, light_viewable TEXT, input_file TEXT, additional_files TEXT)"
+        "CREATE TABLE datas (id TEXT PRIMARY KEY, geode_object TEXT, viewer_object TEXT, native_file TEXT, "
+        "viewable_file 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_filename"].endswith(".vtm")
+    assert response.get_json()["viewable_file"].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_filename"].endswith(".vtp")
+    assert response.get_json()["viewable_file"].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_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
+    native_file = response.get_json()["native_file"]
+    assert type(native_file) is str
+    viewable_file = response.get_json()["viewable_file"]
+    assert type(viewable_file) 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_filename = file
+        data.native_file = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_filename)
+        data_path = geode_functions.data_file_path(data.id, data.native_file)
         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_filename = file
+        data.native_file = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_filename)
+        data_path = geode_functions.data_file_path(data.id, data.native_file)
         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_filename = file
+        data.native_file = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_filename)
+        data_path = geode_functions.data_file_path(data.id, data.native_file)
         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_filename = file
+        data.native_file = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_filename)
+        data_path = geode_functions.data_file_path(data.id, data.native_file)
         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_filename = file
+        data.native_file = file
         session = get_session()
         if session:
             session.commit()
 
-        data_path = geode_functions.data_file_path(data.id, data.native_filename)
+        data_path = geode_functions.data_file_path(data.id, data.native_file)
         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

@@ -9,13 +9,11 @@
 import shutil
 import uuid
 import zipfile
-import io
 from pathlib import Path
 
 # Local application imports
 from opengeodeweb_microservice.database.data import Data
-from opengeodeweb_microservice.database.connection import get_session
-from opengeodeweb_back import geode_functions, utils_functions
+from opengeodeweb_back import utils_functions
 from opengeodeweb_back.geode_objects.geode_brep import GeodeBRep
 
 base_dir = os.path.abspath(os.path.dirname(__file__))
@@ -123,12 +121,12 @@ def test_save_all_viewables_and_return_info(client: FlaskClient) -> None:
         )
 
         assert isinstance(result, dict)
-        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")
+        native_file = result["native_file"]
+        assert isinstance(native_file, str)
+        assert native_file.startswith("native.")
+        viewable_file = result["viewable_file"]
+        assert isinstance(viewable_file, str)
+        assert viewable_file.endswith(".vtm")
         assert isinstance(result["id"], str)
         assert len(result["id"]) == 32
         assert re.match(r"[0-9a-f]{32}", result["id"])
@@ -139,8 +137,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_filename == result["native_filename"]
-        assert db_entry.viewable_filename == result["viewable_filename"]
+        assert db_entry.native_file == result["native_file"]
+        assert db_entry.viewable_file == result["viewable_file"]
         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 +167,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_filename == result["native_filename"]
+        assert db_entry_before.native_file == result["native_file"]
 
 
 def test_generate_native_viewable_and_light_viewable_from_object(
@@ -186,10 +184,10 @@ def test_generate_native_viewable_and_light_viewable_from_object(
         )
 
     assert isinstance(result, dict)
-    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["native_file"], str)
+    assert result["native_file"].startswith("native.")
+    assert isinstance(result["viewable_file"], str)
+    assert result["viewable_file"].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 +205,10 @@ def test_generate_native_viewable_and_light_viewable_from_file(
         )
 
     assert isinstance(result, dict)
-    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["native_file"], str)
+    assert result["native_file"].startswith("native.")
+    assert isinstance(result["viewable_file"], str)
+    assert result["viewable_file"].endswith(".vtm")
     assert isinstance(result["id"], str)
     assert re.match(r"[0-9a-f]{32}", result["id"])
     assert isinstance(result["viewer_type"], str)