Merge pull request #5540 from voxel51/fix/detections-non-dense

sashankaryal · web-flow · commit ccea11b56250 · 2025-03-05T13:50:32.000-06:00
treat detections as non-dense by default
diff --git a/app/packages/state/src/labelsVisibility.test.ts b/app/packages/state/src/labelsVisibility.test.ts
@@ -2,11 +2,21 @@ import { describe, expect, it } from "vitest";
 import { computeDefaultVisibleLabels } from "./labelsVisibility";
 
 const sampleSchemaMock = {
+  segmentation: {
+    ftype: "fiftyone.core.labels.Segmentation",
+    dbField: "segmentation",
+    name: "segmentation",
+    embeddedDocType: "fiftyone.core.labels.Segmentation",
+    path: "segmentation",
+    description: null,
+    info: null,
+    subfield: null,
+  },
   detection: {
-    ftype: "fiftyone.core.labels.Detections",
+    ftype: "fiftyone.core.labels.Detection",
     dbField: "detection",
     name: "detection",
-    embeddedDocType: "fiftyone.core.labels.Detections",
+    embeddedDocType: "fiftyone.core.labels.Detection",
     path: "detection",
     description: null,
     info: null,
@@ -25,12 +35,12 @@ const sampleSchemaMock = {
 } as const;
 
 const frameSchemaMock = {
-  detection: {
-    ftype: "fiftyone.core.labels.Detections",
-    dbField: "frames.detection",
-    name: "detection",
-    embeddedDocType: "fiftyone.core.labels.Detections",
-    path: "detection",
+  segmentation: {
+    ftype: "fiftyone.core.labels.Segmentation",
+    dbField: "frames.segmentation",
+    name: "segmentation",
+    embeddedDocType: "fiftyone.core.labels.Segmentation",
+    path: "segmentation",
     description: null,
     info: null,
     subfield: null,
@@ -39,8 +49,8 @@ const frameSchemaMock = {
 
 describe("computeDefaultVisibleLabels", () => {
   it("returns all non-dense labels when no config is provided", () => {
-    const allSampleLabels = ["detection", "classification"];
-    const allFrameLabels = ["frames.detection"];
+    const allSampleLabels = ["segmentation", "detection", "classification"];
+    const allFrameLabels = ["frames.segmentation"];
 
     const result = computeDefaultVisibleLabels(
       sampleSchemaMock,
@@ -50,12 +60,12 @@ describe("computeDefaultVisibleLabels", () => {
       undefined
     );
 
-    expect(result).toEqual(["classification"]);
+    expect(result).toEqual(["detection", "classification"]);
   });
 
   it("respects 'include' config only", () => {
-    const allSampleLabels = ["detection", "classification", "otherLabel"];
-    const allFrameLabels = ["frames.detection"];
+    const allSampleLabels = ["segmentation", "classification", "otherLabel"];
+    const allFrameLabels = ["frames.segmentation"];
 
     const result = computeDefaultVisibleLabels(
       sampleSchemaMock,
@@ -69,8 +79,8 @@ describe("computeDefaultVisibleLabels", () => {
   });
 
   it("respects 'exclude' config only", () => {
-    const allSampleLabels = ["detection", "classification", "otherLabel"];
-    const allFrameLabels = ["frames.detection"];
+    const allSampleLabels = ["segmentation", "classification", "otherLabel"];
+    const allFrameLabels = ["frames.segmentation"];
 
     const result = computeDefaultVisibleLabels(
       sampleSchemaMock,
@@ -80,24 +90,28 @@ describe("computeDefaultVisibleLabels", () => {
       { exclude: ["classification"] }
     );
 
-    expect(result).toEqual(["detection", "otherLabel", "frames.detection"]);
+    expect(result).toEqual([
+      "segmentation",
+      "otherLabel",
+      "frames.segmentation",
+    ]);
   });
 
   it("correctly applies both include & exclude", () => {
-    const allSampleLabels = ["detection", "classification", "otherLabel"];
-    const allFrameLabels = ["frames.detection"];
+    const allSampleLabels = ["segmentation", "classification", "otherLabel"];
+    const allFrameLabels = ["frames.segmentation"];
 
     const result = computeDefaultVisibleLabels(
       sampleSchemaMock,
       frameSchemaMock,
       allSampleLabels,
       allFrameLabels,
       {
-        include: ["detection", "classification", "otherLabel"],
+        include: ["segmentation", "classification", "otherLabel"],
         exclude: ["classification"],
       }
     );
 
-    expect(result).toEqual(["detection", "otherLabel"]);
+    expect(result).toEqual(["segmentation", "otherLabel"]);
   });
 });
diff --git a/app/packages/utilities/src/schema.ts b/app/packages/utilities/src/schema.ts
@@ -5,8 +5,6 @@ export const SEGMENTATION_EMBEDDED_DOC_TYPE =
 export const HEATMAP_EMBEDDED_DOC_TYPE = "fiftyone.core.labels.Heatmap";
 
 export const DENSE_LABEL_EMBEDDED_DOC_TYPES = [
-  DETECTION_EMBEDDED_DOC_TYPE,
-  DETECTIONS_EMBEDDED_DOC_TYPE,
   SEGMENTATION_EMBEDDED_DOC_TYPE,
   HEATMAP_EMBEDDED_DOC_TYPE,
 ];
diff --git a/e2e-pw/package.json b/e2e-pw/package.json
@@ -5,22 +5,22 @@
     "type": "commonjs",
     "license": "MIT",
     "devDependencies": {
-        "@eslint/js": "^9.19.0",
+        "@eslint/js": "^9.21.0",
         "@playwright/test": "^1.50.1",
-        "@types/node": "^22.13.0",
+        "@types/node": "^22.13.9",
         "@types/wait-on": "^5.3.4",
-        "@typescript-eslint/eslint-plugin": "^8.22.0",
-        "@typescript-eslint/parser": "^8.22.0",
+        "@typescript-eslint/eslint-plugin": "^8.26.0",
+        "@typescript-eslint/parser": "^8.26.0",
         "dotenv": "^16.4.7",
-        "eslint": "^9.19.0",
+        "eslint": "^9.21.0",
         "eslint-plugin-playwright": "^2.2.0",
         "jimp": "^1.6.0",
-        "mongodb": "^6.13.0",
+        "mongodb": "^6.14.2",
         "tree-kill": "^1.2.2",
         "ts-dedent": "^2.2.0",
-        "typescript": "^5.7.3",
-        "typescript-eslint": "^8.22.0",
-        "vitest": "^3.0.5",
+        "typescript": "^5.8.2",
+        "typescript-eslint": "^8.26.0",
+        "vitest": "^3.0.7",
         "wait-on": "^8.0.2"
     },
     "scripts": {
@@ -34,5 +34,5 @@
         "devserver": "VITE_API=http://localhost:8787 VITE_NO_STATE=true FIFTYONE_DEFAULT_APP_PORT=5193 && (cd ../app && yarn dev --host 0.0.0.0)",
         "remove-pw-dbs": "./scripts/del-pw-dbs.sh"
     },
-    "packageManager": "yarn@4.3.1"
+    "packageManager": "yarn@4.7.0"
 }
diff --git a/e2e-pw/src/oss/poms/grid/index.ts b/e2e-pw/src/oss/poms/grid/index.ts
@@ -1,10 +1,10 @@
 import { Locator, Page, expect } from "src/oss/fixtures";
+import { Duration } from "src/oss/utils";
 import { EventUtils } from "src/shared/event-utils";
 import { GridActionsRowPom } from "../action-row/grid-actions-row";
 import { GridSliceSelectorPom } from "../action-row/grid-slice-selector";
 import { GridTaggerPom } from "../action-row/tagger/grid-tagger";
 import { UrlPom } from "../url";
-import { Duration } from "src/oss/utils";
 
 export class GridPom {
   readonly assert: GridAsserter;
@@ -65,17 +65,19 @@ export class GridPom {
   }
 
   async scrollBottom() {
-    return this.getForwardSection()
-      .locator("div")
-      .last()
-      .scrollIntoViewIfNeeded({ timeout: Duration.Seconds(20) });
+    const forwardSectionDiv = this.getForwardSection().locator("div").last();
+    await forwardSectionDiv.waitFor({ state: "visible" });
+    return forwardSectionDiv.scrollIntoViewIfNeeded({
+      timeout: Duration.Seconds(20),
+    });
   }
 
   async scrollTop() {
-    return this.getBackwardSection()
-      .locator("div")
-      .first()
-      .scrollIntoViewIfNeeded({ timeout: Duration.Seconds(20) });
+    const backwardSectionDiv = this.getBackwardSection().locator("div").first();
+    await backwardSectionDiv.waitFor({ state: "visible" });
+    return backwardSectionDiv.scrollIntoViewIfNeeded({
+      timeout: Duration.Seconds(20),
+    });
   }
 
   async selectSlice(slice: string) {
diff --git a/e2e-pw/src/oss/specs/sidebar/sidebar.spec.ts b/e2e-pw/src/oss/specs/sidebar/sidebar.spec.ts
@@ -39,8 +39,9 @@ test.describe.serial("sidebar-filter-visibility", () => {
     sidebar,
     eventUtils,
   }) => {
-    // only show ground_truth
-    await sidebar.clickFieldCheckbox("ground_truth");
+    // only show ground_truth (on by default), hide predictions
+    await sidebar.clickFieldCheckbox("predictions");
+
     const entryExpandPromise = eventUtils.getEventReceivedPromiseForPredicate(
       "animation-onRest",
       () => true
@@ -95,8 +96,8 @@ test.describe.serial("sidebar-filter-visibility", () => {
     sidebar,
     eventUtils,
   }) => {
-    // only show ground_truth
-    await sidebar.clickFieldCheckbox("ground_truth");
+    // only show ground_truth (on by default), hide predictions
+    await sidebar.clickFieldCheckbox("predictions");
 
     const entryExpandPromise = eventUtils.getEventReceivedPromiseForPredicate(
       "animation-onRest",
@@ -153,8 +154,8 @@ test.describe.serial("sidebar-filter-visibility", () => {
     sidebar,
     eventUtils,
   }) => {
-    // only show ground_truth
-    await sidebar.clickFieldCheckbox("ground_truth");
+    // only show ground_truth (on by default), hide predictions
+    await sidebar.clickFieldCheckbox("predictions");
 
     const entryExpandPromise = eventUtils.getEventReceivedPromiseForPredicate(
       "animation-onRest",
@@ -212,8 +213,9 @@ test.describe.serial("sidebar-filter-visibility", () => {
     sidebar,
     eventUtils,
   }) => {
-    // only show ground_truth
-    await sidebar.clickFieldCheckbox("ground_truth");
+    // only show ground_truth (on by default), hide predictions
+    await sidebar.clickFieldCheckbox("predictions");
+
     const entryExpandPromise = eventUtils.getEventReceivedPromiseForPredicate(
       "animation-onRest",
       () => true
diff --git a/e2e-pw/src/oss/specs/smoke-tests/tagger.spec.ts b/e2e-pw/src/oss/specs/smoke-tests/tagger.spec.ts
@@ -38,10 +38,8 @@ test.beforeAll(async ({ fiftyoneLoader, foWebServer }) => {
   });
 });
 
-test.beforeEach(async ({ page, fiftyoneLoader, sidebar }) => {
+test.beforeEach(async ({ page, fiftyoneLoader }) => {
   await fiftyoneLoader.waitUntilGridVisible(page, datasetName);
-  await sidebar.clickFieldCheckbox("ground_truth");
-  await sidebar.clickFieldCheckbox("predictions");
 });
 
 test.describe.serial("tag", () => {
diff --git a/e2e-pw/yarn.lock b/e2e-pw/yarn.lock
