Merge branch 'develop' into bugfix/zoo-clip-support-for-multi-gpu-setups

voxel51 · Jan 8, 2025 · a15f3ba · a15f3ba
2 parents 310a6bd + e7f3edd
commit a15f3ba
Show file tree

Hide file tree

Showing 295 changed files with 9,800 additions and 11,901 deletions.
diff --git a/.github/workflows/build-docs.yml b/.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

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest-m
     env:
       FIFTYONE_DO_NOT_TRACK: true
+      FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE: false
       FIFTYONE_DATABASE_URI: mongodb://localhost:27017
       FIFTYONE_DATABASE_NAME: playwright
       ELECTRON_EXTRA_LAUNCH_ARGS: "--disable-gpu"
@@ -67,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

diff --git a/.github/workflows/pr.yml b/.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') }}
diff --git a/.github/workflows/test.yml b/.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

diff --git a/app/package.json b/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"
     }

diff --git a/app/packages/app/src/components/Nav.tsx b/app/packages/app/src/components/Nav.tsx
@@ -3,7 +3,7 @@ import {
   GitHubLink,
   Header,
   IconButton,
-  SlackLink,
+  DiscordLink,
   iconContainer,
 } from "@fiftyone/components";
 import { ViewBar } from "@fiftyone/core";
@@ -111,7 +111,7 @@ const Nav: React.FC<
           >
             {mode === "dark" ? <LightMode color="inherit" /> : <DarkMode />}
           </IconButton>
-          <SlackLink />
+          <DiscordLink />
           <GitHubLink />
           <DocsLink />
         </div>

diff --git a/app/packages/app/src/components/Setup.tsx b/app/packages/app/src/components/Setup.tsx
@@ -2,7 +2,7 @@ import {
   DocsLink,
   GitHubLink,
   Header,
-  SlackLink,
+  DiscordLink,
   iconContainer,
   useTheme,
 } from "@fiftyone/components";
@@ -190,7 +190,7 @@ const Setup = () => {
     <div data-cy="setup-page">
       <Header title={"FiftyOne"}>
         <div className={iconContainer} style={{ flex: 1 }}>
-          <SlackLink />
+          <DiscordLink />
           <GitHubLink />
           <DocsLink />
         </div>

diff --git a/app/packages/app/src/routing/RouterContext.ts b/app/packages/app/src/routing/RouterContext.ts
@@ -97,7 +97,6 @@ export const createRouter = <T extends OperationType>(
         }
 
         throw e;
-
       }
 
       requestAnimationFrame(() => {
@@ -223,7 +222,7 @@ const makeGetEntryResource = <T extends OperationType>() => {
     hard: boolean;
     handleError?: (error: unknown) => void;
   }): Resource<Entry<T>> => {
-    if (isReusable(location)) {
+    if (!hard && isReusable(location)) {
       // throw the current resource (page) if it can be reused
       throw currentResource;
     }

diff --git a/app/packages/components/package.json b/app/packages/components/package.json
@@ -40,7 +40,7 @@
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
         "@fiftyone/state": "*",
-        "@mui/icons-material": "^5.10.2",
+        "@mui/icons-material": "^5.16.7",
         "@mui/material": "^5.9.0",
         "@react-spring/web": "^9.7.3",
         "@textea/json-viewer": "^3.4.1",

diff --git a/app/packages/components/src/components/Icons/Icons.tsx b/app/packages/components/src/components/Icons/Icons.tsx
@@ -8,18 +8,19 @@ import { iconLink } from "./Icons.module.css";
 
 export { iconContainer } from "./Icons.module.css";
 
-export const SlackLink = () => (
+export const DiscordLink = () => (
   <ExternalLink
     className={iconLink}
-    href={"https://slack.voxel51.com"}
-    title={"Slack"}
+    href={"https://community.voxel51.com/"}
+    title={"Discord"}
   >
     <SvgIcon
       sx={{
         fill: (theme) => theme.palette.text.secondary,
       }}
+      viewBox="0 0 127.14 96.36"
     >
-      <path d="M6 15a2 2 0 0 1-2 2a2 2 0 0 1-2-2a2 2 0 0 1 2-2h2v2m1 0a2 2 0 0 1 2-2a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2a2 2 0 0 1-2-2v-5m2-8a2 2 0 0 1-2-2a2 2 0 0 1 2-2a2 2 0 0 1 2 2v2H9m0 1a2 2 0 0 1 2 2a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2a2 2 0 0 1 2-2h5m8 2a2 2 0 0 1 2-2a2 2 0 0 1 2 2a2 2 0 0 1-2 2h-2v-2m-1 0a2 2 0 0 1-2 2a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2a2 2 0 0 1 2 2v5m-2 8a2 2 0 0 1 2 2a2 2 0 0 1-2 2a2 2 0 0 1-2-2v-2h2m0-1a2 2 0 0 1-2-2a2 2 0 0 1 2-2h5a2 2 0 0 1 2 2a2 2 0 0 1-2 2h-5z" />
+      <path d="M107.7,8.07A105.15,105.15,0,0,0,81.47,0a72.06,72.06,0,0,0-3.36,6.83A97.68,97.68,0,0,0,49,6.83,72.37,72.37,0,0,0,45.64,0,105.89,105.89,0,0,0,19.39,8.09C2.79,32.65-1.71,56.6.54,80.21h0A105.73,105.73,0,0,0,32.71,96.36,77.7,77.7,0,0,0,39.6,85.25a68.42,68.42,0,0,1-10.85-5.18c.91-.66,1.8-1.34,2.66-2a75.57,75.57,0,0,0,64.32,0c.87.71,1.76,1.39,2.66,2a68.68,68.68,0,0,1-10.87,5.19,77,77,0,0,0,6.89,11.1A105.25,105.25,0,0,0,126.6,80.22h0C129.24,52.84,122.09,29.11,107.7,8.07ZM42.45,65.69C36.18,65.69,31,60,31,53s5-12.74,11.43-12.74S54,46,53.89,53,48.84,65.69,42.45,65.69Zm42.24,0C78.41,65.69,73.25,60,73.25,53s5-12.74,11.44-12.74S96.23,46,96.12,53,91.08,65.69,84.69,65.69Z" />
     </SvgIcon>
   </ExternalLink>
 );

diff --git a/app/packages/components/src/components/Icons/index.ts b/app/packages/components/src/components/Icons/index.ts
@@ -12,5 +12,5 @@ export {
   KeyboardArrowUp,
   LookerArrowLeftIcon,
   LookerArrowRightIcon,
-  SlackLink,
+  DiscordLink,
 } from "./Icons";
diff --git a/app/packages/components/src/components/ModalBase/ModalBase.tsx b/app/packages/components/src/components/ModalBase/ModalBase.tsx
@@ -49,6 +49,7 @@ interface ModalButtonView {
   label: string;
   icon?: string;
   iconPosition?: string;
+  title?: string;
   componentsProps: any;
 }
 
@@ -104,6 +105,7 @@ const ModalBase: React.FC<ModalBaseProps> = ({
     variant: props?.variant || "outlined",
     label: props?.label || "",
     disabled: props?.disabled,
+    title: props?.title,
     componentsProps: {
       button: {
         sx: {

diff --git a/app/packages/components/src/components/MuiButton/index.tsx b/app/packages/components/src/components/MuiButton/index.tsx
@@ -1,11 +1,27 @@
 import React from "react";
-import { ButtonProps, CircularProgress, Button, Stack } from "@mui/material";
+import {
+  ButtonProps,
+  CircularProgress,
+  Button,
+  Stack,
+  useTheme,
+} from "@mui/material";
 
 export default function MuiButton(props: ButtonPropsType) {
   const { loading, variant, ...otherProps } = props;
+  const theme = useTheme();
 
   const containedStyles =
     variant === "contained" ? { sx: { color: "white" } } : {};
+  const outlinedStyles =
+    variant === "outlined"
+      ? {
+          sx: {
+            color: theme.palette.text.secondary,
+            borderColor: theme.palette.text.secondary,
+          },
+        }
+      : {};
 
   return (
     <Stack
@@ -14,7 +30,12 @@ export default function MuiButton(props: ButtonPropsType) {
       alignItems="center"
       sx={{ position: "relative" }}
     >
-      <Button {...containedStyles} variant={variant} {...otherProps} />
+      <Button
+        {...containedStyles}
+        {...outlinedStyles}
+        variant={variant}
+        {...otherProps}
+      />
       {loading && (
         <CircularProgress size={20} sx={{ position: "absolute", left: 6 }} />
       )}