Skip to content

update dependencies #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 26, 2025
Merged

update dependencies #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ab054a
update dependencies
JulienChampagnol Jan 26, 2025
e5c67d7
remove unused imports
JulienChampagnol Jan 26, 2025
ff4ba3c
fix is_viewable on some classes
JulienChampagnol Jan 26, 2025
e726681
return data.name()
JulienChampagnol Jan 26, 2025
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.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.8.1
# via flask
attrs==24.3.0
attrs==25.1.0
# via
# jsonschema
# referencing
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/opengeodeweb_back/geode_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import os

# Third party imports
import flask
import opengeode_geosciences as og_gs
import opengeode as og

Expand Down
6 changes: 3 additions & 3 deletions src/opengeodeweb_back/geode_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down
6 changes: 1 addition & 5 deletions src/opengeodeweb_back/routes/blueprint_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 3 additions & 1 deletion tests/test_geode_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down Expand Up @@ -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,
Expand Down
Loading