Merge branch 'develop' into 'fb-fit-1123'

ricardoantoniocm · ricardoantoniocm · commit ea9722c485b3 · 2026-01-12T12:30:20.000Z
Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/20919412034
diff --git a/label_studio/core/feature_flags/stale_feature_flags.py b/label_studio/core/feature_flags/stale_feature_flags.py
@@ -64,6 +64,20 @@
     'fflag_root_223_optimize_delete_predictions': True,
     'fflag_root_212_reduce_importstoragelink_counts': True,
     # Jan 8
+    'fflag_feat_all_dia_2067_tasks_table_component': True,  # Removed from code
+    'fflag_feat_front_dia_1747_projects_list_banner': True,  # Removed from code
+    'fflag_feat_front_leap_1424_grid_preview_short': True,  # Removed from code
+    'ff_front_dev_1536_taxonomy_user_labels_150222_long': True,  # Removed from code
+    'fflag_feat_front_leap_2036_annotations_summary': True,  # Removed from code
+    'fflag_feat_front_leap_1973_adjustable_spans_090425_short': True,  # Removed from code
+    'fflag_feat_front_lsdv_5451_async_taxonomy_110823_short': True,  # Removed from code
+    'fflag_feat_all_lsdv_e_294_llm_annotations_180723_long': True,  # Removed from code
+    'fflag_fix_front_dev_3793_relative_coords_short': True,  # Removed from code
+    'fflag_feat_front_lsdv_4583_6_images_preloading_short': True,  # Removed from code
+    'fflag_feat_all_leap_1821_annotation_limit_short': True,
+    'fflag_all_feat_dia_1777_ls_homepage_short': True,
+    'fflag_feat_all_leap_1181_bulk_annotation_short': True,
+    'fflag_feat_front_lsdv_4583_multi_image_segmentation_short': True,
     'fflag_fix_back_plt_914_projects_list_cache_sdk_09102025_short': True,
     'fflag_fix_back_plt_913_cache_annotator_queue_total_07102025_short': True,
     'fflag_fix_back_plt_913_cache_finished_task_number_06102025_short': True,
diff --git a/label_studio/feature_flags.json b/label_studio/feature_flags.json
@@ -2229,6 +2229,33 @@
       "version": 2,
       "deleted": false
     },
+    "fflag_feat_fit_1084_fsm_analytics_kpis": {
+      "key": "fflag_feat_fit_1084_fsm_analytics_kpis",
+      "on": true,
+      "prerequisites": [],
+      "targets": [],
+      "contextTargets": [],
+      "rules": [],
+      "fallthrough": {
+        "variation": 0
+      },
+      "offVariation": 1,
+      "variations": [
+        true,
+        false
+      ],
+      "clientSideAvailability": {
+        "usingMobileKey": false,
+        "usingEnvironmentId": false
+      },
+      "clientSide": false,
+      "salt": "fea6fb38190a4ad6a102f56ea210a706",
+      "trackEvents": false,
+      "trackEventsFallthrough": false,
+      "debugEventsUntilDate": null,
+      "version": 3,
+      "deleted": false
+    },
     "fflag_feat_fit_449_datamanager_filter_members_short": {
       "key": "fflag_feat_fit_449_datamanager_filter_members_short",
       "on": false,
diff --git a/label_studio/io_storages/base_models.py b/label_studio/io_storages/base_models.py
@@ -398,34 +398,16 @@ def resolve_uri(self, uri, task=None):
                     logger.debug(f'No storage info found for URI={uri}')
                     return
 
-                if flag_set('fflag_optic_all_optic_1938_storage_proxy', user=self.project.organization.created_by):
-                    if task is None:
-                        logger.error(f'Task is required to resolve URI={uri}', exc_info=True)
-                        raise ValueError(f'Task is required to resolve URI={uri}')
-
-                    proxy_url = urljoin(
-                        settings.HOSTNAME,
-                        reverse('storages:task-storage-data-resolve', kwargs={'task_id': task.id})
-                        + f'?fileuri={base64.urlsafe_b64encode(extracted_uri.encode()).decode()}',
-                    )
-                    return uri.replace(extracted_uri, proxy_url)
-
-                # ff off: old logic without proxy
-                else:
-                    if self.presign and task is not None:
-                        proxy_url = urljoin(
-                            settings.HOSTNAME,
-                            reverse('storages:task-storage-data-presign', kwargs={'task_id': task.id})
-                            + f'?fileuri={base64.urlsafe_b64encode(extracted_uri.encode()).decode()}',
-                        )
-                        return uri.replace(extracted_uri, proxy_url)
-                    else:
-                        # this branch is our old approach:
-                        # it generates presigned URLs if storage.presign=True;
-                        # or it inserts base64 media into task data if storage.presign=False
-                        http_url = self.generate_http_url(extracted_uri)
-
-                return uri.replace(extracted_uri, http_url)
+                if task is None:
+                    logger.error(f'Task is required to resolve URI={uri}', exc_info=True)
+                    raise ValueError(f'Task is required to resolve URI={uri}')
+
+                proxy_url = urljoin(
+                    settings.HOSTNAME,
+                    reverse('storages:task-storage-data-resolve', kwargs={'task_id': task.id})
+                    + f'?fileuri={base64.urlsafe_b64encode(extracted_uri.encode()).decode()}',
+                )
+                return uri.replace(extracted_uri, proxy_url)
             except Exception:
                 logger.info(f"Can't resolve URI={uri}", exc_info=True)
 
diff --git a/label_studio/io_storages/proxy_api.py b/label_studio/io_storages/proxy_api.py
@@ -4,7 +4,6 @@
 from typing import Union
 from urllib.parse import unquote
 
-from core.feature_flags import flag_set
 from core.utils.exceptions import extract_message
 from django.conf import settings
 from django.http import HttpRequest, HttpResponse, HttpResponseRedirect, StreamingHttpResponse
@@ -40,21 +39,17 @@ def resolve(self, request: HttpRequest, fileuri: str, instance: Union[Task, Proj
             fileuri = unquote(fileuri)
 
         # Try to find storage by URL
-        project = None
-        if flag_set('fflag_optic_all_optic_1938_storage_proxy', user='auto'):
-            project = instance if isinstance(instance, Project) else instance.project
-            storage_objects = project.get_all_import_storage_objects
-            storage = get_storage_by_url(fileuri, storage_objects)
-            if not storage:
-                logger.error(f'Could not find storage for URI {fileuri}')
-                return Response(status=status.HTTP_404_NOT_FOUND)
-            # Not all storages support presigned URLs
-            if not hasattr(storage, 'presign'):
-                logger.error(f'Storage {storage} does not support presign URLs')
-                return Response(status=status.HTTP_404_NOT_FOUND)
-            presign = storage.presign
-        else:
-            presign = True
+        project = instance if isinstance(instance, Project) else instance.project
+        storage_objects = project.get_all_import_storage_objects
+        storage = get_storage_by_url(fileuri, storage_objects)
+        if not storage:
+            logger.error(f'Could not find storage for URI {fileuri}')
+            return Response(status=status.HTTP_404_NOT_FOUND)
+        # Not all storages support presigned URLs
+        if not hasattr(storage, 'presign'):
+            logger.error(f'Storage {storage} does not support presign URLs')
+            return Response(status=status.HTTP_404_NOT_FOUND)
+        presign = storage.presign
 
         # Check if storage should use presigned URLs;
         # It's important to have this check here, because it increases security:
diff --git a/label_studio/io_storages/tests/test_proxy_api.py b/label_studio/io_storages/tests/test_proxy_api.py
@@ -37,10 +37,8 @@ def test_resolve_with_permission_denied(self):
         result = self.mixin.resolve(self.request, 'test_fileuri', self.task)
         assert result.status_code == status.HTTP_403_FORBIDDEN
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_with_base64_decoding(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_with_base64_decoding(self, mock_get_storage):
         mock_get_storage.return_value = self.storage
         fileuri = base64.urlsafe_b64encode(b'test_uri').decode()
 
@@ -49,10 +47,8 @@ def test_resolve_with_base64_decoding(self, mock_get_storage, mock_flag_set):
             self.mixin.resolve(self.request, fileuri, self.task)
             mock_redirect.assert_called_once_with('test_uri', self.task, 'Task')
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_with_url_unquote_fallback(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_with_url_unquote_fallback(self, mock_get_storage):
         mock_get_storage.return_value = self.storage
 
         with patch.object(self.mixin, 'redirect_to_presign_url') as mock_redirect:
@@ -61,28 +57,22 @@ def test_resolve_with_url_unquote_fallback(self, mock_get_storage, mock_flag_set
             self.mixin.resolve(self.request, 's3://bucket/file.jpg', self.task)
             mock_redirect.assert_called_once_with('s3://bucket/file.jpg', self.task, 'Task')
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_storage_not_found(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_storage_not_found(self, mock_get_storage):
         mock_get_storage.return_value = None
         result = self.mixin.resolve(self.request, 'fileuri', self.task)
         assert result.status_code == status.HTTP_404_NOT_FOUND
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_storage_no_presign_support(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_storage_no_presign_support(self, mock_get_storage):
         mock_storage = MagicMock()
         delattr(mock_storage, 'presign')
         mock_get_storage.return_value = mock_storage
         result = self.mixin.resolve(self.request, 'fileuri', self.task)
         assert result.status_code == status.HTTP_404_NOT_FOUND
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_with_presign_true(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_with_presign_true(self, mock_get_storage):
         mock_storage = MagicMock()
         mock_storage.presign = True
         mock_get_storage.return_value = mock_storage
@@ -92,10 +82,8 @@ def test_resolve_with_presign_true(self, mock_get_storage, mock_flag_set):
             self.mixin.resolve(self.request, 'fileuri', self.task)
             mock_redirect.assert_called_once()
 
-    @patch('io_storages.proxy_api.flag_set')
     @patch('io_storages.proxy_api.get_storage_by_url')
-    def test_resolve_with_presign_false(self, mock_get_storage, mock_flag_set):
-        mock_flag_set.return_value = True
+    def test_resolve_with_presign_false(self, mock_get_storage):
         mock_storage = MagicMock()
         mock_storage.presign = False
         mock_get_storage.return_value = mock_storage
diff --git a/label_studio/tasks/api.py b/label_studio/tasks/api.py
@@ -2,7 +2,6 @@
 
 import logging
 
-from core.feature_flags import flag_set
 from core.mixins import GetParentObjectMixin
 from core.permissions import ViewClassPermission, all_permissions
 from core.utils.common import is_community
@@ -343,13 +342,10 @@ def get_queryset(self):
         if review:
             kwargs = {'fields_for_evaluation': ['annotators', 'reviewed']}
         else:
-            if flag_set('fflag_fix_back_bros_182_api_task_optimizations', user=self.request.user):
-                kwargs = {
-                    'all_fields': True,
-                    'excluded_fields_for_evaluation': self.get_excluded_fields_for_evaluation(),
-                }
-            else:
-                kwargs = {'all_fields': True}
+            kwargs = {
+                'all_fields': True,
+                'excluded_fields_for_evaluation': self.get_excluded_fields_for_evaluation(),
+            }
         project = self.request.query_params.get('project') or self.request.data.get('project')
         if not project:
             project = task.project.id
diff --git a/label_studio/tests/conftest.py b/label_studio/tests/conftest.py
@@ -705,7 +705,6 @@ def set_feature_flag_envvar():
     """
     Automatically set the environment variable for all tests, including Tavern tests.
     """
-    os.environ['fflag_optic_all_optic_1938_storage_proxy'] = 'true'
     os.environ['fflag_feat_utc_210_prediction_validation_15082025'] = 'true'
 
 
diff --git a/web/libs/editor/src/tags/object/TimeSeries.jsx b/web/libs/editor/src/tags/object/TimeSeries.jsx
@@ -28,7 +28,6 @@ import { fixMobxObserve } from "../../utils/utilities";
 import "./TimeSeries/MultiChannel";
 import "./TimeSeries/Channel";
 import { getChannelColor } from "./TimeSeries/palette";
-import { FF_TIMESERIES_SYNC, isFF } from "../../utils/feature-flags";
 import { ff } from "@humansignal/core";
 /**
  * The `TimeSeries` tag can be used to label time series data. Read more about Time Series Labeling on [the time series template page](../templates/time_series.html).
@@ -1022,16 +1021,13 @@ const Model = types
 
     registerSyncHandlers() {
       if (!isAlive(self)) return;
-      if (isFF(FF_TIMESERIES_SYNC)) {
-        self.syncHandlers.set("seek", self._handleSeek);
-        self.syncHandlers.set("play", self._handlePlay);
-        self.syncHandlers.set("pause", self._handlePause);
-      }
+      self.syncHandlers.set("seek", self._handleSeek);
+      self.syncHandlers.set("play", self._handlePlay);
+      self.syncHandlers.set("pause", self._handlePause);
     },
 
     emitSeekSync() {
       if (!isAlive(self)) return;
-      if (!isFF(FF_TIMESERIES_SYNC)) return;
       if (self.suppressSync) return;
 
       const centerTime = self.centerTime; // centerTime is in NATIVE units (ms if isDate, else seconds/indices)
@@ -1056,7 +1052,7 @@ const Model = types
     },
 
     plotClickHandler(timeClicked) {
-      if (!isAlive(self) || !isFF(FF_TIMESERIES_SYNC) || !self.sync) return;
+      if (!isAlive(self) || !self.sync) return;
       if (self.isNotReady) return;
 
       const [minKey, maxKey] = self.keysRange;
diff --git a/web/libs/editor/src/tags/object/__tests__/TimeSeries.test.js b/web/libs/editor/src/tags/object/__tests__/TimeSeries.test.js
@@ -2,7 +2,6 @@
 import * as d3 from "d3";
 import { types } from "mobx-state-tree";
 import { mockFF } from "../../../../__mocks__/global";
-import { FF_TIMESERIES_SYNC } from "../../../utils/feature-flags";
 import { TimeSeriesModel } from "../TimeSeries";
 
 const ff = mockFF();
@@ -36,7 +35,6 @@ const MockStore = types
 
 // Set up feature flags
 ff.setup();
-ff.set(FF_TIMESERIES_SYNC, true);
 
 describe("TimeSeries brush range calculation", () => {
   // creating models can be a long one, so all tests will share one model
diff --git a/web/libs/editor/src/utils/feature-flags.ts b/web/libs/editor/src/utils/feature-flags.ts
@@ -169,14 +169,6 @@ export const FF_IMAGE_MEMORY_USAGE = "fflag_feat_front_optic_1479_improve_image_
 
 export const FF_VIDEO_FRAME_SEEK_PRECISION = "fflag_fix_front_optic_1608_improve_video_frame_seek_precision_short";
 
-/**
- * Allows the time series component to participate in synchronized playback with other media components (like audio and video)
- * when the feature flag is enabled, while maintaining independent operation when the flag is disabled.
- *
- * @link https://app.launchdarkly.com/projects/default/flags/fflag_feat_optic_2125_timeseries_sync
- */
-export const FF_TIMESERIES_SYNC = "fflag_feat_optic_2125_timeseries_sync";
-
 Object.assign(window, {
   APP_SETTINGS: {
     ...(window.APP_SETTINGS ?? {}),
