merged main fixed conflicts

gchq · Nov 14, 2024 · b3e96ce · b3e96ce
2 parents 891195a + 8773602
commit b3e96ce
Show file tree

Hide file tree

Showing 87 changed files with 3,236 additions and 2,129 deletions.
diff --git a/.github/workflows/build.js.yml b/.github/workflows/build.js.yml
@@ -30,7 +30,7 @@ jobs:
           outputs: type=docker,dest=/tmp/bailo_backend.tar
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bailo_backend
           path: /tmp/bailo_backend.tar
@@ -58,7 +58,7 @@ jobs:
           outputs: type=docker,dest=/tmp/bailo_frontend.tar
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: bailo_frontend
           path: /tmp/bailo_frontend.tar
@@ -125,12 +125,12 @@ jobs:
 
       # Get Bailo Docker image
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_backend
           path: /tmp
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_frontend
           path: /tmp
@@ -242,13 +242,13 @@ jobs:
       # Run Cypress integration tests
       #- run: CYPRESS_BASE_URL=$(minikube service node-port --url) npm run cy:run
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots-k8s
           path: cypress/screenshots
 
-      # - uses: actions/upload-artifact@v3
+      # - uses: actions/upload-artifact@v4
       #   if: always()
       #   with:
       #     name: cypress-videos
@@ -278,12 +278,12 @@ jobs:
 
       # Get Bailo Docker images
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_backend
           path: /tmp
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_frontend
           path: /tmp
@@ -353,13 +353,13 @@ jobs:
           install: false
           spec: cypress/e2e/bailo/**/*
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: cypress-screenshots-e2e
           path: frontend/cypress/screenshots
 
-      # - uses: actions/upload-artifact@v3
+      # - uses: actions/upload-artifact@v4
       #   if: always()
       #   with:
       #     name: cypress-videos
@@ -373,7 +373,7 @@ jobs:
         if: always()
         run: cat logs/stack.log
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: logs
@@ -398,12 +398,12 @@ jobs:
 
       # Get Bailo Docker images
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_backend
           path: /tmp
       - name: Download artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: bailo_frontend
           path: /tmp
@@ -492,8 +492,8 @@ jobs:
         if: always()
         run: cat logs/stack.log
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: logs
+          name: python-logs
           path: logs
diff --git a/.github/workflows/python-publish-test.yml b/.github/workflows/python-publish-test.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Upload Bailo artifact
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: python-package-distributions
           path: lib/python/dist/
@@ -66,7 +66,7 @@ jobs:
       #Retrieve Bailo artifact
       - name: Download all the dists
         if: needs.build.outputs.files-changed-output == 'true'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: python-package-distributions
           path: lib/python/dist/

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -42,7 +42,7 @@ jobs:
 
       # Upload Bailo artifact
       - name: Store the distribution packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: python-package-distributions
           path: lib/python/dist/
@@ -64,7 +64,7 @@ jobs:
       # Retrieve Bailo artifact
       - name: Download all the dists
         if: needs.build.outputs.files-changed-output == 'true'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: python-package-distributions
           path: lib/python/dist/

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -47,7 +47,7 @@ jobs:
         run: |
           make html
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: python-docs
           path: ./backend/docs/python-docs/html
@@ -65,7 +65,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Download Python Docs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: python-docs
           path: ./backend/docs/python-docs/html

diff --git a/backend/config/default.cjs b/backend/config/default.cjs
@@ -181,8 +181,13 @@ module.exports = {
       gpus: {},
     },
     modelMirror: {
-      enabled: false,
-      disclaimer: '## Example Agreement \n I agree that this model is suitable for exporting',
+      import: {
+        enabled: false,
+      },
+      export: {
+        enabled: false,
+        disclaimer: '## Example Agreement \n I agree that this model is suitable for exporting',
+      },
     },
 
     announcement: {