gitgnore added

requirements.in added
config added
app.config and conftest added temporarily
connection to database
model of database
pyproject.toml
READEME.md added
requirements.txt added

Author: MaxNumerique

.gitignore

@@ -0,0 +1,6 @@
+.pytest_cache
+venv
+__pycache__
+node_modules
+.mypy_cache
+*.egg-info

README.md

@@ -19,7 +19,7 @@
 
 ## Introduction
 
-OpenGeodeWeb-Microservice is a dedicated service that manages the database logic extracted from the OpenGeodeWeb-Back (OGWB) project. It provides a REST API for managing geological data and associated metadata.
+Database model and ORM layer for the OpenGeodeWeb ecosystem.
 
 ## Changelog
 

pyproject.toml

@@ -7,30 +7,21 @@ name = "OpenGeodeWeb-Microservice"
 version = "1.0.0"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
-description = "Microservice Python pour la gestion des données et de la base de données de l'écosystème OpenGeodeWeb"
+description = "Database model and ORM layer for OpenGeodeWeb ecosystem"
 readme = "README.md"
 requires-python = ">=3.9, <3.13"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
-    "Framework :: Flask",
-    "Topic :: Database",
-    "Topic :: Scientific/Engineering",
 ]
 
 [project.urls]
 "Homepage" = "https://github.com/Geode-solutions/OpenGeodeWeb-Microservice"
 "Bug Tracker" = "https://github.com/Geode-solutions/OpenGeodeWeb-Microservice/issues"
-"Repository" = "https://github.com/Geode-solutions/OpenGeodeWeb-Microservice.git"
 
 [tool.setuptools.dynamic]
 dependencies = { file = ["requirements.txt"] }
 
 [tool.setuptools.packages.find]
 where = ["src"]
-
-[tool.setuptools.package-data]
-"ogwm" = ["*.json"]
-"ogwm.routes" = ["*.json"]
-"ogwm.models" = ["*.json"]

requirements.txt

@@ -1,11 +1,2 @@
-# Flask et extensions
-Flask[async]==3.0.3
-Flask-Cors==6.0.1
-Flask-SQLAlchemy==3.1.1
-werkzeug==3.0.3
-
-# Base de données et validation
-fastjsonschema==2.16.2
-
-# Utilitaires
-python-dotenv==1.0.0
+SQLAlchemy>=2.0.0
+Flask-SQLAlchemy>=3.1.1

app.py src/opengeodeweb_microservice/__init__.pyapp.py renamed to src/opengeodeweb_microservice/__init__.py

@@ -0,0 +1,38 @@
+# # Standard library imports
+# import os
+# import time
+
+# # Third party imports
+# # Local application imports
+# from .database import DATABASE_FILENAME
+
+
+# class Config(object):
+#     FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
+#     DEFAULT_HOST = "localhost"
+#     DEFAULT_PORT = "5000"
+#     CORS_HEADERS = "Content-Type"
+#     UPLOAD_FOLDER = "./uploads"
+#     REQUEST_COUNTER = 0
+#     LAST_REQUEST_TIME = time.time()
+#     LAST_PING_TIME = time.time()
+#     SQLALCHEMY_TRACK_MODIFICATIONS = False
+
+
+# class ProdConfig(Config):
+#     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"
+#     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_microservice/app_config.py

@@ -0,0 +1,28 @@
+"""Database connection management"""
+
+from typing import Optional
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+
+from src.opengeodeweb_microservice.microservice.base import Base
+
+
+class DatabaseConnection:
+
+    def __init__(self, database_filename: str = "project.db"):
+        self.database_filename = database_filename
+        self.database: Optional[SQLAlchemy] = None
+
+    def init_app(self, app: Flask) -> SQLAlchemy:
+        if self.database is None:
+            self.database = SQLAlchemy(model_class=Base)
+
+        self.database.init_app(app)
+
+        with app.app_context():
+            self.database.create_all()
+
+        return self.database
+
+    def get_database(self) -> Optional[SQLAlchemy]:
+        return self.database

requirements.in …odeweb_microservice/database/__init__.pyrequirements.in renamed to src/opengeodeweb_microservice/database/__init__.py requirements.in renamed to src/opengeodeweb_microservice/database/__init__.py

@@ -0,0 +1,22 @@
+from typing import Optional
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+
+from src.opengeodeweb_microservice.database.connection import DatabaseConnection
+
+# Global database instance
+_database_connection = DatabaseConnection()
+
+
+def init_database(app: Flask, database_filename: str = "project.db") -> SQLAlchemy:
+    global _database_connection
+    _database_connection.database_filename = database_filename
+    return _database_connection.init_app(app)
+
+
+def get_session() -> Optional[SQLAlchemy]:
+    return _database_connection.get_database()
+
+
+def get_database_connection() -> DatabaseConnection:
+    return _database_connection