Merge branch 'release-1.7.0'

cvat-ai · Nov 15, 2021 · 967b0fe · 967b0fe
2 parents 8d03ed7 + 2bb8643
commit 967b0fe
Show file tree

Hide file tree

Showing 371 changed files with 82,388 additions and 114,016 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 module.exports = {
+    root: true,
     env: {
         node: true,
         browser: true,
@@ -12,12 +13,43 @@ module.exports = {
         sourceType: 'module',
         ecmaVersion: 2018,
     },
-    plugins: ['eslint-plugin-header'],
-    extends: ['eslint:recommended', 'prettier'],
+    ignorePatterns: [
+        '.eslintrc.js',
+        'lint-staged.config.js',
+    ],
+    plugins: ['security', 'no-unsanitized', 'eslint-plugin-header', 'import'],
+    extends: [
+        'eslint:recommended', 'plugin:security/recommended', 'plugin:no-unsanitized/DOM',
+        'airbnb-base', 'plugin:import/errors', 'plugin:import/warnings',
+        'plugin:import/typescript',
+    ],
     rules: {
         'header/header': [2, 'line', [{
             pattern: ' {1}Copyright \\(C\\) (?:20\\d{2}-)?2021 Intel Corporation',
             template: ' Copyright (C) 2021 Intel Corporation'
         }, '', ' SPDX-License-Identifier: MIT']],
+        'no-plusplus': 0,
+        'no-continue': 0,
+        'no-console': 0,
+        'no-param-reassign': ['error', { 'props': false }],
+        'no-restricted-syntax': [0, { selector: 'ForOfStatement' }],
+        'no-await-in-loop': 0,
+        'indent': ['error', 4, { 'SwitchCase': 1 }],
+        'max-len': ['error', { code: 120, ignoreStrings: true }],
+        'func-names': 0,
+        'valid-typeof': 0,
+        'no-useless-constructor': 0, // sometimes constructor is necessary to generate right documentation in cvat-core
+        'quotes': ['error', 'single'],
+        'lines-between-class-members': 0,
+        'class-methods-use-this': 0,
+        'no-underscore-dangle': ['error', { allowAfterThis: true }],
+        'max-classes-per-file': 0,
+        'operator-linebreak': ['error', 'after'],
+        'newline-per-chained-call': 0,
+        'global-require': 0,
+        'arrow-parens': ['error', 'always'],
+        'security/detect-object-injection': 0, // the rule is relevant for user input data on the node.js environment
+        'import/order': ['error', {'groups': ['builtin', 'external', 'internal']}],
+        'import/prefer-default-export': 0, // works incorrect with interfaces
     },
 };
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ develop, hotfix-*, master, release-* ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '25 19 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
 
       - name: Run checks
         run: |
@@ -21,10 +21,8 @@ jobs:
           done
 
           if [[ ! -z ${changed_files_eslint} ]]; then
-            for package_files in `find -maxdepth 2 -name "package.json" -type f`; do
-              cd $(dirname $package_files) && npm ci && cd ${{ github.workspace }}
-            done
-            npm install eslint-detailed-reporter --save-dev
+            npm ci
+            npm install eslint-detailed-reporter --save-dev --legacy-peer-deps
             mkdir -p eslint_report
 
             echo "ESLint version: "`npx eslint --version`

diff --git a/.github/workflows/github_pages.yml b/.github/workflows/github_pages.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '16.x'
 
       - name: Install npm packages
         working-directory: ./site
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build docs
         run: |
-          pip install gitpython packaging
+          pip install gitpython packaging toml
           python site/build_docs.py
 
       - name: Deploy

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,9 +5,14 @@ on:
       - 'master'
       - 'develop'
   pull_request:
+    types: [edited, ready_for_review, opened, synchronize, reopened]
 
 jobs:
   Unit_testing:
+      if: |
+        github.event.pull_request.draft == false &&
+        !startsWith(github.event.pull_request.title, '[WIP]') &&
+        !startsWith(github.event.pull_request.title, '[Dependent]')
       runs-on: ubuntu-latest
       steps:
       - uses: actions/checkout@v2
@@ -75,6 +80,10 @@ jobs:
             ${{ github.workspace }}/lcov.info
 
   E2E_testing:
+    if: |
+      github.event.pull_request.draft == false &&
+      !startsWith(github.event.pull_request.title, '[WIP]') &&
+      !startsWith(github.event.pull_request.title, '[Dependent]')
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -126,7 +135,7 @@ jobs:
           key: ${{ runner.os }}-build-ui-${{ steps.get-sha.outputs.sha }}
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1.1.2
       - name: Building CVAT server image
@@ -158,23 +167,23 @@ 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 components/serverless/docker-compose.serverless.yml up -d
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml -f tests/docker-compose.file_share.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"
+          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
             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'
+              npx cypress run --headed --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'
+              npx cypress run --browser chrome --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
             fi
             mv ./.nyc_output/out.json ./.nyc_output/out_${{ matrix.specs }}.json
           else
             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'
+              npx cypress run --headed --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'
+              npx cypress run --browser chrome --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js'
             fi
           fi
       - name: Creating a log file from "cvat" container logs

diff --git a/.github/workflows/publish_docker_images.yml b/.github/workflows/publish_docker_images.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
       - name: Run end-to-end tests
         env:
           DJANGO_SU_NAME: 'admin'
@@ -31,7 +31,7 @@ jobs:
           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
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f components/serverless/docker-compose.serverless.yml -f tests/docker-compose.file_share.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

diff --git a/.github/workflows/remark.yml b/.github/workflows/remark.yml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
 
       - name: Run checks
         run: |

diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -10,15 +10,15 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
       - name: Build CVAT
         env:
           DJANGO_SU_NAME: "admin"
           DJANGO_SU_EMAIL: "admin@localhost.company"
           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 -f components/serverless/docker-compose.serverless.yml up -d --build
+          docker-compose -f docker-compose.yml -f docker-compose.dev.yml -f ./tests/docker-compose.email.yml -f tests/docker-compose.file_share.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/.github/workflows/stylelint.yml b/.github/workflows/stylelint.yml
@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-            node-version: 12
+            node-version: '16.x'
 
       - name: Run checks
         run: |

diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@
 /profiles
 /ssh/*
 !/ssh/README.md
-node_modules
 /Mask_RCNN/
 /letsencrypt-webroot/
 
@@ -21,9 +20,6 @@ __pycache__
 ._*
 .coverage
 
-# Ignore development npm files
-node_modules
-
 # Ignore npm logs file
 npm-debug.log*
 yarn-debug.log*
@@ -46,4 +42,22 @@ yarn-error.log*
 /site/public/
 /site/resources/
 /site/node_modules/
-/site/tech-doc-hugo
+/site/tech-doc-hugo
+
+# Ignore all the installed packages
+node_modules
+
+# Ignore all js dists
+cvat-data/dist
+cvat-core/dist
+cvat-canvas/dist
+cvat-canvas3d/dist
+cvat-ui/dist
+
+# produced by npm run docs in cvat-core
+cvat-core/docs
+# produced by npm run test in cvat-core
+cvat-core/reports
+# produced by prepare in the root package.json script
+.husky
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,31 +5,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## \[1.7.0] - Unreleased
+## \[1.7.0] - 2021-11-15
 
 ### Added
 
-- TDB
+- cvat-ui: support cloud storages (<https://github.com/openvinotoolkit/cvat/pull/3372>)
+- interactor: add HRNet interactive segmentation serverless function (<https://github.com/openvinotoolkit/cvat/pull/3740>)
+- Added GPU implementation for SiamMask, reworked tracking approach (<https://github.com/openvinotoolkit/cvat/pull/3571>)
+- Progress bar for manifest creating (<https://github.com/openvinotoolkit/cvat/pull/3712>)
+- Add a tutorial on attaching cloud storage AWS-S3 (<https://github.com/openvinotoolkit/cvat/pull/3745>)
+  and Azure Blob Container (<https://github.com/openvinotoolkit/cvat/pull/3778>)
+- The feature to remove annotations in a specified range of frames (<https://github.com/openvinotoolkit/cvat/pull/3617>)
 
 ### Changed
 
-- TDB
-
-### Deprecated
-
-- TDB
-
-### Removed
-
-- TDB
+- UI tracking has been reworked (<https://github.com/openvinotoolkit/cvat/pull/3571>)
+- Manifest generation: Reduce creating time (<https://github.com/openvinotoolkit/cvat/pull/3712>)
+- Migration from NPM 6 to NPM 7 (<https://github.com/openvinotoolkit/cvat/pull/3773>)
+- Update Datumaro dependency to 0.2.0 (<https://github.com/openvinotoolkit/cvat/pull/3813>)
 
 ### Fixed
 
-- TDB
+- Fixed JSON transform issues in network requests (<https://github.com/openvinotoolkit/cvat/pull/3706>)
+- Display a more user-friendly exception message (<https://github.com/openvinotoolkit/cvat/pull/3721>)
+- Exception `DataCloneError: The object could not be cloned` (<https://github.com/openvinotoolkit/cvat/pull/3733>)
+- Fixed extension comparison in task frames CLI (<https://github.com/openvinotoolkit/cvat/pull/3674>)
+- Incorrect work when copy job list with "Copy" button (<https://github.com/openvinotoolkit/cvat/pull/3749>)
+- Iterating over manifest (<https://github.com/openvinotoolkit/cvat/pull/3792>)
+- Manifest removing (<https://github.com/openvinotoolkit/cvat/pull/3791>)
+- Fixed project updated date (<https://github.com/openvinotoolkit/cvat/pull/3814>)
+- Fixed dextr deployment (<https://github.com/openvinotoolkit/cvat/pull/3820>)
+- Migration of `dataset_repo` application (<https://github.com/openvinotoolkit/cvat/pull/3827>)
+- Helm settings for external psql database were unused by backend (<https://github.com/openvinotoolkit/cvat/pull/3779>)
+- Updated WSL setup for development (<https://github.com/openvinotoolkit/cvat/pull/3828>)
+- Helm chart config (<https://github.com/openvinotoolkit/cvat/pull/3784>)
 
 ### Security
 
-- TDB
+- Fix security issues on the documentation website unsafe use of target blank
+  and potential clickjacking on legacy browsers (<https://github.com/openvinotoolkit/cvat/pull/3789>)
 
 ## \[1.6.0] - 2021-09-17
 

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -14,7 +14,7 @@ RUN apt-get update && \
         && \
     curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
     echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | tee /etc/apt/sources.list.d/google-chrome.list && \
-    curl https://deb.nodesource.com/setup_12.x | bash - && \
+    curl https://deb.nodesource.com/setup_16.x | bash - && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
         google-chrome-stable \
         nodejs \