Skip to content

Commit ee782fc

Browse files
Merge pull request #115 from Geode-solutions/next
No commit message
2 parents d4c274c + 4ecf9be commit ee782fc

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# CHANGELOG
22

33

4+
## v5.4.3-rc.1 (2025-01-26)
5+
6+
### Bug Fixes
7+
8+
- **deps**: Trigger semantic
9+
([`ac4ddd7`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/ac4ddd70936ec159945b4b6864d97c664ce8b1b7))
10+
11+
412
## v5.4.2 (2025-01-22)
513

614

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
55

66
[project]
77
name = "OpenGeodeWeb-Back"
8-
version = "5.4.2"
8+
version = "5.4.3-rc.1"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
asgiref==3.8.1
88
# via flask
9-
attrs==24.3.0
9+
attrs==25.1.0
1010
# via
1111
# jsonschema
1212
# referencing
@@ -20,12 +20,12 @@ flask[async]==3.1.0
2020
# flask-cors
2121
flask-cors==5.0.0
2222
# via -r requirements.in
23-
geode-background==8.8.9
23+
geode-background==8.8.10
2424
# via
2525
# geode-explicit
2626
# geode-implicit
2727
# geode-simplex
28-
geode-common==33.3.0
28+
geode-common==33.4.0
2929
# via
3030
# -r requirements.in
3131
# geode-background
@@ -51,7 +51,7 @@ geode-numerics==5.2.4
5151
# -r requirements.in
5252
# geode-implicit
5353
# geode-simplex
54-
geode-simplex==9.0.7
54+
geode-simplex==9.0.8
5555
# via
5656
# -r requirements.in
5757
# geode-implicit
@@ -69,7 +69,7 @@ markupsafe==3.0.2
6969
# via
7070
# jinja2
7171
# werkzeug
72-
opengeode-core==15.9.7
72+
opengeode-core==15.9.8
7373
# via
7474
# -r requirements.in
7575
# geode-background
@@ -84,7 +84,7 @@ opengeode-core==15.9.7
8484
# opengeode-geosciencesio
8585
# opengeode-inspector
8686
# opengeode-io
87-
opengeode-geosciences==8.2.1
87+
opengeode-geosciences==8.2.2
8888
# via
8989
# -r requirements.in
9090
# geode-implicit
@@ -106,7 +106,7 @@ opengeode-io==7.0.9
106106
# geode-implicit
107107
# geode-viewables
108108
# opengeode-geosciencesio
109-
referencing==0.36.1
109+
referencing==0.36.2
110110
# via
111111
# jsonschema
112112
# jsonschema-specifications

src/opengeodeweb_back/geode_functions.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import os
33

44
# Third party imports
5-
import flask
65
import opengeode_geosciences as og_gs
76
import opengeode as og
87

src/opengeodeweb_back/geode_objects.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def geode_objects_dict():
110110
"builder": og.GraphBuilder.create,
111111
"object_type": "mesh",
112112
"is_3D": False,
113-
"is_viewable": True,
113+
"is_viewable": False,
114114
},
115115
"HybridSolid3D": {
116116
"class": og.HybridSolid3D,
@@ -321,7 +321,7 @@ def geode_objects_dict():
321321
"save": og.save_raster_image2D,
322322
"object_type": "mesh",
323323
"is_3D": False,
324-
"is_viewable": False,
324+
"is_viewable": True,
325325
"save_viewable": g_v.save_viewable_raster_image2D,
326326
},
327327
"RasterImage3D": {
@@ -335,7 +335,7 @@ def geode_objects_dict():
335335
"save": og.save_raster_image3D,
336336
"object_type": "mesh",
337337
"is_3D": False,
338-
"is_viewable": False,
338+
"is_viewable": True,
339339
"save_viewable": g_v.save_viewable_raster_image3D,
340340
},
341341
"RegularGrid2D": {

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,7 @@ def save_viewable_file():
240240
data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
241241
generated_id = str(uuid.uuid4()).replace("-", "")
242242

243-
if geode_functions.is_viewable(flask.request.json["input_geode_object"]):
244-
name = data.name()
245-
else:
246-
name = flask.request.json["filename"]
247-
243+
name = data.name()
248244
native_extension = data.native_extension()
249245

250246
absolute_native_file_path = os.path.join(

tests/test_geode_functions.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,14 @@ def test_load():
8686
print(f"\t\t{additional_files=}")
8787
if geode_functions.is_loadable(geode_object, file_absolute_path):
8888
data = geode_functions.load(geode_object, file_absolute_path)
89+
data_name = data.name()
8990
if "save_viewable" in value:
9091
uu_id = str(uuid.uuid4()).replace("-", "")
9192
viewable_file_path = geode_functions.save_viewable(
9293
geode_object,
9394
data,
9495
os.path.abspath(f"./output"),
95-
uu_id,
96+
data_name,
9697
)
9798
os.remove(viewable_file_path)
9899
geode_objects_and_output_extensions = (
@@ -174,6 +175,7 @@ def test_geode_object_output_extensions():
174175
geode_objets_and_output_extensions = (
175176
geode_functions.geode_objects_output_extensions(geode_object, data)
176177
)
178+
data_name = data.name()
177179
assert type(geode_objets_and_output_extensions) is dict
178180
for (
179181
output_geode_object,

0 commit comments

Comments
 (0)