Merge branch 'development' into release/v1.0.8

.gitignore

@@ -169,4 +169,7 @@ cornssh.pub
 *.db
 
 # IO files
-*.mps
+*.mps
+
+# airflow logs
+cornflow-server/airflow_config/logs

cornflow-server/Dockerfile

@@ -2,7 +2,7 @@
 # AUTHOR: [email protected]
 
 FROM python:3.10-slim-buster
-LABEL maintainer="sistemas@baobabsoluciones"
+LABEL maintainer="cornflow@baobabsoluciones"
 
 # Never prompt the user for choices on installation/configuration of packages
 ENV DEBIAN_FRONTEND noninteractive
@@ -39,6 +39,11 @@ RUN mkdir -p /usr/src/app/log
 # create folder for custom ssh keys
 RUN mkdir /usr/src/app/.ssh
 
+# user cornflow on application
+RUN useradd -ms /bin/bash -d /usr/src/app cornflow
+RUN chown -R cornflow: /usr/src/app
+USER cornflow
+
 EXPOSE 5000
 
 # execute python init script

cornflow-server/airflow_config/Dockerfile

@@ -1,9 +1,9 @@
 # VERSION 2.7.1
-# AUTHOR: sistemas@baobabsoluciones.es
+# AUTHOR: cornflow@baobabsoluciones.es
 # DESCRIPTION: Airflow 2.7.1 image personalized for use with Cornflow (from puckel/docker-airflow https://github.com/puckel/docker-airflow by "Puckel_")
 
 FROM python:3.10-slim-buster
-LABEL maintainer="sistemas@baobabsoluciones"
+LABEL maintainer="cornflow@baobabsoluciones"
 
 # Never prompt the user for choices on installation/configuration of packages
 ENV DEBIAN_FRONTEND noninteractive

cornflow-server/airflow_config/airflow_local_settings.py

@@ -0,0 +1,23 @@
+# AIRFLOW custom UI colors for CornflowEnv
+
+STATE_COLORS = {
+    "deferred": "#7c4fe0",
+    "failed": "#c9301c",
+    "queued": "#656d78",
+    "removed": "#7bdcb5",
+    "restarting": "#9b51e0",
+    "running": "#01FF70",
+    "scheduled": "#fcb900",
+    "shutdown": "blue",
+    "skipped": "darkorchid",
+    "success": "#00d084",
+    "up_for_reschedule": "#f78da7",
+    "up_for_retry": "yellow",
+    "upstream_failed": "#b31e1e",
+}
+
+from airflow.www.utils import UIAlert
+
+DASHBOARD_UIALERTS = [
+    UIAlert("Welcome! This is the backend of your Cornflow environment. Airflow™ is a platform created by the community to programmatically author, schedule and monitor workflows."),
+]

cornflow-server/airflow_config/logs/README.rst

@@ -0,0 +1,10 @@
+Airflow LOGS
+--------------
+
+Users can specify the directory to place log files in airflow.cfg using base_log_folder. By default, logs are placed in the AIRFLOW_HOME directory.
+
+The following convention is followed while naming logs: {dag_id}/{task_id}/{execution_date}/{try_number}.log
+
+In addition, users can supply a remote location to store current logs and backups.
+
+In the Airflow Web UI, local logs take precedence over remote logs. If local logs can not be found or accessed, the remote logs will be displayed. Note that logs are only sent to remote storage once a task is complete (including failure); In other words, remote logs for running tasks are unavailable.

cornflow-server/airflow_config/scripts/solvers/get_gurobi.py

@@ -22,10 +22,10 @@ def install():
         install_dir = "/usr/local/airflow/gurobi"
         os.chdir("/usr/local/airflow")
         subprocess.check_output(
-            ["wget", "https://packages.gurobi.com/9.5/gurobi9.5.0_linux64.tar.gz"]
+            ["wget", "https://packages.gurobi.com/10.0/gurobi10.0.1_linux64.tar.gz"]
         )
-        subprocess.check_output(["tar", "-xvf", "gurobi9.5.0_linux64.tar.gz"])
-        os.rename("gurobi950", "gurobi")
+        subprocess.check_output(["tar", "-xvf", "gurobi10.0.1_linux64.tar.gz"])
+        os.rename("gurobi1001", "gurobi")
         uid = pwd.getpwnam("airflow").pw_uid
         gid = grp.getgrnam("airflow").gr_gid
         os.chown(install_dir, uid, gid)

cornflow-server/cornflow/app.py

@@ -49,6 +49,7 @@ def create_app(env_name="development", dataconn=None):
     dictConfig(log_config(app_config[env_name].LOG_LEVEL))
 
     app = Flask(__name__)
+    app.json.sort_keys = False
     app.logger.setLevel(app_config[env_name].LOG_LEVEL)
 
     app.config.from_object(app_config[env_name])