Merge branch 'develop' into mk/fix_issue_with_azure_connection_str

cvat-ai · Jan 9, 2024 · a02bcd8 · a02bcd8
2 parents 808ca7e + 64d6d7a
commit a02bcd8
Show file tree

Hide file tree

Showing 58 changed files with 929 additions and 595 deletions.
diff --git a/.github/workflows/bandit.yml b/.github/workflows/bandit.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
             **/*.py

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
               cvat-sdk/**/*.py

diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
               **/Dockerfile*

diff --git a/.github/workflows/isort.yml b/.github/workflows/isort.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
               cvat-sdk/**/*.py

diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
               **/*.py

diff --git a/.github/workflows/stylelint.yml b/.github/workflows/stylelint.yml
@@ -9,7 +9,7 @@ jobs:
         with:
             node-version: '16.x'
       - id: files
-        uses: tj-actions/changed-files@v35.9.2
+        uses: tj-actions/changed-files@v41.0.0
         with:
           files: |
               **/*.css

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2018-2022 Intel Corporation
-Copyright (c) 2022 CVAT.ai Corporation
+Copyright (c) 2022-2024 CVAT.ai Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/changelog.d/20231225_115001_boris_retry_if_504.md b/changelog.d/20231225_115001_boris_retry_if_504.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- Creating duplicating annotations when nginx throws 504 timeout status (workaround)
+  (<https://github.com/opencv/cvat/pull/7286>)
diff --git a/changelog.d/20231227_100059_boris_update_pillow.md b/changelog.d/20231227_100059_boris_update_pillow.md
@@ -0,0 +1,6 @@
+### Fixed
+
+- `TIFF` images are saved as `JPEG` images with `.tif` extension in original chunks
+  (<https://github.com/opencv/cvat/pull/7100>)
+- EXIF rotated TIFF images are handled incorrectly
+  (<https://github.com/opencv/cvat/pull/7100>)
diff --git a/changelog.d/20231227_104741_maria_fix_rq_scheduler_launch.md b/changelog.d/20231227_104741_maria_fix_rq_scheduler_launch.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- RQ Scheduler launch, broken in PR 7245
+  (<https://github.com/opencv/cvat/pull/7293>)
diff --git a/changelog.d/20231228_131558_boris_fixed_couple_of_gt_bugs.md b/changelog.d/20231228_131558_boris_fixed_couple_of_gt_bugs.md
@@ -0,0 +1,7 @@
+### Fixed
+
+- UI crashes if user highligts conflict related to annotations hidden by a filter
+  (<https://github.com/opencv/cvat/pull/7299>)
+- Annotations conflicts are not highligted properly on the first frame of a job
+  (<https://github.com/opencv/cvat/pull/7299>)
+
diff --git a/changelog.d/20240103_112843_boris_skeletons_autofill.md b/changelog.d/20240103_112843_boris_skeletons_autofill.md
@@ -0,0 +1,8 @@
+### Fixed
+
+- Error message `Edge's nodeFrom ${dataNodeFrom} or nodeTo ${dataNodeTo} do not to refer to any node`
+ when upload a file with some abscent skeleton nodes (<https://github.com/opencv/cvat/pull/7302>)
+- Wrong context menu position in skeleton configurator (Firefox only)
+ (<https://github.com/opencv/cvat/pull/7302>)
+- Fixed console error `(Error: <rect> attribute width: A negative value is not valid`
+ appearing when skeleton with all outside elements is created (<https://github.com/opencv/cvat/pull/7302>)
diff --git a/cvat-canvas/package.json b/cvat-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "type": "module",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas library",
   "main": "src/canvas.ts",

diff --git a/cvat-canvas/src/typescript/canvas.ts b/cvat-canvas/src/typescript/canvas.ts
@@ -109,7 +109,7 @@ class CanvasImpl implements Canvas {
         this.model.activate(clientID, attributeID);
     }
 
-    public highlight(clientIDs: number[] | null, severity: HighlightSeverity | null = null): void {
+    public highlight(clientIDs: number[], severity: HighlightSeverity | null = null): void {
         this.model.highlight(clientIDs, severity);
     }
 

diff --git a/cvat-canvas/src/typescript/canvasModel.ts b/cvat-canvas/src/typescript/canvasModel.ts
@@ -56,8 +56,8 @@ export enum HighlightSeverity {
 }
 
 export interface HighlightedElements {
-    elementsIDs: number [];
-    severity: HighlightSeverity;
+    elementsIDs: number[];
+    severity: HighlightSeverity | null;
 }
 
 export enum RectDrawingMethod {
@@ -267,7 +267,7 @@ export interface CanvasModel {
     setup(frameData: any, objectStates: any[], zLayer: number): void;
     setupIssueRegions(issueRegions: Record<number, { hidden: boolean; points: number[] }>): void;
     activate(clientID: number | null, attributeID: number | null): void;
-    highlight(clientIDs: number[] | null, severity: HighlightSeverity): void;
+    highlight(clientIDs: number[], severity: HighlightSeverity): void;
     rotate(rotationAngle: number): void;
     focus(clientID: number, padding: number): void;
     fit(): void;
@@ -641,18 +641,11 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
         this.notify(UpdateReasons.SHAPE_ACTIVATED);
     }
 
-    public highlight(clientIDs: number[] | null, severity: HighlightSeverity | null): void {
-        if (Array.isArray(clientIDs)) {
-            this.data.highlightedElements = {
-                elementsIDs: clientIDs,
-                severity,
-            };
-        } else {
-            this.data.highlightedElements = {
-                elementsIDs: [],
-                severity: null,
-            };
-        }
+    public highlight(clientIDs: number[], severity: HighlightSeverity | null): void {
+        this.data.highlightedElements = {
+            elementsIDs: clientIDs,
+            severity,
+        };
 
         this.notify(UpdateReasons.SHAPE_HIGHLIGHTED);
     }

diff --git a/cvat-canvas/src/typescript/canvasView.ts b/cvat-canvas/src/typescript/canvasView.ts
@@ -3070,11 +3070,7 @@ export class CanvasViewImpl implements CanvasView, Listener {
 
         const SVGElement = makeSVGFromTemplate(state.label.structure.svg);
 
-        let xtl = Number.MAX_SAFE_INTEGER;
-        let ytl = Number.MAX_SAFE_INTEGER;
-        let xbr = Number.MIN_SAFE_INTEGER;
-        let ybr = Number.MIN_SAFE_INTEGER;
-
+        let [xtl, ytl, xbr, ybr] = [null, null, null, null];
         const svgElements: Record<number, SVG.Element> = {};
         const templateElements = Array.from(SVGElement.children()).filter((el: SVG.Element) => el.type === 'circle');
         for (let i = 0; i < state.elements.length; i++) {
@@ -3084,10 +3080,10 @@ export class CanvasViewImpl implements CanvasView, Listener {
                 const [cx, cy] = this.translateToCanvas(points);
 
                 if (!element.outside) {
-                    xtl = Math.min(xtl, cx);
-                    ytl = Math.min(ytl, cy);
-                    xbr = Math.max(xbr, cx);
-                    ybr = Math.max(ybr, cy);
+                    xtl = xtl === null ? cx : Math.min(xtl, cx);
+                    ytl = ytl === null ? cy : Math.min(ytl, cy);
+                    xbr = xbr === null ? cx : Math.max(xbr, cx);
+                    ybr = ybr === null ? cy : Math.max(ybr, cy);
                 }
 
                 const templateElement = templateElements.find((el: SVG.Circle) => el.attr('data-label-id') === element.label.id);
@@ -3182,6 +3178,13 @@ export class CanvasViewImpl implements CanvasView, Listener {
             }
         }
 
+        // if all elements were outside, set coordinates to zeros
+        xtl = xtl || 0;
+        ytl = ytl || 0;
+        xbr = xbr || 0;
+        ybr = ybr || 0;
+
+        // apply bounding box margin
         xtl -= consts.SKELETON_RECT_MARGIN;
         ytl -= consts.SKELETON_RECT_MARGIN;
         xbr += consts.SKELETON_RECT_MARGIN;

diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
 cvat-sdk~=2.10.0
-Pillow>=10.0.1
+Pillow>=10.1.0
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/cvat-core/package.json b/cvat-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-core",
-  "version": "14.0.0",
+  "version": "14.0.3",
   "type": "module",
   "description": "Part of Computer Vision Tool which presents an interface for client-side integration",
   "main": "src/api.ts",

diff --git a/cvat-core/src/annotations-actions.ts b/cvat-core/src/annotations-actions.ts
@@ -11,7 +11,7 @@ import ObjectState from './object-state';
 import { getAnnotations, getCollection } from './annotations';
 
 export interface SingleFrameActionInput {
-    collection: Omit<SerializedCollection, 'tracks' | 'tags'>;
+    collection: Omit<SerializedCollection, 'tracks' | 'tags' | 'version'>;
     frameData: {
         width: number;
         height: number;
@@ -20,7 +20,7 @@ export interface SingleFrameActionInput {
 }
 
 export interface SingleFrameActionOutput {
-    collection: Omit<SerializedCollection, 'tracks' | 'tags'>;
+    collection: Omit<SerializedCollection, 'tracks' | 'tags' | 'version'>;
 }
 
 export enum ActionParameterType {

diff --git a/cvat-core/src/annotations-collection.ts b/cvat-core/src/annotations-collection.ts
@@ -9,7 +9,7 @@ import {
     SkeletonShape, SkeletonTrack, PolygonShape, CuboidShape,
     RectangleShape, PolylineShape, PointsShape, EllipseShape,
 } from './annotations-objects';
-import { SerializedCollection, SerializedTrack } from './server-response-types';
+import { SerializedCollection, SerializedShape, SerializedTrack } from './server-response-types';
 import AnnotationsFilter from './annotations-filter';
 import { checkObjectType } from './common';
 import Statistics from './statistics';
@@ -116,7 +116,7 @@ export default class Collection {
         };
     }
 
-    import(data: SerializedCollection): ImportedCollection {
+    import(data: Omit<SerializedCollection, 'version'>): ImportedCollection {
         const result = {
             tags: [],
             shapes: [],
@@ -159,16 +159,16 @@ export default class Collection {
         return result;
     }
 
-    export(): SerializedCollection {
+    export(): Omit<SerializedCollection, 'version'> {
         const data = {
-            tracks: this.tracks.filter((track) => !track.removed).map((track) => track.toJSON()),
+            tracks: this.tracks.filter((track) => !track.removed).map((track) => track.toJSON() as SerializedTrack),
             shapes: Object.values(this.shapes)
                 .reduce((accumulator, frameShapes) => {
                     accumulator.push(...frameShapes);
                     return accumulator;
                 }, [])
                 .filter((shape) => !shape.removed)
-                .map((shape) => shape.toJSON()),
+                .map((shape) => shape.toJSON() as SerializedShape),
             tags: Object.values(this.tags)
                 .reduce((accumulator, frameTags) => {
                     accumulator.push(...frameTags);
@@ -331,7 +331,7 @@ export default class Collection {
             }
 
             if (object.shapeType === ShapeType.SKELETON) {
-                for (const element of (object as SkeletonShape | SkeletonTrack).elements) {
+                for (const element of (object as unknown as SkeletonShape | SkeletonTrack).elements) {
                     // for each track/shape element get its first objectState and keep it
                     elements[element.label.id] = [
                         ...(elements[element.label.id] || []), element,