cleaned geode_functions using data_id

adapt routes and schemas

Author: MaxNumerique

src/opengeodeweb_back/geode_functions.py

@@ -11,6 +11,7 @@
 from .geode_objects import geode_objects_dict
 from . import utils_functions
 from .data import Data
+from .database import database
 
 
 def geode_object_value(geode_object: str):
@@ -53,17 +54,9 @@ def data_file_path(data_id: str, filename: str = None) -> str:
     return os.path.join(data_folder_path, data_id)
 
 
-# Get data from database using data_id
-def get_data_info(data_id: str):
-    data_entry = Data.query.get(data_id)
-    if not data_entry:
-        flask.abort(404, f"Data with id {data_id} not found")
-    return data_entry
-
-
-# Using data_id, load data directly
 def load_data_by_id(data_id: str):
-    data_entry = Data.query.get(data_id)
+    data_entry = database.session.get(Data, data_id)
+    print(data_entry.geode_object)
     if not data_entry:
         flask.abort(404, f"Data with id {data_id} not found")
 
@@ -72,9 +65,12 @@ def load_data_by_id(data_id: str):
     return load(data_entry.geode_object, file_absolute_path)
 
 
-def load_data(geode_object: str, data_id: str, filename: str):
-    file_absolute_path = data_file_path(data_id, filename)
-    return load(geode_object, file_absolute_path)
+def get_data_info(data_id: str):
+    from .data import Data
+    data_entry = database.session.get(Data, data_id)
+    if not data_entry:
+        flask.abort(404, f"Data with id {data_id} not found")
+    return data_entry
 
 
 def upload_file_path(filename):

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -290,14 +290,8 @@ def create_point():
 )
 def texture_coordinates():
     utils_functions.validate_request(flask.request, texture_coordinates_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data_by_id(flask.request.json["id"])
     texture_coordinates = data.texture_manager().texture_names()
-
     return flask.make_response({"texture_coordinates": texture_coordinates}, 200)
 
 
@@ -314,14 +308,8 @@ def texture_coordinates():
 )
 def vertex_attribute_names():
     utils_functions.validate_request(flask.request, vertex_attribute_names_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data_by_id(flask.request.json["id"])
     vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "vertex_attribute_names": vertex_attribute_names,
@@ -343,14 +331,8 @@ def vertex_attribute_names():
 )
 def polygon_attribute_names():
     utils_functions.validate_request(flask.request, polygon_attribute_names_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data_by_id(flask.request.json["id"])
     polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "polygon_attribute_names": polygon_attribute_names,
@@ -372,14 +354,8 @@ def polygon_attribute_names():
 )
 def polyhedron_attribute_names():
     utils_functions.validate_request(flask.request, polyhedron_attribute_names_json)
-    data = geode_functions.load_data(
-        flask.request.json["input_geode_object"],
-        flask.request.json["id"],
-        flask.request.json["filename"],
-    )
-
+    data = geode_functions.load_data_by_id(flask.request.json["id"])
     polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()
-
     return flask.make_response(
         {
             "polyhedron_attribute_names": polyhedron_attribute_names,

src/opengeodeweb_back/routes/models/blueprint_models.py

@@ -49,8 +49,6 @@ def extract_model_uuids(model):
 @routes.route(mesh_components_json["route"], methods=mesh_components_json["methods"])
 def extract_uuids_endpoint():
     utils_functions.validate_request(flask.request, mesh_components_json)
-
     model = geode_functions.load_data_by_id(flask.request.json["id"])
-
     uuid_dict = extract_model_uuids(model)
     return flask.make_response({"uuid_dict": uuid_dict}, 200)

src/opengeodeweb_back/utils_functions.py

@@ -248,7 +248,7 @@ def generate_native_viewable_and_light_viewable_from_file(
         shutil.copy2(source_path, dest_path)
         additional_files_copied.append(additional_file.filename)
 
-    data = geode_functions.load_data(geode_object, temp_data_entry.id, input_filename)
+    data = geode_functions.load(geode_object, copied_full_path)
 
     database.session.delete(temp_data_entry)
     database.session.flush()

tests/test_models_routes.py

@@ -3,6 +3,8 @@
 import flask
 
 from src.opengeodeweb_back import geode_functions
+from src.opengeodeweb_back.data import Data
+from src.opengeodeweb_back.database import database
 
 
 def test_model_mesh_components(client, test_id):
@@ -28,14 +30,16 @@ def test_model_mesh_components(client, test_id):
 
 def test_extract_brep_uuids(client, test_id):
     route = "/models/mesh_components"
-
     brep_filename = "cube.og_brep"
-    json_data = {"id": test_id, "geode_object": "BRep", "filename": brep_filename}
-
-    with client.application.app_context():
-        data_path = geode_functions.data_file_path(json_data["id"], brep_filename)
+    
+    with client.application.app_context():        
+        data_entry = Data.create(name="test_brep", geode_object="BRep", input_file=brep_filename)
+        data_entry.native_file_name = brep_filename
+        database.session.commit()
+        data_path = geode_functions.data_file_path(test_id, brep_filename)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy(f"./tests/data/{brep_filename}", data_path)
+    json_data = {"id": test_id}
     response = client.post(route, json=json_data)
 
     assert response.status_code == 200

tests/test_routes.py

@@ -7,6 +7,8 @@
 
 # Local application imports
 from src.opengeodeweb_back import geode_functions, geode_objects, test_utils
+from src.opengeodeweb_back.data import Data
+from src.opengeodeweb_back.database import database
 
 
 def test_allowed_files(client):
@@ -169,18 +171,25 @@ def get_full_data():
     test_utils.test_route_wrong_params(client, route, get_full_data)
 
 
-def test_texture_coordinates(client, test_id):
+def test_texture_coordinates(client, test_id):    
     with client.application.app_context():
-        data_path = geode_functions.data_file_path(test_id, "hat.vtp")
+        data = Data.create(
+            name="hat",
+            geode_object="PolygonalSurface3D",
+            input_file="hat.vtp"
+        )
+        data.native_file_name = "hat.vtp"
+        database.session.commit()
+
+        data_path = geode_functions.data_file_path(data.id, "hat.vtp")
+        print(data_path)
         os.makedirs(os.path.dirname(data_path), exist_ok=True)
         shutil.copy("./tests/data/hat.vtp", data_path)
 
     response = client.post(
         "/texture_coordinates",
         json={
-            "input_geode_object": "PolygonalSurface3D",
-            "id": test_id,
-            "filename": "hat.vtp",
+            "id": data.id
         },
     )
     assert response.status_code == 200
@@ -211,9 +220,7 @@ def test_vertex_attribute_names(client, test_id):
 
                             def get_full_data():
                                 return {
-                                    "input_geode_object": geode_object,
                                     "id": test_id,
-                                    "filename": f"test.{input_extension}",
                                 }
 
                             response = client.post(route, json=get_full_data())
@@ -250,9 +257,7 @@ def test_polygon_attribute_names(client, test_id):
 
                             def get_full_data():
                                 return {
-                                    "input_geode_object": geode_object,
                                     "id": test_id,
-                                    "filename": f"test.{input_extension}",
                                 }
 
                             response = client.post(route, json=get_full_data())
@@ -289,9 +294,7 @@ def test_polyhedron_attribute_names(client, test_id):
 
                             def get_full_data():
                                 return {
-                                    "input_geode_object": geode_object,
                                     "id": test_id,
-                                    "filename": f"test.{input_extension}",
                                 }
 
                             response = client.post(route, json=get_full_data())