Merge branch 'HumanSignal:develop' into feature/timeline-sync

Author: cloudmark

label_studio/projects/models.py

@@ -418,8 +418,10 @@ def _update_tasks_states(
             f'{self.maximum_annotations} and percentage {self.overlap_cohort_percentage}'
         )
         # if only maximum annotations parameter is tweaked
-        if maximum_annotations_changed and (not overlap_cohort_percentage_changed or self.maximum_annotations == 1):
-            tasks_with_overlap = self.tasks.filter(overlap__gt=1)
+        if maximum_annotations_changed and not overlap_cohort_percentage_changed:
+            # if there are tasks with overlap > 1 and maximum annotations has not been set to 1, preserve the cohort.
+            # but if maximum_annotations is set to 1, then all tasks should be affected (since there is no longer a distinct cohort)
+            tasks_with_overlap = self.tasks.filter(overlap__gt=1) if self.maximum_annotations > 1 else self.tasks.all()
             if tasks_with_overlap.exists():
                 # if there is a part with overlapped tasks, affect only them
                 tasks_with_overlap.update(overlap=self.maximum_annotations)
@@ -433,8 +435,17 @@ def _update_tasks_states(
             bulk_update_stats_project_tasks(tasks_with_overlap, project=self)
 
         # if cohort slider is tweaked
-        elif overlap_cohort_percentage_changed and self.maximum_annotations > 1:
-            self._rearrange_overlap_cohort()
+        elif overlap_cohort_percentage_changed:
+            if self.maximum_annotations == 1:
+                if maximum_annotations_changed:
+                    self.tasks.update(overlap=1)
+                    bulk_update_stats_project_tasks(self.tasks.all(), project=self)
+                else:
+                    logger.info(
+                        f'Project {str(self)}: cohort percentage was changed but maximum annotations was not and is 1; taking no action'
+                    )
+            else:
+                self._rearrange_overlap_cohort()
 
         # if adding/deleting tasks and cohort settings are applied
         elif tasks_number_changed and self.overlap_cohort_percentage < 100 and self.maximum_annotations > 1:

label_studio/tasks/models.py

@@ -1395,17 +1395,14 @@ def bulk_update_stats_project_tasks(tasks, project=None):
 
     with transaction.atomic():
         use_overlap = project._can_use_overlap()
-        maximum_annotations = project.maximum_annotations
         # update filters if we can use overlap
         if use_overlap:
             # following definition of `completed_annotations` above, count cancelled annotations
             # as completed if project is in IGNORE_SKIPPED mode
             completed_annotations_f_expr = F('total_annotations')
             if project.skip_queue == project.SkipQueue.IGNORE_SKIPPED:
                 completed_annotations_f_expr += F('cancelled_annotations')
-            finished_q = Q(GreaterThanOrEqual(completed_annotations_f_expr, maximum_annotations)) | Q(
-                GreaterThanOrEqual(completed_annotations_f_expr, 1), overlap=1
-            )
+            finished_q = Q(GreaterThanOrEqual(completed_annotations_f_expr, F('overlap')))
             finished_tasks = tasks.filter(finished_q)
             finished_tasks_ids = finished_tasks.values_list('id', flat=True)
             tasks.update(is_labeled=Q(id__in=finished_tasks_ids))

label_studio/tests/test_projects.tavern.yml

@@ -192,7 +192,7 @@ stages:
 
 ---
 
-test_name: test_overlap_change_to_1
+test_name: test_overlap_change_to_1_and_adjust_cohort_percentage
 
 strict: False
 
@@ -243,16 +243,12 @@ stages:
       url: '{django_live_url}/api/projects/{project_pk}/import?return_task_ids=true&preannotated_from_fields=bbox'
     response:
       status_code: 201
-      save:
-        json:
-          first_task: "task_ids[0]"
-          second_task: "task_ids[1]"
-  - name: update_project_to_1
+  - name: update_project_to_1_and_adjust_cohort_percentage
     request:
       url: "{django_live_url}/api/projects/{project_pk}"
       json:
         maximum_annotations: 1
-        overlap_cohort_percentage: 0
+        overlap_cohort_percentage: 40
       method: PATCH
       headers:
         content-type: application/json