Merge branch 'develop' into zm/consensus-simple-merging

.github/workflows/docs.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: '18.x'
+          node-version: '22.x'
 
       - name: Install npm packages
         working-directory: ./site

.github/workflows/eslint.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Install dependencies
         run: |

.github/workflows/full.yml

@@ -256,7 +256,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Download CVAT server image
         uses: actions/download-artifact@v4

.github/workflows/main.yml

@@ -280,7 +280,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-            node-version: '18.x'
+            node-version: '22.x'
 
       - name: Download CVAT server image
         uses: actions/download-artifact@v4
@@ -383,6 +383,109 @@ jobs:
           name: cypress_videos_${{ matrix.specs }}
           path: ${{ github.workspace }}/tests/cypress/videos
 
+  helm_rest_api_testing:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Start minikube
+        uses: medyagh/setup-minikube@latest
+        with:
+          cpus: max
+          memory: max
+
+      - name: Try the cluster
+        run: kubectl get pods -A
+
+      - name: Download CVAT server image
+        uses: actions/download-artifact@v4
+        with:
+          name: cvat_server
+          path: /tmp/cvat_server/
+
+      - name: Download CVAT UI images
+        uses: actions/download-artifact@v4
+        with:
+          name: cvat_ui
+          path: /tmp/cvat_ui/
+
+      - name: Load images
+        run: |
+          eval $(minikube -p minikube docker-env)
+          docker load --input /tmp/cvat_server/image.tar
+          docker load --input /tmp/cvat_ui/image.tar
+          docker image ls -a
+
+      - uses: azure/setup-helm@v4
+
+      - name: Update Helm chart dependencies
+        working-directory: helm-chart
+        run: |
+          helm dependency update
+
+      - name: Deploy to minikube
+        run: |
+          printf "  service:\n    externalIPs:\n      - $(minikube ip)\n" >> helm-chart/test.values.yaml
+          helm upgrade release-${{ github.run_id }}-${{ github.run_attempt }} --install helm-chart \
+            -f helm-chart/cvat.values.yaml \
+            -f helm-chart/test.values.yaml \
+            --set cvat.backend.tag=${{ env.CVAT_VERSION }} \
+            --set cvat.frontend.tag=${{ env.CVAT_VERSION }}
+
+      - name: Update test config
+        run: |
+          sed -i -e 's$http://localhost:8080$http://cvat.local:80$g' tests/python/shared/utils/config.py
+          find tests/python/shared/assets/ -type f -name '*.json' | xargs sed -i -e 's$http://localhost:8080$http://cvat.local$g'
+          echo "$(minikube ip) cvat.local" | sudo tee -a /etc/hosts
+
+      - name: Generate SDK
+        run: |
+          pip3 install --user -r cvat-sdk/gen/requirements.txt
+          ./cvat-sdk/gen/generate.sh
+
+      - name: Install test requirements
+        run: |
+          pip3 install --user cvat-sdk/
+          pip3 install --user cvat-cli/
+          pip3 install --user -r tests/python/requirements.txt
+
+      - name: Wait for CVAT to be ready
+        run: |
+          max_tries=60
+          while [[ $(kubectl get pods -l component=server -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" && max_tries -gt 0 ]]; do echo "waiting for CVAT pod" && (( max_tries-- )) && sleep 5; done
+          while [[ $(kubectl get pods -l app.kubernetes.io/name=postgresql -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" && max_tries -gt 0 ]]; do echo "waiting for DB pod" && (( max_tries-- )) && sleep 5; done
+          while [[ $(curl -s -o /tmp/server_response -w "%{http_code}" cvat.local/api/server/about) != "200" && max_tries -gt 0 ]]; do echo "waiting for CVAT" && (( max_tries-- )) && sleep 5; done
+          kubectl get pods
+          kubectl logs $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}')
+
+      - name: REST API and SDK tests
+        # We don't have external services in Helm tests, so we ignore corresponding cases
+        # They are still tested without Helm
+        run: |
+          kubectl cp tests/mounted_file_share/images $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}'):/home/django/share
+          kubectl cp tests/mounted_file_share/videos $(kubectl get pods -l component=server -o jsonpath='{.items[0].metadata.name}'):/home/django/share
+          pytest --timeout 30 --platform=kube -m "not with_external_services" tests/python --log-cli-level DEBUG
+
+      - name: Creating a log file from "cvat" container logs
+        if: failure()
+        env:
+            LOGS_DIR: "${{ github.workspace }}/rest_api_testing"
+        run: |
+          mkdir ${LOGS_DIR}
+          kubectl logs $(kubectl get pods -l component=server -o 'jsonpath={.items[0].metadata.name}') >${LOGS_DIR}/cvat_server.log
+          kubectl logs $(kubectl get pods -l component=worker-import -o 'jsonpath={.items[0].metadata.name}') >${LOGS_DIR}/cvat_worker_import.log
+          kubectl logs $(kubectl get pods -l component=worker-export -o 'jsonpath={.items[0].metadata.name}') >${LOGS_DIR}/cvat_worker_export.log
+          kubectl logs $(kubectl get pods -l component=worker-webhooks -o 'jsonpath={.items[0].metadata.name}') >${LOGS_DIR}/cvat_worker_webhooks.log
+          kubectl logs $(kubectl get pods -l app.kubernetes.io/name=traefik -o 'jsonpath={.items[0].metadata.name}') >${LOGS_DIR}/traefik.log
+
+      - name: Uploading "cvat" container logs as an artifact
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: helm_rest_api_container_logs
+          path: "${{ github.workspace }}/rest_api_testing"
+
   publish_dev_images:
     if: github.ref == 'refs/heads/develop'
     needs: [rest_api_testing, unit_testing, e2e_testing]

.github/workflows/remark.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Run checks
         run: |

.github/workflows/schedule.yml

@@ -180,7 +180,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Download CVAT server image
         uses: actions/download-artifact@v4

.github/workflows/stylelint.yml

@@ -7,7 +7,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Install dependencies
         run: |

.github/workflows/update-yarn-lock.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-            node-version: '16.x'
+            node-version: '22.x'
 
       - name: Update yarn.lock file
         run: yarn

changelog.d/20250205_122237_sekachev.bs_small_objects_limit.md

@@ -0,0 +1,4 @@
+### Changed
+
+- Updated limitation for minimal object size from 9px area to 1px in dimensions
+  (<https://github.com/cvat-ai/cvat/pull/9055>)

cvat-core/src/object-utils.ts

@@ -67,45 +67,48 @@ export function findAngleDiff(rightAngle: number, leftAngle: number): number {
 }
 
 export function checkShapeArea(shapeType: ShapeType, points: number[]): boolean {
-    const MIN_SHAPE_LENGTH = 3;
-    const MIN_SHAPE_AREA = 9;
-    const MIN_MASK_SHAPE_AREA = 1;
+    const MIN_SHAPE_SIZE = 1;
 
     if (shapeType === ShapeType.POINTS) {
         return true;
     }
 
+    let width = 0;
+    let height = 0;
+
     if (shapeType === ShapeType.MASK) {
         const [left, top, right, bottom] = points.slice(-4);
-        const area = (right - left + 1) * (bottom - top + 1);
-        return area >= MIN_MASK_SHAPE_AREA;
-    }
-
-    if (shapeType === ShapeType.ELLIPSE) {
+        [width, height] = [right - left + 1, bottom - top + 1];
+    } else if (shapeType === ShapeType.RECTANGLE) {
+        const [xtl, ytl, xbr, ybr] = points;
+        [width, height] = [xbr - xtl, ybr - ytl];
+    } else if (shapeType === ShapeType.ELLIPSE) {
         const [cx, cy, rightX, topY] = points;
-        const [rx, ry] = [rightX - cx, cy - topY];
-        return rx * ry * Math.PI > MIN_SHAPE_AREA;
-    }
-
-    let xmin = Number.MAX_SAFE_INTEGER;
-    let xmax = Number.MIN_SAFE_INTEGER;
-    let ymin = Number.MAX_SAFE_INTEGER;
-    let ymax = Number.MIN_SAFE_INTEGER;
+        [width, height] = [(rightX - cx) * 2, (cy - topY) * 2];
+    } else {
+        // polygon, polyline, cuboid, skeleton
+        let xmin = Number.MAX_SAFE_INTEGER;
+        let xmax = Number.MIN_SAFE_INTEGER;
+        let ymin = Number.MAX_SAFE_INTEGER;
+        let ymax = Number.MIN_SAFE_INTEGER;
+
+        for (let i = 0; i < points.length - 1; i += 2) {
+            xmin = Math.min(xmin, points[i]);
+            xmax = Math.max(xmax, points[i]);
+            ymin = Math.min(ymin, points[i + 1]);
+            ymax = Math.max(ymax, points[i + 1]);
+        }
 
-    for (let i = 0; i < points.length - 1; i += 2) {
-        xmin = Math.min(xmin, points[i]);
-        xmax = Math.max(xmax, points[i]);
-        ymin = Math.min(ymin, points[i + 1]);
-        ymax = Math.max(ymax, points[i + 1]);
-    }
+        if (shapeType === ShapeType.POLYLINE) {
+            // horizontal / vertical lines have one of dimensions equal to zero
+            const length = Math.max(xmax - xmin, ymax - ymin);
+            return length >= MIN_SHAPE_SIZE;
+        }
 
-    if (shapeType === ShapeType.POLYLINE) {
-        const length = Math.max(xmax - xmin, ymax - ymin);
-        return length >= MIN_SHAPE_LENGTH;
+        [width, height] = [xmax - xmin, ymax - ymin];
     }
 
-    const area = (xmax - xmin) * (ymax - ymin);
-    return area >= MIN_SHAPE_AREA;
+    return width >= MIN_SHAPE_SIZE && height >= MIN_SHAPE_SIZE;
 }
 
 export function rotatePoint(x: number, y: number, angle: number, cx = 0, cy = 0): number[] {