Merge pull request #8591 from cvat-ai/release-2.21.2

Release v2.21.2

.vscode/launch.json

@@ -376,6 +376,22 @@
             "env": {},
             "console": "internalConsole"
         },
+        {
+            "name": "server: sync periodic jobs",
+            "type": "debugpy",
+            "request": "launch",
+            "justMyCode": false,
+            "stopOnEntry": false,
+            "python": "${command:python.interpreterPath}",
+            "program": "${workspaceFolder}/manage.py",
+            "args": [
+                "syncperiodicjobs"
+            ],
+            "django": true,
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "console": "internalConsole"
+        },
         {
             "name": "server: tests",
             "type": "debugpy",

CHANGELOG.md

@@ -16,6 +16,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.21.2'></a>
+## \[2.21.2\] - 2024-10-24
+
+### Added
+
+- Access to /analytics can now be granted
+  (<https://github.com/cvat-ai/cvat/pull/8509>)
+
+### Fixed
+
+- Expired sessions are now cleared from the database daily
+  (<https://github.com/cvat-ai/cvat/pull/8552>)
+
+- Fixed export/import errors for tracks with duplicated shapes.
+  Fixed a bug which caused shape duplication on track import.
+  (<https://github.com/cvat-ai/cvat/pull/8553>)
+
+- Fix Grafana container restart policy
+  (<https://github.com/cvat-ai/cvat/pull/8577>)
+
+- Fixed some interface tooltips having 'undefined' shortcuts
+  (<https://github.com/cvat-ai/cvat/pull/8578>)
+
+- Memory consumption during preparation of image chunks
+  (<https://github.com/cvat-ai/cvat/pull/8581>)
+
+- Fixed a bug where an export RQ job being retried may break scheduling
+  of new jobs
+  (<https://github.com/cvat-ai/cvat/pull/8584>)
+
+- UI now allows the user to start automatic annotation again
+  if the previous request fails
+  (<https://github.com/cvat-ai/cvat/pull/8587>)
+
 <a id='changelog-2.21.1'></a>
 ## \[2.21.1\] - 2024-10-18
 

Dockerfile

@@ -134,6 +134,7 @@ RUN apt-get update && \
         supervisor \
         tzdata \
         unrar \
+        wait-for-it \
     && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
     dpkg-reconfigure -f noninteractive tzdata && \
     rm -rf /var/lib/apt/lists/* && \
@@ -192,7 +193,7 @@ RUN python -m pip uninstall -y pip
 COPY cvat/nginx.conf /etc/nginx/nginx.conf
 COPY --chown=${USER} components /tmp/components
 COPY --chown=${USER} supervisord/ ${HOME}/supervisord
-COPY --chown=${USER} wait-for-it.sh manage.py backend_entrypoint.sh wait_for_deps.sh ${HOME}/
+COPY --chown=${USER} manage.py backend_entrypoint.sh wait_for_deps.sh ${HOME}/
 COPY --chown=${USER} utils/ ${HOME}/utils
 COPY --chown=${USER} cvat/ ${HOME}/cvat
 COPY --chown=${USER} rqscheduler.py ${HOME}

backend_entrypoint.sh

@@ -8,7 +8,7 @@ fail() {
 }
 
 wait_for_db() {
-    ~/wait-for-it.sh "${CVAT_POSTGRES_HOST}:${CVAT_POSTGRES_PORT:-5432}" -t 0
+    wait-for-it "${CVAT_POSTGRES_HOST}:${CVAT_POSTGRES_PORT:-5432}" -t 0
 }
 
 cmd_bash() {
@@ -18,6 +18,9 @@ cmd_bash() {
 cmd_init() {
     wait_for_db
     ~/manage.py migrate
+
+    wait-for-it "${CVAT_REDIS_INMEM_HOST}:${CVAT_REDIS_INMEM_PORT:-6379}" -t 0
+    ~/manage.py syncperiodicjobs
 }
 
 cmd_run() {

cvat-cli/requirements/base.txt

@@ -1,3 +1,3 @@
-cvat-sdk~=2.21.1
+cvat-sdk~=2.21.2
 Pillow>=10.3.0
 setuptools>=70.0.0 # not directly required, pinned by Snyk to avoid a vulnerability

cvat-cli/src/cvat_cli/version.py

@@ -1 +1 @@
-VERSION = "2.21.1"
+VERSION = "2.21.2"

cvat-core/src/annotations-collection.ts

@@ -1295,7 +1295,7 @@ export default class Collection {
         const predicate = sign > 0 ? (frame) => frame <= frameTo : (frame) => frame >= frameTo;
         const update = sign > 0 ? (frame) => frame + 1 : (frame) => frame - 1;
 
-        // if not looking for an emty frame nor frame with annotations, return the next frame
+        // if not looking for an empty frame nor frame with annotations, return the next frame
         // check if deleted frames are allowed additionally
         if (!annotationsFilters) {
             let frame = frameFrom;

cvat-core/src/api.ts

@@ -26,7 +26,7 @@ import QualityReport from './quality-report';
 import QualityConflict from './quality-conflict';
 import QualitySettings from './quality-settings';
 import AnalyticsReport from './analytics-report';
-import ValidationLayout from './validation-layout';
+import { JobValidationLayout, TaskValidationLayout } from './validation-layout';
 import { Request } from './request';
 
 import * as enums from './enums';
@@ -427,7 +427,8 @@ function build(): CVATCore {
             QualityReport,
             Request,
             FramesMetaData,
-            ValidationLayout,
+            JobValidationLayout,
+            TaskValidationLayout,
         },
         utils: {
             mask2Rle,

cvat-core/src/cloud-storage.ts

@@ -290,7 +290,7 @@ Object.defineProperties(CloudStorage.prototype.save, {
             }
             // update
             if (typeof this.id !== 'undefined') {
-                // provider_type and recource should not change;
+                // provider_type and resource should not change;
                 // send to the server only the values that have changed
                 const initialData: SerializedCloudStorage = {};
                 if (this.displayName) {

cvat-core/src/frames.ts

@@ -683,7 +683,7 @@ export function getContextImage(jobID: number, frame: number): Promise<Record<st
                         // it might raise multiple server requests for context images
                         // if the promise was pending before and several requests came for the same frame
                         // all these requests will stuck on "finally"
-                        // and when the promise fullfilled, it will run all the microtasks
+                        // and when the promise is fulfilled, it will run all the microtasks
                         // since they all have the same request id, all they will perform in executor()
                         frameData.activeContextRequest.finally(() => setTimeout(checkAndExecute));
                     } else {
@@ -775,7 +775,7 @@ export async function getFrame(
     // - getContextImage
     // - getCachedChunks
     // And from this idea we should call refreshJobCacheIfOutdated from each one
-    // Hovewer, following from the order, these methods are usually called
+    // However, following from the order, these methods are usually called
     // it may lead to even more confusing behaviour
     //
     // Usually user first receives frame, then user receives ranges and finally user receives context images

cvat-core/src/index.ts

@@ -32,7 +32,7 @@ import QualityConflict from './quality-conflict';
 import QualitySettings from './quality-settings';
 import AnalyticsReport from './analytics-report';
 import AnnotationGuide from './guide';
-import ValidationLayout from './validation-layout';
+import { JobValidationLayout, TaskValidationLayout } from './validation-layout';
 import { Request } from './request';
 import BaseSingleFrameAction, { listActions, registerAction, runActions } from './annotations-actions';
 import {
@@ -216,7 +216,8 @@ export default interface CVATCore {
         AnalyticsReport: typeof AnalyticsReport;
         Request: typeof Request;
         FramesMetaData: typeof FramesMetaData;
-        ValidationLayout: typeof ValidationLayout;
+        JobValidationLayout: typeof JobValidationLayout;
+        TaskValidationLayout: typeof TaskValidationLayout;
     };
     utils: {
         mask2Rle: typeof mask2Rle;

cvat-core/src/object-utils.ts

@@ -60,7 +60,7 @@ export function findAngleDiff(rightAngle: number, leftAngle: number): number {
     angleDiff = ((angleDiff + 180) % 360) - 180;
     if (Math.abs(angleDiff) >= 180) {
         // if the main arc is bigger than 180, go another arc
-        // to find it, just substract absolute value from 360 and inverse sign
+        // to find it, just subtract absolute value from 360 and inverse sign
         angleDiff = 360 - Math.abs(angleDiff) * Math.sign(angleDiff) * -1;
     }
     return angleDiff;

cvat-core/src/requests-manager.ts

@@ -74,7 +74,7 @@ class RequestsManager {
         const promise = new Promise<Request>((resolve, reject) => {
             const timeoutCallback = async (): Promise<void> => {
                 // We make sure that no more than REQUESTS_COUNT requests are sent simultaneously
-                // If thats the case, we re-schedule the timeout
+                // If that's the case, we re-schedule the timeout
                 const timestamp = Date.now();
                 if (this.requestStack.length >= REQUESTS_COUNT) {
                     const timestampToCheck = this.requestStack[this.requestStack.length - 1];

cvat-core/src/server-proxy.ts

@@ -19,7 +19,7 @@ import {
     SerializedInvitationData, SerializedCloudStorage, SerializedFramesMetaData, SerializedCollection,
     SerializedQualitySettingsData, APIQualitySettingsFilter, SerializedQualityConflictData, APIQualityConflictsFilter,
     SerializedQualityReportData, APIQualityReportsFilter, SerializedAnalyticsReport, APIAnalyticsReportFilter,
-    SerializedRequest, SerializedValidationLayout,
+    SerializedRequest, SerializedJobValidationLayout, SerializedTaskValidationLayout,
 } from './server-response-types';
 import { PaginatedResource } from './core-types';
 import { Request } from './request';
@@ -102,7 +102,7 @@ function fetchAll(url, filter = {}): Promise<any> {
                     }
                 });
 
-                // removing possible dublicates
+                // removing possible duplicates
                 const obj = result.results.reduce((acc: Record<string, any>, item: any) => {
                     acc[item.id] = item;
                     return acc;
@@ -1384,7 +1384,7 @@ async function deleteJob(jobID: number): Promise<void> {
 
 const validationLayout = (instance: 'tasks' | 'jobs') => async (
     id: number,
-): Promise<SerializedValidationLayout | null> => {
+): Promise<SerializedJobValidationLayout | SerializedTaskValidationLayout> => {
     const { backendAPI } = config;
 
     try {

cvat-core/src/server-response-types.ts

@@ -54,6 +54,7 @@ export interface SerializedUser {
     last_login?: string;
     date_joined?: string;
     email_verification_required: boolean;
+    has_analytics_access: boolean;
 }
 
 interface SerializedStorage {
@@ -524,8 +525,14 @@ export interface SerializedRequest {
     owner?: any;
 }
 
-export interface SerializedValidationLayout {
+export interface SerializedJobValidationLayout {
     honeypot_count?: number;
     honeypot_frames?: number[];
     honeypot_real_frames?: number[];
 }
+
+export interface SerializedTaskValidationLayout extends SerializedJobValidationLayout {
+    mode: 'gt' | 'gt_pool' | null;
+    validation_frames?: number[];
+    disabled_frames?: number[];
+}

cvat-core/src/session-implementation.ts

@@ -27,7 +27,10 @@ import {
     decodePreview,
 } from './frames';
 import Issue from './issue';
-import { SerializedLabel, SerializedTask, SerializedValidationLayout } from './server-response-types';
+import {
+    SerializedLabel, SerializedTask, SerializedJobValidationLayout,
+    SerializedTaskValidationLayout,
+} from './server-response-types';
 import { checkInEnum, checkObjectType } from './common';
 import {
     getCollection, getSaver, clearAnnotations, getAnnotations,
@@ -37,7 +40,7 @@ import AnnotationGuide from './guide';
 import requestsManager from './requests-manager';
 import { Request } from './request';
 import User from './user';
-import ValidationLayout from './validation-layout';
+import { JobValidationLayout, TaskValidationLayout } from './validation-layout';
 
 // must be called with task/job context
 async function deleteFrameWrapper(jobID, frame): Promise<void> {
@@ -171,7 +174,7 @@ export function implementJob(Job: typeof JobClass): typeof JobClass {
         ): ReturnType<typeof JobClass.prototype.validationLayout> {
             const result = await serverProxy.jobs.validationLayout(this.id);
             if (Object.keys(result).length) {
-                return new ValidationLayout(result as Required<SerializedValidationLayout>);
+                return new JobValidationLayout(result as SerializedJobValidationLayout);
             }
 
             return null;
@@ -374,7 +377,7 @@ export function implementJob(Job: typeof JobClass): typeof JobClass {
             }
 
             if ('annotationsFilters' in searchParameters && 'generalFilters' in searchParameters) {
-                throw new ArgumentError('Both annotations filters and general fiters could not be used together');
+                throw new ArgumentError('Both annotations filters and general filters could not be used together');
             }
 
             if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) {
@@ -641,9 +644,9 @@ export function implementTask(Task: typeof TaskClass): typeof TaskClass {
         value: async function validationLayoutImplementation(
             this: TaskClass,
         ): ReturnType<typeof TaskClass.prototype.validationLayout> {
-            const result = await serverProxy.tasks.validationLayout(this.id);
-            if (Object.keys(result).length) {
-                return new ValidationLayout(result as Required<SerializedValidationLayout>);
+            const result = await serverProxy.tasks.validationLayout(this.id) as SerializedTaskValidationLayout;
+            if (result.mode !== null) {
+                return new TaskValidationLayout(result);
             }
 
             return null;
@@ -1043,7 +1046,7 @@ export function implementTask(Task: typeof TaskClass): typeof TaskClass {
             }
 
             if ('annotationsFilters' in searchParameters && 'generalFilters' in searchParameters) {
-                throw new ArgumentError('Both annotations filters and general fiters could not be used together');
+                throw new ArgumentError('Both annotations filters and general filters could not be used together');
             }
 
             if (!Number.isInteger(frameFrom) || !Number.isInteger(frameTo)) {

cvat-core/src/session.ts

@@ -28,7 +28,7 @@ import { Request } from './request';
 import logger from './logger';
 import Issue from './issue';
 import ObjectState from './object-state';
-import ValidationLayout from './validation-layout';
+import { JobValidationLayout, TaskValidationLayout } from './validation-layout';
 
 function buildDuplicatedAPI(prototype) {
     Object.defineProperties(prototype, {
@@ -686,7 +686,7 @@ export class Job extends Session {
         return result;
     }
 
-    async validationLayout(): Promise<ValidationLayout | null> {
+    async validationLayout(): Promise<JobValidationLayout | null> {
         const result = await PluginRegistry.apiWrapper.call(this, Job.prototype.validationLayout);
         return result;
     }
@@ -1186,7 +1186,7 @@ export class Task extends Session {
         return result;
     }
 
-    async validationLayout(): Promise<ValidationLayout | null> {
+    async validationLayout(): Promise<TaskValidationLayout | null> {
         const result = await PluginRegistry.apiWrapper.call(this, Task.prototype.validationLayout);
         return result;
     }

cvat-core/src/user.ts

@@ -1,5 +1,5 @@
 // Copyright (C) 2019-2022 Intel Corporation
-// Copyright (C) 2022 CVAT.ai Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -18,6 +18,7 @@ export default class User {
     public readonly isSuperuser: boolean;
     public readonly isActive: boolean;
     public readonly isVerified: boolean;
+    public readonly hasAnalyticsAccess: boolean;
 
     constructor(initialData: SerializedUser) {
         const data = {
@@ -33,6 +34,7 @@ export default class User {
             is_superuser: null,
             is_active: null,
             email_verification_required: null,
+            has_analytics_access: null,
         };
 
         for (const property in data) {
@@ -80,6 +82,9 @@ export default class User {
                 isVerified: {
                     get: () => !data.email_verification_required,
                 },
+                hasAnalyticsAccess: {
+                    get: () => data.has_analytics_access,
+                },
             }),
         );
     }
@@ -98,6 +103,7 @@ export default class User {
             is_superuser: this.isSuperuser,
             is_active: this.isActive,
             email_verification_required: this.isVerified,
+            has_analytics_access: this.hasAnalyticsAccess,
         };
     }
 }