Merge branch 'release-1.5.0'

Evocargo · Aug 2, 2021 · 56c9626 · 56c9626
2 parents 315c9cc + be3240e
commit 56c9626
Show file tree

Hide file tree

Showing 756 changed files with 24,618 additions and 12,200 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -8,3 +8,4 @@ keys/
 logs/
 static/
 templates/
+*/webpack.config.js
diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
@@ -0,0 +1,43 @@
+name: Github pages
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  deploy:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2
+        with:
+          hugo-version: '0.83.1'
+          extended: true
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.x'
+
+      - name: Install npm packages
+        working-directory: ./site
+        run: |
+          npm ci
+
+      - name: Build docs
+        run: |
+          pip install gitpython packaging
+          python site/build_docs.py
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public
+          force_orphan: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -59,7 +59,7 @@ jobs:
           cache-from: type=local,src=/tmp/cvat_cache_server
           tags: openvino/cvat_server:latest
           load: true
-      - name: Runing unit tests
+      - name: Running unit tests
         env:
           HOST_COVERAGE_DATA_DIR: ${{ github.workspace }}
           CONTAINER_COVERAGE_DATA_DIR: "/coverage_data"
@@ -80,7 +80,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3', 'actions_objects', 'actions_objects2', 'actions_users', 'actions_projects', 'canvas3d_functionality', 'issues_prs', 'issues_prs2']
+        specs: ['actions_tasks', 'actions_tasks2', 'actions_tasks3', 'actions_objects', 'actions_objects2', 'actions_users', 'actions_projects_models', 'canvas3d_functionality', 'canvas3d_functionality_2', 'issues_prs', 'issues_prs2']
     steps:
       - uses: actions/checkout@v2
       - name: Getting SHA from the default branch
@@ -151,24 +151,32 @@ jobs:
         run: |
           npm ci
           npm run coverage
-          docker-compose -f docker-compose.yml -f docker-compose.dev.yml build cvat_ui
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml build cvat_ui
       - name: Running e2e tests
         env:
           DJANGO_SU_NAME: 'admin'
           DJANGO_SU_EMAIL: '[email protected]'
           DJANGO_SU_PASSWORD: '12qwaszx'
           API_ABOUT_PAGE: "localhost:8080/api/v1/server/about"
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml up -d
           /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' ${API_ABOUT_PAGE})" != "401" ]]; do sleep 5; done'
           docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"          docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
           cd ./tests
           npm ci
           if [[ ${{ github.ref }} == 'refs/heads/develop' ]]; then
-            npx cypress run --headless --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            if [ ${{ matrix.specs }} == 'canvas3d_functionality' ] || [ ${{ matrix.specs }} == 'canvas3d_functionality_2' ]; then
+              npx cypress run --browser chrome --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            else
+              npx cypress run --headless --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            fi
             mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json
           else
-            npx cypress run --headless --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            if [ ${{ matrix.specs }} == 'canvas3d_functionality' ] || [ ${{ matrix.specs }} == 'canvas3d_functionality_2' ]; then
+              npx cypress run --browser chrome --env coverage=false --config-file cypress_canvas3d.json --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            else
+              npx cypress run --headless --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
+            fi
           fi
       - name: Creating a log file from "cvat" container logs
         if: failure()
@@ -199,7 +207,7 @@ jobs:
     needs: [Unit_testing, E2E_testing]
     steps:
       - uses: actions/checkout@v2
-      - name: Geting SHA from the default branch
+      - name: Getting SHA from the default branch
         id: get-sha
         run: |
           URL_get_default_branch="https://api.github.com/repos/${{ github.repository }}"

diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml
@@ -4,43 +4,55 @@ on:
     types: [published]
 
 jobs:
-  build_and_push_to_registry:
+  Unit_testing:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-            node-version: 12
-
-      - name: Build images
-        run: |
-          CLAM_AV=yes INSTALL_SOURCES=yes docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml build
-
       - name: Run unit tests
         env:
           HOST_COVERAGE_DATA_DIR: ${{ github.workspace }}
           CONTAINER_COVERAGE_DATA_DIR: '/coverage_data'
-          DJANGO_SU_NAME: 'admin'
-          DJANGO_SU_EMAIL: '[email protected]'
-          DJANGO_SU_PASSWORD: '12qwaszx'
         run: |
           docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'coverage run -a manage.py test cvat/apps utils/cli'
           docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.ci.yml run cvat_ci /bin/bash -c 'cd cvat-data && npm ci && cd ../cvat-core && npm ci && npm run test'
-          docker-compose up -d
-          docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
 
+  E2E_testing:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+            node-version: 12
       - name: Run end-to-end tests
+        env:
+          DJANGO_SU_NAME: 'admin'
+          DJANGO_SU_EMAIL: '[email protected]'
+          DJANGO_SU_PASSWORD: '12qwaszx'
+          API_ABOUT_PAGE: "localhost:8080/api/v1/server/about"
         run: |
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml build
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml up -d
+          /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' ${API_ABOUT_PAGE})" != "401" ]]; do sleep 5; done'
+          docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
           cd ./tests
           npm ci
           npm run cypress:run:chrome
+          npm run cypress:run:chrome:canvas3d
       - name: Uploading cypress screenshots as an artifact
         if: failure()
         uses: actions/upload-artifact@v2
         with:
           name: cypress_screenshots
           path: ${{ github.workspace }}/tests/cypress/screenshots
 
+  Push_to_registry:
+    runs-on: ubuntu-latest
+    needs: [Unit_testing, E2E_testing]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build images
+        run: |
+          CLAM_AV=yes INSTALL_SOURCES=yes docker-compose -f docker-compose.yml -f docker-compose.dev.yml build
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:

diff --git a/.github/workflows/remark.yml b/.github/workflows/remark.yml
@@ -11,31 +11,16 @@ jobs:
 
       - name: Run checks
         run: |
-          URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
-          PR_FILES=$(curl -s -X GET -G $URL | jq -r '.[] | select(.status != "removed") | .filename')
-          for files in $PR_FILES; do
-            extension="${files##*.}"
-            if [[ $extension == 'md' ]]; then
-              changed_files_remark+=" ${files}"
-            fi
-          done
+          npm ci
+          mkdir -p remark_report
 
-          if [[ ! -z ${changed_files_remark} ]]; then
-            npm ci
-            npm install [email protected] [email protected]
-            mkdir -p remark_report
-
-            echo "Remark version: "`npx remark --version`
-            echo "The files will be checked: "`echo ${changed_files_remark}`
-            npx remark --quiet --report json --no-stdout ${changed_files_remark} 2> ./remark_report/remark_report.json
-            get_report=`cat ./remark_report/remark_report.json  | jq -r '.[] | select(.messages | length > 0)'`
-             if [[ ! -z ${get_report} ]]; then
-              pip install json2html
-              python ./tests/json_to_html.py ./remark_report/remark_report.json
-              exit 1
-            fi
-          else
-            echo "No files with the \"md\" extension found"
+          echo "Remark version: "`npx remark --version`
+          npx remark --quiet --report json --no-stdout . 2> ./remark_report/remark_report.json
+          get_report=`cat ./remark_report/remark_report.json  | jq -r '.[] | select(.messages | length > 0)'`
+          if [[ ! -z ${get_report} ]]; then
+            pip install json2html
+            python ./tests/json_to_html.py ./remark_report/remark_report.json
+            exit 1
           fi
 
       - name: Upload artifacts

diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -18,7 +18,7 @@ jobs:
           DJANGO_SU_PASSWORD: "12qwaszx"
           API_ABOUT_PAGE: "localhost:8080/api/v1/server/about"
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f ./tests/docker-compose.email.yml up -d --build
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f ./tests/docker-compose.email.yml -f components/serverless/docker-compose.serverless.yml up -d --build
           /bin/bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' ${API_ABOUT_PAGE})" != "401" ]]; do sleep 5; done'
           docker exec -i cvat /bin/bash -c "echo \"from django.contrib.auth.models import User; User.objects.create_superuser('${DJANGO_SU_NAME}', '${DJANGO_SU_EMAIL}', '${DJANGO_SU_PASSWORD}')\" | python3 ~/manage.py shell"
       - name: End-to-end testing

diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,9 @@ yarn-error.log*
 /helm-chart/values.*.yaml
 /helm-chart/*.values.yaml
 /helm-chart/charts/*
+
+#Ignore website temp files
+/site/public/
+/site/resources/
+/site/node_modules/
+/site/tech-doc-hugo
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "site/themes/docsy"]
+	path = site/themes/docsy
+	url = https://github.com/google/docsy
diff --git a/.nycrc b/.nycrc
@@ -9,7 +9,9 @@
     ],
     "exclude": [
         "**/3rdparty/*",
-        "**/tests/*"
+        "**/tests/*",
+        "cvat-ui/src/actions/boundaries-actions.ts",
+        "cvat-ui/src/utils/platform-checker.ts"
     ],
     "parser-plugins": [
         "typescript"

diff --git a/.remarkrc.js b/.remarkrc.js
@@ -1,6 +1,8 @@
 exports.settings = { bullet: '*', paddedTable: false };
 
 exports.plugins = [
+    'remark-frontmatter',
+    'remark-gfm',
     'remark-preset-lint-recommended',
     'remark-preset-lint-consistent',
     ['remark-lint-list-item-indent', 'space'],

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,7 +7,7 @@
         {
             "type": "chrome",
             "request": "launch",
-            "preLaunchTask": "ui.js: server",
+            "preLaunchTask": "npm: start - cvat-ui",
             "name": "ui.js: debug",
             "url": "http://localhost:3000",
             "webRoot": "${workspaceFolder}/cvat-ui",
@@ -45,7 +45,7 @@
             "python": "${command:python.interpreterPath}",
             "program": "${workspaceRoot}/manage.py",
             "env": {
-                "CVAT_SERVERLESS":  "1",
+                "CVAT_SERVERLESS":  "1"
             },
             "args": [
                 "runserver",
@@ -207,7 +207,6 @@
         {
             "name": "server: debug",
             "configurations": [
-                "server: chrome",
                 "server: django",
                 "server: RQ - default",
                 "server: RQ - low",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,4 @@
 {
-    "eslint.enable": true,
     "eslint.probe": [
         "javascript",
         "typescript",
@@ -24,5 +23,14 @@
     "python.linting.pycodestyleEnabled": false,
     "licenser.license": "Custom",
     "licenser.customHeader": "Copyright (C) @YEAR@ Intel Corporation\n\nSPDX-License-Identifier: MIT",
-    "files.trimTrailingWhitespace": true
+    "files.trimTrailingWhitespace": true,
+    "python.pythonPath": ".env/bin/python",
+    "sqltools.connections": [
+        {
+            "previewLimit": 50,
+            "driver": "SQLite",
+            "name": "cvat",
+            "database": "${workspaceFolder:cvat}/db.sqlite3"
+        }
+    ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,11 +4,35 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "ui.js: server",
             "type": "npm",
             "script": "start",
             "path": "cvat-ui/",
-            "problemMatcher": []
+            "label": "npm: start - cvat-ui",
+            "detail": "webpack-dev-server --env.API_URL=http://localhost:7000 --config ./webpack.config.js --mode=development",
+            "promptOnClose": true,
+            "isBackground": true,
+            "problemMatcher": {
+                "owner": "webpack",
+                "severity": "error",
+                "fileLocation": "absolute",
+                "pattern": [
+                  {
+                    "regexp": "ERROR in (.*)",
+                    "file": 1
+                  },
+                  {
+                    "regexp": "\\((\\d+),(\\d+)\\):(.*)",
+                    "line": 1,
+                    "column": 2,
+                    "message": 3
+                  }
+                ],
+                "background": {
+                  "activeOnStart": true,
+                  "beginsPattern": "webpack-dev-server",
+                  "endsPattern": "Compiled"
+                }
+            }
         }
     ]
-}
+}