Merge branch 'develop' into 'fb-fit-132/date-picker-filter-dropdown-data-manager-not-optimized-dark-mode'

ricardoantoniocm · ricardoantoniocm · commit 10bb6aacb65e · 2025-07-17T15:27:04.000Z
Workflow run: https://github.com/HumanSignal/label-studio/actions/runs/16349287722
diff --git a/label_studio/io_storages/base_models.py b/label_studio/io_storages/base_models.py
@@ -35,6 +35,8 @@
 from webhooks.models import WebhookAction
 from webhooks.utils import emit_webhooks_for_instance
 
+from .exceptions import UnsupportedFileFormatError
+
 logger = logging.getLogger(__name__)
 
 
@@ -451,7 +453,7 @@ def _scan_and_create_links(self, link_class):
                 json_extensions = {'.json', '.jsonl', '.parquet'}
 
                 if ext and ext not in json_extensions:
-                    raise ValueError(
+                    raise UnsupportedFileFormatError(
                         f'File "{key}" is not a JSON/JSONL/Parquet file. Only .json, .jsonl, and .parquet files can be processed.\n'
                         f"If you're trying to import non-JSON data (images, audio, text, etc.), "
                         f'edit storage settings and enable "Treat every bucket object as a source file"'
@@ -571,7 +573,14 @@ class Meta:
 @job('low')
 def import_sync_background(storage_class, storage_id, timeout=settings.RQ_LONG_JOB_TIMEOUT, **kwargs):
     storage = storage_class.objects.get(id=storage_id)
-    storage.scan_and_create_links()
+    try:
+        storage.scan_and_create_links()
+    except UnsupportedFileFormatError:
+        # This is an expected error when user tries to import non-JSON files without enabling blob URLs
+        # We don't want to fail the job in this case, just mark the storage as failed with a clear message
+        storage.info_set_failed()
+        # Exit gracefully without raising exception to avoid job failure
+        return
 
 
 @job('low', timeout=settings.RQ_LONG_JOB_TIMEOUT)
diff --git a/label_studio/io_storages/exceptions.py b/label_studio/io_storages/exceptions.py
@@ -0,0 +1,2 @@
+class UnsupportedFileFormatError(ValueError):
+    pass
diff --git a/web/libs/editor/LSF.init.md b/web/libs/editor/LSF.init.md
@@ -4,6 +4,8 @@ Different thoughts and investingations related to LSF init.
 
 ## App render
 
+TODO: Rewrite this part when both FF_1170 and FF_3873 are gone! First is removed, the second is still there.
+
 We have 3 UI versions: old (awful), medium (outliner v1), modern (draggable panels)
 
 Flag:
@@ -12,7 +14,7 @@ Flag:
 
 Components:
 
-- modern (FF_1170 + FF_3873): `SideTabsPanels` + `SidePanels/TabPanels` + `OutlinerTree` + `BottomBar`
+- modern (FF_1170 + FF_3873): `SidePanels/TabPanels/SideTabsPanels` (sic!!) + `OutlinerTree` + `BottomBar`
 - medium (FF_1170): `SidePanels` + `OutlinerTree`
 - old: `SidebarTabs` + `AnnotationTab` + `Entities/RegionTree` and surprisingly `BottomBar` if FF_3873 enabled without FF_1170
 
@@ -82,6 +84,8 @@ called from 3 places:
 
 ## Huge mess with "side panels"
 
+TODO: Rewrite this part when both FF_1170 and FF_3873 are gone! First is removed, the second is still there.
+
 We have three versions of interface:
 1. with DEV-1170 FF off we have old interface with `components/SidebarTabs`
 2. with DEV-1170 FF on and DEV-3873 off we have intermediate interface with `components/SidePanels/SidePanels.tsx`
diff --git a/web/libs/editor/src/components/SidePanels/SidePanels.tsx b/web/libs/editor/src/components/SidePanels/SidePanels.tsx
@@ -1,3 +1,6 @@
+/* istanbul ignore file */
+// @deprecated should be removed along with FF_DEV_3873
+
 import { observer } from "mobx-react";
 import { type CSSProperties, type FC, Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Block, Elem } from "../../utils/bem";
diff --git a/web/libs/editor/tests/integration/data/core/info_panels.ts b/web/libs/editor/tests/integration/data/core/info_panels.ts
@@ -0,0 +1,25 @@
+export const dataSimple = {
+  text: "This text exists for testing purposes",
+};
+
+export const configSimple = `<View>
+  <Labels name="lbl" toName="text">
+    <Label value="Word1" />
+    <Label value="Word2" />
+  </Labels>
+  <Text name="text" value="$text" inline="true"/>
+</View>`;
+
+export const resultSimple = {
+  id: "reg1",
+  type: "labels",
+  from_name: "lbl",
+  to_name: "text",
+  score: 0.89,
+  value: {
+    start: 5,
+    end: 9,
+    labels: ["Word1"],
+    text: "text",
+  },
+};
diff --git a/web/libs/editor/tests/integration/e2e/core/info_panels.cy.ts b/web/libs/editor/tests/integration/e2e/core/info_panels.cy.ts
@@ -0,0 +1,82 @@
+import { Labels, LabelStudio } from "@humansignal/frontend-test/helpers/LSF";
+import { RichText } from "@humansignal/frontend-test/helpers/LSF/RichText";
+import { FF_DEV_3873 } from "libs/editor/src/utils/feature-flags";
+import { configSimple, dataSimple, resultSimple } from "../../data/core/info_panels";
+
+describe("Label Studio UI info panels", () => {
+  it("Open every panel and interact with regions", () => {
+    LabelStudio.setFeatureFlagsOnPageLoad({
+      [FF_DEV_3873]: true,
+    });
+
+    LabelStudio.init({
+      config: configSimple,
+      task: {
+        annotations: [{ id: 1, result: [resultSimple] }],
+        predictions: [],
+        id: 1,
+        data: dataSimple,
+      },
+    });
+
+    // Info panel is active and it has empty state
+    cy.get("[class$=tab-container_active]").find("#Info-draggable").should("exist");
+    cy.contains("View region details").should("be.visible");
+
+    // Regions panel is also active but has one region in it
+    cy.get("[class$=tab-container_active]").find("#Regions-draggable").should("exist");
+    // This region's score is visible
+    cy.get("[class$=control_type_score]").should("have.text", "0.89");
+
+    // Change regions grouping by openining dropdown; it will be closed automatically
+    cy.contains("Manual").click();
+    cy.contains("Group by Label").should("be.visible");
+    // waiting for dropdown to be fully visible
+    // @todo better options?
+    cy.wait(200);
+    cy.contains("Group by Label").click();
+    cy.get("[class$=lsf-outliner-item__title").contains("Word1").should("be.visible");
+    cy.contains("Group by Label").should("not.be.visible");
+
+    // Select Relations panel, empty state is shown, Regions will be unselected
+    cy.get("#Relations-draggable").click();
+    cy.get("[class$=tab-container_active]").find("#Regions-draggable").should("not.exist");
+    cy.contains("Create relations between regions").should("be.visible");
+
+    // Select History panel, Info panel will be unselected
+    cy.get("#History-draggable").click();
+    // No annotation history so far
+    cy.get("[class$=tab-container_active]").find("#Info-draggable").should("not.exist");
+    cy.contains("See a log of user actions").should("be.visible");
+
+    // Change editor settings to keep region selected
+    cy.get("[aria-label='Settings']").click();
+    cy.contains("Select region after creating it").click();
+    cy.get("[aria-label='Close']").click();
+
+    // Create second region in Text tag
+    Labels.select("Word2");
+    RichText.selectText("This");
+    RichText.hasRegionWithText("This");
+
+    Labels.selectedLabel.contains("Word2").should("exist");
+
+    // Create relation between regions by hotkey
+    cy.get("body").type("{alt}{r}");
+    RichText.findRegionWithText("text").click();
+    // First click will trigger hover, so we need second click to actually click on the region
+    RichText.findRegionWithText("text").click();
+
+    // There is a new relation in a list
+    cy.contains("Relations (1)").should("be.visible");
+    cy.get("[data-testid='detailed-region']").contains("Word2").should("be.visible");
+    cy.get("[data-testid='detailed-region']").contains("Word1").should("be.visible");
+
+    // And there is also new regions group in a list
+    cy.get("#Regions-draggable").click();
+    cy.get("[class$=lsf-outliner-item__title").contains("Word2").should("be.visible");
+
+    // And draft panel just appeared in a history
+    cy.get("[class$=history-item_selected]").find("[data-reason='Draft']").should("be.visible");
+  });
+});
diff --git a/web/libs/editor/tests/integration/e2e/core/label_studio.cy.ts b/web/libs/editor/tests/integration/e2e/core/label_studio.cy.ts
@@ -1,4 +1,5 @@
 import { LabelStudio } from "@humansignal/frontend-test/helpers/LSF";
+import { FF_DEV_3873, FF_SIMPLE_INIT } from "libs/editor/src/utils/feature-flags";
 
 describe("Label Studio UI init", () => {
   it("Initialize empty Label Studio", () => {
@@ -14,6 +15,7 @@ describe("Label Studio UI init", () => {
         },
       },
     });
+    cy.contains("No more annotations").should("be.visible");
   });
 
   it("Initialize Label Studio", () => {
@@ -29,5 +31,56 @@ describe("Label Studio UI init", () => {
         },
       },
     });
+    cy.contains("Labeled regions will appear here").should("be.visible");
+  });
+
+  it("Initialize Label Studio with simple init FF (LEAP-443)", () => {
+    const callApi = cy.spy().as("callApi");
+
+    // testing both new UI and simple init FF
+    LabelStudio.setFeatureFlagsOnPageLoad({
+      [FF_SIMPLE_INIT]: true,
+      [FF_DEV_3873]: true,
+    });
+
+    LabelStudio.init({
+      onSubmitAnnotation: (annotation: object) => {
+        callApi(annotation);
+      },
+      config: "<View></View>",
+      task: {
+        annotations: [
+          { id: 1, result: [] },
+          { id: 2, result: [] },
+        ],
+        predictions: [],
+        id: 1,
+        data: {
+          image:
+            "https://htx-pub.s3.us-east-1.amazonaws.com/examples/images/nick-owuor-astro-nic-visuals-wDifg5xc9Z4-unsplash.jpg",
+        },
+      },
+    });
+    cy.contains("Labeled regions will appear here").should("be.visible");
+    // we already have an annotation, so we should have Update button and no Submit button
+    cy.contains("Update").should("be.visible");
+    cy.contains("Submit").should("not.exist");
+
+    // now we create a new annotation and submit it
+    cy.get('[aria-label="Create an annotation"]').click();
+    cy.contains("Update").should("not.exist");
+    cy.contains("Submit").should("be.visible");
+
+    // submit by hotkey
+    cy.get("body").type(Cypress.platform === "darwin" ? "{cmd}{enter}" : "{ctrl}{enter}");
+
+    // we should have called the API once
+    cy.get("@callApi").should("have.been.calledOnce");
+
+    // @todo technically we should have Update button and no Submit button again,
+    // @todo but currently this logic is crazy and we reload task in LSO/LSE anyway;
+    // @todo so at least we check that there is only one of these two buttons.
+    cy.contains("Submit").should("be.visible");
+    cy.contains("Update").should("not.exist");
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class UnsupportedFileFormatError(ValueError):`
	`2`	`+ pass`