From 5e69c1cd92e48dc85d03fff3c0cee2479b97a596 Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:22:43 +0200
Subject: [PATCH 1/9] 0.25.5 Fixed issue when model isn't found

---
 .../dataProviders/pythonDataProvider/dataUtils/models.py    | 6 +-----
 backend/swagger.yaml                                        | 2 +-
 frontend/package-lock.json                                  | 4 ++--
 frontend/package.json                                       | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/backend/modules/dataProviders/pythonDataProvider/dataUtils/models.py b/backend/modules/dataProviders/pythonDataProvider/dataUtils/models.py
index aab04d00c..50a056da3 100644
--- a/backend/modules/dataProviders/pythonDataProvider/dataUtils/models.py
+++ b/backend/modules/dataProviders/pythonDataProvider/dataUtils/models.py
@@ -149,11 +149,7 @@ def add_results_dict(project_id, modelId, data):
 
     if not model_exist(project_id, modelId):
         raise (
-            "Model '"
-            + modelId
-            + "' in project : '"
-            + projects.getProjectNameFromId(project_id)
-            + "' doesn't exist"
+            "Model '" + modelId + "' in project : '" + project_id + "' doesn't exist"
         )
 
     # Get resultStructure & project_block_structure
diff --git a/backend/swagger.yaml b/backend/swagger.yaml
index 61d798d85..72b269321 100644
--- a/backend/swagger.yaml
+++ b/backend/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: 0.25.4
+  version: 0.25.5
   title: DebiAI_BACKEND_API
   description: DebiAI backend api
   contact:
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d0891ce0b..88cbba4de 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "debiai_frontend",
-  "version": "0.25.4",
+  "version": "0.25.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "debiai_frontend",
-      "version": "0.25.4",
+      "version": "0.25.5",
       "license": "Apache-2.0",
       "dependencies": {
         "axios": "^0.21.4",
diff --git a/frontend/package.json b/frontend/package.json
index fec87ae46..4e2960cbf 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "debiai_frontend",
-  "version": "0.25.4",
+  "version": "0.25.5",
   "description": "Frontend for Debiai, made with Vuejs",
   "license": "Apache-2.0",
   "scripts": {

From f01fc733652db37f844a683efe861cda07d69715 Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:33:01 +0200
Subject: [PATCH 2/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index 41f4ba357..91fa2b212 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -128,4 +128,20 @@ jobs:
       - name: Test with pytest
         run: |
           cd backend
-          python websrv.py & sleep 5 && pytest tests/
\ No newline at end of file
+          python websrv.py & sleep 5 && pytest tests/
+
+  docker-build-check: # Build the docker image and check that it can run
+    name: Docker build check
+    needs:
+      [black-format-check, prettier-check, cspell-check, version-upgrade-check]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Build the Docker image
+        run: |
+          docker build -t debiai .
+      - name: Run the Docker image
+        run: |
+          docker run -d -p 3000:3000 debiai

From cb8de9af55f33ab9ad1eab6e17d643ce8e7a2778 Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:38:05 +0200
Subject: [PATCH 3/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index 91fa2b212..d792144b4 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -140,8 +140,26 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Build the Docker image
-        run: |
-          docker build -t debiai .
+        run: docker build -t debiai .
+
       - name: Run the Docker image
+        run: docker run -d -p 3000:3000 debiai
+
+      - name: Wait for Health Check
         run: |
-          docker run -d -p 3000:3000 debiai
+          for i in {1..10}; do
+            health_status=$(docker inspect --format='{{.State.Health.Status}}' $(docker ps -q))
+            echo "Health status: $health_status"
+            if [ "$health_status" = "healthy" ]; then
+              echo "Container is healthy"
+              exit 0
+            fi
+            if [ "$health_status" = "unhealthy" ]; then
+              echo "Container is unhealthy"
+              exit 1
+            fi
+            echo "Waiting for container health status..."
+            sleep 5
+          done
+          echo "Container did not become healthy within the expected time"
+          exit 1

From 6382012603604ae2ba8474eb0180ff78e90c5b5e Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:41:26 +0200
Subject: [PATCH 4/9] Cspell

---
 cspell.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cspell.json b/cspell.json
index dc4bf51b2..14bd80891 100644
--- a/cspell.json
+++ b/cspell.json
@@ -5,6 +5,7 @@
     "*index",
     "applymap",
     "astype",
+    "buildx",
     "cacheout",
     "ckdtree",
     "Confiance",

From 7383b09d5dd50f9a172a377c8d6e7377d07bf12c Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:42:53 +0200
Subject: [PATCH 5/9] Cspell

---
 cspell.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cspell.json b/cspell.json
index 14bd80891..2a15b4366 100644
--- a/cspell.json
+++ b/cspell.json
@@ -62,6 +62,7 @@
     "*.png",
     "*.yaml",
     ".vscode/*",
+    "backend/requirements.txt",
     "backend/data/*",
     "__pycache__/",
     "frontend/dist",

From 32a26e269482262b0e28f9cf9651a1018fd4b73a Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 17:59:09 +0200
Subject: [PATCH 6/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index d792144b4..4102e98fc 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -141,25 +141,24 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Build the Docker image
         run: docker build -t debiai .
-
       - name: Run the Docker image
         run: docker run -d -p 3000:3000 debiai
-
       - name: Wait for Health Check
         run: |
           for i in {1..10}; do
-            health_status=$(docker inspect --format='{{.State.Health.Status}}' $(docker ps -q))
-            echo "Health status: $health_status"
-            if [ "$health_status" = "healthy" ]; then
-              echo "Container is healthy"
+            status=$(docker inspect --format='{{.State.Status}}' $(docker ps -q))
+            echo "Docker status: $status"
+            if [ "$status" = "running" ]; then
+              echo "Container is running"
               exit 0
             fi
-            if [ "$health_status" = "unhealthy" ]; then
-              echo "Container is unhealthy"
+            if [ "$status" = "exited" ]; then
+              echo "Container exited"
               exit 1
             fi
-            echo "Waiting for container health status..."
+            echo "Waiting for container status..."
+            echo "Current container status: $status"
             sleep 5
           done
-          echo "Container did not become healthy within the expected time"
+          echo "Container did not start in time"
           exit 1

From c0cea4e7dca8b1478729bb725c594251c631a61f Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Thu, 26 Oct 2023 18:13:12 +0200
Subject: [PATCH 7/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 31 ++++++++++++------------
 cspell.json                              |  1 +
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index 4102e98fc..468c01eae 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -34,7 +34,10 @@ jobs:
         with:
           node-version: 16
       - name: Install dependencies and check prettier format
-        run: cd frontend && npm install && npm run prettier:check
+        run: |
+          cd frontend
+          npm install prettier
+          npm run prettier:check
 
   cspell-check: # Check that the project does not contain spelling errors
     name: CSpell check
@@ -143,22 +146,20 @@ jobs:
         run: docker build -t debiai .
       - name: Run the Docker image
         run: docker run -d -p 3000:3000 debiai
-      - name: Wait for Health Check
+      - name: Wait for the Docker container to start
         run: |
           for i in {1..10}; do
-            status=$(docker inspect --format='{{.State.Status}}' $(docker ps -q))
-            echo "Docker status: $status"
-            if [ "$status" = "running" ]; then
-              echo "Container is running"
-              exit 0
-            fi
-            if [ "$status" = "exited" ]; then
-              echo "Container exited"
-              exit 1
-            fi
-            echo "Waiting for container status..."
-            echo "Current container status: $status"
-            sleep 5
+              status=$(docker inspect --format='{{.State.Status}}' $(docker ps -q) | tr -d '[:space:]')
+              echo "Docker status: $status"
+              if [ "$status" = "running" ]; then
+                  echo "Container is running"
+                  exit 0
+              elif [ "$status" = "exited" ]; then
+                  echo "Container exited"
+                  exit 1
+              fi
+              echo "Waiting for container status..."
+              sleep 5
           done
           echo "Container did not start in time"
           exit 1
diff --git a/cspell.json b/cspell.json
index 2a15b4366..d6e1abc35 100644
--- a/cspell.json
+++ b/cspell.json
@@ -17,6 +17,7 @@
     "Drange",
     "dtype",
     "dvec",
+    "elif",
     "fromlist",
     "groundtruth",
     "kneighbors",

From 2f2a7f87fe59be07679c9d1761e04db498e43ff2 Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Mon, 30 Oct 2023 10:23:25 +0100
Subject: [PATCH 8/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index 468c01eae..ad0fb8dbd 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -149,8 +149,13 @@ jobs:
       - name: Wait for the Docker container to start
         run: |
           for i in {1..10}; do
+              echo "Waiting for container status..."
+              sleep 3
+              docker ps
+              docker ps -q
+              docker inspect --format='{{.State.Status}}' $(docker ps -q)
               status=$(docker inspect --format='{{.State.Status}}' $(docker ps -q) | tr -d '[:space:]')
-              echo "Docker status: $status"
+              echo "Docker status: '$status'";
               if [ "$status" = "running" ]; then
                   echo "Container is running"
                   exit 0
@@ -158,8 +163,6 @@ jobs:
                   echo "Container exited"
                   exit 1
               fi
-              echo "Waiting for container status..."
-              sleep 5
           done
           echo "Container did not start in time"
           exit 1

From 313596d6a9aebde1ab700744502419ffa42ce042 Mon Sep 17 00:00:00 2001
From: "tom.mansion" <tomansion@yahoo.fr>
Date: Mon, 30 Oct 2023 10:32:14 +0100
Subject: [PATCH 9/9] Docker test workflow

---
 .github/workflows/pull-request-check.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pull-request-check.yml b/.github/workflows/pull-request-check.yml
index ad0fb8dbd..3378f4226 100644
--- a/.github/workflows/pull-request-check.yml
+++ b/.github/workflows/pull-request-check.yml
@@ -148,14 +148,13 @@ jobs:
         run: docker run -d -p 3000:3000 debiai
       - name: Wait for the Docker container to start
         run: |
+          echo "Waiting for container status..."
           for i in {1..10}; do
-              echo "Waiting for container status..."
               sleep 3
-              docker ps
-              docker ps -q
-              docker inspect --format='{{.State.Status}}' $(docker ps -q)
-              status=$(docker inspect --format='{{.State.Status}}' $(docker ps -q) | tr -d '[:space:]')
+              container_id=$(docker ps -q -f "ancestor=debiai")
+              status=$(docker inspect --format='{{.State.Status}}' $container_id | tr -d '[:space:]') 
               echo "Docker status: '$status'";
+              
               if [ "$status" = "running" ]; then
                   echo "Container is running"
                   exit 0