diff --git a/label_studio/core/feature_flags/stale_feature_flags.py b/label_studio/core/feature_flags/stale_feature_flags.py index 956b6c7fdcc4..24296d8bc10d 100644 --- a/label_studio/core/feature_flags/stale_feature_flags.py +++ b/label_studio/core/feature_flags/stale_feature_flags.py @@ -22,7 +22,6 @@ 'fflag_fix_back_lsdv_4929_limit_exports_10042023_short': True, 'fflag_feat_front_lsdv_4620_richtext_opimization_060423_short': True, 'fflag_feat_front_lsdv_4661_full_uri_resolve_15032023_short': True, - 'fflag_fix_back_LSDV_4748_annotate_task_number_14032023_short': True, 'fflag_feat_front_lsdv_4659_skipduplicates_060323_short': True, 'fflag_fix_font_lsdv_1148_hotkeys_namespaces_01022023_short': True, 'fflag_fix_back_lsdv_1044_check_annotations_24012023_short': False, diff --git a/label_studio/projects/functions/__init__.py b/label_studio/projects/functions/__init__.py index c00d7fb604d7..46cd7649285d 100644 --- a/label_studio/projects/functions/__init__.py +++ b/label_studio/projects/functions/__init__.py @@ -5,19 +5,13 @@ def annotate_task_number(queryset): - if flag_set('fflag_fix_back_LSDV_4748_annotate_task_number_14032023_short', user='auto'): - tasks = Task.objects.filter(project=OuterRef('id')).values_list('id') - return queryset.annotate(task_number=SQCount(tasks)) - else: - return queryset.annotate(task_number=Count('tasks', distinct=True)) + tasks = Task.objects.filter(project=OuterRef('id')).values_list('id') + return queryset.annotate(task_number=SQCount(tasks)) def annotate_finished_task_number(queryset): - if flag_set('fflag_fix_back_LSDV_4748_annotate_task_number_14032023_short', user='auto'): - tasks = Task.objects.filter(project=OuterRef('id'), is_labeled=True).values_list('id') - return queryset.annotate(finished_task_number=SQCount(tasks)) - else: - return queryset.annotate(finished_task_number=Count('tasks', distinct=True, filter=Q(tasks__is_labeled=True))) + tasks = Task.objects.filter(project=OuterRef('id'), is_labeled=True).values_list('id') + return queryset.annotate(finished_task_number=SQCount(tasks)) def annotate_total_predictions_number(queryset):