Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/blueprint_create

Author: SpliiT

requirements.txt

@@ -59,3 +59,5 @@ werkzeug==3.1.2
     #   -r requirements.in
     #   flask
     #   flask-cors
+
+opengeodeweb-microservice==1.*,>=1.0.5rc1

src/opengeodeweb_back/utils_functions.py

@@ -224,6 +224,7 @@ def generate_native_viewable_and_light_viewable_from_object(
 ) -> dict[str, str | list[str]]:
     data_entry = Data.create(
         geode_object=geode_object,
+        viewer_object=geode_functions.get_object_type(geode_object),
         input_file="",
         additional_files=[],
     )
@@ -236,6 +237,7 @@ def generate_native_viewable_and_light_viewable_from_file(
 ) -> dict[str, str | list[str]]:
     data_entry = Data.create(
         geode_object=geode_object,
+        viewer_object=geode_functions.get_object_type(geode_object),
         input_file=input_filename,
         additional_files=[],
     )

tests/test_models_routes.py

@@ -35,6 +35,7 @@ def test_extract_brep_uuids(client, test_id):
     with client.application.app_context():
         data_entry = Data.create(
             geode_object="BRep",
+            viewer_object=geode_functions.get_object_type("BRep"),
             input_file=brep_filename,
         )
         data_entry.native_file_name = brep_filename

tests/test_routes.py

@@ -171,7 +171,11 @@ def get_full_data():
 
 def test_texture_coordinates(client, test_id):
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="hat.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="hat.vtp",
+        )
         data.native_file_name = "hat.vtp"
         session = get_session()
         if session:
@@ -195,7 +199,11 @@ def test_vertex_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/vertex_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="test.vtp",
+        )
         data.native_file_name = "test.vtp"
         session = get_session()
         if session:
@@ -217,7 +225,11 @@ def test_polygon_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/polygon_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolygonalSurface3D", input_file="test.vtp")
+        data = Data.create(
+            geode_object="PolygonalSurface3D",
+            viewer_object=geode_functions.get_object_type("PolygonalSurface3D"),
+            input_file="test.vtp",
+        )
         data.native_file_name = "test.vtp"
         session = get_session()
         if session:
@@ -239,7 +251,11 @@ def test_polyhedron_attribute_names(client, test_id):
     route = f"/opengeodeweb_back/polyhedron_attribute_names"
 
     with client.application.app_context():
-        data = Data.create(geode_object="PolyhedralSolid3D", input_file="test.vtu")
+        data = Data.create(
+            geode_object="PolyhedralSolid3D",
+            viewer_object=geode_functions.get_object_type("PolyhedralSolid3D"),
+            input_file="test.vtu",
+        )
         data.native_file_name = "test.vtu"
         session = get_session()
         if session:

tests/test_utils_functions.py

@@ -105,6 +105,7 @@ def test_save_all_viewables_and_return_info(client):
 
         data_entry = Data.create(
             geode_object=geode_object,
+            viewer_object=geode_functions.get_object_type(geode_object),
             input_file=input_file,
             additional_files=additional_files,
         )
@@ -146,6 +147,7 @@ def test_save_all_viewables_commits_to_db(client):
 
         data_entry = Data.create(
             geode_object=geode_object,
+            viewer_object=geode_functions.get_object_type(geode_object),
             input_file=input_file,
             additional_files=[],
         )