Skip to content

Commit b312038

Browse files
MaxNumeriquegithub-actions[bot]
authored andcommitted
Apply prepare changes
1 parent 6544070 commit b312038

File tree

6 files changed

+29
-20
lines changed

6 files changed

+29
-20
lines changed

src/opengeodeweb_back/geode_functions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ def is_loadable(geode_object: str, file_absolute_path: str):
3838
def load(geode_object: str, file_absolute_path: str):
3939
return geode_object_value(geode_object)["load"](file_absolute_path)
4040

41+
4142
def load_from_request(geode_object: str, data_folder_path: str, request_json: dict):
4243
file_absolute_path = os.path.join(
4344
data_folder_path,
@@ -46,17 +47,18 @@ def load_from_request(geode_object: str, data_folder_path: str, request_json: di
4647
)
4748
return load(geode_object, file_absolute_path)
4849

50+
4951
def build_data_path(data_folder_path, request_json, filename):
5052
return os.path.join(
5153
data_folder_path,
5254
request_json["id"],
5355
werkzeug.utils.secure_filename(filename),
5456
)
5557

58+
5659
def build_upload_file_path(upload_folder, filename):
5760
secure_filename = werkzeug.utils.secure_filename(filename)
58-
return os.path.abspath(os.path.join(upload_folder, secure_filename)
59-
)
61+
return os.path.abspath(os.path.join(upload_folder, secure_filename))
6062

6163

6264
def is_saveable(geode_object: str, data, filename: str):

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ def allowed_objects():
100100
UPLOAD_FOLDER = flask.current_app.config["UPLOAD_FOLDER"]
101101
utils_functions.validate_request(flask.request, allowed_objects_json)
102102
file_absolute_path = geode_functions.build_upload_file_path(
103-
UPLOAD_FOLDER, flask.request.json["filename"])
103+
UPLOAD_FOLDER, flask.request.json["filename"]
104+
)
104105
allowed_objects = geode_functions.list_geode_objects(
105106
file_absolute_path, flask.request.json["supported_feature"]
106107
)
@@ -125,7 +126,8 @@ def missing_files():
125126
missing_files = geode_functions.missing_files(
126127
flask.request.json["input_geode_object"],
127128
geode_functions.build_upload_file_path(
128-
UPLOAD_FOLDER, flask.request.json["filename"]),
129+
UPLOAD_FOLDER, flask.request.json["filename"]
130+
),
129131
)
130132
has_missing_files = missing_files.has_missing_files()
131133

@@ -218,7 +220,8 @@ def geode_objects_and_output_extensions():
218220
data = geode_functions.load(
219221
flask.request.json["input_geode_object"],
220222
geode_functions.build_upload_file_path(
221-
UPLOAD_FOLDER, flask.request.json["filename"]),
223+
UPLOAD_FOLDER, flask.request.json["filename"]
224+
),
222225
)
223226
geode_objects_and_output_extensions = (
224227
geode_functions.geode_objects_output_extensions(
@@ -292,10 +295,10 @@ def texture_coordinates():
292295
DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
293296
utils_functions.validate_request(flask.request, texture_coordinates_json)
294297
data = geode_functions.load_from_request(
295-
flask.request.json["input_geode_object"],
296-
DATA_FOLDER_PATH,
297-
flask.request.json,
298-
)
298+
flask.request.json["input_geode_object"],
299+
DATA_FOLDER_PATH,
300+
flask.request.json,
301+
)
299302

300303
texture_coordinates = data.texture_manager().texture_names()
301304

@@ -317,9 +320,9 @@ def vertex_attribute_names():
317320
DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
318321
utils_functions.validate_request(flask.request, vertex_attribute_names_json)
319322
data = geode_functions.load_from_request(
320-
flask.request.json["input_geode_object"],
321-
DATA_FOLDER_PATH,
322-
flask.request.json,
323+
flask.request.json["input_geode_object"],
324+
DATA_FOLDER_PATH,
325+
flask.request.json,
323326
)
324327

325328
vertex_attribute_names = data.vertex_attribute_manager().attribute_names()
@@ -347,9 +350,9 @@ def polygon_attribute_names():
347350
DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
348351
utils_functions.validate_request(flask.request, polygon_attribute_names_json)
349352
data = geode_functions.load_from_request(
350-
flask.request.json["input_geode_object"],
351-
DATA_FOLDER_PATH,
352-
flask.request.json,
353+
flask.request.json["input_geode_object"],
354+
DATA_FOLDER_PATH,
355+
flask.request.json,
353356
)
354357

355358
polygon_attribute_names = data.polygon_attribute_manager().attribute_names()
@@ -377,9 +380,9 @@ def polyhedron_attribute_names():
377380
DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"]
378381
utils_functions.validate_request(flask.request, vertex_attribute_names_json)
379382
data = geode_functions.load_from_request(
380-
flask.request.json["input_geode_object"],
381-
DATA_FOLDER_PATH,
382-
flask.request.json,
383+
flask.request.json["input_geode_object"],
384+
DATA_FOLDER_PATH,
385+
flask.request.json,
383386
)
384387

385388
polyhedron_attribute_names = data.polyhedron_attribute_manager().attribute_names()

src/opengeodeweb_back/routes/models/blueprint_models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def uuid_to_flat_index():
2222
vtm_file_path = geode_functions.build_data_path(
2323
flask.current_app.config["DATA_FOLDER_PATH"],
2424
flask.request.json,
25-
"viewable.vtm"
25+
"viewable.vtm",
2626
)
2727
tree = ET.parse(vtm_file_path)
2828
except FileNotFoundError:

tests/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def app_context():
3333
with app.app_context():
3434
yield
3535

36+
3637
@pytest.fixture
3738
def test_id():
38-
return "1"
39+
return "1"

tests/test_models_routes.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import os
22
import shutil
3+
4+
35
def test_model_mesh_components(client, test_id):
46
route = "/models/vtm_component_indices"
57

tests/test_routes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Standard library imports
22
import os
3+
34
# Third party imports
45
from werkzeug.datastructures import FileStorage
56

0 commit comments

Comments
 (0)