Merge pull request #137 from debiai/hotfix_no_model_found

Hotfix no model found & new workflow

.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
@@ -128,4 +131,37 @@ jobs:
  - name: Test with pytest
  run: |
  cd backend
- python websrv.py & sleep 5 && pytest tests/
+ 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
+ - name: Wait for the Docker container to start
+ run: |
+ echo "Waiting for container status..."
+ for i in {1..10}; do
+ sleep 3
+ 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
+ elif [ "$status" = "exited" ]; then
+ echo "Container exited"
+ exit 1
+ fi
+ done
+ echo "Container did not start in time"
+ exit 1

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

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:

cspell.json

@@ -5,6 +5,7 @@
  "*index",
  "applymap",
  "astype",
+ "buildx",
  "cacheout",
  "ckdtree",
  "Confiance",
@@ -16,6 +17,7 @@
  "Drange",
  "dtype",
  "dvec",
+ "elif",
  "fromlist",
  "groundtruth",
  "kneighbors",
@@ -61,6 +63,7 @@
  "*.png",
  "*.yaml",
  ".vscode/*",
+ "backend/requirements.txt",
  "backend/data/*",
  "__pycache__/",
  "frontend/dist",

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": {