Merge branch 'develop' into 'fb-utc-3/popover-spark'

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

Author: nass600

.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/source/guide/storage.md

@@ -77,18 +77,9 @@ When disabled, tasks in JSON format can be loaded directly from storage buckets
 
 <img src="/images/source-storages-treat-off.png" class="make-intense-zoom">
 
-###### On
-
-When enabled, Label Studio automatically lists files from the storage bucket and constructs tasks. This is only possible for simple labeling tasks that involve a single media source (such as an image, text, etc.).* 
-
-<img src="/images/source-storages-treat-on.png" class="make-intense-zoom">
-
-
-#### One Task - One JSON File 
-
-If you plan to load JSON tasks from the Source Storage (`Treat every bucket object as a source file = No`), you must place only one task as the **dict** per one JSON file. Otherwise, Label Studio will not load your data properly.
+You may put multiple tasks inside the same JSON file, but not mix task formats inside the same file.
 
-{% details <b>Example with tasks in separate JSON files</b> %}
+{% details <b>Example with bare tasks</b> %}
 
 
 `task_01.json`
@@ -107,11 +98,27 @@ If you plan to load JSON tasks from the Source Storage (`Treat every bucket obje
 }
 ```
 
+Or:
+
+`tasks.json`
+```
+[
+  {
+    "image": "s3://bucket/1.jpg",
+    "text": "opossums are awesome"
+  },
+  {
+    "image": "s3://bucket/2.jpg",
+    "text": "cats are awesome"
+  }
+]
+```
+
 {% enddetails %}
 
 <br>
 
-{% details <b>Example with tasks, annotations and predictions in separate JSON files</b> %}
+{% details <b>Example with tasks, annotations and predictions</b> %}
 
 `task_with_predictions_and_annotations_01.json`
 ```
@@ -137,28 +144,39 @@ If you plan to load JSON tasks from the Source Storage (`Treat every bucket obje
 }
 ```
 
-{% enddetails %}
-
-<br>
+Or:
 
-{% details <b>Python script to split a single JSON file with multiple tasks</b> %}
+`tasks_with_predictions_and_annotations.json`
+```
+[
+  {
+      "data": {
+          "image": "s3://bucket/1.jpg",
+          "text": "opossums are awesome"
+      },
+      "annotations": [...],  
+      "predictions": [...]
+  },
+  {
+      "data": {
+        "image": "s3://bucket/2.jpg",
+        "text": "cats are awesome"
+      }
+      "annotations": [...],  
+      "predictions": [...]
+  }
+]
+```
 
- Python script to split a single JSON file containing multiple tasks into separate JSON files, each containing one task:
+{% enddetails %}
 
-```python
-import sys
-import json
+<br>
 
-input_json = sys.argv[1]
-with open(input_json) as inp:
-    tasks = json.load(inp)
+###### On
 
-for i, v in enumerate(tasks):
-    with open(f'task_{i}.json', 'w') as f:
-        json.dump(v, f)
-```
+When enabled, Label Studio automatically lists files from the storage bucket and constructs tasks. This is only possible for simple labeling tasks that involve a single media source (such as an image, text, etc.).* 
 
-{% enddetails %}
+<img src="/images/source-storages-treat-on.png" class="make-intense-zoom">
 
 
 ### Target storage

docs/source/guide/tasks.md

@@ -343,10 +343,9 @@ You can then import text tasks to label that match the following JSON format:
   }]
 }]
 ```
-If you're placing JSON files in [cloud storage](storage.html), place 1 task in each JSON file in the storage bucket. If you want to upload a JSON file from your machine directly into Label Studio, you can place multiple tasks in one JSON file and import it using Label Studio GUI (Data Manager => Import button). 
 
 #### Example JSON with multiple tasks
-You can place multiple tasks in one JSON file if you're uploading the JSON file using Label Studio Import Dialog only (Data Manager => Import button). 
+You can place multiple tasks in one JSON file if you're uploading the JSON file using Label Studio Import Dialog only (Data Manager => Import button), or when importing from [cloud storage](storage.html). When using cloud storage, you must ensure every task in the file is formatted the same way. 
 
 <br/>
 {% details <b>To place multiple tasks in one JSON file, use this JSON format example</b> %}
@@ -376,6 +375,22 @@ The "data" parameter must contain the "my_text" field defined in the text labeli
    }
 ]
 {% endcodeblock %}
+
+You can also use the bare contents of the "data" field without nesting, as long as you have no annotations or predictions.
+
+{% codeblock lang:json %}
+[
+   {
+      "my_text":"Opossums like to be aloft in trees."
+   },
+   {
+      "my_text":"Opossums are opportunistic."
+   },
+   {
+      "my_text":"Opossums like to forage for food."
+   }
+]
+{% endcodeblock %}
 {% enddetails %}
 
 #### Example JSON for older versions of Label Studio

docs/source/guide/troubleshooting.md

@@ -190,7 +190,7 @@ If there is only LIST permission, Label Studio can scan the bucket for the exist
 ### Tasks don't load the way I expect
 
 If the tasks sync to Label Studio but don't appear the way that you expect, maybe with URLs instead of images or with one task where you expect to see many, check the following:
-- If you're placing JSON files in [cloud storage](storage.html), place 1 task in each JSON file in the storage bucket. If you want to upload a JSON file from local storage into Label Studio, you can place multiple tasks in one JSON file. 
+- If you're placing JSON files in [cloud storage](storage.html), ensure that if you have multiple tasks in the same file, they are all formatted the same way (for example, you cannot have 1 task with the raw contents of the `data` field and another task that contains annotations and predictions in the same file).
 - If you're syncing image or audio files, make sure **Treat every bucket object as a source file** is enabled. 
 
 ### Unable to access local storage when using Windows

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

@@ -2096,7 +2096,7 @@
     },
     "fflag_feat_dia_2092_multitasks_per_storage_link": {
       "key": "fflag_feat_dia_2092_multitasks_per_storage_link",
-      "on": false,
+      "on": true,
       "prerequisites": [],
       "targets": [],
       "contextTargets": [],
@@ -2118,7 +2118,7 @@
       "trackEvents": false,
       "trackEventsFallthrough": false,
       "debugEventsUntilDate": null,
-      "version": 2,
+      "version": 4,
       "deleted": false
     },
     "fflag_feat_front_dev-2536_comment_notifications_short": {

poetry.lock

@@ -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/mixins/ToolManagerMixin.js

@@ -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/PolygonPoint.jsx

@@ -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;
     },