Checks for frame_selection_method if honeypot_real_frames specified

cvat-ai · Oct 3, 2024 · 0123148 · 0123148
1 parent 7bb5ae7
commit 0123148
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py
@@ -653,6 +653,7 @@ class JobWriteSerializer(WriteOnceMixin, serializers.ModelSerializer):
     frames = serializers.ListField(
         child=serializers.IntegerField(min_value=0),
         required=False,
+        allow_empty=False,
         help_text=textwrap.dedent("""\
             The list of frame ids. Applicable only to the "{}" frame selection method
         """.format(models.JobFrameSelectionMethod.MANUAL))
@@ -734,13 +735,9 @@ def validate(self, attrs):
         elif frame_selection_method == models.JobFrameSelectionMethod.MANUAL:
             field_validation.require_field(attrs, "frames")
 
-            frames = attrs['frames']
-            if not frames:
-                raise serializers.ValidationError("The list of frames cannot be empty")
-
         if (
-            frame_selection_method != models.JobFrameSelectionMethod.MANUAL and
-            attrs.get('frames')
+            'frames' in attrs and
+            frame_selection_method != models.JobFrameSelectionMethod.MANUAL
         ):
             raise serializers.ValidationError(
                 '"frames" can only be used when "frame_selection_method" is "{}"'.format(
@@ -942,8 +939,8 @@ class JobValidationLayoutWriteSerializer(serializers.Serializer):
     )
     honeypot_real_frames = serializers.ListSerializer(
         child=serializers.IntegerField(min_value=0),
-        default=[],
         required=False,
+        allow_empty=False,
         help_text=textwrap.dedent("""\
             The list of frame ids. Applicable only to the "{}" frame selection method
         """.format(models.JobFrameSelectionMethod.MANUAL))
@@ -958,6 +955,15 @@ def validate(self, attrs):
         else:
             assert False
 
+        if (
+            'honeypot_real_frames' in attrs and
+            frame_selection_method != models.JobFrameSelectionMethod.MANUAL
+        ):
+            raise serializers.ValidationError(
+                '"honeypot_real_frames" can only be used when '
+                f'"frame_selection_method" is "{models.JobFrameSelectionMethod.MANUAL}"'
+            )
+
         return super().validate(attrs)
 
     @transaction.atomic
@@ -1258,8 +1264,14 @@ def validate(self, attrs):
         elif frame_selection_method == models.JobFrameSelectionMethod.RANDOM_UNIFORM:
             pass
 
-        if "honeypot_real_frames" in attrs:
-            field_validation.require_field(attrs, "frame_selection_method")
+        if (
+            'honeypot_real_frames' in attrs and
+            frame_selection_method != models.JobFrameSelectionMethod.MANUAL
+        ):
+            raise serializers.ValidationError(
+                '"honeypot_real_frames" can only be used when '
+                f'"frame_selection_method" is "{models.JobFrameSelectionMethod.MANUAL}"'
+            )
 
         return super().validate(attrs)
 

diff --git a/cvat/schema.yml b/cvat/schema.yml
@@ -9424,7 +9424,6 @@ components:
           items:
             type: integer
             minimum: 0
-          default: []
           description: |
             The list of frame ids. Applicable only to the "manual" frame selection method
     PatchedJobWriteRequest: