Merge branch 'develop' into bs/disabled_position_editing_aam

CHANGELOG.md

@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reset zoom option doesn't work in tag annotation mode (<https://github.com/openvinotoolkit/cvat/pull/2443>)
 - Canvas is busy error (<https://github.com/openvinotoolkit/cvat/pull/2437>)
 - Projects view layout fix (<https://github.com/openvinotoolkit/cvat/pull/2503>)
+- Fixed the tasks view (infinite loading) when it is impossible to get a preview of the task (<https://github.com/openvinotoolkit/cvat/pull/2504>)
+- Empty frames navigation (<https://github.com/openvinotoolkit/cvat/pull/2505>)
 
 ### Security
 

cvat-ui/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.10.8",
+  "version": "1.10.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.10.8",
+  "version": "1.10.9",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

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

@@ -93,7 +93,7 @@ export function getTasksAsync(query: TasksQuery): ThunkAction<Promise<void>, {},
         }
 
         const array = Array.from(result);
-        const promises = array.map((task): string => (task as any).frames.preview().catch(''));
+        const promises = array.map((task): string => (task as any).frames.preview().catch(() => ''));
 
         dispatch(getInferenceStatusAsync());
 

cvat-ui/src/containers/annotation-page/top-bar/top-bar.tsx

@@ -446,9 +446,9 @@ class AnnotationTopBarContainer extends React.PureComponent<Props, State> {
     }
 
     private searchEmptyFrame(start: number, stop: number): void {
-        const { canvasInstance, jobInstance, searchAnnotations } = this.props;
+        const { canvasInstance, jobInstance, searchEmptyFrame } = this.props;
         if (canvasInstance.isAbleToChangeFrame()) {
-            searchAnnotations(jobInstance, start, stop);
+            searchEmptyFrame(jobInstance, start, stop);
         }
     }
 

cvat/apps/engine/views.py

@@ -25,7 +25,7 @@ from drf_yasg.inspectors import CoreAPICompatInspector, NotHandled
 from drf_yasg.utils import swagger_auto_schema
 from rest_framework import mixins, serializers, status, viewsets
 from rest_framework.decorators import action
-from rest_framework.exceptions import APIException
+from rest_framework.exceptions import APIException, NotFound, ValidationError
 from rest_framework.permissions import SAFE_METHODS, IsAuthenticated
 from rest_framework.renderers import JSONRenderer
 from rest_framework.response import Response
@@ -426,17 +426,20 @@ class TaskViewSet(auth.TaskGetQuerySetMixin, viewsets.ModelViewSet):
             possible_data_type_values = ('chunk', 'frame', 'preview')
             possible_quality_values = ('compressed', 'original')
 
-            if not data_type or data_type not in possible_data_type_values:
-                return Response(data='data type not specified or has wrong value', status=status.HTTP_400_BAD_REQUEST)
-            elif data_type == 'chunk' or data_type == 'frame':
-                if not data_id:
-                    return Response(data='number not specified', status=status.HTTP_400_BAD_REQUEST)
-                elif data_quality not in possible_quality_values:
-                    return Response(data='wrong quality value', status=status.HTTP_400_BAD_REQUEST)
-
             try:
+                if not data_type or data_type not in possible_data_type_values:
+                    raise ValidationError(detail='Data type not specified or has wrong value')
+                elif data_type == 'chunk' or data_type == 'frame':
+                    if not data_id:
+                        raise ValidationError(detail='Number is not specified')
+                    elif data_quality not in possible_quality_values:
+                        raise ValidationError(detail='Wrong quality value')
+
                 db_task = self.get_object()
                 db_data = db_task.data
+                if not db_data:
+                    raise NotFound(detail='Cannot find requested data for the task')
+
                 frame_provider = FrameProvider(db_task.data)
 
                 if data_type == 'chunk':
@@ -468,7 +471,7 @@ class TaskViewSet(auth.TaskGetQuerySetMixin, viewsets.ModelViewSet):
                 else:
                     return Response(data='unknown data type {}.'.format(data_type), status=status.HTTP_400_BAD_REQUEST)
             except APIException as e:
-                return Response(data=e.default_detail, status=e.status_code)
+                return Response(data=e.get_full_details(), status=e.status_code)
             except Exception as e:
                 msg = 'cannot get requested data type: {}, number: {}, quality: {}'.format(data_type, data_id, data_quality)
                 slogger.task[pk].error(msg, exc_info=True)