Merge branch 'develop' into Count_Annotations

cvat-ai · Mar 31, 2024 · 671e02b · 671e02b
2 parents 19eaaca + 02889ee
commit 671e02b
Show file tree

Hide file tree

Showing 91 changed files with 5,550 additions and 1,299 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,66 @@
+name: Docs
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+  pull_request:
+    types: [ready_for_review, opened, synchronize, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  generate_github_pages:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Generate CVAT SDK
+        run: |
+          pip3 install --user -r cvat-sdk/gen/requirements.txt
+          ./cvat-sdk/gen/generate.sh
+
+      - name: Setup Hugo
+        run: |
+          wget https://github.com/gohugoio/hugo/releases/download/v0.110.0/hugo_extended_0.110.0_Linux-64bit.tar.gz
+          (mkdir hugo_extended_0.110.0_Linux-64bit && tar -xf hugo_extended_0.110.0_Linux-64bit.tar.gz -C hugo_extended_0.110.0_Linux-64bit)
+
+          wget https://github.com/gohugoio/hugo/releases/download/v0.83.0/hugo_extended_0.83.0_Linux-64bit.tar.gz
+          (mkdir hugo_extended_0.83.0_Linux-64bit && tar -xf hugo_extended_0.83.0_Linux-64bit.tar.gz -C hugo_extended_0.83.0_Linux-64bit)
+
+          mkdir hugo
+          cp hugo_extended_0.110.0_Linux-64bit/hugo hugo/hugo-0.110
+          cp hugo_extended_0.83.0_Linux-64bit/hugo hugo/hugo-0.83
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+
+      - name: Install npm packages
+        working-directory: ./site
+        run: |
+          npm ci
+
+      - name: Build docs
+        run: |
+          pip install -r site/requirements.txt
+          python site/process_sdk_docs.py
+          PATH="$PWD/hugo:$PATH" python site/build_docs.py
+        env:
+          HUGO_ENV: production
+
+      - name: Deploy
+        if: github.ref == 'refs/heads/develop'
+        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
@@ -385,62 +385,9 @@ jobs:
           name: cypress_screenshots_${{ matrix.specs }}
           path: ${{ github.workspace }}/tests/cypress/screenshots
 
-  generate_github_pages:
-    needs: [rest_api_testing, unit_testing, e2e_testing]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Download CVAT SDK
-        uses: actions/download-artifact@v3
-        with:
-          name: cvat_sdk
-          path: /tmp/cvat_sdk/
-
-      - name: Setup Hugo
-        run: |
-          wget https://github.com/gohugoio/hugo/releases/download/v0.110.0/hugo_extended_0.110.0_Linux-64bit.tar.gz
-          (mkdir hugo_extended_0.110.0_Linux-64bit && tar -xf hugo_extended_0.110.0_Linux-64bit.tar.gz -C hugo_extended_0.110.0_Linux-64bit)
-
-          wget https://github.com/gohugoio/hugo/releases/download/v0.83.0/hugo_extended_0.83.0_Linux-64bit.tar.gz
-          (mkdir hugo_extended_0.83.0_Linux-64bit && tar -xf hugo_extended_0.83.0_Linux-64bit.tar.gz -C hugo_extended_0.83.0_Linux-64bit)
-
-          mkdir hugo
-          cp hugo_extended_0.110.0_Linux-64bit/hugo hugo/hugo-0.110
-          cp hugo_extended_0.83.0_Linux-64bit/hugo hugo/hugo-0.83
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-
-      - name: Install npm packages
-        working-directory: ./site
-        run: |
-          npm ci
-
-      - name: Build docs
-        run: |
-          pip install -r site/requirements.txt
-          python site/process_sdk_docs.py --input-dir /tmp/cvat_sdk/docs/ --site-root site/
-          PATH="$PWD/hugo:$PATH" python site/build_docs.py
-        env:
-          HUGO_ENV: production
-
-      - name: Deploy
-        if: github.ref == 'refs/heads/develop'
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./public
-          force_orphan: true
-
   publish_dev_images:
     if: github.ref == 'refs/heads/develop'
-    needs: [rest_api_testing, unit_testing, e2e_testing, generate_github_pages]
+    needs: [rest_api_testing, unit_testing, e2e_testing]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
     "configurations": [
         {
             "name": "REST API tests: Attach to server",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -26,7 +26,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ annotation worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -46,7 +46,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ export worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -66,7 +66,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ import worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -86,7 +86,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ quality reports worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -106,7 +106,7 @@
         },
         {
             "name": "REST API tests: Attach to RQ analytics reports worker",
-            "type": "python",
+            "type": "debugpy",
             "request": "attach",
             "connect": {
                 "host": "127.0.0.1",
@@ -158,7 +158,7 @@
         },
         {
             "name": "server: django",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -196,7 +196,7 @@
         },
         {
             "name": "server: RQ - import",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -218,7 +218,7 @@
         },
         {
             "name": "server: RQ - export",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -240,7 +240,7 @@
         },
         {
             "name": "server: RQ - quality reports",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -262,7 +262,7 @@
         },
         {
             "name": "server: RQ - analytics reports",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -284,7 +284,7 @@
         },
         {
             "name": "server: RQ - scheduler",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -303,7 +303,7 @@
         },
         {
             "name": "server: RQ - annotation",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -322,7 +322,7 @@
         },
         {
             "name": "server: RQ - webhooks",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -341,7 +341,7 @@
         },
         {
             "name": "server: RQ - cleaning",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": false,
             "justMyCode": false,
@@ -363,7 +363,7 @@
         },
         {
             "name": "server: migrate",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -379,7 +379,7 @@
         },
         {
             "name": "server: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -399,7 +399,7 @@
         },
         {
             "name": "server: REST API tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -413,7 +413,7 @@
         },
         {
             "name": "sdk: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -427,7 +427,7 @@
         },
         {
             "name": "cli: tests",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -441,7 +441,7 @@
         },
         {
             "name": "api client: Postprocess generator output",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -456,7 +456,7 @@
         },
         {
             "name": "docs: Postprocess SDK docs",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -471,7 +471,7 @@
         },
         {
             "name": "docs: Build docs",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,
@@ -482,7 +482,7 @@
         },
         {
             "name": "server: Generate REST API Schema",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "justMyCode": false,
             "stopOnEntry": false,