Next (#295)

app.py

@@ -12,6 +12,7 @@
 import blueprints.blueprint_ID as bp_ID
 
 from opengeodeweb_back import geode_functions
+from opengeodeweb_back.routes import blueprint_routes
 
 from werkzeug.exceptions import HTTPException
 
@@ -78,7 +79,14 @@ def kill_task():
 app.register_blueprint(
     bp_workflows.workflows_routes, url_prefix=f"/workflows", name="workflows_blueprint"
 )
-app.register_blueprint(bp_ID.ID_routes, url_prefix=f"/", name="ID_blueprint")
+app.register_blueprint(
+    blueprint_routes.routes,
+    url_prefix="/opengeodeweb_back",
+    name="blueprint_routes",
+)
+
+app.register_blueprint(bp_ID.ID_routes, url_prefix="/", name="ID_blueprint")
+
 
 if FLASK_DEBUG == False:
     geode_functions.set_interval(kill_task, SECONDS_BETWEEN_SHUTDOWNS)
@@ -99,7 +107,7 @@ def handle_exception(e):
     return response
 
 
-@app.route("/website/createbackend", methods=["POST"])
+@app.route("/createbackend", methods=["POST"])
 def create_backend():
     return flask.make_response({"ID": str("123456")}, 200)
 

blueprints/blueprint_tools.py

@@ -11,7 +11,6 @@
 import blueprints.tools.blueprint_file_converter as bp_file_converter
 import blueprints.tools.blueprint_validity_checker as bp_validity_checker
 import blueprints.tools.blueprint_crs_converter as bp_crs_converter
-from opengeodeweb_back.routes import blueprint_routes
 
 
 tools_routes = flask.Blueprint("tools_routes", __name__)
@@ -50,8 +49,3 @@ def teardown_request(exception):
     url_prefix="/crs_converter",
     name="crs_converter_blueprint",
 )
-tools_routes.register_blueprint(
-    blueprint_routes.routes,
-    url_prefix="/",
-    name="blueprint_routes",
-)

requirements.txt

@@ -2,9 +2,9 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile --pre requirements.in
+#    pip-compile requirements.in
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   flask
     #   opengeodeweb-back
@@ -13,19 +13,15 @@ attrs==23.2.0
     #   jsonschema
     #   opengeodeweb-back
     #   referencing
-blinker==1.7.0
+blinker==1.8.1
     # via
     #   flask
     #   opengeodeweb-back
 click==8.1.7
     # via
     #   flask
     #   opengeodeweb-back
-colorama==0.4.6
-    # via
-    #   click
-    #   opengeodeweb-back
-flask[async]==3.0.1
+flask[async]==3.0.3
     # via
     #   -r requirements.in
     #   flask-cors
@@ -34,13 +30,13 @@ flask-cors==4.0.0
     # via
     #   -r requirements.in
     #   opengeodeweb-back
-geode-background==7.7.1
+geode-background==7.9.8
     # via
     #   geode-explicit
     #   geode-implicit
     #   geode-simplex
     #   opengeodeweb-back
-geode-common==30.1.2
+geode-common==31.0.8
     # via
     #   geode-background
     #   geode-explicit
@@ -49,31 +45,29 @@ geode-common==30.1.2
     #   geode-simplex
     #   geode-viewables
     #   opengeodeweb-back
-geode-conversion==5.2.1
+geode-conversion==5.2.8
     # via
     #   geode-explicit
     #   geode-implicit
     #   opengeodeweb-back
-geode-explicit==4.4.3
+geode-explicit==4.7.5
     # via
     #   geode-implicit
     #   opengeodeweb-back
-geode-implicit==2.6.1
+geode-implicit==2.8.6
     # via opengeodeweb-back
-geode-numerics==4.3.0
+geode-numerics==4.3.3
     # via
     #   geode-implicit
     #   geode-simplex
     #   opengeodeweb-back
-geode-simplex==6.5.1
+geode-simplex==6.7.4
     # via opengeodeweb-back
-geode-viewables==2.2.0
+geode-viewables==2.2.2
     # via opengeodeweb-back
-importlib-metadata==7.0.1
-    # via
-    #   flask
-    #   opengeodeweb-back
-itsdangerous==2.1.2
+importlib-metadata==7.1.0
+    # via flask
+itsdangerous==2.2.0
     # via
     #   flask
     #   opengeodeweb-back
@@ -87,12 +81,12 @@ jsonschema-specifications==2023.12.1
     # via
     #   jsonschema
     #   opengeodeweb-back
-markupsafe==2.1.4
+markupsafe==2.1.5
     # via
     #   jinja2
     #   opengeodeweb-back
     #   werkzeug
-opengeode-core==14.13.2
+opengeode-core==14.19.2
     # via
     #   geode-background
     #   geode-common
@@ -107,51 +101,48 @@ opengeode-core==14.13.2
     #   opengeode-inspector
     #   opengeode-io
     #   opengeodeweb-back
-opengeode-geosciences==7.4.0
+opengeode-geosciences==7.6.4
     # via
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
     #   opengeodeweb-back
-opengeode-geosciencesio==4.6.0
+opengeode-geosciencesio==4.7.6
     # via
     #   geode-implicit
     #   opengeodeweb-back
-opengeode-inspector==4.0.6
+opengeode-inspector==5.1.3
     # via
     #   geode-explicit
     #   geode-implicit
+    #   geode-simplex
     #   opengeodeweb-back
-opengeode-io==6.4.0
+opengeode-io==6.5.1
     # via
     #   geode-implicit
     #   geode-viewables
     #   opengeode-geosciencesio
     #   opengeodeweb-back
-opengeodeweb-back==3.3.1
+opengeodeweb-back==4.1.1
     # via -r requirements.in
 python-dotenv==1.0.1
     # via -r requirements.in
-referencing==0.33.0
+referencing==0.35.0
     # via
     #   jsonschema
     #   jsonschema-specifications
     #   opengeodeweb-back
-rpds-py==0.17.1
+rpds-py==0.18.0
     # via
     #   jsonschema
     #   opengeodeweb-back
     #   referencing
-typing-extensions==4.9.0
-    # via
-    #   asgiref
-    #   opengeodeweb-back
-werkzeug==3.0.1
+typing-extensions==4.11.0
+    # via asgiref
+werkzeug==3.0.2
     # via
     #   -r requirements.in
     #   flask
     #   opengeodeweb-back
-zipp==3.17.0
-    # via
-    #   importlib-metadata
-    #   opengeodeweb-back
+zipp==3.18.1
+    # via importlib-metadata

tests/test_crs_converter.py

@@ -19,7 +19,7 @@ def test_convert_file(client):
 
     filename = "corbi.og_brep"
     response = client.put(
-        "tools/upload_file",
+        "opengeodeweb_back/upload_file",
         data={"file": FileStorage(open(f"./tests/{filename}", "rb"))},
     )
     assert response.status_code == 201

tests/test_file_converter.py

@@ -19,7 +19,7 @@ def test_convert_file(client):
 
     filename = "corbi.og_brep"
     response = client.put(
-        "tools/upload_file",
+        "opengeodeweb_back/upload_file",
         data={"file": FileStorage(open(f"./tests/{filename}", "rb"))},
     )
     assert response.status_code == 201

tests/test_functions.py

@@ -7,7 +7,7 @@ def test_root(client):
 
 
 def test_createbackend(client):
-    response = client.post("/website/createbackend")
+    response = client.post("/createbackend")
     assert response.status_code == 200
     ID = response.json["ID"]
     assert ID == "123456"