refactor: LEAP-1322: Remove Stale Feature Flag - ff_back_2070_inner_i…

…d_12052022_short
HumanSignal · Nov 27, 2024 · 1af5438 · 1af5438
1 parent 6ab4541
commit 1af5438
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 24 deletions.
diff --git a/label_studio/core/feature_flags/stale_feature_flags.py b/label_studio/core/feature_flags/stale_feature_flags.py
@@ -40,7 +40,6 @@
     'ff_front_dev_2431_delete_polygon_points_080622_short': True,
     'ff_front_dev_2290_draft_in_annotation_history_short': True,
     'ff_dev_2128_html_in_labels_150422_short': True,
-    'ff_back_2070_inner_id_12052022_short': True,
     'ff_dev_2007_rework_choices_280322_short': True,
     'ff_front_dev_1495_avatar_mess_210122_short': True,
     'ff_front_1170_outliner_030222_short': True,

diff --git a/label_studio/data_manager/functions.py b/label_studio/data_manager/functions.py
@@ -90,18 +90,17 @@ def get_all_columns(project, *_):
         }
     ]
 
-    if flag_set('ff_back_2070_inner_id_12052022_short', user=project.organization.created_by):
-        result['columns'] += [
-            {
-                'id': 'inner_id',
-                'title': 'Inner ID',
-                'type': 'Number',
-                'help': 'Internal task ID starting from 1 for the current project',
-                'target': 'tasks',
-                'visibility_defaults': {'explore': False, 'labeling': False},
-                'project_defined': False,
-            }
-        ]
+    result['columns'] += [
+        {
+            'id': 'inner_id',
+            'title': 'Inner ID',
+            'type': 'Number',
+            'help': 'Internal task ID starting from 1 for the current project',
+            'target': 'tasks',
+            'visibility_defaults': {'explore': False, 'labeling': False},
+            'project_defined': False,
+        }
+    ]
 
     if flag_set('fflag_fix_back_lsdv_4648_annotator_filter_29052023_short', user=project.organization.created_by):
         project_members = project.all_members.values_list('id', flat=True)

diff --git a/label_studio/tasks/models.py b/label_studio/tasks/models.py
@@ -517,17 +517,16 @@ def ensure_unique_groundtruth(self, annotation_id):
         self.annotations.exclude(id=annotation_id).update(ground_truth=False)
 
     def save(self, *args, update_fields=None, **kwargs):
-        if flag_set('ff_back_2070_inner_id_12052022_short', AnonymousUser):
-            if self.inner_id == 0:
-                task = Task.objects.filter(project=self.project).order_by('-inner_id').first()
-                max_inner_id = 1
-                if task:
-                    max_inner_id = task.inner_id
-
-                # max_inner_id might be None in the old projects
-                self.inner_id = None if max_inner_id is None else (max_inner_id + 1)
-                if update_fields is not None:
-                    update_fields = {'inner_id'}.union(update_fields)
+        if self.inner_id == 0:
+            task = Task.objects.filter(project=self.project).order_by('-inner_id').first()
+            max_inner_id = 1
+            if task:
+                max_inner_id = task.inner_id
+
+            # max_inner_id might be None in the old projects
+            self.inner_id = None if max_inner_id is None else (max_inner_id + 1)
+            if update_fields is not None:
+                update_fields = {'inner_id'}.union(update_fields)
 
         super().save(*args, update_fields=update_fields, **kwargs)