Converted SQLALCHEMY_DATABASE_URI to use absolute paths

Fixed database behavior to prevent table recreation on every test run.
Renamed database model file to data.py for clarity.
Added input_file column to the Data table.
Standardized ID generation to rely on client-generated IDs only.
General cleanup and code readability improvements.

Author: MaxNumerique

app.py

@@ -10,7 +10,7 @@
 from src.opengeodeweb_back.routes.models import blueprint_models
 from src.opengeodeweb_back.utils_functions import handle_exception
 from src.opengeodeweb_back import app_config
-from src.opengeodeweb_back.database import init_db
+from src.opengeodeweb_back.database import initialize_database
 
 
 """ Global config """
@@ -58,6 +58,6 @@ def return_error():
 
 # ''' Main '''
 if __name__ == "__main__":
+    initialize_database(app)
     print(f"Python is running in {FLASK_DEBUG} mode")
-    init_db(app)
     app.run(debug=FLASK_DEBUG, host=DEFAULT_HOST, port=PORT, ssl_context=SSL)

src/opengeodeweb_back/models.py renamed to src/opengeodeweb_back/data.py

@@ -1,21 +1,14 @@
-import uuid
-from datetime import datetime
-from sqlalchemy import String, DateTime, JSON
+from sqlalchemy import String, JSON
 from .database import db
 
-
-def generate_uuid():
-    return str(uuid.uuid4())
-
-
 class Data(db.Model):
     __tablename__ = "datas"
 
-    id = db.Column(String, primary_key=True, default=generate_uuid)
+    id = db.Column(String, primary_key=True)
     name = db.Column(String, nullable=False)
     native_file_name = db.Column(String, nullable=False)
     viewable_file_name = db.Column(String, nullable=False)
     light_viewable = db.Column(String, nullable=True)
     geode_object = db.Column(String, nullable=False)
-    input_files = db.Column(JSON, nullable=True)
-    created_at = db.Column(DateTime, default=datetime.now)
+    input_file = db.Column(JSON, nullable=True)
+    additional_files = db.Column(JSON, nullable=True)

src/opengeodeweb_back/database.py

@@ -2,16 +2,8 @@
 
 db = SQLAlchemy()
 
-initialized = False
-
-
-def init_db(app):
-    global initialized
-    if initialized:
-        return db
-    print("DB", app.config.get("SQLALCHEMY_DATABASE_URI"))
+def initialize_database(app):
     db.init_app(app)
     with app.app_context():
         db.create_all()
-    initialized = True
     return db

src/opengeodeweb_back/utils_functions.py

@@ -14,7 +14,7 @@
 
 # Local application imports
 from . import geode_functions
-from .models import Data
+from .data import Data
 from .database import db
 
 
@@ -180,7 +180,8 @@ def save_all_viewables_and_return_info(
         viewable_file_name=os.path.basename(saved_viewable_file_path),
         light_viewable=os.path.basename(saved_light_viewable_file_path),
         geode_object=geode_object,
-        input_files=additional_files or [],
+        input_file=additional_files or [],
+        additional_files=additional_files or [],
     )
 
     db.session.add(data_entry)
@@ -190,7 +191,7 @@ def save_all_viewables_and_return_info(
         "name": data.name(),
         "native_file_name": os.path.basename(saved_native_file_path[0]),
         "viewable_file_name": os.path.basename(saved_viewable_file_path),
-        "id": generated_id,
+        "id": data_entry.id,
         "object_type": geode_functions.get_object_type(geode_object),
         "binary_light_viewable": binary_light_viewable.decode("utf-8"),
         "geode_object": geode_object,

tests/conftest.py

@@ -8,7 +8,7 @@
 
 # Local application imports
 from app import app
-from src.opengeodeweb_back.database import init_db
+from src.opengeodeweb_back.database import initialize_database
 
 TEST_ID = "1"
 
@@ -17,24 +17,24 @@
 def copy_data():
     shutil.rmtree("./data", ignore_errors=True)
     shutil.copytree("./tests/data/", f"./data/{TEST_ID}/", dirs_exist_ok=True)
-
-
-@pytest.fixture
-def client():
     app.config["TESTING"] = True
     app.config["SERVER_NAME"] = "TEST"
     app.config["DATA_FOLDER_PATH"] = "./data/"
     app.config["UPLOAD_FOLDER"] = "./tests/data/"
-    app.config["REQUEST_COUNTER"] = 0
-    app.config["LAST_REQUEST_TIME"] = time.time()
     BASE_DIR = os.path.abspath(os.path.dirname(__file__))
     db_path = os.path.join(BASE_DIR, "data", "project.db")
     app.config["SQLALCHEMY_DATABASE_URI"] = f"sqlite:///{db_path}"
 
     print("Current working directory:", os.getcwd())
     print("Directory contents:", os.listdir("."))
 
-    init_db(app)
+    initialize_database(app)
+
+
+@pytest.fixture
+def client():
+    app.config["REQUEST_COUNTER"] = 0
+    app.config["LAST_REQUEST_TIME"] = time.time()
     client = app.test_client()
     client.headers = {"Content-type": "application/json", "Accept": "application/json"}
     yield client

tests/test_utils_functions.py

@@ -8,7 +8,7 @@
 
 # Local application imports
 from src.opengeodeweb_back.database import db
-from src.opengeodeweb_back.models import Data
+from src.opengeodeweb_back.data import Data
 from src.opengeodeweb_back import geode_functions, utils_functions
 
 
@@ -99,11 +99,11 @@ def test_save_all_viewables_and_return_info(client):
 
         geode_object = "BRep"
         data = geode_functions.load(geode_object, "./tests/data/test.og_brep")
-        generated_id, data_path = utils_functions.create_unique_data_folder()
+        folder_id, data_path = utils_functions.create_unique_data_folder()
         additional_files = ["additional_file.txt"]
 
         result = utils_functions.save_all_viewables_and_return_info(
-            geode_object, data, generated_id, data_path, additional_files
+            geode_object, data, folder_id, data_path, additional_files
         )
 
         assert isinstance(result, dict)
@@ -116,16 +116,15 @@ def test_save_all_viewables_and_return_info(client):
         assert result["geode_object"] == geode_object
         assert result["input_files"] == additional_files
 
-        db_entry = Data.query.get(generated_id)
+        db_entry = Data.query.get(result["id"])
         assert db_entry is not None
         assert db_entry.name == data.name()
         assert db_entry.native_file_name == os.path.basename(result["native_file_name"])
-        assert db_entry.viewable_file_name == os.path.basename(
-            result["viewable_file_name"]
-        )
+        assert db_entry.viewable_file_name == os.path.basename(result["viewable_file_name"])
         assert db_entry.light_viewable == os.path.basename(db_entry.light_viewable)
         assert db_entry.geode_object == geode_object
-        assert db_entry.input_files == additional_files
+        assert db_entry.input_file == additional_files
+        assert db_entry.additional_files == additional_files
 
 
 def test_generate_native_viewable_and_light_viewable_from_object(client):