Merge pull request #5306 from voxel51/release/v1.2.0

Release/v1.2.0

.github/workflows/build-docs.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           repository: voxel51/fiftyone-teams
           path: fiftyone-teams
-          token: ${{ secrets.TEAMS_GITHUB_PAT }}
+          token: ${{ secrets.RO_FOT_FG_PAT }}
           ref: main
       - name: Set up Python 3.9
         uses: actions/setup-python@v5

.github/workflows/e2e.yml

@@ -68,8 +68,13 @@ jobs:
           python tests/utils/setup_config.py
           python tests/utils/github_actions_flags.py
 
-      - name: FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v3
+      # - name: Setup FFmpeg (with retries)
+      #   uses: FedericoCarboni/setup-ffmpeg@v3
+
+      # Use this until https://github.com/federicocarboni/setup-ffmpeg/pull/23
+      # is merged or the maintainer addresses the root issue.
+      - name: Setup FFmpeg (with retries)
+        uses: afoley587/setup-ffmpeg@main
 
       - name: Cache E2E Node Modules
         id: e2e-node-cache

.github/workflows/pr.yml

@@ -9,14 +9,49 @@ on:
       - main
       - release/v[0-9]+.[0-9]+.[0-9]+
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
+  modified-files:
+    runs-on: ubuntu-latest
+    outputs:
+      app-changes: ${{ steps.filter.outputs.app }}
+      e2e-changes: ${{ steps.filter.outputs.e2e-pw }}
+      fiftyone-changes: ${{ steps.filter.outputs.fiftyone }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            app:
+              - 'app/**'
+            e2e-pw:
+              - 'e2e-pw/**'
+              - '.github/workflows/e2e.yml'
+            fiftyone:
+              - 'fiftyone/**'
+              - 'package/**'
+              - 'requirements/**'
+              - 'tests/**'
+              - 'requirements.txt'
+              - 'setup.py'
+
   build:
+    needs: modified-files
+    if: ${{ needs.modified-files.outputs.app-changes == 'true' || needs.modified-files.outputs.fiftyone-changes == 'true' }}
     uses: ./.github/workflows/build.yml
 
   e2e:
+    needs: modified-files
+    if: ${{ needs.modified-files.outputs.app-changes == 'true' || needs.modified-files.outputs.e2e-changes == 'true' || needs.modified-files.outputs.fiftyone-changes == 'true' }}
     uses: ./.github/workflows/e2e.yml
 
   lint:
+    needs: modified-files
+    if: ${{ needs.modified-files.outputs.app-changes == 'true' || needs.modified-files.outputs.fiftyone-changes == 'true' }}
     uses: ./.github/workflows/lint-app.yml
 
   teams:
@@ -43,6 +78,8 @@ jobs:
           wait_workflow: true
 
   test:
+    needs: modified-files
+    if: ${{ needs.modified-files.outputs.app-changes == 'true' || needs.modified-files.outputs.fiftyone-changes == 'true' }}
     uses: ./.github/workflows/test.yml
 
   all-tests:
@@ -51,6 +88,7 @@ jobs:
     if: always()
     steps:
       - run: sh -c ${{
-          needs.build.result == 'success' &&
-          needs.lint.result == 'success' &&
-          needs.test.result == 'success' }}
+          (needs.build.result == 'success' || needs.build.result == 'skipped') &&
+          (needs.lint.result == 'success' || needs.lint.result == 'skipped') &&
+          (needs.test.result == 'success' || needs.test.result == 'skipped') && 
+          (needs.e2e.result == 'success' || needs.e2e.result == 'skipped') }}

.github/workflows/test.yml

@@ -87,7 +87,7 @@ jobs:
             --ignore tests/no_wrapper
       - name: Upload
         if: ${{ !startsWith(matrix.os, 'windows') && matrix.python == '3.11' }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

app/package.json

@@ -52,7 +52,6 @@
     ],
     "packageManager": "[email protected]",
     "dependencies": {
-        "jpeg-js": "^0.4.4",
         "react-player": "^2.16.0",
         "react-plotly.js": "^2.6.0"
     }

app/packages/app/src/routing/RouterContext.ts

@@ -1,22 +1,21 @@
+import { viewsAreEqual } from "@fiftyone/state";
+import { NotFoundError, Resource, isNotebook } from "@fiftyone/utilities";
 import type { Action, Location } from "history";
+import { createBrowserHistory, createMemoryHistory } from "history";
+import React from "react";
 import type { PreloadedQuery } from "react-relay";
+import { loadQuery } from "react-relay";
 import type {
   ConcreteRequest,
   Environment,
   OperationType,
   VariablesOf,
 } from "relay-runtime";
+import { fetchQuery } from "relay-runtime";
 import type { Route } from ".";
 import type { Queries } from "../makeRoutes";
 import type RouteDefinition from "./RouteDefinition";
 import type { LocationState, MatchPathResult } from "./matchPath";
-
-import { viewsAreEqual } from "@fiftyone/state";
-import { NotFoundError, Resource, isNotebook } from "@fiftyone/utilities";
-import { createBrowserHistory, createMemoryHistory } from "history";
-import React from "react";
-import { loadQuery } from "react-relay";
-import { fetchQuery } from "relay-runtime";
 import { matchPath } from "./matchPath";
 
 export interface RouteData<T extends OperationType> {

app/packages/core/src/components/Grid/Grid.tsx

@@ -72,7 +72,10 @@ function Grid() {
       get: (next) => page(next),
       render: (id, element, dimensions, zooming) => {
         if (lookerStore.has(id.description)) {
-          lookerStore.get(id.description)?.attach(element, dimensions);
+          lookerStore
+            .get(id.description)
+            ?.attach(element, dimensions, getFontSize());
+
           return;
         }
 

app/packages/core/src/components/ImageContainerHeader.tsx

@@ -3,7 +3,7 @@ import * as fos from "@fiftyone/state";
 import { isGroup as isGroupAtom } from "@fiftyone/state";
 import { Apps, ImageAspectRatio } from "@mui/icons-material";
 import Color from "color";
-import { Suspense, useMemo } from "react";
+import React, { Suspense, useMemo } from "react";
 import {
   constSelector,
   useRecoilCallback,

app/packages/core/src/components/Modal/VideoLooker.tsx

@@ -50,31 +50,27 @@ export const VideoLookerReact = (props: VideoLookerReactProps) => {
   );
 };
 
-const TimelineController = ({
-  looker,
-  totalFrames,
-}: {
-  looker: VideoLooker;
-  totalFrames: number;
-}) => {
-  const { getName } = useDefaultTimelineNameImperative();
-  const timelineName = React.useMemo(() => getName(), [getName]);
+const TimelineController = React.memo(
+  ({ looker, totalFrames }: { looker: VideoLooker; totalFrames: number }) => {
+    const { getName } = useDefaultTimelineNameImperative();
+    const timelineName = React.useMemo(() => getName(), [getName]);
 
-  useCreateTimeline({
-    name: timelineName,
-    config: totalFrames
-      ? {
-          totalFrames,
-          loop: true,
-        }
-      : undefined,
-    optOutOfAnimation: true,
-  });
+    useCreateTimeline({
+      name: timelineName,
+      config: totalFrames
+        ? {
+            totalFrames,
+            loop: true,
+          }
+        : undefined,
+      optOutOfAnimation: true,
+    });
 
-  const { pause, play } = useTimeline(timelineName);
+    const { pause, play } = useTimeline(timelineName);
 
-  fos.useEventHandler(looker, "pause", pause);
-  fos.useEventHandler(looker, "play", play);
+    fos.useEventHandler(looker, "pause", pause);
+    fos.useEventHandler(looker, "play", play);
 
-  return null;
-};
+    return null;
+  }
+);

app/packages/core/src/plugins/SchemaIO/components/ContainerizedComponent.tsx

@@ -1,7 +1,7 @@
 import { usePanelEvent } from "@fiftyone/operators";
 import { usePanelId } from "@fiftyone/spaces";
 import { Box, Paper, PaperProps } from "@mui/material";
-import React, { PropsWithChildren } from "react";
+import { PropsWithChildren } from "react";
 import {
   getMarginSx,
   getPaddingSx,

app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Error.tsx

@@ -0,0 +1,40 @@
+import { West } from "@mui/icons-material";
+import { Box, Button, Card, Stack, Typography } from "@mui/material";
+import React from "react";
+import ErrorIcon from "./ErrorIcon";
+
+export default function Error(props: ErrorProps) {
+  const { onBack } = props;
+  return (
+    <Stack sx={{ height: "100%", p: 2 }} spacing={1}>
+      <Box>
+        <Button onClick={onBack} startIcon={<West />} color="secondary">
+          Back to Model Evaluation
+        </Button>
+      </Box>
+      <Card
+        sx={{
+          display: "flex",
+          justifyContent: "center",
+          alignItems: "center",
+          height: "100%",
+        }}
+      >
+        <Stack spacing={2} sx={{ alignItems: "center" }}>
+          <ErrorIcon sx={{ fontSize: 64 }} />
+          <Typography color="secondary">
+            Analyze and improve models collaboratively with your team
+          </Typography>
+          <Typography sx={{ fontWeight: 600 }}>
+            The Model Evaluation panel currently supports only classification,
+            detection, and segmentation evaluations
+          </Typography>
+        </Stack>
+      </Card>
+    </Stack>
+  );
+}
+
+type ErrorProps = {
+  onBack: () => void;
+};

app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/ErrorIcon.tsx

@@ -0,0 +1,33 @@
+import { SvgIcon, SvgIconProps } from "@mui/material";
+import React from "react";
+
+export default function ErrorIcon(props: SvgIconProps) {
+  return (
+    <SvgIcon width="54" height="61" viewBox="0 0 54 61" fill="none" {...props}>
+      <path
+        d="M27 3.16667C34.0667 3.16667 40.6667 3.9 45.5334 5.23333C48.4667 6.03333 50 6.83333 50.6667 7.3V53.7C50.0667 54.1667 48.5334 54.9667 45.5334 55.7667C40.6667 57.1 34.0667 57.8333 27 57.8333C19.9334 57.8333 13.3334 57.1 8.46669 55.7667C5.53335 54.9667 4.00002 54.1667 3.33335 53.7V7.3C3.93335 6.83333 5.46669 6.03333 8.46669 5.23333C13.3334 3.9 19.9334 3.16667 27 3.16667ZM27 0.5C19.7334 0.5 12.8667 1.23333 7.73335 2.63333C2.86669 3.96667 0.666687 5.56667 0.666687 6.56667V54.4333C0.666687 55.4333 2.86669 57.0333 7.73335 58.3667C12.8667 59.7 19.7334 60.5 27 60.5C34.2667 60.5 41.1334 59.7 46.2667 58.3667C51.1334 57.0333 53.3334 55.4333 53.3334 54.4333V6.56667C53.3334 5.56667 51.1334 3.96667 46.2667 2.63333C41.1334 1.23333 34.2667 0.5 27 0.5Z"
+        fill="#FFC59B"
+      />
+      <path
+        d="M18.2664 27.6333C14.3331 27.6333 11.0664 24.4333 11.0664 20.4333C11.0664 16.4333 14.3331 13.2999 18.2664 13.2999C22.1997 13.2999 25.3997 16.4999 25.3997 20.4333C25.3997 24.3666 22.1997 27.6333 18.2664 27.6333ZM18.2664 15.9666C15.7997 15.9666 13.7331 17.9666 13.7331 20.4999C13.7331 23.0333 15.7331 25.0333 18.2664 25.0333C20.7997 25.0333 22.7997 23.0333 22.7997 20.4999C22.7997 17.9666 20.7331 15.9666 18.2664 15.9666Z"
+        fill="#FFC59B"
+      />
+      <path
+        d="M35.7332 27.6333C31.7999 27.6333 28.5332 24.4333 28.5332 20.4333C28.5332 16.4333 31.7332 13.2333 35.7332 13.2333C39.7332 13.2333 42.9332 16.4999 42.9332 20.4333C42.9332 24.3666 39.6665 27.6333 35.7332 27.6333ZM35.7332 15.9666C33.2665 15.9666 31.1999 17.9666 31.1999 20.4999C31.1999 23.0333 33.1999 25.0333 35.7332 25.0333C38.2665 25.0333 40.2665 23.0333 40.2665 20.4999C40.2665 17.9666 38.1999 15.9666 35.7332 15.9666Z"
+        fill="#FFC59B"
+      />
+      <path
+        d="M18.2666 21.9C19.0766 21.9 19.7332 21.2434 19.7332 20.4333C19.7332 19.6233 19.0766 18.9667 18.2666 18.9667C17.4565 18.9667 16.7999 19.6233 16.7999 20.4333C16.7999 21.2434 17.4565 21.9 18.2666 21.9Z"
+        fill="#FFC59B"
+      />
+      <path
+        d="M35.7334 21.9C36.5434 21.9 37.2 21.2434 37.2 20.4333C37.2 19.6233 36.5434 18.9667 35.7334 18.9667C34.9233 18.9667 34.2667 19.6233 34.2667 20.4333C34.2667 21.2434 34.9233 21.9 35.7334 21.9Z"
+        fill="#FFC59B"
+      />
+      <path
+        d="M20.7333 41.2333C20.9333 40.9666 21.6 40.8333 21.9333 40.7666C22.5333 40.7 22.9333 40.9666 23.2 41.5C23.9333 43.0333 26.2666 41.7 25.5333 40.1666C24.2666 37.6333 19.9333 37.3666 18.4666 39.9C17.5333 41.4333 19.8666 42.7666 20.7333 41.2333Z"
+        fill="#FFC59B"
+      />
+    </SvgIcon>
+  );
+}

app/packages/core/src/plugins/SchemaIO/components/NativeModelEvaluationView/Evaluate.tsx

@@ -1,13 +1,25 @@
 import { MuiButton } from "@fiftyone/components";
 import { Add } from "@mui/icons-material";
+import { Box } from "@mui/material";
 import React from "react";
 
 export default function Evaluate(props: EvaluateProps) {
-  const { onEvaluate } = props;
+  const { onEvaluate, permissions } = props;
+  const canEvaluate = permissions.can_evaluate;
   return (
-    <MuiButton onClick={onEvaluate} startIcon={<Add />} variant="contained">
-      Evaluate Model
-    </MuiButton>
+    <Box
+      title={canEvaluate ? "" : "You do not have permission to evaluate model"}
+      sx={{ cursor: canEvaluate ? "pointer" : "not-allowed" }}
+    >
+      <MuiButton
+        onClick={onEvaluate}
+        startIcon={<Add />}
+        variant="contained"
+        disabled={!canEvaluate}
+      >
+        Evaluate Model
+      </MuiButton>
+    </Box>
   );
 }