Merge branch 'develop' into expert-contact-newbackend

dnum-mi · Jun 20, 2024 · 204f221 · 204f221
2 parents e4d44a4 + a8d1eef
commit 204f221
Show file tree

Hide file tree

Showing 104 changed files with 4,887 additions and 5,851 deletions.
diff --git a/.github/workflows/dso-automatic-sync.yml b/.github/workflows/dso-automatic-sync.yml
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -71,6 +71,17 @@ jobs:
     steps:
       - run: cd /app && pytest
 
+  test-frontend-format:
+    name: Test Frontend Formatting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run Prettier check
+        working-directory: frontend
+        run: |
+          npm ci
+          npm run format-check
+
   test-e2e:
     name: Run E2E tests
     needs: [build-backend, build-frontend]

diff --git a/.gitlab-ci-dso.yml b/.gitlab-ci-dso.yml
@@ -3,7 +3,7 @@ include:
     file: vault-ci.yml
     ref: main
   - project: $CATALOG_PATH
-    file: kaniko-ci.yml
+    file: kaniko-ci-mirror.yml
     ref: main
 
 default:
@@ -30,7 +30,7 @@ docker-build-frontend:
     BUILD_ARGS: --build-arg=VERSION=1.1.1
   stage: docker-build
   extends:
-    - .kaniko:build-push
+    - .kaniko-mirror:build-push
 
 docker-build-backend:
   variables:
@@ -40,4 +40,4 @@ docker-build-backend:
     BUILD_ARGS: --build-arg=VERSION=1.1.1
   stage: docker-build
   extends:
-    - .kaniko:build-push
+    - .kaniko-mirror:build-push
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,8 +12,8 @@ repos:
         args: ["--profile", "black"]
 -   repo: local
     hooks:
-    -   id: eslint
-        name: eslint
+    -   id: prettier
+        name: prettier
         entry: bash -c 'cd ./frontend && npm run format'
         language: system
         files: ^frontend/
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -10,9 +10,7 @@ user-agents==2.2.0
 boto3==1.28.39
 autodynatrace==2.0.0
 # ML
-ultralytics==8.1.2
-opencv-python==4.9.0.80
-onnxruntime==1.17.1
+https://github.com/dnum-mi/basegun-ml/raw/MLPackages/MLpackages/basegun_ml/dist/basegunml-0.1.tar.gz
 # Dev
 pytest==7.4.3
 coverage==7.3.2
diff --git a/backend/src/ml/measure/best_card.onnx b/backend/src/ml/measure/best_card.onnx
diff --git a/backend/src/ml/measure/best_keypoints.pt b/backend/src/ml/measure/best_keypoints.pt