Skip to content
Closed
Show file tree
Hide file tree
Changes from 9 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
14 changes: 7 additions & 7 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
opengeode-core==15.31.5
opengeode-io==7.4.8
opengeode-inspector==6.8.17
opengeode-geosciences==9.5.9
opengeode-geosciencesio==5.8.10
geode-common==33.19.0
geode-viewables==3.3.4
opengeode-core==16.0.0
opengeode-io==7.4.9
opengeode-inspector==6.8.18
opengeode-geosciences==9.5.10
opengeode-geosciencesio==5.8.11
geode-common==33.19.1
geode-viewables==3.3.5
flask[async]==3.1.2
flask-cors==6.0.1
werkzeug==3.1.2
15 changes: 7 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ flask[async]>=3
# flask-cors
flask-cors==6.0.1
# via -r requirements.in
geode-common==33.19.0
geode-common==33.19.1
# via
# -r requirements.in
# geode-viewables
geode-viewables==3.3.4
geode-viewables==3.3.5
# via -r requirements.in
itsdangerous>=2
# via flask
Expand All @@ -31,7 +31,7 @@ markupsafe>=3
# flask
# jinja2
# werkzeug
opengeode-core==15.31.5
opengeode-core==16.0.0
# via
# -r requirements.in
# geode-common
Expand All @@ -40,16 +40,16 @@ opengeode-core==15.31.5
# opengeode-geosciencesio
# opengeode-inspector
# opengeode-io
opengeode-geosciences==9.5.9
opengeode-geosciences==9.5.10
# via
# -r requirements.in
# geode-viewables
# opengeode-geosciencesio
opengeode-geosciencesio==5.8.10
opengeode-geosciencesio==5.8.11
# via -r requirements.in
opengeode-inspector==6.8.17
opengeode-inspector==6.8.18
# via -r requirements.in
opengeode-io==7.4.8
opengeode-io==7.4.9
# via
# -r requirements.in
# geode-viewables
Expand All @@ -60,4 +60,3 @@ werkzeug==3.1.2
# flask
# flask-cors

opengeodeweb-microservice==1.*,>=1.0.15
5 changes: 4 additions & 1 deletion src/opengeodeweb_back/utils_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,14 @@ def save_all_viewables_and_return_info(
assert data.native_file is not None
assert data.viewable_file is not None
assert data.light_viewable_file is not None
name = geode_object.identifier.name()
if not name:
name = data.native_file
Comment thread
MaxNumerique marked this conversation as resolved.
Outdated
return {
"native_file": data.native_file,
"viewable_file": data.viewable_file,
"id": data.id,
"name": geode_object.identifier.name(),
"name": name,
"viewer_type": data.viewer_object,
"binary_light_viewable": binary_light_viewable.decode("utf-8"),
"geode_object_type": data.geode_object,
Expand Down
4 changes: 3 additions & 1 deletion tests/test_geode_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def test_input_output() -> None:
if generic_geode_object.is_loadable(file_absolute_path).value() == 0.0:
continue
geode_object = generic_geode_object.load(file_absolute_path)
data_name = geode_object.identifier.name()
data_name = geode_object.identifier.name() or os.path.basename(
file_absolute_path
)
if geode_object.is_viewable():
viewable_file_path = geode_object.save_viewable(
os.path.join(os.path.abspath(f"./output"), data_name)
Expand Down
Loading