test

Author: MaxNumerique

requirements.in

@@ -8,4 +8,4 @@ fastjsonschema==2.16.2
 Flask[async]==3.0.3
 Flask-Cors==6.0.1
 werkzeug==3.0.3
-sqlalchemy==2.0.43
+Flask-SQLAlchemy==3.1.1

src/opengeodeweb_back/database.py

@@ -1,11 +1,9 @@
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+from flask_sqlalchemy import SQLAlchemy
 
+db = SQLAlchemy()
 
-def get_engine(db_path: str):
-    return create_engine(f"sqlite:///{db_path}", echo=False)
-
-
-def get_session(engine):
-    Session = sessionmaker(bind=engine)
-    return Session()
+def init_db(app):
+    db.init_app(app)
+    with app.app_context():
+        db.create_all()
+    return db

src/opengeodeweb_back/models.py

@@ -1,23 +1,19 @@
 import uuid
 from datetime import datetime
-from sqlalchemy import Column, String, DateTime, JSON
-from sqlalchemy.orm import declarative_base
-
-Base = declarative_base()
-
+from sqlalchemy import String, DateTime, JSON
+from .database import db
 
 def generate_uuid():
     return str(uuid.uuid4())
 
-
-class Data(Base):
+class Data(db.Model):
     __tablename__ = "datas"
 
-    id = Column(String, primary_key=True, default=generate_uuid)
-    name = Column(String, nullable=False)
-    native_file_name = Column(String, nullable=False)
-    viewable_file_name = Column(String, nullable=False)
-    binary_light_viewable = Column(String, nullable=True)
-    geode_object = Column(String, nullable=False)
-    input_files = Column(JSON, nullable=True)
-    created_at = Column(DateTime, default=datetime.now)
+    id = db.Column(String, primary_key=True, default=generate_uuid)
+    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)  # Renommé pour correspondre au code
+    geode_object = db.Column(String, nullable=False)
+    input_files = db.Column(JSON, nullable=True)
+    created_at = db.Column(DateTime, default=datetime.now)

src/opengeodeweb_back/utils_functions.py

@@ -14,9 +14,8 @@
 
 # Local application imports
 from . import geode_functions
-from .models import Data, Base
-from .database import get_engine, get_session
-
+from .models import Data
+from .database import db
 
 def increment_request_counter(current_app):
     if "REQUEST_COUNTER" in current_app.config:
@@ -173,12 +172,6 @@ def save_all_viewables_and_return_info(
     with open(saved_light_viewable_file_path, "rb") as f:
         binary_light_viewable = f.read()
 
-    project_root_path = os.path.dirname(data_path)
-    engine = get_engine(os.path.join(project_root_path, "db.sqlite3"))
-
-    Base.metadata.create_all(engine)
-    session = get_session(engine)
-
     data_entry = Data(
         id=generated_id,
         name=data.name(),
@@ -188,9 +181,9 @@ def save_all_viewables_and_return_info(
         geode_object=geode_object,
         input_files=additional_files or [],
     )
-    session.add(data_entry)
-    session.commit()
-    session.close()
+    
+    db.session.add(data_entry)
+    db.session.commit()
 
     return {
         "name": data.name(),