From 293a73208d27d3c77a03df206c7153f59668b45d Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Wed, 6 Aug 2025 12:06:52 +0200 Subject: [PATCH 1/4] fix(object_priority): added object_priority to list_geode_objects function --- src/opengeodeweb_back/geode_functions.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/opengeodeweb_back/geode_functions.py b/src/opengeodeweb_back/geode_functions.py index 3fd4cd05..19d4ddf4 100644 --- a/src/opengeodeweb_back/geode_functions.py +++ b/src/opengeodeweb_back/geode_functions.py @@ -188,7 +188,11 @@ def list_geode_objects( for geode_object in geode_objects_filtered_list: if has_creator(geode_object, file_extension): loadability_score = is_loadable(geode_object, file_absolute_path) - return_dict[geode_object] = {"is_loadable": loadability_score} + object_priority = object_priority(geode_object, file_absolute_path) + return_dict[geode_object] = { + "is_loadable": loadability_score, + "priority": object_priority + } return return_dict From 35942a88c9815cc5caad432630f586171093c1d6 Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Wed, 6 Aug 2025 14:00:47 +0200 Subject: [PATCH 2/4] fix(object_priority): added object_priority to list_geode_objects function --- src/opengeodeweb_back/geode_functions.py | 6 +++--- tests/test_geode_functions.py | 13 +++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/opengeodeweb_back/geode_functions.py b/src/opengeodeweb_back/geode_functions.py index 19d4ddf4..763a4a7e 100644 --- a/src/opengeodeweb_back/geode_functions.py +++ b/src/opengeodeweb_back/geode_functions.py @@ -188,11 +188,11 @@ def list_geode_objects( for geode_object in geode_objects_filtered_list: if has_creator(geode_object, file_extension): loadability_score = is_loadable(geode_object, file_absolute_path) - object_priority = object_priority(geode_object, file_absolute_path) + priority_score = object_priority(geode_object, file_absolute_path) return_dict[geode_object] = { "is_loadable": loadability_score, - "priority": object_priority - } + "object_priority": priority_score, + } return return_dict diff --git a/tests/test_geode_functions.py b/tests/test_geode_functions.py index 3cdaa5e0..620f1542 100644 --- a/tests/test_geode_functions.py +++ b/tests/test_geode_functions.py @@ -304,12 +304,13 @@ def test_list_geode_objects(): assert len(return_dict.keys()) >= 1 for input_geode_object, input_extension_dict in return_dict.items(): assert type(input_extension_dict) is dict - for ( - input_extension, - input_extension_value, - ) in input_extension_dict.items(): - assert isinstance(input_extension_value, float) - assert 0.0 <= input_extension_value <= 1.0 + if "is_loadable" in input_extension_dict: + is_loadable_value = input_extension_dict["is_loadable"] + assert isinstance(is_loadable_value, float) + assert 0.0 <= is_loadable_value <= 1.0 + assert "object_priority" in input_extension_dict + object_priority_value = input_extension_dict["object_priority"] + assert isinstance(object_priority_value, int) def test_geode_objects_output_extensions(): From b3b882bfda54574fbc0a95c0b89f48d2ec230a4b Mon Sep 17 00:00:00 2001 From: MaxNumerique <144453705+MaxNumerique@users.noreply.github.com> Date: Wed, 6 Aug 2025 12:03:23 +0000 Subject: [PATCH 3/4] Apply prepare changes --- tests/test_geode_functions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_geode_functions.py b/tests/test_geode_functions.py index 620f1542..870a130a 100644 --- a/tests/test_geode_functions.py +++ b/tests/test_geode_functions.py @@ -309,7 +309,9 @@ def test_list_geode_objects(): assert isinstance(is_loadable_value, float) assert 0.0 <= is_loadable_value <= 1.0 assert "object_priority" in input_extension_dict - object_priority_value = input_extension_dict["object_priority"] + object_priority_value = input_extension_dict[ + "object_priority" + ] assert isinstance(object_priority_value, int) From c2cfcdc0f15b6d53694fa81b177af628afc51f5f Mon Sep 17 00:00:00 2001 From: MaxNumerique Date: Wed, 6 Aug 2025 15:07:43 +0200 Subject: [PATCH 4/4] fix(ObjectPriority): add object_priority to list_geode_objects function