Merge branch 'feat/extensions' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/extensions

Author: JulienChampagnol

opengeodeweb_back_schemas.json

@@ -343,6 +343,17 @@
       "required": [],
       "additionalProperties": false
     },
+    "import_extension": {
+      "$id": "opengeodeweb_back/import_extension",
+      "route": "/import_extension",
+      "methods": [
+        "POST"
+      ],
+      "type": "object",
+      "properties": {},
+      "required": [],
+      "additionalProperties": false
+    },
     "geographic_coordinate_systems": {
       "$id": "opengeodeweb_back/geographic_coordinate_systems",
       "route": "/geographic_coordinate_systems",

requirements.txt

@@ -60,4 +60,3 @@ werkzeug==3.1.2
     #   flask
     #   flask-cors
 
-opengeodeweb-microservice==1.*,>=1.0.11

src/opengeodeweb_back/app.py

@@ -147,6 +147,9 @@ def run_server() -> None:
     )
     args = parser.parse_args()
     app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
+    app.config.update(
+        EXTENSIONS_FOLDER_PATH=os.path.join(args.data_folder_path, "extensions")
+    )
     app.config.update(UPLOAD_FOLDER=args.upload_folder_path)
     app.config.update(MINUTES_BEFORE_TIMEOUT=args.timeout)
     flask_cors.CORS(app, origins=args.allowed_origins)

src/opengeodeweb_back/app_config.py

@@ -24,6 +24,7 @@ class ProdConfig(Config):
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     DATA_FOLDER_PATH = "/data"
+    EXTENSIONS_FOLDER_PATH = os.path.join(DATA_FOLDER_PATH, "extensions")
 
 
 class DevConfig(Config):
@@ -33,3 +34,4 @@ class DevConfig(Config):
     SECONDS_BETWEEN_SHUTDOWNS = "10"
     BASE_DIR = os.path.dirname(os.path.abspath(__file__))
     DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
+    EXTENSIONS_FOLDER_PATH = os.path.join(DATA_FOLDER_PATH, "extensions")

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -525,11 +525,9 @@ def import_extension() -> flask.Response:
         flask.abort(400, "Uploaded file must be a .vext")
 
     # Create extensions directory in the data folder
-    data_folder_path: str = flask.current_app.config.get("DATA_FOLDER_PATH", "")
-    extensions_folder = os.path.join(data_folder_path, "extensions")
+    extensions_folder = flask.current_app.config["EXTENSIONS_FOLDER_PATH"]
     os.makedirs(extensions_folder, exist_ok=True)
 
-    # Extract extension name from filename (e.g., "vease-modeling-0.0.0.vext" -> "vease-modeling")
     extension_name = (
         filename.rsplit("-", 1)[0] if "-" in filename else filename.replace(".vext", "")
     )
@@ -561,23 +559,23 @@ def import_extension() -> flask.Response:
             if file.endswith(".es.js"):
                 frontend_file = file_path
             elif not file.endswith(".js") and not file.endswith(".css"):
-                # Assume it's the backend executable
                 backend_executable = file_path
-                # Make it executable
                 os.chmod(backend_executable, 0o755)
 
     if not frontend_file:
         flask.abort(400, "Invalid .vext file: missing frontend JavaScript")
-
     if not backend_executable:
         flask.abort(400, "Invalid .vext file: missing backend executable")
 
+    assert frontend_file is not None
+    with open(frontend_file, "r", encoding="utf-8") as f:
+        frontend_content = f.read()
+
     return flask.make_response(
         {
             "extension_name": extension_name,
-            "frontend_path": frontend_file,
+            "frontend_content": frontend_content,
             "backend_path": backend_executable,
-            "extension_folder": extension_path,
         },
         200,
     )

src/opengeodeweb_back/routes/schemas/__init__.py

@@ -9,10 +9,10 @@
 from .kill import *
 from .inspect_file import *
 from .import_project import *
+from .import_extension import *
 from .geographic_coordinate_systems import *
 from .geode_objects_and_output_extensions import *
 from .export_project import *
 from .cell_attribute_names import *
 from .allowed_objects import *
 from .allowed_files import *
-from .import_extension import *

tests/test_models_routes.py

@@ -231,8 +231,10 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
     """Test importing a .vext extension file."""
     route = "/opengeodeweb_back/import_extension"
     original_data_folder = client.application.config["DATA_FOLDER_PATH"]
-    client.application.config["DATA_FOLDER_PATH"] = os.path.join(
-        str(tmp_path), "extension_test_data"
+    new_data_folder = os.path.join(str(tmp_path), "extension_test_data")
+    client.application.config["DATA_FOLDER_PATH"] = new_data_folder
+    client.application.config["EXTENSIONS_FOLDER_PATH"] = os.path.join(
+        new_data_folder, "extensions"
     )
     vext_path = tmp_path / "test-extension-1.0.0.vext"
     with zipfile.ZipFile(vext_path, "w", compression=zipfile.ZIP_DEFLATED) as zipf:
@@ -251,9 +253,8 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
     assert response.status_code == 200
     json_data = response.get_json()
     assert "extension_name" in json_data
-    assert "frontend_path" in json_data
+    assert "frontend_content" in json_data
     assert "backend_path" in json_data
-    assert "extension_folder" in json_data
     assert json_data["extension_name"] == "test-extension"
     extensions_folder = os.path.join(
         client.application.config["DATA_FOLDER_PATH"], "extensions"
@@ -262,9 +263,13 @@ def test_import_extension_route(client: FlaskClient, tmp_path: Path) -> None:
     assert os.path.exists(extension_path)
     dist_path = os.path.join(extension_path, "dist")
     assert os.path.exists(dist_path)
-    frontend_js = json_data["frontend_path"]
-    assert os.path.exists(frontend_js)
-    assert frontend_js.endswith("-extension.es.js")
+
+    # Verify frontend content is returned
+    frontend_content = json_data["frontend_content"]
+    assert isinstance(frontend_content, str)
+    assert len(frontend_content) > 0
+    assert "export const metadata" in frontend_content
+
     backend_exec = json_data["backend_path"]
     assert os.path.exists(backend_exec)
     assert os.access(backend_exec, os.X_OK)
@@ -275,8 +280,10 @@ def test_import_extension_invalid_file(client: FlaskClient, tmp_path: Path) -> N
     """Test importing an invalid .vext file (missing dist folder)."""
     route = "/opengeodeweb_back/import_extension"
     original_data_folder = client.application.config["DATA_FOLDER_PATH"]
-    client.application.config["DATA_FOLDER_PATH"] = os.path.join(
-        str(tmp_path), "extension_invalid_test"
+    new_data_folder = os.path.join(str(tmp_path), "extension_invalid_test")
+    client.application.config["DATA_FOLDER_PATH"] = new_data_folder
+    client.application.config["EXTENSIONS_FOLDER_PATH"] = os.path.join(
+        new_data_folder, "extensions"
     )
     vext_path = tmp_path / "invalid-extension.vext"
     with zipfile.ZipFile(vext_path, "w") as zipf: