From 43e94995601cd00d39f9a5b5aa85b85b1f18b7e6 Mon Sep 17 00:00:00 2001 From: Arnaud Botella Date: Wed, 15 Oct 2025 16:45:35 +0200 Subject: [PATCH 1/3] fix(Data): add viewer object --- src/opengeodeweb_back/utils_functions.py | 2 ++ tests/test_models_routes.py | 1 + tests/test_routes.py | 24 ++++++++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py index f60a104a..d7d8d286 100644 --- a/src/opengeodeweb_back/utils_functions.py +++ b/src/opengeodeweb_back/utils_functions.py @@ -186,6 +186,7 @@ def save_all_viewables_and_return_info( 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, ) @@ -241,6 +242,7 @@ def generate_native_viewable_and_light_viewable_from_file( temp_data_entry = Data.create( geode_object=geode_object, + viewer_object=geode_functions.get_object_type(geode_object), input_file=input_filename, additional_files=[], ) diff --git a/tests/test_models_routes.py b/tests/test_models_routes.py index 83fa4cbd..e1f916b7 100644 --- a/tests/test_models_routes.py +++ b/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 diff --git a/tests/test_routes.py b/tests/test_routes.py index fd1095e2..17354b37 100644 --- a/tests/test_routes.py +++ b/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: From e2e9b37d03292a4cf85647506e660e6e3b264ee0 Mon Sep 17 00:00:00 2001 From: BotellaA <3213882+BotellaA@users.noreply.github.com> Date: Wed, 15 Oct 2025 14:46:28 +0000 Subject: [PATCH 2/3] Apply prepare changes --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3b9ca443..1972ac0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -60,4 +60,3 @@ werkzeug==3.1.2 # flask # flask-cors -opengeodeweb-microservice==1.*,>=1.0.4 From a552555a0a918593b5f9a37056043e77c8783277 Mon Sep 17 00:00:00 2001 From: Arnaud Botella Date: Thu, 16 Oct 2025 14:11:44 +0200 Subject: [PATCH 3/3] fix --- src/opengeodeweb_back/utils_functions.py | 1 + tests/test_utils_functions.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/opengeodeweb_back/utils_functions.py b/src/opengeodeweb_back/utils_functions.py index 7e86c601..934ac195 100644 --- a/src/opengeodeweb_back/utils_functions.py +++ b/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=[], ) diff --git a/tests/test_utils_functions.py b/tests/test_utils_functions.py index 3d7b3dd6..87c457ec 100644 --- a/tests/test_utils_functions.py +++ b/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=[], )