Merge remote-tracking branch 'origin/fb-LEAP-1957/view-all-tests' into fb-LEAP-1957/view-all-tests

Author: Gondragos

.github/workflows/follow-merge-upstream-repo-sync-v2.yml

@@ -16,6 +16,8 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ inputs.branch_name }}
   cancel-in-progress: true
+
+env:
   POETRY_VERSION: 2.1.2
 
 jobs:

docs/source/guide/release_notes/onprem/2.23.0.md

@@ -0,0 +1,88 @@
+---
+hide_sidebar: true
+---
+
+## Label Studio Enterprise 2.23.0
+
+<div class="onprem-highlight">Google Cloud Storage WIF, drag-and-drop for video timelines, multiple security enhancements</div>
+
+*Apr 22, 2025*
+
+Helm Chart version: 1.9.9
+
+### New features
+
+#### Support for Google Cloud Storage Workload Identity Federation (WIF)
+
+When adding project storage, you now have the option to choose Google Cloud Storage WIF.
+
+Unlike the the standard GCS connection using application credentials, this allows Label Studio to request temporary credentials when connecting to your storage.
+
+For more information, see [Google Cloud Storage with Workload Identity Federation (WIF)](https://docs.humansignal.com/guide/storage#Google-Cloud-Storage-with-Workload-Identity-Federation-WIF).
+
+![Screenshot of WIF](/images/releases/2-23-wif.png)
+
+!!! note
+    While this option is available for on-prem users, the typical way to set up GCS in an on-prem environment is through persistent storage as documented [here](https://docs.humansignal.com/guide/persistent_storage.html#Configure-the-GCS-bucket). 
+
+
+### Enhancements
+
+#### Drag-and-drop adjustment for video timeline segments
+
+You can now drag and drop to adjust the length of video timeline segments.
+
+![Screenshot of video timeline](/images/releases/2-23-drag-drop.png)
+
+#### "Custom Scripts" are now "Plugins"
+
+We have renamed "Custom Scripts" to "Plugins." This is reflected in the UI and [in our docs](/plugins).
+
+![Screenshot of video timeline](/images/releases/2-23-plugins.png)
+
+#### Miscellaneous
+
+- Improved tooltips related to [pausing annotators](quality).
+
+- Ensured that when a user is deactivated, they are also automatically logged out. Previously they lost all access, but were not automatically logged out of active sessions.
+
+- Multiple performance improvements for our [AI Assistant](ask_ai).
+
+
+### Security
+
+- Made security improvements around the verbosity of certain API calls.
+
+- Made security improvements around SAML.
+
+- Made security improvements around project parameter validation.
+
+- Made security improvements around exception error messages.
+
+- Made security improvements around workspace permission checks.
+
+
+### Bug fixes
+
+- Fixed an issue where importing from the UI would fail when importing from a URL.
+
+- Fixed an issue where users were unable to edit custom agreement metrics if using manual distribution mode.
+
+- Fixed an issue where regions would be added to the wrong task when moving quickly between tasks.
+
+- Fixed an issue where **Exact frames matching for video** was always showing as an option for agreement metrics regardless of whether the labeling config referenced a video.
+
+- Fixed an issue where the `prediction-changed` value was not being reset after making manual changes to pre-annotations.
+
+- Fixed an issue where a paused annotator is unpaused when a reviewer rejects their annotation and the project is configured to requeue tasks back to the annotator.
+
+- Fixed an issue where some segments were not previewable when annotating videos with the TimeLineLabels tag.
+
+- Fixed several small issues with how labeled regions appear when completing OCR tasks.
+
+
+
+
+
+
+

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). |
 

docs/themes/v2/source/images/releases/2-23-drag-drop.png

@@ -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])
 

docs/themes/v2/source/images/releases/2-23-plugins.png

@@ -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))

docs/themes/v2/source/images/releases/2-23-wif.png

@@ -22,7 +22,7 @@ body {
   display: block;
 }
 .field--wide > *:not(:first-child) {
-  display: block;
+  display: flex;
   margin-top: 4px;
   width: 100%;
   box-sizing: border-box;

label_studio/core/argparser.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/core/settings/base.py

@@ -91,6 +91,7 @@ def predictions_to_annotations_form(user, project):
                     'name': 'model_version',
                     'label': 'Choose predictions',
                     'options': versions,
+                    'value': first,
                 }
             ],
         }
@@ -106,7 +107,7 @@ def predictions_to_annotations_form(user, project):
         'dialog': {
             'title': 'Create Annotations From Predictions',
             'text': 'Create annotations from predictions using selected predictions set '
-            'for each selected task.'
+            'for each selected task. '
             'Your account will be assigned as an owner to those annotations. ',
             'type': 'confirm',
             'form': predictions_to_annotations_form,

label_studio/core/static/css/uikit.css

@@ -4054,7 +4054,7 @@
     },
     "fflag_optic_all_optic_1938_storage_proxy": {
       "key": "fflag_optic_all_optic_1938_storage_proxy",
-      "on": false,
+      "on": true,
       "prerequisites": [],
       "targets": [],
       "contextTargets": [],
@@ -4076,7 +4076,7 @@
       "trackEvents": false,
       "trackEventsFallthrough": false,
       "debugEventsUntilDate": null,
-      "version": 5,
+      "version": 8,
       "deleted": false
     },
     "fix_backend_dev_3134_exclude_deactivated_users": {

label_studio/data_export/mixins.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/data_manager/actions/predictions_to_annotations.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

label_studio/feature_flags.json

@@ -210,7 +210,7 @@ djangorestframework-simplejwt = {extras = ["crypto"], version = "^5.4.0"}
 tldextract = ">=5.1.3"
 
 # Humansignal repo dependencies
-label-studio-sdk = {url = "https://github.com/HumanSignal/label-studio-sdk/archive/e207b82924a1f9a1c0affb7e1fd7d4c9b0f5506b.zip"}
+label-studio-sdk = {url = "https://github.com/HumanSignal/label-studio-sdk/archive/d2ca4fad3ae91afae3608709936434faf13fceab.zip"}
 
 [tool.poetry.group.test.dependencies]
 pytest = "7.2.2"

label_studio/organizations/functions.py

@@ -1,8 +1,10 @@
 .input-ls,
 .select-ls,
 .textarea-ls {
-  height: 40px;
-  min-height: 40px;
+  --input-size: 40px;
+
+  height: var(--input-size);
+  min-height: var(--input-size);
   background: var(--sand_0);
   font-size: 16px;
   line-height: 22px;