From 5ab054aade8d58220fd9e9dc254f362725658a43 Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Sun, 26 Jan 2025 20:07:28 +0100 Subject: [PATCH 1/4] update dependencies --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6273c53e..69511ee1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ # asgiref==3.8.1 # via flask -attrs==24.3.0 +attrs==25.1.0 # via # jsonschema # referencing @@ -20,12 +20,12 @@ flask[async]==3.1.0 # flask-cors flask-cors==5.0.0 # via -r requirements.in -geode-background==8.8.9 +geode-background==8.8.10 # via # geode-explicit # geode-implicit # geode-simplex -geode-common==33.3.0 +geode-common==33.4.0 # via # -r requirements.in # geode-background @@ -51,7 +51,7 @@ geode-numerics==5.2.4 # -r requirements.in # geode-implicit # geode-simplex -geode-simplex==9.0.7 +geode-simplex==9.0.8 # via # -r requirements.in # geode-implicit @@ -69,7 +69,7 @@ markupsafe==3.0.2 # via # jinja2 # werkzeug -opengeode-core==15.9.7 +opengeode-core==15.9.8 # via # -r requirements.in # geode-background @@ -84,7 +84,7 @@ opengeode-core==15.9.7 # opengeode-geosciencesio # opengeode-inspector # opengeode-io -opengeode-geosciences==8.2.1 +opengeode-geosciences==8.2.2 # via # -r requirements.in # geode-implicit @@ -106,7 +106,7 @@ opengeode-io==7.0.9 # geode-implicit # geode-viewables # opengeode-geosciencesio -referencing==0.36.1 +referencing==0.36.2 # via # jsonschema # jsonschema-specifications From e5c67d7645ad94d8f4aeb73ad71aa44028ff8bac Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Sun, 26 Jan 2025 20:07:50 +0100 Subject: [PATCH 2/4] remove unused imports --- src/opengeodeweb_back/geode_functions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/opengeodeweb_back/geode_functions.py b/src/opengeodeweb_back/geode_functions.py index 2869d493..65cd4944 100644 --- a/src/opengeodeweb_back/geode_functions.py +++ b/src/opengeodeweb_back/geode_functions.py @@ -2,7 +2,6 @@ import os # Third party imports -import flask import opengeode_geosciences as og_gs import opengeode as og From ff4ba3c3c5a74f18e0f35790091544867bf3d05b Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Sun, 26 Jan 2025 20:08:05 +0100 Subject: [PATCH 3/4] fix is_viewable on some classes --- src/opengeodeweb_back/geode_objects.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opengeodeweb_back/geode_objects.py b/src/opengeodeweb_back/geode_objects.py index 83e55f91..e0d697ac 100644 --- a/src/opengeodeweb_back/geode_objects.py +++ b/src/opengeodeweb_back/geode_objects.py @@ -110,7 +110,7 @@ def geode_objects_dict(): "builder": og.GraphBuilder.create, "object_type": "mesh", "is_3D": False, - "is_viewable": True, + "is_viewable": False, }, "HybridSolid3D": { "class": og.HybridSolid3D, @@ -321,7 +321,7 @@ def geode_objects_dict(): "save": og.save_raster_image2D, "object_type": "mesh", "is_3D": False, - "is_viewable": False, + "is_viewable": True, "save_viewable": g_v.save_viewable_raster_image2D, }, "RasterImage3D": { @@ -335,7 +335,7 @@ def geode_objects_dict(): "save": og.save_raster_image3D, "object_type": "mesh", "is_3D": False, - "is_viewable": False, + "is_viewable": True, "save_viewable": g_v.save_viewable_raster_image3D, }, "RegularGrid2D": { From e7266819c5d19096c13564ec22f4f7a378b5251f Mon Sep 17 00:00:00 2001 From: JulienChampagnol Date: Sun, 26 Jan 2025 20:08:37 +0100 Subject: [PATCH 4/4] return data.name() --- src/opengeodeweb_back/routes/blueprint_routes.py | 6 +----- tests/test_geode_functions.py | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index f8c49a92..9f9dcbed 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -240,11 +240,7 @@ def save_viewable_file(): data = geode_functions.load(flask.request.json["input_geode_object"], file_path) generated_id = str(uuid.uuid4()).replace("-", "") - if geode_functions.is_viewable(flask.request.json["input_geode_object"]): - name = data.name() - else: - name = flask.request.json["filename"] - + name = data.name() native_extension = data.native_extension() absolute_native_file_path = os.path.join( diff --git a/tests/test_geode_functions.py b/tests/test_geode_functions.py index 7d264374..fe7a9320 100644 --- a/tests/test_geode_functions.py +++ b/tests/test_geode_functions.py @@ -86,13 +86,14 @@ def test_load(): print(f"\t\t{additional_files=}") if geode_functions.is_loadable(geode_object, file_absolute_path): data = geode_functions.load(geode_object, file_absolute_path) + data_name = data.name() if "save_viewable" in value: uu_id = str(uuid.uuid4()).replace("-", "") viewable_file_path = geode_functions.save_viewable( geode_object, data, os.path.abspath(f"./output"), - uu_id, + data_name, ) os.remove(viewable_file_path) geode_objects_and_output_extensions = ( @@ -174,6 +175,7 @@ def test_geode_object_output_extensions(): geode_objets_and_output_extensions = ( geode_functions.geode_objects_output_extensions(geode_object, data) ) + data_name = data.name() assert type(geode_objets_and_output_extensions) is dict for ( output_geode_object,