corrected merged issues & dependencies issues

Author: MaxNumerique

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -247,18 +247,7 @@ def save_viewable_file():
     secure_filename = werkzeug.utils.secure_filename(flask.request.json["filename"])
     file_path = os.path.abspath(os.path.join(UPLOAD_FOLDER, secure_filename))
     data = geode_functions.load(flask.request.json["input_geode_object"], file_path)
-<<<<<<< HEAD
     response_data = utils_functions.create_response_with_binary_light_viewable(flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH)
-=======
-    generated_id = str(uuid.uuid4()).replace("-", "")
-    name = data.name()
-    object_type = geode_functions.get_object_type(
-        flask.request.json["input_geode_object"]
-    )
-    response_data = utils_functions.create_geode_object_response(
-        flask.request.json["input_geode_object"], data, DATA_FOLDER_PATH
-    )
->>>>>>> 850db36bc3cfa160172b32485df1623e5714d7b8
     return flask.jsonify(response_data), 200
 
 
@@ -280,15 +269,8 @@ def create_point():
     builder.create_point(opengeode.Point3D([x, y, z]))
     builder.set_name(title)
     return flask.make_response(
-<<<<<<< HEAD
     utils_functions.create_response_with_binary_light_viewable("PointSet3D", PointSet3D, DATA_FOLDER_PATH),
     200,
-=======
-        utils_functions.create_geode_object_response(
-            "PointSet3D", PointSet3D, DATA_FOLDER_PATH
-        ),
-        200,
->>>>>>> 850db36bc3cfa160172b32485df1623e5714d7b8
     )
 
 

src/opengeodeweb_back/utils_functions.py

@@ -87,16 +87,7 @@ def validate_request(request, schema):
         validate(json_data)
     except fastjsonschema.JsonSchemaException as e:
         error_msg = str(e)
-        
-        if "data must contain" in error_msg:
-            field = error_msg.split("data must contain ['")[1].split("']")[0]
-            error_msg = f"'{field}' is a required property"
-        elif "data must not contain" in error_msg:
-            field = error_msg.split("data must not contain {'")[1].split("'")[0]
-            error_msg = f"Additional properties are not allowed ('{field}' was unexpected)"
-            
-        flask.abort(400, f"Validation error: {error_msg}")
-
+        flask.abort(400, error_msg)
 
 def set_interval(func, sec, args=None):
     def func_wrapper():