Merge branch 'develop' into 'fb-leap-1717/path-to-regexp-upg'

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

.github/workflows/docker-build-ontop.yml

@@ -110,7 +110,7 @@ jobs:
             ${{ steps.calculate-docker-tags.outputs.docker-tags }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.12.0
         id: docker_build_and_push
         with:
           context: .

.github/workflows/docker-build.yml

@@ -129,7 +129,7 @@ jobs:
             type=raw,value=${{ steps.version.outputs.build_version }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.12.0
         id: docker_build_and_push
         with:
           context: .

.github/workflows/docker-release-promote.yml

@@ -195,7 +195,7 @@ jobs:
             ${{ steps.generate-tags.outputs.ubuntu-tags }}
 
       - name: Build and Push Release Ubuntu Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.12.0
         id: docker_build
         with:
           context: ${{ steps.release_dockerfile.outputs.release_dir }}

.github/workflows/validator-pull-request-labeler.yml

@@ -36,7 +36,7 @@ jobs:
           configuration_path: ".github/pr-title-checker-config.json"
 
       - name: "Set PR's label based on title"
-        uses: release-drafter/release-drafter@v6.0.0
+        uses: release-drafter/release-drafter@v6.1.0
         with:
           disable-releaser: true
           config-name: autolabeler.yml

README.md

@@ -2,7 +2,7 @@
 
 ![GitHub](https://img.shields.io/github/license/heartexlabs/label-studio?logo=heartex) ![label-studio:build](https://github.com/HumanSignal/label-studio/workflows/label-studio:build/badge.svg) ![GitHub release](https://img.shields.io/github/v/release/heartexlabs/label-studio?include_prereleases)
 
-[Website](https://labelstud.io/) • [Docs](https://labelstud.io/guide/) • [Twitter](https://twitter.com/labelstudiohq) • [Join Slack Community <img src="https://app.heartex.ai/docs/images/slack-mini.png" width="18px"/>](https://slack.labelstud.io/?source=github-1)
+[Website](https://labelstud.io/) • [Docs](https://labelstud.io/guide/) • [Join Slack Community <img src="https://app.heartex.ai/docs/images/slack-mini.png" width="18px"/>](https://slack.labelstud.io/?source=github-1)
 
 
 ## What is Label Studio?
@@ -23,7 +23,7 @@ Have a custom dataset? You can customize Label Studio to fit your needs. Read an
 
 ## Try out Label Studio
 
-Install Label Studio locally, or deploy it in a cloud instance. [Or, sign up for a free trial of our Enterprise edition.](https://heartex.com/free-trial).
+Install Label Studio locally, or deploy it in a cloud instance. [Or, sign up for a free trial of our Enterprise edition.](https://humansignal.com/free-trial).
 
 - [Install locally with Docker](#install-locally-with-docker)
 - [Run with Docker Compose (Label Studio + Nginx + PostgreSQL)](#run-with-docker-compose)
@@ -248,12 +248,12 @@ Include a citation for Label Studio in the **References** section of your articl
     Mikhail Malyuk and
     Andrey Holmanyuk and
     Nikolai Liubimov},
-  year={2020-2024},
+  year={2020-2025},
 }
 ```
 
 ## License
 
-This software is licensed under the [Apache 2.0 LICENSE](/LICENSE) © [Heartex](https://www.heartex.com/). 2020-2024
+This software is licensed under the [Apache 2.0 LICENSE](/LICENSE) © [Heartex](https://www.heartex.com/). 2020-2025
 
 <img src="https://user-images.githubusercontent.com/12534576/192582529-cf628f58-abc5-479b-a0d4-8a3542a4b35e.png" title="Hey everyone!" width="180" />

label_studio/feature_flags.json

@@ -2877,6 +2877,33 @@
       "version": 4,
       "deleted": false
     },
+    "fflag_feat_front_optic_1479_improve_image_tag_memory_usage_short": {
+      "key": "fflag_feat_front_optic_1479_improve_image_tag_memory_usage_short",
+      "on": false,
+      "prerequisites": [],
+      "targets": [],
+      "contextTargets": [],
+      "rules": [],
+      "fallthrough": {
+        "variation": 0
+      },
+      "offVariation": 1,
+      "variations": [
+        true,
+        false
+      ],
+      "clientSideAvailability": {
+        "usingMobileKey": false,
+        "usingEnvironmentId": false
+      },
+      "clientSide": false,
+      "salt": "21716e7aae704a6cb04f7d72ee5cff33",
+      "trackEvents": false,
+      "trackEventsFallthrough": false,
+      "debugEventsUntilDate": null,
+      "version": 2,
+      "deleted": false
+    },
     "fflag_feat_front_optic_66_lazy_chart_evaluation_19092023_short": {
       "key": "fflag_feat_front_optic_66_lazy_chart_evaluation_19092023_short",
       "on": true,

label_studio/ml_model_providers/migrations/0006_modelproviderconnection_google_application_credentials_and_more.py

@@ -0,0 +1,62 @@
+# Generated by Django 5.1.4 on 2025-01-03 20:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "ml_model_providers",
+            "0005_modelproviderconnection_budget_alert_threshold_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="modelproviderconnection",
+            name="google_application_credentials",
+            field=models.TextField(
+                blank=True,
+                help_text="The content of GOOGLE_APPLICATION_CREDENTIALS json file",
+                null=True,
+                verbose_name="google application credentials",
+            ),
+        ),
+        migrations.AddField(
+            model_name="modelproviderconnection",
+            name="google_location",
+            field=models.CharField(
+                blank=True,
+                help_text="Google project location",
+                max_length=255,
+                null=True,
+                verbose_name="google location",
+            ),
+        ),
+        migrations.AddField(
+            model_name="modelproviderconnection",
+            name="google_project_id",
+            field=models.CharField(
+                blank=True,
+                help_text="Google project ID",
+                max_length=255,
+                null=True,
+                verbose_name="google project id",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="modelproviderconnection",
+            name="provider",
+            field=models.CharField(
+                choices=[
+                    ("OpenAI", "OpenAI"),
+                    ("AzureOpenAI", "AzureOpenAI"),
+                    ("VertexAI", "VertexAI"),
+                    ("Custom", "Custom"),
+                ],
+                default="OpenAI",
+                max_length=255,
+            ),
+        ),
+    ]

label_studio/ml_model_providers/models.py

@@ -11,6 +11,7 @@
 class ModelProviders(models.TextChoices):
     OPENAI = 'OpenAI', _('OpenAI')
     AZURE_OPENAI = 'AzureOpenAI', _('AzureOpenAI')
+    VERTEX_AI = 'VertexAI', _('VertexAI')
     CUSTOM = 'Custom', _('Custom')
 
 
@@ -32,6 +33,21 @@ class ModelProviderConnection(models.Model):
 
     endpoint = models.CharField(max_length=512, null=True, blank=True, help_text='Azure OpenAI endpoint')
 
+    google_application_credentials = models.TextField(
+        _('google application credentials'),
+        null=True,
+        blank=True,
+        help_text='The content of GOOGLE_APPLICATION_CREDENTIALS json file',
+    )
+
+    google_project_id = models.CharField(
+        _('google project id'), max_length=255, null=True, blank=True, help_text='Google project ID'
+    )
+
+    google_location = models.CharField(
+        _('google location'), max_length=255, null=True, blank=True, help_text='Google project location'
+    )
+
     cached_available_models = models.CharField(
         max_length=4096, null=True, blank=True, help_text='List of available models from the provider'
     )

label_studio/ml_models/migrations/0013_alter_thirdpartymodelversion_provider.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.4 on 2025-01-03 20:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ml_models", "0012_alter_thirdpartymodelversion_provider"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="thirdpartymodelversion",
+            name="provider",
+            field=models.CharField(
+                choices=[
+                    ("OpenAI", "OpenAI"),
+                    ("AzureOpenAI", "AzureOpenAI"),
+                    ("VertexAI", "VertexAI"),
+                    ("Custom", "Custom"),
+                ],
+                default="OpenAI",
+                help_text="The model provider to use e.g. OpenAI",
+                max_length=255,
+            ),
+        ),
+    ]

label_studio/projects/models.py

@@ -1208,8 +1208,8 @@ def update_data_columns(self, tasks):
             self.common_data_columns = list(sorted(common_data_columns))
         else:
             self.common_data_columns = list(sorted(set(self.common_data_columns) & common_data_columns))
-        logger.debug(f'summary.all_data_columns = {self.all_data_columns}')
-        logger.debug(f'summary.common_data_columns = {self.common_data_columns}')
+        logger.info(f'update summary.all_data_columns = {self.all_data_columns} project_id={self.project_id}')
+        logger.info(f'update summary.common_data_columns = {self.common_data_columns} project_id={self.project_id}')
         self.save(update_fields=['all_data_columns', 'common_data_columns'])
 
     def remove_data_columns(self, tasks):
@@ -1232,8 +1232,8 @@ def remove_data_columns(self, tasks):
                 if key in common_data_columns:
                     common_data_columns.remove(key)
             self.common_data_columns = common_data_columns
-        logger.debug(f'summary.all_data_columns = {self.all_data_columns}')
-        logger.debug(f'summary.common_data_columns = {self.common_data_columns}')
+        logger.info(f'remove summary.all_data_columns = {self.all_data_columns} project_id={self.project_id}')
+        logger.info(f'remove summary.common_data_columns = {self.common_data_columns} project_id={self.project_id}')
         self.save(
             update_fields=[
                 'all_data_columns',

web/apps/labelstudio/src/components/HeidiTips/liveContent.json

@@ -15,7 +15,7 @@
     },
     {
       "title": "Did you know?",
-      "content": "Label Studio now has a Starter Cloud offering optimized for small teams and projects.",
+      "content": "Try Label Studio Starter Cloud, optimized for small teams and projects.",
       "link": {
         "label": "Learn more",
         "url": "https://humansignal.com/pricing/",
@@ -134,7 +134,7 @@
     },
     {
       "title": "Did you know?",
-      "content": "Label Studio now has a Starter Cloud offering optimized for small teams and projects.",
+      "content": "Try Label Studio Starter Cloud, optimized for small teams and projects.",
       "link": {
         "label": "Learn more",
         "url": "https://humansignal.com/pricing/",
@@ -244,6 +244,18 @@
           "treatment": "enterprise_platform_live"
         }
       }
+    },
+    {
+      "title": "Upcoming Webinar",
+      "description": "Join Jimmy Whitaker January 29th to learn how to analyze and annotate multi-turn generative AI chat responses.",
+      "link": {
+        "label": "Learn more or sign up",
+        "url": "https://humansignal.com/webinars/evaluating-llm-based-chat-systems-for-continuous-improvement/",
+        "params": {
+          "experiment": "login_revamp",
+          "treatment": "webinar_jan29_live"
+        }
+      }
     }
   ]
 }