fix: Remove feature flag ff_front_dev_1682 to fix Prediction score column showing null

label_studio/data_manager/managers.py

@@ -666,26 +666,15 @@ def annotate_predictions_score(queryset):
     if not first_task:
         return queryset
 
-    # new approach with each ML backend contains it's version
-    if flag_set('ff_front_dev_1682_model_version_dropdown_070622_short', first_task.project.organization.created_by):
-        model_versions = list(
-            first_task.project.ml_backends.filter(project=first_task.project).values_list('model_version', flat=True)
-        )
-        if len(model_versions) == 0:
-            return queryset.annotate(predictions_score=Avg('predictions__score'))
-
-        else:
-            return queryset.annotate(
-                predictions_score=Avg('predictions__score', filter=Q(predictions__model_version__in=model_versions))
-            )
+    model_versions = list(
+        first_task.project.ml_backends.filter(project=first_task.project).values_list('model_version', flat=True)
+    )
+    if len(model_versions) == 0:
+        return queryset.annotate(predictions_score=Avg('predictions__score'))
     else:
-        model_version = first_task.project.model_version
-        if model_version is None:
-            return queryset.annotate(predictions_score=Avg('predictions__score'))
-        else:
-            return queryset.annotate(
-                predictions_score=Avg('predictions__score', filter=Q(predictions__model_version=model_version))
-            )
+        return queryset.annotate(
+            predictions_score=Avg('predictions__score', filter=Q(predictions__model_version__in=model_versions))
+        )
 
 
 def annotate_annotations_ids(queryset):

label_studio/feature_flags.json

@@ -487,33 +487,6 @@
       "version": 6,
       "deleted": false
     },
-    "ff_front_dev_1682_model_version_dropdown_070622_short": {
-      "key": "ff_front_dev_1682_model_version_dropdown_070622_short",
-      "on": false,
-      "prerequisites": [],
-      "targets": [],
-      "contextTargets": [],
-      "rules": [],
-      "fallthrough": {
-        "variation": 0
-      },
-      "offVariation": 1,
-      "variations": [
-        true,
-        false
-      ],
-      "clientSideAvailability": {
-        "usingMobileKey": false,
-        "usingEnvironmentId": false
-      },
-      "clientSide": false,
-      "salt": "58f4f819d52b461b9e833cdb896311d6",
-      "trackEvents": false,
-      "trackEventsFallthrough": false,
-      "debugEventsUntilDate": null,
-      "version": 9,
-      "deleted": false
-    },
     "ff_front_dev_2186_comments_for_update": {
       "key": "ff_front_dev_2186_comments_for_update",
       "on": false,

label_studio/tasks/serializers.py

@@ -899,9 +899,9 @@ def _get_user(self):
     def get_predictions(self, task):
         predictions = task.predictions
         user = self._get_user()
-        if flag_set('ff_front_dev_1682_model_version_dropdown_070622_short', user=user or 'auto'):
-            active_ml_backends = task.project.get_active_ml_backends()
-            model_versions = active_ml_backends.values_list('model_version', flat=True)
+        active_ml_backends = task.project.get_active_ml_backends()
+        model_versions = active_ml_backends.values_list('model_version', flat=True)
+        if model_versions:
             logger.debug(f'Selecting predictions from active ML backend model versions: {model_versions}')
             predictions = predictions.filter(model_version__in=model_versions)
         elif task.project.model_version:

label_studio/tests/conftest.py

@@ -675,18 +675,6 @@ def get_server_url(live_server):
     yield live_server.url
 
 
-@pytest.fixture(name='ff_front_dev_1682_model_version_dropdown_070622_short_off', autouse=True)
-def ff_front_dev_1682_model_version_dropdown_070622_short_off():
-    from core.feature_flags import flag_set
-
-    def fake_flag_set(*args, **kwargs):
-        if args[0] == 'ff_front_dev_1682_model_version_dropdown_070622_short':
-            return False
-        return flag_set(*args, **kwargs)
-
-    with mock.patch('tasks.serializers.flag_set', wraps=fake_flag_set):
-        yield
-
 
 @pytest.fixture(name='async_import_off', autouse=True)
 def async_import_off():

web/libs/core/src/lib/utils/feature-flags/flags.ts

@@ -6,10 +6,6 @@
  */
 export const FF_DEV_1480 = "ff_front_dev_1480_created_on_in_review_180122_short";
 
-/**
- * Model version selector per model backend
- */
-export const FF_DEV_1682 = "ff_front_dev_1682_model_version_dropdown_070622_short";
 
 /**
  * Enables "Enterprise Awareness" features