Merge branch 'develop' into 'fb-leap-2009/granularity'

Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/14635186966

Author: MihajloHoma

docs/source/guide/start.md

@@ -55,8 +55,9 @@ The following command line arguments are optional and must be specified with `la
 | `--initial-project-description` | `LABEL_STUDIO_PROJECT_DESC` | `''` | Specify a project description for a Label Studio project. See [Set up your labeling project](setup.html). |
 | `--password` | `LABEL_STUDIO_PASSWORD` | `None` | Password to use for the default user. See [Set up user accounts](signup.html). |
 | `--username` | `LABEL_STUDIO_USERNAME` | `default_user@localhost` | Username to use for the default user. See [Set up user accounts](signup.html). |
-| `--user-token` |  `LABEL_STUDIO_USER_TOKEN` | Automatically generated. | Authentication token for a user to use for the API. Must be set with a username, otherwise automatically generated. See [Set up user accounts](signup.html).
+| `--user-token` |  `LABEL_STUDIO_USER_TOKEN` | Automatically generated. | Authentication token for a user to use for the API. Must be set with a username, otherwise automatically generated. See [Set up user accounts](signup.html). |
 | `--agree-fix-sqlite` | N/A | `False` | Automatically agree to let Label Studio fix SQLite issues when using Python 3.6–3.8 on Windows operating systems. | 
+| `--enable-legacy-api-token` | `LABEL_STUDIO_ENABLE_LEGACY_API_TOKEN` | `False` | Enable legacy API token authentication. Useful for running with a pre-existing token via `--user-token`. |
 | N/A | `LABEL_STUDIO_LOCAL_FILES_SERVING_ENABLED` | `False` | Allow Label Studio to access local file directories to import storage. See [Run Label Studio on Docker and use local storage](start.html#Run_Label_Studio_on_Docker_and_use_local_storage). |
 | N/A | `LABEL_STUDIO_LOCAL_FILES_DOCUMENT_ROOT` | `/` | Specify the root directory for Label Studio to use when accessing local file directories. See [Run Label Studio on Docker and use local storage](start.html#Run_Label_Studio_on_Docker_and_use_local_storage). |
 

label_studio/core/argparser.py

@@ -100,6 +100,12 @@ def project_name(raw_name):
         action='store_true',
         help='Agree to fix SQLite issues on python 3.6-3.8 on Windows automatically',
     )
+    root_parser.add_argument(
+        '--enable-legacy-api-token',
+        dest='enable_legacy_api_token',
+        action='store_true',
+        help='Enable legacy API token authentication',
+    )
 
     parser = argparse.ArgumentParser(description='Label studio', parents=[root_parser])
 

label_studio/core/settings/base.py

@@ -821,6 +821,8 @@ def collect_versions_dummy(**kwargs):
 
 LOGOUT_REDIRECT_URL = get_env('LOGOUT_REDIRECT_URL', None)
 
+# Enable legacy tokens (useful for running with a pre-existing token via `LABEL_STUDIO_USER_TOKEN`)
+LABEL_STUDIO_ENABLE_LEGACY_API_TOKEN = get_bool_env('LABEL_STUDIO_ENABLE_LEGACY_API_TOKEN', False)
 RESOLVER_PROXY_BUFFER_SIZE = int(get_env('RESOLVER_PROXY_BUFFER_SIZE', 512 * 1024))
 RESOLVER_PROXY_TIMEOUT = int(get_env('RESOLVER_PROXY_TIMEOUT', 20))
 RESOLVER_PROXY_MAX_RANGE_SIZE = int(get_env('RESOLVER_PROXY_MAX_RANGE_SIZE', 8 * 1024 * 1024))

label_studio/data_export/mixins.py

@@ -110,7 +110,13 @@ def _get_filtered_annotations_queryset(self, annotation_filter_options=None):
             return queryset
 
         q = reduce(lambda x, y: x | y, q_list)
-        return queryset.filter(q)
+        annotations_qs = queryset.filter(q)
+
+        # prefetch reviews in LSE
+        if hasattr(annotations_qs.model, 'reviews'):
+            annotations_qs = annotations_qs.prefetch_related('reviews')
+
+        return annotations_qs
 
     @staticmethod
     def _get_export_serializer_option(serialization_options):
@@ -144,6 +150,7 @@ def _get_export_serializer_option(serialization_options):
 
     def get_task_queryset(self, ids, annotation_filter_options):
         annotations_qs = self._get_filtered_annotations_queryset(annotation_filter_options=annotation_filter_options)
+
         return (
             Task.objects.filter(id__in=ids)
             .prefetch_related(
@@ -152,7 +159,7 @@ def get_task_queryset(self, ids, annotation_filter_options):
                     queryset=annotations_qs,
                 )
             )
-            .prefetch_related('predictions', 'drafts')
+            .prefetch_related('predictions', 'drafts', 'comment_authors', 'file_upload')
         )
 
     def get_export_data(self, task_filter_options=None, annotation_filter_options=None, serialization_options=None):
@@ -272,10 +279,10 @@ def export_to_file(self, task_filter_options=None, annotation_filter_options=Non
             self.status = self.Status.COMPLETED
             self.save(update_fields=['status'])
 
-        except Exception:
+        except Exception as e:
             self.status = self.Status.FAILED
             self.save(update_fields=['status'])
-            logger.exception('Export was failed')
+            logger.exception('Export was failed: %s', e)
         finally:
             self.finished_at = datetime.now()
             self.save(update_fields=['finished_at'])

label_studio/organizations/functions.py

@@ -1,10 +1,11 @@
 from core.utils.common import temporary_disconnect_all_signals
+from django.conf import settings
 from django.db import transaction
 from organizations.models import Organization, OrganizationMember
 from projects.models import Project
 
 
-def create_organization(title, created_by, **kwargs):
+def create_organization(title, created_by, legacy_api_tokens_enabled=False, **kwargs):
     from core.feature_flags import flag_set
 
     JWT_ACCESS_TOKEN_ENABLED = flag_set('fflag__feature_develop__prompts__dia_1829_jwt_token_auth')
@@ -13,9 +14,11 @@ def create_organization(title, created_by, **kwargs):
         org = Organization.objects.create(title=title, created_by=created_by, **kwargs)
         OrganizationMember.objects.create(user=created_by, organization=org)
         if JWT_ACCESS_TOKEN_ENABLED:
-            # set auth tokens to new system for new users
+            # set auth tokens to new system for new users, unless specified otherwise
             org.jwt.api_tokens_enabled = True
-            org.jwt.legacy_api_tokens_enabled = False
+            org.jwt.legacy_api_tokens_enabled = (
+                legacy_api_tokens_enabled or settings.LABEL_STUDIO_ENABLE_LEGACY_API_TOKEN
+            )
             org.jwt.save()
         return org
 

label_studio/server.py

@@ -171,7 +171,9 @@ def _create_user(input_args, config):
     user = User.objects.get(email=username)
     org = Organization.objects.first()
     if not org:
-        org = Organization.create_organization(created_by=user, title='Label Studio')
+        org = Organization.create_organization(
+            created_by=user, title='Label Studio', legacy_api_tokens_enabled=input_args.enable_legacy_api_token
+        )
     else:
         org.add_user(user)
     user.active_organization = org

web/dist/apps/labelstudio/main.js

@@ -1,6 +1,6 @@
 {
-  "message": "feat: OPTIC-1733: Standardize Dropdown Components Using LSE selector (#7257)",
-  "commit": "ddb598a3e2f0aedb7d58055aa80b1937ee7f901f",
-  "date": "2025-04-22T18:37:23.000Z",
+  "message": "fix: LEAP-1947: Fix interactive view all FF in image tag case (#7387)",
+  "commit": "98dfd898c23e94a2f094df3798ad233ba8a83a91",
+  "date": "2025-04-23T16:14:37.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/main.js.map

@@ -1,6 +1,6 @@
 {
-  "message": "feat: OPTIC-1733: Standardize Dropdown Components Using LSE selector (#7257)",
-  "commit": "ddb598a3e2f0aedb7d58055aa80b1937ee7f901f",
-  "date": "2025-04-22T18:37:23.000Z",
+  "message": "fix: LEAP-1947: Fix interactive view all FF in image tag case (#7387)",
+  "commit": "98dfd898c23e94a2f094df3798ad233ba8a83a91",
+  "date": "2025-04-23T16:14:37.000Z",
   "branch": "develop"
 }

web/dist/apps/labelstudio/vendor.js

@@ -221,7 +221,8 @@ function renderItem(ref: IAnyStateTreeNode, annotation: IAnnotation, includeKey
   if (isFF(FF_DEV_3391)) {
     if (!annotation) return null;
 
-    el = annotation.ids.get(cleanUpId(ref.id ?? ref.name));
+    // The part `|| el` is a hack to allow it to work with Image regions. For some reason, it uses this function for rendering
+    el = annotation.ids.get(cleanUpId(ref.id ?? ref.name)) || el;
   }
 
   if (!el) {

web/dist/apps/labelstudio/vendor.js.map

@@ -1,7 +1,6 @@
 {
   "ff_front_DEV_1713_audio_ui_150222_short": false,
   "ff_front_dev_2715_audio_3_280722_short": true,
-  "fflag_fix_front_dev_3391_interactive_view_all": false,
   "fflag_feat_front_dev_3873_labeling_ui_improvements_short": true,
   "fflag_fix_front_lsdv_4620_memory_leaks_100723_short": false
 }

web/dist/libs/datamanager/version.json

@@ -1,5 +1,7 @@
+import { ff } from "@humansignal/core";
 import { getEnv, getRoot, types } from "mobx-state-tree";
 import { cloneNode } from "../core/Helpers";
+import { FF_DEV_3391 } from "../utils/feature-flags";
 import { AnnotationMixin } from "./AnnotationMixin";
 
 const ToolMixin = types
@@ -10,6 +12,13 @@ const ToolMixin = types
   })
   .views((self) => ({
     get obj() {
+      if (ff.isActive(FF_DEV_3391)) {
+        // It's a temporal solution (see root description)
+        const root = self.manager?.root;
+        if (root?.annotationStore.selected) {
+          return root.annotationStore.selected.names.get(self.manager?.name);
+        }
+      }
       return self.manager?.obj ?? getEnv(self).object;
     },
 
@@ -18,6 +27,16 @@ const ToolMixin = types
     },
 
     get control() {
+      if (ff.isActive(FF_DEV_3391)) {
+        // It's a temporal solution (see root description)
+        const control = getEnv(self).control;
+        const { name } = control;
+        const root = self.manager?.root;
+        if (root?.annotationStore.selected) {
+          return root.annotationStore.selected.names.get(name);
+        }
+        return control;
+      }
       return getEnv(self).control;
     },
 

web/dist/libs/editor/version.json

@@ -1,10 +1,15 @@
+import { ff } from "@humansignal/core";
 import { types } from "mobx-state-tree";
 import ToolsManager from "../tools/Manager";
 import * as Tools from "../tools";
+import { FF_DEV_3391 } from "../utils/feature-flags";
 
 export const ToolManagerMixin = types.model().actions((self) => {
   return {
     afterAttach() {
+      if (ff.isActive(FF_DEV_3391) && !self.annotation) {
+        return;
+      }
       const toolNames = self.toolNames ?? [];
       const manager = ToolsManager.getInstance({ name: self.toname });
       const env = { manager, control: self };

web/libs/editor/src/core/Tree.tsx

@@ -174,8 +174,10 @@ const _Annotation = types
 
     const updateIds = (item) => {
       const children = item.children?.map(updateIds);
+      const imageEntities = item.imageEntities?.map(updateIds);
 
       if (children) item = { ...item, children };
+      if (imageEntities) item = { ...item, imageEntities };
       if (item.id) item = { ...item, id: `${item.name ?? item.id}@${sn.id}` };
       // @todo fallback for tags with name as id:
       // if (item.name) item = { ...item, name: item.name + "@" + sn.id };

web/libs/editor/src/core/feature-flags/flags.json

@@ -1,3 +1,4 @@
+import { ff } from "@humansignal/core";
 import { inject } from "mobx-react";
 import { destroy, getRoot, getType, types } from "mobx-state-tree";
 
@@ -16,6 +17,7 @@ import ToolsManager from "../../../tools/Manager";
 import { parseValue } from "../../../utils/data";
 import {
   FF_DEV_3377,
+  FF_DEV_3391,
   FF_DEV_3793,
   FF_LSDV_4583,
   FF_LSDV_4583_6,
@@ -567,7 +569,9 @@ const Model = types
       };
     },
   }))
-
+  .volatile((self) => ({
+    manager: null,
+  }))
   // actions for the tools
   .actions((self) => {
     const manager = ToolsManager.getInstance({ name: self.name });
@@ -577,18 +581,19 @@ const Model = types
       if (!self.store.task) return;
 
       const parsedValue = self.multiImage ? self.parsedValueList : self.parsedValue;
+      const idPostfix = self.annotation ? `@${self.annotation.id}` : "";
 
       if (Array.isArray(parsedValue)) {
         parsedValue.forEach((src, index) => {
           self.imageEntities.push({
-            id: `${self.name}#${index}`,
+            id: `${self.name}#${index}${idPostfix}`,
             src,
             index,
           });
         });
       } else {
         self.imageEntities.push({
-          id: `${self.name}#0`,
+          id: `${self.name}#0${idPostfix}`,
           src: parsedValue,
           index: 0,
         });
@@ -598,6 +603,9 @@ const Model = types
     }
 
     function afterAttach() {
+      if (ff.isActive(FF_DEV_3391) && !self.annotation) {
+        return;
+      }
       if (self.selectioncontrol) manager.addTool("MoveTool", Tools.Selection.create({}, env));
 
       if (self.zoomcontrol) manager.addTool("ZoomPanTool", Tools.Zoom.create({}, env));

web/libs/editor/src/mixins/Tool.js

@@ -42,6 +42,19 @@ class ToolsManager {
   get preservedTool() {
     return window.localStorage.getItem(`selected-tool:${this.name}`);
   }
+  /**
+    There are some problems with working with ToolManager with interactive view all flag switched on.
+    For now, tool manager is hidden in view_all,
+    so it allows us to use root and selected annotation
+    while we are looking for the object or the control from the tool.
+    At the same time, we can use `annotation_id`
+    as an additional key to be able to get the right annotation in that view_all mode.
+    But in that case,
+    there will be a problem with the inconsistent state of tool manager for 2 different annotations in the context of the same task.
+    */
+  get root() {
+    return root;
+  }
 
   get obj() {
     return root.annotationStore.names.get(this.name);