Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: Re-newed import/export request failed immediately if the previous failed #8649

Merged
merged 7 commits into from
Nov 7, 2024
Merged

Fixed: Re-newed import/export request failed immediately if the previous failed #8649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8afdcc
Fixed: Cannot read properties of undefined (reading 'push')
bsekachev Nov 6, 2024
e74144d
Update 20241106_095739_sekachev.bs_fixed_exception_1.md
bsekachev Nov 6, 2024
7790d9a
Run in microtask
bsekachev Nov 6, 2024
3efcb71
Fixed: Re-newed import/export request failed immediately if the previ…
bsekachev Nov 6, 2024
c7fddfc
Merge branch 'develop' into bs/fixed_exception_2
bsekachev Nov 7, 2024
c46caee
Applied comments
bsekachev Nov 7, 2024
08a85e6
Do not listen to finished requests
bsekachev Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.d/20241106_112907_sekachev.bs_fixed_exception_2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Re-newed import/export request failed immediately if the previous failed
(<https://github.com/cvat-ai/cvat/pull/8649>)
140 changes: 78 additions & 62 deletions cvat-ui/src/actions/export-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
// SPDX-License-Identifier: MIT

import { ActionUnion, createAction, ThunkAction } from 'utils/redux';

import { Storage, ProjectOrTaskOrJob, Job } from 'cvat-core-wrapper';
import {
getInstanceType, RequestInstanceType, listen, RequestsActions,
shouldListenForProgress,
Storage, ProjectOrTaskOrJob, Job, getCore, StorageLocation,
} from 'cvat-core-wrapper';
import {
getInstanceType, RequestInstanceType, listen,
RequestsActions, updateRequestProgress,
} from './requests-actions';

export enum ExportActionTypes {
Expand All @@ -24,6 +25,8 @@ export enum ExportActionTypes {
EXPORT_BACKUP_FAILED = 'EXPORT_BACKUP_FAILED',
}

const core = getCore();

export const exportActions = {
openExportDatasetModal: (instance: ProjectOrTaskOrJob) => (
createAction(ExportActionTypes.OPEN_EXPORT_DATASET_MODAL, { instance })
Expand All @@ -36,7 +39,7 @@ export const exportActions = {
instanceType: 'project' | 'task' | 'job',
format: string,
resource: 'dataset' | 'annotations',
target?: 'local' | 'cloudstorage',
target?: StorageLocation,
) => (
createAction(ExportActionTypes.EXPORT_DATASET_SUCCESS, {
instance,
Expand Down Expand Up @@ -67,60 +70,41 @@ export const exportActions = {
closeExportBackupModal: (instance: ProjectOrTaskOrJob) => (
createAction(ExportActionTypes.CLOSE_EXPORT_BACKUP_MODAL, { instance })
),
exportBackupSuccess: (instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType, instanceType: 'task' | 'project', target?: 'local' | 'cloudstorage') => (
exportBackupSuccess: (instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType, instanceType: 'task' | 'project', target?: StorageLocation) => (
createAction(ExportActionTypes.EXPORT_BACKUP_SUCCESS, { instance, instanceType, target })
),
exportBackupFailed: (instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType, instanceType: 'task' | 'project', error: any) => (
createAction(ExportActionTypes.EXPORT_BACKUP_FAILED, { instance, instanceType, error })
),
};

export async function listenExportDatasetAsync(
rqID: string,
dispatch: (action: ExportActions | RequestsActions) => void,
params: {
instance: ProjectOrTaskOrJob | RequestInstanceType,
format: string,
saveImages: boolean,
},
): Promise<void> {
const { instance, format, saveImages } = params;
const resource = saveImages ? 'dataset' : 'annotations';

const instanceType = getInstanceType(instance);
try {
const result = await listen(rqID, dispatch);
const target = !result?.url ? 'cloudstorage' : 'local';
dispatch(exportActions.exportDatasetSuccess(
instance, instanceType, format, resource, target,
));
} catch (error) {
dispatch(exportActions.exportDatasetFailed(instance, instanceType, format, resource, error));
}
}

/** *
* Function is supposed to be used when a new dataset export request initiated by a user
** */
export const exportDatasetAsync = (
instance: ProjectOrTaskOrJob,
format: string,
saveImages: boolean,
useDefaultSettings: boolean,
targetStorage: Storage,
name?: string,
): ThunkAction => async (dispatch, getState) => {
const state = getState();

): ThunkAction => async (dispatch) => {
const resource = saveImages ? 'dataset' : 'annotations';
const instanceType = getInstanceType(instance);

try {
const rqID = await instance.annotations
.exportDataset(format, saveImages, useDefaultSettings, targetStorage, name);
if (shouldListenForProgress(rqID, state.requests)) {
await listenExportDatasetAsync(rqID, dispatch, {
instance, format, saveImages,

if (rqID) {
await core.requests.listen(rqID, {
callback: (updatedRequest) => updateRequestProgress(updatedRequest, dispatch),
});
}
if (!rqID) {
const target = targetStorage.location;
dispatch(exportActions.exportDatasetSuccess(
instance, instanceType, format, resource, target,
));
} else {
dispatch(exportActions.exportDatasetSuccess(
instance, instanceType, format, resource,
));
Expand All @@ -130,47 +114,79 @@ export const exportDatasetAsync = (
}
};

export async function listenExportBackupAsync(
/** *
* Function is supposed to be used when a new backup export request initiated by a user
** */
export const exportBackupAsync = (
instance: Exclude<ProjectOrTaskOrJob, Job>,
targetStorage: Storage,
useDefaultSetting: boolean,
fileName: string,
): ThunkAction => async (dispatch) => {
const instanceType = getInstanceType(instance) as 'project' | 'task';
try {
const rqID = await instance.backup(targetStorage, useDefaultSetting, fileName);
if (rqID) {
await core.requests.listen(rqID, {
callback: (updatedRequest) => updateRequestProgress(updatedRequest, dispatch),
});
const target = targetStorage.location;
dispatch(exportActions.exportBackupSuccess(instance, instanceType, target));
} else {
dispatch(exportActions.exportBackupSuccess(instance, instanceType));
}
} catch (error) {
dispatch(exportActions.exportBackupFailed(instance, instanceType, error as Error));
}
};

/** *
* Function is supposed to be used when application starts listening to existing dataset export request
** */
export async function listenExportDatasetAsync(
rqID: string,
dispatch: (action: ExportActions | RequestsActions) => void,
params: {
instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType,
instance: ProjectOrTaskOrJob | RequestInstanceType,
format: string,
saveImages: boolean,
},
): Promise<void> {
const { instance } = params;
const instanceType = getInstanceType(instance) as 'project' | 'task';
const { instance, format, saveImages } = params;
const resource = saveImages ? 'dataset' : 'annotations';

const instanceType = getInstanceType(instance);
try {
const result = await listen(rqID, dispatch);
const target = !result?.url ? 'cloudstorage' : 'local';
dispatch(exportActions.exportBackupSuccess(instance, instanceType, target));
const target = !result?.url ? StorageLocation.CLOUD_STORAGE : StorageLocation.LOCAL;
dispatch(exportActions.exportDatasetSuccess(
instance, instanceType, format, resource, target,
));
} catch (error) {
dispatch(exportActions.exportBackupFailed(instance, instanceType, error as Error));
dispatch(exportActions.exportDatasetFailed(instance, instanceType, format, resource, error));
}
}

export const exportBackupAsync = (
instance: Exclude<ProjectOrTaskOrJob, Job>,
targetStorage: Storage,
useDefaultSetting: boolean,
fileName: string,
): ThunkAction => async (dispatch, getState) => {
const state = getState();

/** *
* Function is supposed to be used when application starts listening to existing backup export request
** */
export async function listenExportBackupAsync(
rqID: string,
dispatch: (action: ExportActions | RequestsActions) => void,
params: {
instance: Exclude<ProjectOrTaskOrJob, Job> | RequestInstanceType,
},
): Promise<void> {
const { instance } = params;
const instanceType = getInstanceType(instance) as 'project' | 'task';

try {
const rqID = await instance
.backup(targetStorage, useDefaultSetting, fileName);
if (shouldListenForProgress(rqID, state.requests)) {
await listenExportBackupAsync(rqID, dispatch, { instance });
}
if (!rqID) {
dispatch(exportActions.exportBackupSuccess(instance, instanceType));
}
const result = await listen(rqID, dispatch);
const target = !result?.url ? StorageLocation.CLOUD_STORAGE : StorageLocation.LOCAL;
dispatch(exportActions.exportBackupSuccess(instance, instanceType, target));
} catch (error) {
dispatch(exportActions.exportBackupFailed(instance, instanceType, error as Error));
}
};
}

export type ExportActions = ActionUnion<typeof exportActions>;
Loading
Loading