Merge remote-tracking branch 'origin/develop' into nm/serverless_iog

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/opencv-control.tsx

@@ -168,7 +168,7 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
         const {
             shapesUpdated, isDone, threshold, shapes,
         } = (e as CustomEvent).detail;
-        const pressedPoints = convertShapesForInteractor(shapes).flat();
+        const pressedPoints = convertShapesForInteractor(shapes, 0).flat();
         this.interactionIsDone = isDone;
 
         try {

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/tools-control.tsx

@@ -88,21 +88,6 @@ const mapDispatchToProps = {
     createAnnotations: createAnnotationsAsync,
 };
 
-function convertShapesForInteractor(shapes: InteractionResult[], button: number): number[][] {
-    const reducer = (acc: number[][], _: number, index: number, array: number[]): number[][] => {
-        if (!(index % 2)) {
-            // 0, 2, 4
-            acc.push([array[index], array[index + 1]]);
-        }
-        return acc;
-    };
-
-    return shapes.filter((shape: InteractionResult): boolean => shape.shapeType === 'points' && shape.button === button)
-        .map((shape: InteractionResult): number[] => shape.points)
-        .flat()
-        .reduce(reducer, []);
-}
-
 type Props = StateToProps & DispatchToProps;
 interface State {
     activeInteractor: Model | null;

cvat-ui/src/components/labels-editor/common.ts

@@ -26,23 +26,23 @@ function validateParsedAttribute(attr: Attribute): void {
 
     if (!['number', 'undefined'].includes(typeof attr.id)) {
         throw new Error(
-            `Attribute: "${attr.name}". ` + `Type of attribute id must be a number or undefined. Got value ${attr.id}`,
+            `Attribute: "${attr.name}". Type of attribute id must be a number or undefined. Got value ${attr.id}`,
         );
     }
 
     if (!['checkbox', 'number', 'text', 'radio', 'select'].includes((attr.input_type || '').toLowerCase())) {
-        throw new Error(`Attribute: "${attr.name}". ` + `Unknown input type: ${attr.input_type}`);
+        throw new Error(`Attribute: "${attr.name}". Unknown input type: ${attr.input_type}`);
     }
 
     if (typeof attr.mutable !== 'boolean') {
         throw new Error(
-            `Attribute: "${attr.name}". ` + `Mutable flag must be a boolean value. Got value ${attr.mutable}`,
+            `Attribute: "${attr.name}". Mutable flag must be a boolean value. Got value ${attr.mutable}`,
         );
     }
 
     if (!Array.isArray(attr.values)) {
         throw new Error(
-            `Attribute: "${attr.name}". ` + `Attribute values must be an array. Got type ${typeof attr.values}`,
+            `Attribute: "${attr.name}". Attribute values must be an array. Got type ${typeof attr.values}`,
         );
     }
 
@@ -52,7 +52,7 @@ function validateParsedAttribute(attr: Attribute): void {
 
     for (const value of attr.values) {
         if (typeof value !== 'string') {
-            throw new Error(`Attribute: "${attr.name}". ` + `Each value must be a string. Got value ${value}`);
+            throw new Error(`Attribute: "${attr.name}". Each value must be a string. Got value ${value}`);
         }
     }
 }
@@ -64,12 +64,12 @@ export function validateParsedLabel(label: Label): void {
 
     if (!['number', 'undefined'].includes(typeof label.id)) {
         throw new Error(
-            `Label "${label.name}". ` + `Type of label id must be only a number or undefined. Got value ${label.id}`,
+            `Label "${label.name}". Type of label id must be only a number or undefined. Got value ${label.id}`,
         );
     }
 
     if (typeof label.color !== 'string') {
-        throw new Error(`Label "${label.name}". ` + `Label color must be a string. Got ${typeof label.color}`);
+        throw new Error(`Label "${label.name}". Label color must be a string. Got ${typeof label.color}`);
     }
 
     if (!label.color.match(/^#[0-9a-fA-F]{6}$|^$/)) {
@@ -80,7 +80,7 @@ export function validateParsedLabel(label: Label): void {
     }
 
     if (!Array.isArray(label.attributes)) {
-        throw new Error(`Label "${label.name}". ` + `attributes must be an array. Got type ${typeof label.attributes}`);
+        throw new Error(`Label "${label.name}". Attributes must be an array. Got type ${typeof label.attributes}`);
     }
 
     for (const attr of label.attributes) {

cvat-ui/src/cvat-canvas-wrapper.ts

@@ -12,20 +12,20 @@ import {
     InteractionResult as _InteractionResult,
 } from 'cvat-canvas/src/typescript/canvas';
 
-export function convertShapesForInteractor(shapes: InteractionResult[]): number[][] {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function convertShapesForInteractor(shapes: InteractionResult[], button: number): number[][] {
     const reducer = (acc: number[][], _: number, index: number, array: number[]): number[][] => {
-        if (!(index % 2)) { // 0, 2, 4
-            acc.push([
-                array[index],
-                array[index + 1],
-            ]);
+        if (!(index % 2)) {
+            // 0, 2, 4
+            acc.push([array[index], array[index + 1]]);
         }
         return acc;
     };
 
-    return shapes.filter((shape: InteractionResult): boolean => shape.shapeType === 'points' && shape.button === 0)
+    return shapes.filter((shape: InteractionResult): boolean => shape.shapeType === 'points' && shape.button === button)
         .map((shape: InteractionResult): number[] => shape.points)
-        .flat().reduce(reducer, []);
+        .flat()
+        .reduce(reducer, []);
 }
 
 export type InteractionData = _InteractionData;

cvat/requirements/base.txt

@@ -7,7 +7,7 @@ django-compressor==2.4
 django-rq==2.3.2
 EasyProcess==0.3
 Pillow==7.2.0
-numpy==1.20.0
+numpy==1.19.2
 python-ldap==3.3.1
 pytz==2020.1
 pyunpack==0.2.1