Skip to content

Commit bbb13b1

Browse files
JulienChampagnolJulienChampagnol
committed
pull from master
BREAKING CHANGE: geode_objects_output_extensions takes data as input
1 parent 68ca7f9 commit bbb13b1

File tree

10 files changed

+3730
-73
lines changed

10 files changed

+3730
-73
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist
33
venv
44
output
55
__pycache__
6+
.vscode

‎CHANGELOG.md‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,47 @@
22

33

44

5+
## v2.1.0-rc.2 (2023-11-21)
6+
7+
### Feature
8+
9+
* feat(output_extensions): return is_saveable key
10+
11+
BREAMING CHANGE: geode_objects_output_extensions needs data input ([`61edda6`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/61edda6c84429079bad3bf3f76a52f929fa3a1d7))
12+
13+
### Fix
14+
15+
* fix(CrossSection): is_saveable method ([`10c4f5c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/10c4f5ca760c90aad57e6355d21d01957a4bebf8))
16+
17+
### Unknown
18+
19+
* Merge pull request #40 from Geode-solutions/feat/is_saveable ([`f98db5f`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/f98db5ff8627c7bd8e438c90d0729f77b2ead6fd))
20+
21+
* Merge branch 'next' into feat/is_saveable ([`2971bae`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/2971baed310ec13866a2554029ca41f23f933f81))
22+
23+
* Merge branch 'feat/is_saveable' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/is_saveable ([`4fcbce2`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/4fcbce29885f6d31752f14109b6ff3034d612e8d))
24+
25+
* update unit tests ([`d54ca8e`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/d54ca8e6f7de3a250ba76ef34b589506372cd60a))
26+
27+
* update unit tests ([`41fe232`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/41fe23236f440fc97a7030d5f82a087fc77e6942))
28+
29+
* update requirements ([`007cc5a`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/007cc5aa8f4d66a3d387f3e73e0141665e747f0e))
30+
31+
* add tests files ([`c6eeae5`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/c6eeae5c9812f17e509e1734e9395c2176595722))
32+
33+
* update tests ([`464eae3`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/464eae31527fe651c4f224327d8c25a3c08c92bf))
34+
35+
* update e2e tests ([`07decc6`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/07decc683244d3eb2431f74138afcf539c539235))
36+
37+
* gitignore ([`b122a9a`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/b122a9acaa403bfb6683c7598d1452cafb6ae904))
38+
39+
* remove upload_file method ([`d0fe9ab`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/d0fe9ab031d370729702ca9ee1b03da9e2e7a4ff))
40+
41+
* update requirements ([`e48c31c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/e48c31c1217b3f156e4263ab81c9b00dbb8218de))
42+
43+
* add load test ([`37dabd1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/37dabd1c4b8f8837e07449ff854a3c0029caf3c2))
44+
45+
546
## v2.1.0-rc.1 (2023-11-15)
647

748
### Feature
@@ -35,13 +76,17 @@ BREAKING CHANGE: Arguments changement(array to json schema) ([`2128439`](https:/
3576

3677
### Unknown
3778

79+
* feat(geode_functions) : is_saveable function ([`a4c070c`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/a4c070c38ac92a941b92982f841b60f5ae5fddfc))
80+
3881
* Merge pull request #36 from Geode-solutions/json_back
3982

4083
feat(validate_request):
4184
add json schema into function
4285

4386
BREAKING CHANGE: Arguments changement(array to json schema) ([`06829f5`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/06829f5620a3c3d5ea24ebed51e64e94ad84b0b2))
4487

88+
* feat(geode_objects_dict) : is_saveable key ([`8fc9cf1`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/8fc9cf1288056f1106ab57e4ba52db8bf3ad092c))
89+
4590
* remove useless lines ([`ebbe0e8`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/ebbe0e850b45c703d1af157f3136274ae2711202))
4691

4792
* Json Back - Upgrade ([`c11c23d`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/c11c23d0c30f0ac25f89d3f28dce41dbde0fa6bd))

‎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 = "2.1.0-rc.1"
8+
version = "2.1.0-rc.2"
99
dynamic = ["dependencies"]
1010
authors = [
1111
{ name="Geode-solutions", email="[email protected]" },

‎requirements.txt‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,11 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile
5+
# pip-compile --pre --resolver=backtracking requirements.in
66
#
7-
asgiref==3.7.2
8-
# via flask
9-
attrs==23.1.0
10-
# via
11-
# jsonschema
12-
# referencing
13-
blinker==1.7.0
14-
# via flask
15-
click==8.1.7
16-
# via flask
17-
flask[async]==3.0.0
18-
# via -r requirements.in
19-
geode-common==29.0.1
7+
geode-common==30.0.0rc7
208
# via geode-viewables
21-
geode-viewables==2.1.3
9+
geode-viewables==2.1.4rc1
2210
# via -r requirements.in
2311
itsdangerous==2.1.2
2412
# via flask
@@ -41,19 +29,19 @@ opengeode-core==14.9.3
4129
# opengeode-geosciencesio
4230
# opengeode-inspector
4331
# opengeode-io
44-
opengeode-geosciences==7.2.1
32+
opengeode-geosciences==7.2.2rc4
4533
# via
4634
# -r requirements.in
4735
# geode-viewables
4836
# opengeode-geosciencesio
4937
# opengeode-inspector
50-
opengeode-geosciencesio==4.5.1
38+
opengeode-geosciencesio==4.5.2rc1
5139
# via
5240
# -r requirements.in
5341
# opengeode-inspector
54-
opengeode-inspector==4.0.0
42+
opengeode-inspector==4.0.1rc1
5543
# via -r requirements.in
56-
opengeode-io==6.2.1
44+
opengeode-io==6.2.2rc1
5745
# via
5846
# -r requirements.in
5947
# geode-viewables

‎src/opengeodeweb_back/geode_functions.py‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ def load(geode_object: str, file_absolute_path: str):
3838
return geode_object_value(geode_object)["load"](file_absolute_path)
3939

4040

41+
def is_saveable(geode_object: str, data, filename: str):
42+
return geode_object_value(geode_object)["is_saveable"](data, filename)
43+
44+
4145
def save(geode_object: str, data, folder_absolute_path: str, filename: str):
4246
return geode_object_value(geode_object)["save"](
4347
data, os.path.join(folder_absolute_path, filename)
@@ -146,20 +150,27 @@ def list_geode_objects(extension: str, key: str = None):
146150
return geode_objects_list
147151

148152

149-
def geode_objects_output_extensions(geode_object: str):
153+
def geode_objects_output_extensions(geode_object: str, data):
150154
return_list = []
151155
geode_object_dict = {}
152156
geode_object_dict["geode_object"] = geode_object
153-
geode_object_dict["output_extensions"] = geode_object_output_extensions(
154-
geode_object
155-
)
157+
158+
output = geode_object_output_extensions(geode_object)
159+
160+
extension_saveable_array = []
161+
for output_extension in output:
162+
bool_is_saveable = is_saveable(geode_object, data, f"test.{output_extension}")
163+
extension_saveable_array.append(
164+
{"extension": output_extension, "is_saveable": bool_is_saveable}
165+
)
166+
167+
geode_object_dict["outputs"] = extension_saveable_array
156168

157169
return_list.append(geode_object_dict)
158170

159171
if "parent" in geode_object_value(geode_object).keys():
160172
parent_key = geode_object_value(geode_object)["parent"]
161-
return_list += geode_objects_output_extensions(parent_key)
162-
173+
return_list += geode_objects_output_extensions(parent_key, data)
163174
return return_list
164175

165176

@@ -175,22 +186,6 @@ def versions(list_packages: list):
175186
return list_with_versions
176187

177188

178-
def upload_file(file: str, file_name: str, upload_folder: str, file_size: int):
179-
if not os.path.exists(upload_folder):
180-
os.mkdir(upload_folder)
181-
file_decoded = base64.b64decode(file.split(",")[-1])
182-
secure_file_name = werkzeug.utils.secure_filename(file_name)
183-
file_path = os.path.join(upload_folder, secure_file_name)
184-
f = open(file_path, "wb")
185-
f.write(file_decoded)
186-
f.close()
187-
188-
final_size = os.path.getsize(file_path)
189-
uploaded_file = int(file_size) == int(final_size)
190-
if not uploaded_file:
191-
flask.abort(500, "File not uploaded")
192-
193-
194189
def create_lock_file(
195190
folder_absolute_path,
196191
):

‎src/opengeodeweb_back/geode_objects.py‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def geode_objects_dict():
1313
"output_factory": og.BRepOutputFactory,
1414
"missing_files": og.check_brep_missing_files,
1515
"load": og.load_brep,
16+
"is_saveable": og.is_brep_saveable,
1617
"save": og.save_brep,
1718
"builder": og.BRepBuilder,
1819
"crs": {
@@ -32,6 +33,7 @@ def geode_objects_dict():
3233
"output_factory": og_gs.CrossSectionOutputFactory,
3334
"missing_files": og_gs.check_cross_section_missing_files,
3435
"load": og_gs.load_cross_section,
36+
"is_saveable": og_gs.is_cross_section_saveable,
3537
"save": og_gs.save_cross_section,
3638
"builder": og_gs.CrossSectionBuilder,
3739
"crs": {
@@ -50,6 +52,7 @@ def geode_objects_dict():
5052
"output_factory": og.EdgedCurveOutputFactory2D,
5153
"missing_files": og.check_edged_curve_missing_files2D,
5254
"load": og.load_edged_curve2D,
55+
"is_saveable": og.is_edged_curve_saveable2D,
5356
"save": og.save_edged_curve2D,
5457
"builder": og.EdgedCurveBuilder2D.create,
5558
"crs": {
@@ -68,6 +71,7 @@ def geode_objects_dict():
6871
"output_factory": og.EdgedCurveOutputFactory3D,
6972
"missing_files": og.check_edged_curve_missing_files3D,
7073
"load": og.load_edged_curve3D,
74+
"is_saveable": og.is_edged_curve_saveable3D,
7175
"save": og.save_edged_curve3D,
7276
"builder": og.EdgedCurveBuilder3D.create,
7377
"crs": {
@@ -86,6 +90,7 @@ def geode_objects_dict():
8690
"output_factory": og.GraphOutputFactory,
8791
"missing_files": og.check_graph_missing_files,
8892
"load": og.load_graph,
93+
"is_saveable": og.is_graph_saveable,
8994
"save": og.save_graph,
9095
"builder": og.GraphBuilder.create,
9196
"is_model": False,
@@ -97,6 +102,7 @@ def geode_objects_dict():
97102
"output_factory": og.HybridSolidOutputFactory3D,
98103
"missing_files": og.check_hybrid_solid_missing_files3D,
99104
"load": og.load_hybrid_solid3D,
105+
"is_saveable": og.is_hybrid_solid_saveable3D,
100106
"save": og.save_hybrid_solid3D,
101107
"builder": og.HybridSolidBuilder3D.create,
102108
"crs": {
@@ -115,6 +121,7 @@ def geode_objects_dict():
115121
"output_factory": og.PointSetOutputFactory2D,
116122
"missing_files": og.check_point_set_missing_files2D,
117123
"load": og.load_point_set2D,
124+
"is_saveable": og.is_point_set_saveable2D,
118125
"save": og.save_point_set2D,
119126
"builder": og.PointSetBuilder2D.create,
120127
"crs": {
@@ -133,6 +140,7 @@ def geode_objects_dict():
133140
"output_factory": og.PointSetOutputFactory3D,
134141
"missing_files": og.check_point_set_missing_files3D,
135142
"load": og.load_point_set3D,
143+
"is_saveable": og.is_point_set_saveable3D,
136144
"save": og.save_point_set3D,
137145
"builder": og.PointSetBuilder3D.create,
138146
"crs": {
@@ -151,6 +159,7 @@ def geode_objects_dict():
151159
"output_factory": og.PolygonalSurfaceOutputFactory2D,
152160
"missing_files": og.check_polygonal_surface_missing_files2D,
153161
"load": og.load_polygonal_surface2D,
162+
"is_saveable": og.is_polygonal_surface_saveable2D,
154163
"save": og.save_polygonal_surface2D,
155164
"builder": og.PolygonalSurfaceBuilder2D.create,
156165
"crs": {
@@ -169,6 +178,7 @@ def geode_objects_dict():
169178
"output_factory": og.PolygonalSurfaceOutputFactory3D,
170179
"missing_files": og.check_polygonal_surface_missing_files3D,
171180
"load": og.load_polygonal_surface3D,
181+
"is_saveable": og.is_polygonal_surface_saveable3D,
172182
"save": og.save_polygonal_surface3D,
173183
"builder": og.PolygonalSurfaceBuilder3D.create,
174184
"crs": {
@@ -187,6 +197,7 @@ def geode_objects_dict():
187197
"output_factory": og.PolyhedralSolidOutputFactory3D,
188198
"missing_files": og.check_polyhedral_solid_missing_files3D,
189199
"load": og.load_polyhedral_solid3D,
200+
"is_saveable": og.is_polyhedral_solid_saveable3D,
190201
"save": og.save_polyhedral_solid3D,
191202
"builder": og.PolyhedralSolidBuilder3D.create,
192203
"crs": {
@@ -205,6 +216,7 @@ def geode_objects_dict():
205216
"output_factory": og.RasterImageOutputFactory2D,
206217
"missing_files": og.check_raster_image_missing_files2D,
207218
"load": og.load_raster_image2D,
219+
"is_saveable": og.is_raster_image_saveable2D,
208220
"save": og.save_raster_image2D,
209221
"is_model": False,
210222
"is_3D": False,
@@ -216,6 +228,7 @@ def geode_objects_dict():
216228
"output_factory": og.RasterImageOutputFactory3D,
217229
"missing_files": og.check_raster_image_missing_files3D,
218230
"load": og.load_raster_image3D,
231+
"is_saveable": og.is_raster_image_saveable3D,
219232
"save": og.save_raster_image3D,
220233
"is_model": False,
221234
"is_3D": False,
@@ -227,6 +240,7 @@ def geode_objects_dict():
227240
"output_factory": og.RegularGridOutputFactory2D,
228241
"missing_files": og.check_regular_grid_missing_files2D,
229242
"load": og.load_regular_grid2D,
243+
"is_saveable": og.is_regular_grid_saveable2D,
230244
"save": og.save_regular_grid2D,
231245
"builder": og.RegularGridBuilder2D.create,
232246
"crs": {
@@ -244,6 +258,7 @@ def geode_objects_dict():
244258
"output_factory": og.RegularGridOutputFactory3D,
245259
"missing_files": og.check_regular_grid_missing_files3D,
246260
"load": og.load_regular_grid3D,
261+
"is_saveable": og.is_regular_grid_saveable3D,
247262
"save": og.save_regular_grid3D,
248263
"builder": og.RegularGridBuilder3D.create,
249264
"crs": {
@@ -261,6 +276,7 @@ def geode_objects_dict():
261276
"output_factory": og.SectionOutputFactory,
262277
"missing_files": og.check_section_missing_files,
263278
"load": og.load_section,
279+
"is_saveable": og.is_section_saveable,
264280
"save": og.save_section,
265281
"builder": og.SectionBuilder,
266282
"crs": {
@@ -280,6 +296,7 @@ def geode_objects_dict():
280296
"output_factory": og_gs.StructuralModelOutputFactory,
281297
"missing_files": og_gs.check_structural_model_missing_files,
282298
"load": og_gs.load_structural_model,
299+
"is_saveable": og_gs.is_structural_model_saveable,
283300
"save": og_gs.save_structural_model,
284301
"builder": og_gs.StructuralModelBuilder,
285302
"crs": {
@@ -296,8 +313,9 @@ def geode_objects_dict():
296313
"TetrahedralSolid3D": {
297314
"input_factory": og.TetrahedralSolidInputFactory3D,
298315
"output_factory": og.TetrahedralSolidOutputFactory3D,
299-
"load": og.load_tetrahedral_solid3D,
300316
"missing_files": og.check_tetrahedral_solid_missing_files3D,
317+
"load": og.load_tetrahedral_solid3D,
318+
"is_saveable": og.is_tetrahedral_solid_saveable3D,
301319
"save": og.save_tetrahedral_solid3D,
302320
"builder": og.TetrahedralSolidBuilder3D.create,
303321
"crs": {
@@ -316,6 +334,7 @@ def geode_objects_dict():
316334
"output_factory": og.TriangulatedSurfaceOutputFactory2D,
317335
"missing_files": og.check_triangulated_surface_missing_files2D,
318336
"load": og.load_triangulated_surface2D,
337+
"is_saveable": og.is_triangulated_surface_saveable2D,
319338
"save": og.save_triangulated_surface2D,
320339
"builder": og.TriangulatedSurfaceBuilder2D.create,
321340
"crs": {
@@ -334,6 +353,7 @@ def geode_objects_dict():
334353
"output_factory": og.TriangulatedSurfaceOutputFactory3D,
335354
"missing_files": og.check_triangulated_surface_missing_files3D,
336355
"load": og.load_triangulated_surface3D,
356+
"is_saveable": og.is_triangulated_surface_saveable3D,
337357
"save": og.save_triangulated_surface3D,
338358
"builder": og.TriangulatedSurfaceBuilder3D.create,
339359
"crs": {
@@ -352,6 +372,7 @@ def geode_objects_dict():
352372
"output_factory": og.VertexSetOutputFactory,
353373
"missing_files": og.check_vertex_set_missing_files,
354374
"load": og.load_vertex_set,
375+
"is_saveable": og.is_vertex_set_saveable,
355376
"save": og.save_vertex_set,
356377
"builder": og.VertexSetBuilder.create,
357378
"is_model": False,

0 commit comments

Comments
 (0)