Merge pull request #8190 from cvat-ai/release-2.16.1

Release v2.16.1

CHANGELOG.md

@@ -16,6 +16,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-2.16.1'></a>
+## \[2.16.1\] - 2024-07-18
+
+### Added
+
+- Datumaro format now supports skeletons
+  (<https://github.com/cvat-ai/cvat/pull/8165>)
+
+### Changed
+
+- Quality analytics page will now report job assignees from quality reports
+  instead of current job assignees
+  (<https://github.com/cvat-ai/cvat/pull/8123>)
+
+- When exporting projects in COCO format, images in different subsets are now stored in different subfolders
+  (<https://github.com/cvat-ai/cvat/pull/8171>)
+
+- On task export, put images to folders depending on subset
+  (<https://github.com/cvat-ai/cvat/pull/8176>)
+
+### Fixed
+
+- User interface crashed if there are active creating task requests on a project page
+  (<https://github.com/cvat-ai/cvat/pull/8187>)
+
+- Permission error: organization owner cannot export dataset and backup
+  (<https://github.com/cvat-ai/cvat/pull/8185>)
+
 <a id='changelog-2.16.0'></a>
 ## \[2.16.0\] - 2024-07-15
 

cvat-cli/requirements/base.txt

@@ -1,3 +1,3 @@
-cvat-sdk~=2.16.0
+cvat-sdk~=2.16.1
 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.16.0"
+VERSION = "2.16.1"

cvat-core/src/quality-report.ts

@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 import { SerializedQualityReportData } from './server-response-types';
+import User from './user';
 
 export interface QualitySummary {
     frameCount: number;
@@ -36,6 +37,7 @@ export default class QualityReport {
     #target: string;
     #createdDate: string;
     #gtLastUpdated: string;
+    #assignee: User | null;
     #summary: Partial<SerializedQualityReportData['summary']>;
 
     constructor(initialData: SerializedQualityReportData) {
@@ -47,6 +49,12 @@ export default class QualityReport {
         this.#gtLastUpdated = initialData.gt_last_updated;
         this.#createdDate = initialData.created_date;
         this.#summary = initialData.summary;
+
+        if (initialData.assignee) {
+            this.#assignee = new User(initialData.assignee);
+        } else {
+            this.#assignee = null;
+        }
     }
 
     get id(): number {
@@ -77,6 +85,10 @@ export default class QualityReport {
         return this.#createdDate;
     }
 
+    get assignee(): User | null {
+        return this.#assignee;
+    }
+
     get summary(): QualitySummary {
         return {
             frameCount: this.#summary.frame_count,

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

@@ -296,6 +296,7 @@ export interface SerializedQualityReportData {
     target: string;
     created_date?: string;
     gt_last_updated?: string;
+    assignee?: SerializedUser | null;
     summary?: {
         frame_count: number;
         frame_share: number;

cvat-sdk/gen/generate.sh

@@ -8,7 +8,7 @@ set -e
 
 GENERATOR_VERSION="v6.0.1"
 
-VERSION="2.16.0"
+VERSION="2.16.1"
 LIB_NAME="cvat_sdk"
 LAYER1_LIB_NAME="${LIB_NAME}/api_client"
 DST_DIR="$(cd "$(dirname -- "$0")/.." && pwd)"

cvat-ui/src/components/analytics-page/task-quality/job-list.tsx

@@ -67,12 +67,12 @@ function JobListComponent(props: Props): JSX.Element {
     function collectUsers(path: string): ColumnFilterItem[] {
         return Array.from<string | null>(
             new Set(
-                jobs.map((job: any) => {
-                    if (job[path] === null) {
+                Object.values(jobsReports).map((report: QualityReport) => {
+                    if (report[path] === null) {
                         return null;
                     }
 
-                    return job[path].username;
+                    return report[path].username;
                 }),
             ),
         ).map((value: string | null) => ({ text: value || 'Is Empty', value: value || false }));
@@ -127,8 +127,8 @@ function JobListComponent(props: Props): JSX.Element {
             dataIndex: 'assignee',
             key: 'assignee',
             className: 'cvat-job-item-assignee',
-            render: (jobInstance: any): JSX.Element => (
-                <Text>{jobInstance?.assignee?.username}</Text>
+            render: (report: QualityReport): JSX.Element => (
+                <Text>{report?.assignee?.username}</Text>
             ),
             sorter: sorter('assignee.assignee.username'),
             filters: collectUsers('assignee'),
@@ -232,7 +232,7 @@ function JobListComponent(props: Props): JSX.Element {
             job: job.id,
             download: job,
             stage: job,
-            assignee: job,
+            assignee: report,
             quality: report,
             conflicts: report,
             frame_intersection: report,

cvat-ui/src/components/project-page/project-page.tsx

@@ -23,9 +23,8 @@ import notification from 'antd/lib/notification';
 import { getCore, Project, Task } from 'cvat-core-wrapper';
 import { CombinedState, Indexable } from 'reducers';
 import { getProjectTasksAsync } from 'actions/projects-actions';
-import { cancelInferenceAsync } from 'actions/models-actions';
 import CVATLoadingSpinner from 'components/common/loading-spinner';
-import TaskItem from 'components/tasks-page/task-item';
+import TaskItem from 'containers/tasks-page/task-item';
 import MoveTaskModal from 'components/move-task-modal/move-task-modal';
 import ModelRunnerDialog from 'components/model-runner-modal/model-runner-dialog';
 import {
@@ -60,10 +59,7 @@ export default function ProjectPageComponent(): JSX.Element {
     const [updatingProject, setUpdatingProject] = useState(false);
     const mounted = useRef(false);
 
-    const ribbonPlugins = useSelector((state: CombinedState) => state.plugins.components.taskItem.ribbon);
     const deletes = useSelector((state: CombinedState) => state.projects.activities.deletes);
-    const taskDeletes = useSelector((state: CombinedState) => state.tasks.activities.deletes);
-    const tasksActiveInferences = useSelector((state: CombinedState) => state.models.inferences);
     const tasks = useSelector((state: CombinedState) => state.tasks.current);
     const tasksCount = useSelector((state: CombinedState) => state.tasks.count);
     const tasksQuery = useSelector((state: CombinedState) => state.projects.tasksGettingQuery);
@@ -120,12 +116,12 @@ export default function ProjectPageComponent(): JSX.Element {
     }, [tasksQuery]);
 
     useEffect(() => {
-        if (projectInstance && id in deletes && deletes[id]) {
+        if (deletes[id]) {
             history.push('/projects');
         }
     }, [deletes]);
 
-    if (fechingProject) {
+    if (fechingProject || id in deletes) {
         return <Spin size='large' className='cvat-spinner' />;
     }
 
@@ -153,14 +149,8 @@ export default function ProjectPageComponent(): JSX.Element {
                         .map((task: Task) => (
                             <TaskItem
                                 key={task.id}
-                                ribbonPlugins={ribbonPlugins}
-                                deleted={task.id in taskDeletes ? taskDeletes[task.id] : false}
-                                hidden={false}
-                                activeInference={tasksActiveInferences[task.id] || null}
-                                cancelAutoAnnotation={() => {
-                                    dispatch(cancelInferenceAsync(task.id));
-                                }}
-                                taskInstance={task}
+                                taskID={task.id}
+                                idx={tasks.indexOf(task)}
                             />
                         ))}
                 </React.Fragment>

cvat-ui/src/reducers/projects-reducer.ts

@@ -1,9 +1,10 @@
 // Copyright (C) 2020-2022 Intel Corporation
-// Copyright (C) 2022-2023 CVAT.ai Corporation
+// Copyright (C) 2022-2024 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import { AnyAction } from 'redux';
+import { omit } from 'lodash';
 
 import { ProjectsActionTypes } from 'actions/projects-actions';
 import { BoundariesActionTypes } from 'actions/boundaries-actions';
@@ -117,49 +118,40 @@ export default (state: ProjectsState = defaultState, action: AnyAction): Project
         }
         case ProjectsActionTypes.DELETE_PROJECT: {
             const { projectId } = action.payload;
-            const { deletes } = state.activities;
-
-            deletes[projectId] = false;
 
             return {
                 ...state,
                 activities: {
                     ...state.activities,
                     deletes: {
-                        ...deletes,
+                        ...state.activities.deletes,
+                        [projectId]: false,
                     },
                 },
             };
         }
         case ProjectsActionTypes.DELETE_PROJECT_SUCCESS: {
             const { projectId } = action.payload;
-            const { deletes } = state.activities;
-
-            deletes[projectId] = true;
 
             return {
                 ...state,
                 activities: {
                     ...state.activities,
                     deletes: {
-                        ...deletes,
+                        ...state.activities.deletes,
+                        [projectId]: true,
                     },
                 },
             };
         }
         case ProjectsActionTypes.DELETE_PROJECT_FAILED: {
             const { projectId } = action.payload;
-            const { deletes } = state.activities;
-
-            delete deletes[projectId];
 
             return {
                 ...state,
                 activities: {
                     ...state.activities,
-                    deletes: {
-                        ...deletes,
-                    },
+                    deletes: omit(state.activities.deletes, projectId),
                 },
             };
         }

cvat-ui/src/utils/platform-checker.ts

@@ -45,7 +45,7 @@ export default function showPlatformNotification(): boolean {
 }
 
 export function showUnsupportedNotification(): boolean {
-    const necessaryFeatures = [window.ResizeObserver, Object.fromEntries];
+    const necessaryFeatures = [window.ResizeObserver, Object.fromEntries, Object.hasOwn];
 
     const unsupportedFeatures = necessaryFeatures.some((feature) => typeof feature === 'undefined');
     return !featuresNotificationShown && unsupportedFeatures;

cvat/__init__.py

@@ -4,6 +4,6 @@
 
 from cvat.utils.version import get_version
 
-VERSION = (2, 16, 0, 'final', 0)
+VERSION = (2, 16, 1, 'final', 0)
 
 __version__ = get_version(VERSION)

cvat/apps/dataset_manager/bindings.py

@@ -200,7 +200,7 @@ class CommonData(InstanceLabelData):
     Tag = namedtuple('Tag', 'frame, label, attributes, source, group, id')
     Tag.__new__.__defaults__ = (0, None)
     Frame = namedtuple(
-        'Frame', 'idx, id, frame, name, width, height, labeled_shapes, tags, shapes, labels')
+        'Frame', 'idx, id, frame, name, width, height, labeled_shapes, tags, shapes, labels, subset')
     Label = namedtuple('Label', 'id, name, color, type')
 
     def __init__(self,
@@ -223,6 +223,7 @@ def __init__(self,
         self._db_data = db_task.data
         self._use_server_track_ids = use_server_track_ids
         self._required_frames = included_frames
+        self._db_subset = db_task.subset
 
         super().__init__(db_task)
 
@@ -268,6 +269,7 @@ def _init_frame_info(self):
                     "path": "frame_{:06d}".format(self.abs_frame_id(frame)),
                     "width": self._db_data.video.width,
                     "height": self._db_data.video.height,
+                    "subset": self._db_subset,
                 } for frame in self.rel_range
             }
         else:
@@ -278,6 +280,7 @@ def _init_frame_info(self):
                     "path": db_image.path,
                     "width": db_image.width,
                     "height": db_image.height,
+                    "subset": self._db_subset,
                 } for db_image in queryset
             }
 
@@ -409,6 +412,7 @@ def get_frame(idx):
                 frames[frame] = CommonData.Frame(
                     idx=idx,
                     id=frame_info.get("id", 0),
+                    subset=frame_info["subset"],
                     frame=frame,
                     name=frame_info["path"],
                     height=frame_info["height"],
@@ -1487,12 +1491,14 @@ def __init__(
         dimension: DimensionType = DimensionType.DIM_2D,
         **kwargs
     ):
+        instance_meta = instance_data.meta[instance_data.META_FIELD]
         dm.SourceExtractor.__init__(
-            self, media_type=dm.Image if dimension == DimensionType.DIM_2D else PointCloud
+            self,
+            media_type=dm.Image if dimension == DimensionType.DIM_2D else PointCloud,
+            subset=instance_meta['subset'],
         )
         CVATDataExtractorMixin.__init__(self, **kwargs)
 
-        instance_meta = instance_data.meta[instance_data.META_FIELD]
         self._categories = self._load_categories(instance_meta['labels'])
         self._user = self._load_user_info(instance_meta) if dimension == DimensionType.DIM_3D else {}
         self._dimension = dimension
@@ -1527,6 +1533,7 @@ def __init__(
                 dm_item = dm.DatasetItem(
                         id=osp.splitext(frame_data.name)[0],
                         annotations=dm_anno, media=dm_image,
+                        subset=frame_data.subset,
                         attributes={'frame': frame_data.frame
                     })
             elif dimension == DimensionType.DIM_3D:
@@ -1543,7 +1550,7 @@ def __init__(
                 dm_item = dm.DatasetItem(
                     id=osp.splitext(osp.split(frame_data.name)[-1])[0],
                     annotations=dm_anno, media=PointCloud(dm_image[0]), related_images=dm_image[1],
-                    attributes=attributes
+                    attributes=attributes, subset=frame_data.subset,
                 )
 
             dm_items.append(dm_item)

cvat/apps/dataset_manager/formats/coco.py

@@ -20,7 +20,7 @@ def _export(dst_file, temp_dir, instance_data, save_images=False):
     with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
         dataset = Dataset.from_extractors(extractor, env=dm_env)
         dataset.export(temp_dir, 'coco_instances', save_images=save_images,
-            merge_images=True)
+            merge_images=False)
 
     make_zip_archive(temp_dir, dst_file)
 
@@ -44,7 +44,7 @@ def _export(dst_file, temp_dir, instance_data, save_images=False):
     with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
         dataset = Dataset.from_extractors(extractor, env=dm_env)
         dataset.export(temp_dir, 'coco_person_keypoints', save_images=save_images,
-            merge_images=True)
+            merge_images=False)
 
     make_zip_archive(temp_dir, dst_file)