fix: build altitudes entity dynamicly

Author: jpm-cbna

atlas/configuration/config_schema.py

@@ -163,6 +163,10 @@ class Meta:
     AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=True)
     TYPE_TERRITOIRE_SHEET = fields.List(fields.String(), load_default=["COM"])
     AFFICHAGE_GRAPH_PHENOLOGIE = fields.Boolean(load_default=False)
+    ALTITUDE_RANGES = fields.List(
+        fields.Integer(),
+        load_default=[0, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000],
+    )
     AFFICHAGE_TOUT_TERRITOIRE_GRAPH = fields.Boolean(load_default=False)
     AFFICHAGE_GRAPH_PROVENANCE_DONNEE = fields.Boolean(load_default=False)
     COLOR_STACKED_BAR_CHARTS = fields.List(

atlas/modeles/entities/vmAltitudes.py

@@ -1,18 +1,32 @@
-# coding: utf-8
+from itertools import pairwise
+from flask import current_app
 from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy import Integer
 from atlas.env import db
 
 
-class VmAltitudes(db.Model):
-    __tablename__ = "vm_altitudes"
-    __table_args__ = {"schema": "atlas"}
+def create_vm_altitudes_class():
+    """
+    Dynamically creates and returns the VmAltitudes model class
+    based on the altitude ranges defined in the configuration.
+    """
+    altitude_ranges = current_app.config["ALTITUDE_RANGES"]
+    print("LAAA", altitude_ranges)
 
-    cd_ref: Mapped[int] = mapped_column(primary_key=True)
-    _0_500: Mapped[int] = mapped_column()
-    _500_1000: Mapped[int] = mapped_column()
-    _1000_1500: Mapped[int] = mapped_column()
-    _1500_2000: Mapped[int] = mapped_column()
-    _2000_2500: Mapped[int] = mapped_column()
-    _2500_3000: Mapped[int] = mapped_column()
-    _3000_3500: Mapped[int] = mapped_column()
-    _3500_4000: Mapped[int] = mapped_column()
+    class_attributes = {
+        "__tablename__": "vm_altitudes",
+        "__table_args__": {"schema": "atlas"},
+        # Fixed column
+        "cd_ref": mapped_column(Integer, primary_key=True),
+    }
+
+    for alt_min, alt_max in pairwise(altitude_ranges):
+        # The '_' prefix is necessary because a variable name cannot start with a number.
+        column_name = f"_{alt_min}_{alt_max}"
+        class_attributes[column_name] = mapped_column(Integer)
+
+    VmAltitudesClass = type("VmAltitudes", (db.Model,), class_attributes)
+    return VmAltitudesClass
+
+
+VmAltitudes = create_vm_altitudes_class()

install_app.sh

@@ -214,15 +214,34 @@ function updatePythonConfigFile() {
     local conf_file="config.py"
     local conf_path="${__conf_dir__}/${conf_file}"
 
-    local pg_uri="postgresql:\/\/${user_pg}:${user_pg_pass}@${db_host}:${db_port}\/${db_name}"
-    sed -i "s/SQLALCHEMY_DATABASE_URI = .*$/SQLALCHEMY_DATABASE_URI = \"${pg_uri}\"/" "${conf_path}"
-    if [[ $? -eq 0 ]]; then
-        printVerbose ">SQLALCHEMY_DATABASE_URI ${Gre}updated${RCol} in ${conf_file}"
+    local pg_uri="postgresql://${user_pg}:${user_pg_pass}@${db_host}:${db_port}/${db_name}"
+    if grep -q "SQLALCHEMY_DATABASE_URI" "${conf_path}"; then
+        sed -i "s#SQLALCHEMY_DATABASE_URI = .*\$#SQLALCHEMY_DATABASE_URI = \"${pg_uri}\"#" "${conf_path}"
+        if [[ $? -eq 0 ]]; then
+            printVerbose ">SQLALCHEMY_DATABASE_URI ${Gre}updated${Gra} in ${Std}${conf_file}${Gra}"
+        fi
+    else
+        echo "SQLALCHEMY_DATABASE_URI = \"${pg_uri}\"" >> "${conf_path}"
+        local msg=">SQLALCHEMY_DATABASE_URI not found in ${Std}${conf_file}${Gra}, "
+        msg+="${Gre}we added it to the end of the file${Gra}."
+        printVerbose "${msg}"
     fi
 
-    sed -i "s/GUNICORN_PORT = .*$/GUNICORN_PORT = \"${gun_port}\"/"  "${conf_path}"
-    if [[ $? -eq 0 ]]; then
-        printVerbose ">GUNICORN_PORT ${Gre}updated${RCol} in ${conf_file}"
+    # Convert the bash array 'altitudes' into a comma-separated string
+    local old_ifs=$IFS
+    IFS=','
+    local altitudes_str="${altitudes[*]}"
+    IFS=$old_ifs
+    if grep -q "ALTITUDE_RANGES" "${conf_path}"; then
+        sed -i "s/ALTITUDE_RANGES = .*$/ALTITUDE_RANGES = [${altitudes_str}]/"  "${conf_path}"
+        if [[ $? -eq 0 ]]; then
+            printVerbose ">ALTITUDE_RANGES ${Gre}updated${Gra} in ${Std}${conf_file}${Gra}"
+        fi
+    else
+        echo "ALTITUDE_RANGES = [${altitudes_str}]" >> "${conf_path}"
+        local msg=">ALTITUDE_RANGES not found in ${Std}${conf_file}${Gra}, "
+        msg+="${Gre}we added it to the end of the file${Gra}."
+        printVerbose "${msg}"
     fi
 }
 
@@ -317,4 +336,3 @@ function startAtlasService() {
 }
 
 main "${@}"
-