Merge remote-tracking branch 'origin/develop' into fb-ROOT-11

Author: matt-bernstein

.github/workflows/apply-linters.yml

@@ -24,7 +24,7 @@ jobs:
           ref: ${{ inputs.branch_name }}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.12'
 

.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.16.0
+        uses: docker/build-push-action@v6.17.0
         id: docker_build_and_push
         with:
           context: .

.github/workflows/docker-build.yml

@@ -130,7 +130,7 @@ jobs:
             type=raw,value=${{ steps.version.outputs.build_version }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.16.0
+        uses: docker/build-push-action@v6.17.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.16.0
+        uses: docker/build-push-action@v6.17.0
         id: docker_build
         with:
           context: ${{ steps.release_dockerfile.outputs.release_dir }}

.github/workflows/tests.yml

@@ -140,7 +140,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: ${{ github.event.pull_request.head.repo.fork == false && github.event.pull_request.user.login != 'dependabot[bot]' }}
-        uses: codecov/codecov-action@v5.4.2
+        uses: codecov/codecov-action@v5.4.3
         with:
           name: codecov-python-${{ matrix.python-version }}
           flags: pytests

docs/themes/v2/layout/templates.ejs

@@ -4,10 +4,11 @@
 
 <div class="templates-grid">
   <% page.cards.forEach(function(card) { %>
+    <% const tags = typeof card.categories === "object" ? card.categories.join(", ") : card.categories %>
     <div class="templates-card">
       <img src="<%= card.image %>" alt="" />
       <a href="<%= card.url %>"><%- partial("component/heading", {text: card.title, size: "XXSmall", tag: "span" }) %></a>
-      <%- partial("component/text", {text: card.categories, tag: "p", size: "Small"}) %>
+      <%- partial("component/text", {text: tags, tag: "p", size: "Small"}) %>
     </div>
   <% }); %>
 </div>

label_studio/feature_flags.json

@@ -3120,6 +3120,33 @@
       "version": 2,
       "deleted": false
     },
+    "fflag_feat_root_11_support_jsonl_cloud_storage": {
+      "key": "fflag_feat_root_11_support_jsonl_cloud_storage",
+      "on": false,
+      "prerequisites": [],
+      "targets": [],
+      "contextTargets": [],
+      "rules": [],
+      "fallthrough": {
+        "variation": 0
+      },
+      "offVariation": 1,
+      "variations": [
+        true,
+        false
+      ],
+      "clientSideAvailability": {
+        "usingMobileKey": false,
+        "usingEnvironmentId": false
+      },
+      "clientSide": false,
+      "salt": "85e018dcd2e64c689a61ee7ed3c5edb2",
+      "trackEvents": false,
+      "trackEventsFallthrough": false,
+      "debugEventsUntilDate": null,
+      "version": 2,
+      "deleted": false
+    },
     "fflag_feature_all_optic_1421_cold_start_v2": {
       "key": "fflag_feature_all_optic_1421_cold_start_v2",
       "on": false,

label_studio/io_storages/localfiles/models.py

@@ -78,16 +78,16 @@ def iterkeys(self):
                     continue
                 yield str(file)
 
-    def get_data(self, key) -> list[dict]:
+    def get_data(self, key) -> dict | list[dict]:
         path = Path(key)
         if self.use_blob_urls:
             # include self-hosted links pointed to local resources via
             # {settings.HOSTNAME}/data/local-files?d=<path/to/local/dir>
             document_root = Path(settings.LOCAL_FILES_DOCUMENT_ROOT)
             relative_path = str(path.relative_to(document_root))
-            return [
-                {settings.DATA_UNDEFINED_NAME: f'{settings.HOSTNAME}/data/local-files/?d={quote(str(relative_path))}'}
-            ]
+            return {
+                settings.DATA_UNDEFINED_NAME: f'{settings.HOSTNAME}/data/local-files/?d={quote(str(relative_path))}'
+            }
 
         try:
             with open(path, encoding='utf8') as f:
@@ -99,7 +99,7 @@ def get_data(self, key) -> list[dict]:
             )
 
         if isinstance(value, dict):
-            return [value]
+            return value
         elif isinstance(value, list):
             for idx, item in enumerate(value):
                 if not isinstance(item, dict):

label_studio/io_storages/s3/models.py

@@ -27,7 +27,7 @@
     get_client_and_resource,
     resolve_s3_url,
 )
-from io_storages.utils import storage_can_resolve_bucket_url
+from io_storages.utils import storage_can_resolve_bucket_url, load_tasks_json
 from tasks.models import Annotation
 from tasks.validation import ValidationError as TaskValidationError
 
@@ -228,7 +228,6 @@ def get_data(self, key) -> Union[dict, list[dict]]:
         _, s3 = self.get_client_and_resource()
         bucket = s3.Bucket(self.bucket)
         obj = s3.Object(bucket.name, key).get()['Body'].read().decode('utf-8')
-        from io_storages.utils import load_tasks_json
 
         # TODO: Why do only S3 storages use TaskValidationError here? If the mystery is resolved, can remove this argument from load_tasks_json and use ValueError everywhere
         return load_tasks_json(obj, key, self.__class__.__name__, TaskValidationError)

label_studio/tests/data_manager/test_api_actions.py

@@ -140,7 +140,7 @@ def test_action_remove_duplicates(business_client, project_id, storage_model, li
     # this task would have row_index=0 instead of None if it was created after multitask support was added
     link_model.objects.create(task=task4, key='duplicated.jpg', storage=storage)
 
-    # task 5: add not a duplicated task using the same key, ensuring multiple tasks in the same key don't interfere
+    # task 5: add a non-duplicated task using the same key, ensuring multiple tasks in the same key don't interfere
     task_data = {'data': {'image': 'normal2.jpg'}}
     task5 = make_task(task_data, project)
     link_model.objects.create(task=task5, key='duplicated.jpg', row_index=1, storage=storage)

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

@@ -7,7 +7,8 @@ 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) {
+      if (ff.isActive(FF_DEV_3391) && self.annotationStore.initialized) {
+        self.tools = self.annotationStore.names.get(self.name).tools;
         return;
       }
       const toolNames = self.toolNames ?? [];

web/libs/editor/src/regions/PolygonPoint.jsx

@@ -3,10 +3,11 @@ import { Circle, Rect } from "react-konva";
 import { observer } from "mobx-react";
 import { getParent, getRoot, hasParent, types } from "mobx-state-tree";
 
+import { RELATIVE_STAGE_HEIGHT, RELATIVE_STAGE_WIDTH } from "../components/ImageView/Image";
 import { guidGenerator } from "../core/Helpers";
 import { useRegionStyles } from "../hooks/useRegionColor";
+import { AnnotationMixin } from "../mixins/AnnotationMixin";
 import { FF_DEV_3793, isFF } from "../utils/feature-flags";
-import { RELATIVE_STAGE_HEIGHT, RELATIVE_STAGE_WIDTH } from "../components/ImageView/Image";
 
 const PolygonPointAbsoluteCoordsDEV3793 = types
   .model()
@@ -83,12 +84,10 @@ const PolygonPointRelativeCoords = types
       return self.parent?.parent;
     },
 
-    get annotation() {
-      return getRoot(self).annotationStore.selected;
-    },
     get canvasX() {
       return isFF(FF_DEV_3793) ? self.stage?.internalToCanvasX(self.x) : self.x;
     },
+
     get canvasY() {
       return isFF(FF_DEV_3793) ? self.stage?.internalToCanvasY(self.y) : self.y;
     },
@@ -196,10 +195,12 @@ const PolygonPointRelativeCoords = types
     },
   }));
 
-const PolygonPoint = isFF(FF_DEV_3793)
+const PolygonPointModel = isFF(FF_DEV_3793)
   ? PolygonPointRelativeCoords
   : types.compose("PolygonPoint", PolygonPointRelativeCoords, PolygonPointAbsoluteCoordsDEV3793);
 
+const PolygonPoint = types.compose("PolygonPoint", AnnotationMixin, PolygonPointModel);
+
 const PolygonPointView = observer(({ item, name }) => {
   if (!item.parent) return;
 

web/libs/editor/src/regions/TimeSeriesRegion.js

@@ -31,13 +31,6 @@ const Model = types
       return self.object;
     },
 
-    // Do not remove this annotation getter until saving/updating annotation in LS will work without errors
-    get annotation() {
-      const root = getRoot(self);
-
-      return root !== self ? root.annotationStore?.selected : null;
-    },
-
     getRegionElement() {
       return self._brushRef;
     },

web/libs/editor/src/regions/VideoRegion.js

@@ -2,6 +2,7 @@ import { getRoot, types } from "mobx-state-tree";
 
 import { guidGenerator } from "../core/Helpers";
 import { AreaMixin } from "../mixins/AreaMixin";
+import { AnnotationMixin } from "../mixins/AnnotationMixin";
 import NormalizationMixin from "../mixins/Normalization";
 import RegionsMixin from "../mixins/Regions";
 import { VideoModel } from "../tags/object/Video";
@@ -29,10 +30,6 @@ const Model = types
       return self.object;
     },
 
-    get annotation() {
-      return getRoot(self)?.annotationStore?.selected;
-    },
-
     getShape() {
       throw new Error("Method getShape be implemented on a shape level");
     },
@@ -141,6 +138,13 @@ const Model = types
     },
   }));
 
-const VideoRegion = types.compose("VideoRegionModel", RegionsMixin, AreaMixin, NormalizationMixin, Model);
+const VideoRegion = types.compose(
+  "VideoRegionModel",
+  RegionsMixin,
+  AreaMixin,
+  AnnotationMixin,
+  NormalizationMixin,
+  Model,
+);
 
 export { VideoRegion };

web/libs/editor/src/tags/control/Label.jsx

@@ -190,12 +190,6 @@ const Model = types
 
       // if we are going to select label and it would be the first in this labels group
       if (!labels.selectedLabels.length && !self.selected) {
-        // unselect labels from other groups of labels connected to this obj
-
-        self.annotation.toNames
-          .get(labels.toname)
-          .filter((tag) => tag.type && tag.type.endsWith("labels") && tag.name !== labels.name);
-
         // unselect other tools if they exist and selected
         const manager = ToolsManager.getInstance({ name: self.parent.toname });
         const tool = Object.values(self.parent?.tools || {})[0];

web/libs/editor/src/tags/object/TimeSeries.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import * as d3 from "d3";
 import { inject, observer } from "mobx-react";
-import { getEnv, getRoot, getType, types } from "mobx-state-tree";
+import { getEnv, getRoot, getType, isAlive, types } from "mobx-state-tree";
 import throttle from "lodash.throttle";
 import { Spin } from "antd";
 
@@ -494,6 +494,9 @@ const Model = types
           }
           [data, headers] = parseCSV(text, separator);
         }
+        // @todo this actions might be called for detached instance with DEV-3391 FF
+        // @todo at least it should be rewritten to use MST `flow()`
+        if (!isAlive(self)) return;
         self.setData(data);
         self.setColumnNames(headers);
         self.updateValue(store);

web/libs/editor/src/tags/object/Video/Video.js

@@ -16,12 +16,15 @@ import ObjectBase from "../Base";
  *
  * ### Video format
  *
- * Label Studio relies on your web browser to play videos, so it's essential that your videos use a format and codecs that are universally supported. To ensure maximum compatibility, we recommend using an MP4 container with video encoded using the H.264 (AVC) codec and audio encoded with AAC. This combination is widely supported across all modern browsers and minimizes issues like incorrect total duration detection or problems with playback. In addition, it's important to convert your videos to a constant frame rate (CFR), ideally around 30 fps, to avoid discrepancies in frame counts and issues with duplicated or missing frames.
+ * Label Studio relies on your web browser to play videos and evaluate the total frame number. So, it's essential that your videos use a format and codecs that are universally supported. To ensure maximum compatibility, we recommend using an MP4 container with video encoded using the H.264 (AVC) codec and audio encoded with AAC. This combination is widely supported across all modern browsers and minimizes issues like incorrect total duration detection or problems with playback. In addition, it's important to convert your videos to a constant frame rate (CFR), ideally around 30 fps, to avoid discrepancies in frame counts and issues with duplicated or missing frames. All audio and video streams from your file must have the same durations; otherwise, you will have extra total frames.
  *
- * Converting your videos to this recommended format will help ensure that they play smoothly in Label Studio and that the frame rate and duration are correctly recognized for accurate annotations. To convert any video to this format, you can use FFmpeg. For example, the following command converts an input video to MP4 with H.264 video, AAC audio, and a constant frame rate of 30 fps:
+ * Converting your videos to this recommended format will help ensure that they play smoothly in Label Studio and that the frame rate and duration are correctly recognized for accurate annotations. To convert any video to this format, you can use FFmpeg. For example, the following commands convert an input video to MP4 with H.264 video, AAC audio, and a constant frame rate of 30 fps:
  *
  * ```bash
- * ffmpeg -i input_video.mp4 -c:v libx264 -profile:v high -level 4.0 -pix_fmt yuv420p -r 30 -c:a aac -b:a 128k output_video.mp4
+ * # Extract the exact video stream duration in seconds
+ * DUR=$(ffprobe -v error -select_streams v:0 -show_entries stream=duration -of default=nokey=1:noprint_wrappers=1 input.mp4)
+ * # Re-encode media file to recommended format
+ * ffmpeg -i input_video.mp4 -c:v libx264 -profile:v high -level 4.0 -pix_fmt yuv420p -r 30 -c:a aac -b:a 128k -to $DUR output_video.mp4
  * ```
  *
  * In this command:
@@ -31,6 +34,7 @@ import ObjectBase from "../Base";
  * - `-pix_fmt yuv420p` ensures the pixel format is compatible with most browsers.
  * - `-r 30` forces a constant frame rate of 30 fps. You can also omit the -r option, ffmpeg will save your current frame rate. This is fine if you are 100% certain that your video has a constant frame rate.
  * - `-c:a aac -b:a 128k` encodes the audio in AAC at 128 kbps.
+ * - `-to` stops writing output as soon as the container clock hits your video’s end timestamp, so any extra audio tail is automatically dropped.
  * - `output_video.mp4` is the converted video file ready for use in Label Studio.
  *
  * Using this FFmpeg command to re-encode your videos will help eliminate playback issues and ensure that Label Studio detects the total video duration  accurately, providing a smooth annotation experience.

web/libs/editor/src/tags/visual/Collapse.jsx

@@ -8,7 +8,8 @@ import Registry from "../../core/Registry";
 import Types from "../../core/Types";
 import Tree from "../../core/Tree";
 import { isSelfServe } from "../../utils/billing";
-import { FF_BULK_ANNOTATION } from "../../utils/feature-flags";
+import { FF_BULK_ANNOTATION, isFF } from "../../utils/feature-flags";
+import { guidGenerator } from "../../utils/unique";
 
 const { Panel } = Collapse;
 
@@ -88,6 +89,7 @@ const PanelModel = types
 
 const Model = types
   .model({
+    id: types.optional(types.identifier, guidGenerator),
     type: "collapse",
 
     size: types.optional(types.string, "4"),

web/libs/editor/src/tools/Manager.js

@@ -1,4 +1,6 @@
+import { ff } from "@humansignal/core";
 import { destroy } from "mobx-state-tree";
+import { FF_DEV_3391 } from "../utils/feature-flags";
 import { guidGenerator } from "../utils/unique";
 
 /** @type {Map<any, ToolsManager>} */
@@ -57,6 +59,9 @@ class ToolsManager {
   }
 
   get obj() {
+    if (ff.isActive(FF_DEV_3391)) {
+      return root.annotationStore.selected?.names.get(this.name);
+    }
     return root.annotationStore.names.get(this.name);
   }