Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OpenGeode-core==15.24.1
OpenGeode-IO==7.3.1
OpenGeode-core==15.24.2
OpenGeode-IO==7.3.2
OpenGeode-Inspector==6.7.0
OpenGeode-Geosciences==9.2.1
OpenGeode-GeosciencesIO==5.7.1
OpenGeode-Geosciences==9.2.2
OpenGeode-GeosciencesIO==5.7.2
Geode-Viewables==3.2.0
fastjsonschema==2.16.2
Flask[async]==3.0.3
Flask-Cors==6.0.1
werkzeug==3.0.3
werkzeug==3.0.3
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ markupsafe==3.0.2
# via
# jinja2
# werkzeug
opengeode-core==15.24.1
opengeode-core==15.24.2
# via
# -r requirements.in
# geode-common
Expand All @@ -40,16 +40,16 @@ opengeode-core==15.24.1
# opengeode-geosciencesio
# opengeode-inspector
# opengeode-io
opengeode-geosciences==9.2.1
opengeode-geosciences==9.2.2
# via
# -r requirements.in
# geode-viewables
# opengeode-geosciencesio
opengeode-geosciencesio==5.7.1
opengeode-geosciencesio==5.7.2
# via -r requirements.in
opengeode-inspector==6.7.0
# via -r requirements.in
opengeode-io==7.3.1
opengeode-io==7.3.2
# via
# -r requirements.in
# geode-viewables
Expand Down
9 changes: 5 additions & 4 deletions src/opengeodeweb_back/geode_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ def additional_files(geode_object: str, file_absolute_path: str):
return geode_object_value(geode_object)["additional_files"](file_absolute_path)


def is_loadable(geode_object: str, file_absolute_path: str):
return geode_object_value(geode_object)["is_loadable"](file_absolute_path)
def is_loadable(geode_object: str, file_absolute_path: str) -> float:
percentage = geode_object_value(geode_object)["is_loadable"](file_absolute_path)
return percentage.value()


def load(geode_object: str, file_absolute_path: str):
Expand Down Expand Up @@ -183,8 +184,8 @@ def list_geode_objects(

for geode_object in geode_objects_filtered_list:
if has_creator(geode_object, file_extension):
file_is_loadable = is_loadable(geode_object, file_absolute_path)
return_dict[geode_object] = {"is_loadable": file_is_loadable}
loadability_score = is_loadable(geode_object, file_absolute_path)
return_dict[geode_object] = {"is_loadable": loadability_score}
return return_dict


Expand Down
14 changes: 8 additions & 6 deletions tests/test_geode_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ def test_is_loadable():
for input_extension in input_extensions:
file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
is_loadable = geode_functions.is_loadable(geode_object, file_absolute_path)
assert type(is_loadable) is bool
assert isinstance(is_loadable, float)
assert 0.0 <= is_loadable <= 1.0


def test_load():
Expand All @@ -73,7 +74,7 @@ def test_load():
for input_extension in input_extensions:
print(f"\t{input_extension=}")
file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
if geode_functions.is_loadable(geode_object, file_absolute_path):
if geode_functions.is_loadable(geode_object, file_absolute_path) > 0.0:
data = geode_functions.load(geode_object, file_absolute_path)
data_name = data.name()
if "save_viewable" in value:
Expand Down Expand Up @@ -171,7 +172,7 @@ def test_geode_object_output_extensions():
print(
f"\t\tAdditional files: {[f.filename for f in additional.optional_files]}"
)
if geode_functions.is_loadable(geode_object, file_absolute_path):
if geode_functions.is_loadable(geode_object, file_absolute_path) > 0.0:
data = geode_functions.load(geode_object, file_absolute_path)
geode_objets_and_output_extensions = (
geode_functions.geode_objects_output_extensions(geode_object, data)
Expand Down Expand Up @@ -214,7 +215,7 @@ def test_get_inspector_children():
print(f"\t\t{mandatory_files=}", flush=True)
additional_files = [f.filename for f in additional.optional_files]
print(f"\t\t{additional_files=}", flush=True)
if geode_functions.is_loadable(geode_object, file_absolute_path):
if geode_functions.is_loadable(geode_object, file_absolute_path) > 0.0:
data = geode_functions.load(geode_object, file_absolute_path)
class_inspector = geode_functions.inspect(geode_object, data)
assert "InspectionResult" in class_inspector.__class__.__name__
Expand Down Expand Up @@ -296,15 +297,16 @@ def test_list_geode_objects():
input_extension,
input_extension_value,
) in input_extension_dict.items():
assert type(input_extension_value) is bool
assert isinstance(input_extension_value, float)
assert 0.0 <= input_extension_value <= 1.0


def test_geode_objects_output_extensions():
for geode_object, value in geode_objects.geode_objects_dict().items():
input_extensions = geode_functions.geode_object_input_extensions(geode_object)
for input_extension in input_extensions:
file_absolute_path = os.path.join(data_folder, f"test.{input_extension}")
if geode_functions.is_loadable(geode_object, file_absolute_path):
if geode_functions.is_loadable(geode_object, file_absolute_path) > 0.0:
data = geode_functions.load(geode_object, file_absolute_path)
geode_objects_and_output_extensions = (
geode_functions.geode_objects_output_extensions(geode_object, data)
Expand Down
36 changes: 21 additions & 15 deletions tests/test_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,13 @@ def test_vertex_attribute_names(client, test_id):
elements = geode_functions.get_elements(geode_object)
if "points" in elements:
for input_extension in input_extensions:
is_loadable = geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
if is_loadable:
if (
geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
> 0.0
):

def get_full_data():
return {
Expand Down Expand Up @@ -238,11 +240,13 @@ def test_polygon_attribute_names(client, test_id):
elements = geode_functions.get_elements(geode_object)
if "polygons" in elements:
for input_extension in input_extensions:
is_loadable = geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
if is_loadable:
if (
geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
> 0.0
):

def get_full_data():
return {
Expand Down Expand Up @@ -275,11 +279,13 @@ def test_polyhedron_attribute_names(client, test_id):
elements = geode_functions.get_elements(geode_object)
if "polyhedrons" in elements:
for input_extension in input_extensions:
is_loadable = geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
if is_loadable:
if (
geode_functions.is_loadable(
geode_object,
os.path.join("./data", f"test.{input_extension}"),
)
> 0.0
):

def get_full_data():
return {
Expand Down
Loading