Export only annotated images option.

cvat-core/src/annotations.ts

@@ -166,6 +166,7 @@ export async function exportDataset(
     instance,
     format: string,
     saveImages: boolean,
+    onlyAnnotated: boolean,
     useDefaultSettings: boolean,
     targetStorage: Storage,
     name?: string,
@@ -177,13 +178,13 @@ export async function exportDataset(
     let result = null;
     if (instance instanceof Task) {
         result = await serverProxy.tasks
-            .exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name);
+            .exportDataset(instance.id, format, saveImages, onlyAnnotated, useDefaultSettings, targetStorage, name);
     } else if (instance instanceof Job) {
         result = await serverProxy.jobs
-            .exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name);
+            .exportDataset(instance.id, format, saveImages, onlyAnnotated, useDefaultSettings, targetStorage, name);
     } else {
         result = await serverProxy.projects
-            .exportDataset(instance.id, format, saveImages, useDefaultSettings, targetStorage, name);
+            .exportDataset(instance.id, format, saveImages, onlyAnnotated, useDefaultSettings, targetStorage, name);
     }
 
     return result;

cvat-core/src/project-implementation.ts

@@ -111,11 +111,20 @@ export default function implementProject(Project: typeof ProjectClass): typeof P
             this: ProjectClass,
             format: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[0],
             saveImages: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[1],
-            useDefaultSettings: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[2],
-            targetStorage: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[3],
-            customName: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[4],
+            onlyAnnotated: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[2],
+            useDefaultSettings: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[3],
+            targetStorage: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[4],
+            customName: Parameters<typeof ProjectClass.prototype.annotations.exportDataset>[5],
         ): ReturnType<typeof ProjectClass.prototype.annotations.exportDataset> {
-            const rqID = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName);
+            const rqID = await exportDataset(
+                this,
+                format,
+                saveImages,
+                onlyAnnotated,
+                useDefaultSettings,
+                targetStorage,
+                customName,
+            );
             return rqID;
         },
     });

cvat-core/src/project.ts

@@ -34,6 +34,7 @@ export default class Project {
         exportDataset: (
             format: string,
             saveImages: boolean,
+            onlyAnnotated: boolean,
             useDefaultSettings: boolean,
             targetStorage: Storage,
             name?: string,
@@ -265,15 +266,17 @@ Object.defineProperties(
                 async exportDataset(
                     format: Parameters<typeof Project.prototype.annotations.exportDataset>[0],
                     saveImages: Parameters<typeof Project.prototype.annotations.exportDataset>[1],
-                    useDefaultSettings: Parameters<typeof Project.prototype.annotations.exportDataset>[2],
-                    targetStorage: Parameters<typeof Project.prototype.annotations.exportDataset>[3],
-                    customName: Parameters<typeof Project.prototype.annotations.exportDataset>[4],
+                    onlyAnnotated: Parameters<typeof Project.prototype.annotations.exportDataset>[2],
+                    useDefaultSettings: Parameters<typeof Project.prototype.annotations.exportDataset>[3],
+                    targetStorage: Parameters<typeof Project.prototype.annotations.exportDataset>[4],
+                    customName: Parameters<typeof Project.prototype.annotations.exportDataset>[5],
                 ) {
                     const result = await PluginRegistry.apiWrapper.call(
                         this,
                         Project.prototype.annotations.exportDataset,
                         format,
                         saveImages,
+                        onlyAnnotated,
                         useDefaultSettings,
                         targetStorage,
                         customName,

cvat-core/src/server-proxy.ts

@@ -38,6 +38,7 @@ type Params = {
     filename?: string,
     action?: string,
     save_images?: boolean,
+    only_annotated?: boolean,
 };
 
 tus.defaultOptions.storeFingerprintForResuming = false;
@@ -805,6 +806,7 @@ function exportDataset(instanceType: 'projects' | 'jobs' | 'tasks') {
         id: number,
         format: string,
         saveImages: boolean,
+        onlyAnnotated: boolean,
         useDefaultSettings: boolean,
         targetStorage: Storage,
         name?: string,
@@ -817,6 +819,7 @@ function exportDataset(instanceType: 'projects' | 'jobs' | 'tasks') {
             ...(name ? { filename: name } : {}),
             format,
             save_images: saveImages,
+            only_annotated: onlyAnnotated,
         };
         return new Promise<string | void>((resolve, reject) => {
             async function request() {

cvat-core/src/session-implementation.ts

@@ -513,11 +513,20 @@ export function implementJob(Job: typeof JobClass): typeof JobClass {
             this: JobClass,
             format: Parameters<typeof JobClass.prototype.annotations.exportDataset>[0],
             saveImages: Parameters<typeof JobClass.prototype.annotations.exportDataset>[1],
-            useDefaultSettings: Parameters<typeof JobClass.prototype.annotations.exportDataset>[2],
-            targetStorage: Parameters<typeof JobClass.prototype.annotations.exportDataset>[3],
-            customName?: Parameters<typeof JobClass.prototype.annotations.exportDataset>[4],
+            onlyAnnotated: Parameters<typeof JobClass.prototype.annotations.exportDataset>[2],
+            useDefaultSettings: Parameters<typeof JobClass.prototype.annotations.exportDataset>[3],
+            targetStorage: Parameters<typeof JobClass.prototype.annotations.exportDataset>[4],
+            customName?: Parameters<typeof JobClass.prototype.annotations.exportDataset>[5],
         ): ReturnType<typeof JobClass.prototype.annotations.exportDataset> {
-            const rqID = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName);
+            const rqID = await exportDataset(
+                this,
+                format,
+                saveImages,
+                onlyAnnotated,
+                useDefaultSettings,
+                targetStorage,
+                customName,
+            );
             return rqID;
         },
     });
@@ -1169,11 +1178,20 @@ export function implementTask(Task: typeof TaskClass): typeof TaskClass {
             this: TaskClass,
             format: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[0],
             saveImages: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[1],
-            useDefaultSettings: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[2],
-            targetStorage: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[3],
-            customName: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[4],
+            onlyAnnotated: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[2],
+            useDefaultSettings: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[3],
+            targetStorage: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[4],
+            customName: Parameters<typeof TaskClass.prototype.annotations.exportDataset>[5],
         ): ReturnType<typeof TaskClass.prototype.annotations.exportDataset> {
-            const rqID = await exportDataset(this, format, saveImages, useDefaultSettings, targetStorage, customName);
+            const rqID = await exportDataset(
+                this,
+                format,
+                saveImages,
+                onlyAnnotated,
+                useDefaultSettings,
+                targetStorage,
+                customName,
+            );
             return rqID;
         },
     });

cvat-core/src/session.ts

@@ -173,6 +173,7 @@ function buildDuplicatedAPI(prototype) {
                 async exportDataset(
                     format: string,
                     saveImages: boolean,
+                    onlyAnnotated: boolean,
                     useDefaultSettings: boolean,
                     targetStorage: Storage,
                     customName?: string,
@@ -182,6 +183,7 @@ function buildDuplicatedAPI(prototype) {
                         prototype.annotations.exportDataset,
                         format,
                         saveImages,
+                        onlyAnnotated,
                         useDefaultSettings,
                         targetStorage,
                         customName,
@@ -360,6 +362,7 @@ export class Session {
         exportDataset: (
             format: string,
             saveImages: boolean,
+            onlyAnnotated: boolean,
             useDefaultSettings: boolean,
             targetStorage: Storage,
             name?: string,

cvat-sdk/cvat_sdk/core/proxies/model_proxy.py

@@ -230,6 +230,8 @@ def export(
         status_check_period: Optional[int] = None,
         location: Optional[Location] = None,
         cloud_storage_id: Optional[int] = None,
+        save_images: Optional[bool] = None,
+        only_annotated: Optional[bool] = None,
         **query_params,
     ) -> None:
         query_params = {
@@ -254,6 +256,10 @@ def export(
         if not local_downloading:
             query_params["filename"] = str(filename)
 
+        if save_images and only_annotated:
+            query_params["save_images"] = save_images
+            query_params["only_annotated"] = only_annotated
+
         downloader = Downloader(self._client)
         export_request = downloader.prepare_file(
             endpoint,
@@ -300,6 +306,7 @@ def export_dataset(
         pbar: Optional[ProgressReporter] = None,
         status_check_period: Optional[int] = None,
         include_images: bool = True,
+        only_annotated: bool = False,
         location: Optional[Location] = None,
         cloud_storage_id: Optional[int] = None,
     ) -> None:
@@ -332,6 +339,7 @@ def export_dataset(
             cloud_storage_id=cloud_storage_id,
             format=format_name,
             save_images=include_images,
+            only_annotated=only_annotated,
         )
 
         self._client.logger.info(

cvat-ui/src/actions/export-actions.ts

@@ -103,6 +103,7 @@ export const exportDatasetAsync = (
     instance: ProjectOrTaskOrJob,
     format: string,
     saveImages: boolean,
+    onlyAnnotated: boolean,
     useDefaultSettings: boolean,
     targetStorage: Storage,
     name?: string,
@@ -114,7 +115,7 @@ export const exportDatasetAsync = (
 
     try {
         const rqID = await instance.annotations
-            .exportDataset(format, saveImages, useDefaultSettings, targetStorage, name);
+            .exportDataset(format, saveImages, onlyAnnotated, useDefaultSettings, targetStorage, name);
         if (shouldListenForProgress(rqID, state.requests)) {
             await listenExportDatasetAsync(rqID, dispatch, {
                 instance, format, saveImages,

cvat-ui/src/components/export-dataset/export-dataset-modal.tsx

@@ -16,6 +16,7 @@ import Input from 'antd/lib/input';
 import Form from 'antd/lib/form';
 import Switch from 'antd/lib/switch';
 import Space from 'antd/lib/space';
+import Radio from 'antd/lib/radio';
 import TargetStorageField from 'components/storage/target-storage-field';
 import CVATMarkdown from 'components/common/cvat-markdown';
 import { CombinedState, StorageLocation } from 'reducers';
@@ -27,6 +28,7 @@ import {
 type FormValues = {
     selectedFormat: string | undefined;
     saveImages: boolean;
+    onlyAnnotated: boolean;
     customName: string | undefined;
     targetStorage: StorageData;
     useProjectTargetStorage: boolean;
@@ -35,6 +37,7 @@ type FormValues = {
 const initialValues: FormValues = {
     selectedFormat: undefined,
     saveImages: false,
+    onlyAnnotated: false,
     customName: undefined,
     targetStorage: {
         location: StorageLocation.LOCAL,
@@ -52,6 +55,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element {
     const [instanceType, setInstanceType] = useState('');
 
     const [useDefaultTargetStorage, setUseDefaultTargetStorage] = useState(true);
+    const [saveImages, setSaveImages] = useState(false);
     const [form] = Form.useForm();
     const [targetStorage, setTargetStorage] = useState<StorageData>({
         location: StorageLocation.LOCAL,
@@ -94,6 +98,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element {
     const closeModal = (): void => {
         setUseDefaultTargetStorage(true);
         setTargetStorage({ location: StorageLocation.LOCAL });
+        setSaveImages(false);
         form.resetFields();
         if (instance) {
             dispatch(exportActions.closeExportDatasetModal(instance));
@@ -108,6 +113,7 @@ function ExportDatasetModal(props: StateToProps): JSX.Element {
                     instance as ProjectOrTaskOrJob,
                     values.selectedFormat as string,
                     values.saveImages,
+                    values.onlyAnnotated,
                     useDefaultTargetStorage,
                     useDefaultTargetStorage ? new Storage({
                         location: defaultStorageLocation,
@@ -180,11 +186,28 @@ function ExportDatasetModal(props: StateToProps): JSX.Element {
                         name='saveImages'
                         valuePropName='checked'
                     >
-                        <Switch className='cvat-modal-export-save-images' />
-                    </Form.Item>
+                        <Switch
+                            className='cvat-modal-export-save-images'
+                            onChange={(checked: boolean) => {
+                                setSaveImages(checked);
+                                form.setFieldsValue({ saveImages: checked });
+                            }}
+                        />                    </Form.Item>
                     <Text strong>Save images</Text>
                 </Space>
 
+                {saveImages && (
+                    <Form.Item
+                        name='onlyAnnotated'
+                        label={<Text strong>Image saving option</Text>}
+                    >
+                        <Radio.Group className='cvat-modal-export-image-saving-options'>
+                            <Radio value={false}>All images</Radio>
+                            <Radio value={true}>Images with annotations only</Radio>
+                        </Radio.Group>
+                    </Form.Item>
+                )}
+
                 <Form.Item label={<Text strong>Custom name</Text>} name='customName'>
                     <Input
                         placeholder='Custom name for a dataset'

cvat/apps/dataset_manager/bindings.py

@@ -1574,6 +1574,7 @@ def __init__(
         instance_data: CommonData,
         *,
         include_images: bool = False,
+        only_annotated: bool = False,
         format_type: str = None,
         dimension: DimensionType = DimensionType.DIM_2D,
         **kwargs
@@ -1640,7 +1641,8 @@ def __init__(
                     attributes=attributes, subset=frame_data.subset,
                 )
 
-            dm_items.append(dm_item)
+            if not only_annotated or len(dm_anno) > 0:
+                dm_items.append(dm_item)
 
         self._items = dm_items
 
@@ -1662,6 +1664,7 @@ def __init__(
         project_data: ProjectData,
         *,
         include_images: bool = False,
+        only_annotated: bool = False,
         format_type: str = None,
         dimension: DimensionType = DimensionType.DIM_2D,
         **kwargs
@@ -1729,8 +1732,10 @@ def __init__(
                     annotations=dm_anno, media=PointCloud(dm_image[0]), related_images=dm_image[1],
                     attributes=attributes, subset=frame_data.subset
                 )
-            dm_items.append(dm_item)
-
+
+            if not only_annotated or len(dm_anno) > 0:
+                dm_items.append(dm_item)
+
         self._items = dm_items
 
     def categories(self):
@@ -1746,12 +1751,14 @@ def __len__(self):
 def GetCVATDataExtractor(
     instance_data: Union[ProjectData, CommonData],
     include_images: bool = False,
+    only_annotated: bool = False,
     format_type: str = None,
     dimension: DimensionType = DimensionType.DIM_2D,
     **kwargs
 ):
     kwargs.update({
         'include_images': include_images,
+        'only_annotated': only_annotated,
         'format_type': format_type,
         'dimension': dimension,
     })

cvat/apps/dataset_manager/formats/camvid.py

@@ -16,8 +16,8 @@
 
 
 @exporter(name='CamVid', ext='ZIP', version='1.0')
-def _export(dst_file, temp_dir, instance_data, save_images=False):
-    with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
+def _export(dst_file, temp_dir, instance_data, save_images=False, only_annotated=False):
+    with GetCVATDataExtractor(instance_data, include_images=save_images, only_annotated=only_annotated) as extractor:
         dataset = Dataset.from_extractors(extractor, env=dm_env)
         dataset.transform(RotatedBoxesToPolygons)
         dataset.transform('polygons_to_masks')

cvat/apps/dataset_manager/formats/cityscapes.py

@@ -19,8 +19,8 @@
 
 
 @exporter(name='Cityscapes', ext='ZIP', version='1.0')
-def _export(dst_file, temp_dir, instance_data, save_images=False):
-    with GetCVATDataExtractor(instance_data, include_images=save_images) as extractor:
+def _export(dst_file, temp_dir, instance_data, save_images=False, only_annotated=False):
+    with GetCVATDataExtractor(instance_data, include_images=save_images, only_annotated=only_annotated) as extractor:
         dataset = Dataset.from_extractors(extractor, env=dm_env)
         dataset.transform(RotatedBoxesToPolygons)
         dataset.transform('polygons_to_masks')