Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into fix/unused_params

Author: MaxNumerique

.gitignore

@@ -9,4 +9,6 @@ __pycache__
 .vscode
 uploads
 node_modules
-schemas.json
+schemas.json
+.mypy_cache
+*.db

.vscode/settings.json

@@ -3,5 +3,11 @@
         "."
     ],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "mypy-type-checker.args": [
+        "--config-file=mypy.ini"
+    ],
+    "mypy-type-checker.interpreter": [
+        "${workspaceFolder}/venv/bin/python"
+    ]
 }

app.py

@@ -10,6 +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 initialize_database
 
 
 """ Global config """
@@ -57,5 +58,6 @@ def return_error():
 
 # ''' Main '''
 if __name__ == "__main__":
+    initialize_database(app)
     print(f"Python is running in {FLASK_DEBUG} mode")
     app.run(debug=FLASK_DEBUG, host=DEFAULT_HOST, port=PORT, ssl_context=SSL)

commitlint.config.js

@@ -0,0 +1,16 @@
+export default {
+  extends: ["@commitlint/config-angular"],
+  rules: {
+    "scope-empty": [2, "never"],
+    "subject-empty": [2, "never"],
+    "subject-max-length": [0],
+    "body-leading-blank": [0],
+    "footer-leading-blank": [0],
+    "header-max-length": [0],
+    "scope-case": [0],
+    "subject-case": [0],
+    "subject-full-stop": [0],
+    "type-case": [0],
+    "type-empty": [0],
+  },
+}

mypy.ini

@@ -0,0 +1,3 @@
+[mypy]
+strict = True
+files = src/

requirements.in

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

requirements.txt

@@ -17,12 +17,17 @@ flask[async]==3.0.3
     #   -r requirements.in
     #   flask
     #   flask-cors
+    #   flask-sqlalchemy
 flask-cors==6.0.1
     # via -r requirements.in
+flask-sqlalchemy==3.1.1
+    # via -r requirements.in
 geode-common==33.9.0
     # via geode-viewables
 geode-viewables==3.2.0
     # via -r requirements.in
+greenlet==3.2.4
+    # via sqlalchemy
 itsdangerous==2.2.0
     # via flask
 jinja2==3.1.6
@@ -54,6 +59,10 @@ opengeode-io==7.3.2
     #   -r requirements.in
     #   geode-viewables
     #   opengeode-geosciencesio
+sqlalchemy==2.0.43
+    # via flask-sqlalchemy
+typing-extensions==4.15.0
+    # via sqlalchemy
 werkzeug==3.0.3
     # via
     #   -r requirements.in

src/opengeodeweb_back/app_config.py

@@ -4,6 +4,7 @@
 
 # Third party imports
 # Local application imports
+from .database import DATABASE_FILENAME
 
 
 class Config(object):
@@ -15,19 +16,27 @@ class Config(object):
     REQUEST_COUNTER = 0
     LAST_REQUEST_TIME = time.time()
     LAST_PING_TIME = time.time()
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 
 class ProdConfig(Config):
     SSL = None
     ORIGINS = ""
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
-    DATA_FOLDER_PATH = "/data/"
+    DATA_FOLDER_PATH = "/data"
+    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.abspath(
+        os.path.join(DATA_FOLDER_PATH, DATABASE_FILENAME)
+        )}"
 
 
 class DevConfig(Config):
     SSL = None
     ORIGINS = "*"
     MINUTES_BEFORE_TIMEOUT = "1"
     SECONDS_BETWEEN_SHUTDOWNS = "10"
-    DATA_FOLDER_PATH = "./data/"
+    BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+    DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
+    SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(
+        BASE_DIR, DATA_FOLDER_PATH, DATABASE_FILENAME
+        )}"

src/opengeodeweb_back/data.py

@@ -0,0 +1,44 @@
+from sqlalchemy import String, JSON
+from sqlalchemy.orm import Mapped, mapped_column
+from .database import database, Base
+import uuid
+
+
+class Data(Base):
+    __tablename__ = "datas"
+
+    id: Mapped[str] = mapped_column(
+        String, primary_key=True, default=lambda: str(uuid.uuid4()).replace("-", "")
+    )
+    name: Mapped[str] = mapped_column(String, nullable=False)
+    native_file_name: Mapped[str] = mapped_column(String, nullable=False)
+    viewable_file_name: Mapped[str] = mapped_column(String, nullable=False)
+    geode_object: Mapped[str] = mapped_column(String, nullable=False)
+
+    light_viewable: Mapped[str | None] = mapped_column(String, nullable=True)
+    input_file: Mapped[str | None] = mapped_column(String, nullable=True)
+    additional_files: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
+
+    @staticmethod
+    def create(
+        name: str,
+        geode_object: str,
+        input_file: str | None = None,
+        additional_files: list[str] | None = None,
+    ) -> "Data":
+        input_file = input_file if input_file is not None else ""
+        additional_files = additional_files if additional_files is not None else []
+
+        data_entry = Data(
+            name=name,
+            geode_object=geode_object,
+            input_file=input_file,
+            additional_files=additional_files,
+            native_file_name="",
+            viewable_file_name="",
+            light_viewable=None,
+        )
+
+        database.session.add(data_entry)
+        database.session.flush()
+        return data_entry

src/opengeodeweb_back/database.py

@@ -0,0 +1,19 @@
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy.orm import DeclarativeBase
+
+DATABASE_FILENAME = "project.db"
+
+
+class Base(DeclarativeBase):
+    pass
+
+
+database = SQLAlchemy(model_class=Base)
+
+
+def initialize_database(app: Flask) -> SQLAlchemy:
+    database.init_app(app)
+    with app.app_context():
+        database.create_all()
+    return database