Merge pull request #4438 from voxel51/merge/v0.24.0-to-main

Merge/v0.24.0 to main
voxel51 · May 29, 2024 · 5bf793e · 5bf793e
2 parents 2b7619d + bbfd217
commit 5bf793e
Show file tree

Hide file tree

Showing 777 changed files with 26,841 additions and 11,340 deletions.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -0,0 +1,37 @@
+language: "en"
+early_access: false
+reviews:
+  request_changes_workflow: false
+  high_level_summary: true
+  poem: true
+  review_status: true
+  collapse_walkthrough: false
+  path_filters:
+    - "!**/.xml"
+    - "!**/__generated__/**"
+    - "!**/generated/**"
+    - "!**/*.json"
+    - "!**/*.svg"
+    - "!**/*.png"
+    - "!**/*.jpg"
+    - "!**/*.gif"
+    - "!**/*.lock"
+  path_instructions:
+    - path: "**/*.{ts,tsx}"
+      instructions:
+        "Review the Typescript and React code for conformity with best practices in React, Recoil,
+        Graphql, and Typescript. Highlight any deviations."
+  auto_review:
+    enabled: true
+    ignore_title_keywords:
+      - "WIP"
+      - "DO NOT MERGE"
+      - "DRAFT"
+    drafts: false
+    base_branches:
+      - "develop"
+      - "main"
+      - "release/.*"
+      - "feat/.*"
+chat:
+  auto_reply: true
diff --git a/.github/workflows/build-db.yml b/.github/workflows/build-db.yml
@@ -31,7 +31,7 @@ jobs:
           python-version: 3.9
       - name: Install dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
       - name: Set environment
         env:
           RELEASE_TAG: ${{ github.ref }}
@@ -43,27 +43,27 @@ jobs:
         if: ${{ matrix.platform == 'darwin-arm64' }}
         run: |
           cd package/db
-          FODB_MACHINE=arm64 FODB_SYSTEM=Darwin python setup.py bdist_wheel
+          FODB_MACHINE=arm64 FODB_SYSTEM=Darwin python -Im build
       - name: Build Darwin x86_64 wheel
         if: ${{ matrix.platform == 'darwin-x86_64' }}
         run: |
           cd package/db
-          FODB_MACHINE=x86_64 FODB_SYSTEM=Darwin python setup.py bdist_wheel
+          FODB_MACHINE=x86_64 FODB_SYSTEM=Darwin python -Im build
       - name: Build Windows 32 wheel
         if: ${{ matrix.platform == 'windows-32' }}
         run: |
           cd package/db
-          FODB_MACHINE=32 FODB_SYSTEM=Windows python setup.py bdist_wheel
+          FODB_MACHINE=32 FODB_SYSTEM=Windows python -Im build
       - name: Build Windows x86_64 wheel
         if: ${{ matrix.platform == 'windows-x86_64' }}
         run: |
           cd package/db
-          FODB_MACHINE=x86_64 FODB_SYSTEM=Windows python setup.py bdist_wheel
+          FODB_MACHINE=x86_64 FODB_SYSTEM=Windows python -Im build
       - name: Build sdist
         if: ${{ matrix.platform == 'sdist' }}
         run: |
           cd package/db
-          python setup.py sdist
+          python -Im build --sdist
       - name: Upload
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -33,7 +33,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
       - name: Cache Node Modules
         id: node-cache
         uses: actions/cache@v3
@@ -70,7 +70,7 @@ jobs:
           fi
       - name: Build wheel
         working-directory: package/desktop
-        run: python setup.py bdist_wheel --plat-name ${{ matrix.platform }}
+        run: RELEASE_DIR=${PWD}/../../app/packages/desktop/release python -Im build -C="--build-option=--plat-name=${{ matrix.platform }}"
       - name: Upload wheel
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -23,6 +23,7 @@ on:
   pull_request:
     branches:
       - develop
+      - feat/*
       - main
       - rel-*
       - release-*
@@ -58,12 +59,12 @@ jobs:
           python-version: 3.8
       - name: Install pip dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
       - name: Install ETA from source
         run: |
           git clone https://github.com/voxel51/eta eta --depth 1 --branch develop
           cd eta
-          python setup.py bdist_wheel
+          python -Im build
           pip install ./dist/*.whl
       - name: Install
         run: |
@@ -72,6 +73,7 @@ jobs:
           pip install -r fiftyone-teams/requirements/dev.txt
           pip install fiftyone-brain fiftyone-db
           pip install pycocotools tensorflow torch torchvision
+          pip install typing_extensions==4.10.0
           pip install .
       - name: Cache Node Modules
         id: node-cache

diff --git a/.github/workflows/build-graphql.yml b/.github/workflows/build-graphql.yml
@@ -21,7 +21,7 @@ jobs:
           python-version: 3.9
       - name: Install dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
       - name: Set environment
         env:
           RELEASE_TAG: ${{ github.ref }}
@@ -32,7 +32,7 @@ jobs:
       - name: Build wheel
         run: |
           cd package/graphql
-          python setup.py sdist bdist_wheel
+          python -Im build
       - name: Upload wheel(s)
         uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
           python-version: 3.8
       - name: Install dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
       - name: Cache Node Modules
         id: node-cache
         uses: actions/cache@v3

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Install setup dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
+          pip install --upgrade pip setuptools wheel build
 
       - name: Install requirements.txt
         run: |

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -5,6 +5,7 @@ on:
     types: [opened, synchronize]
     branches:
       - develop
+      - feat/*
       - main
       - release/v[0-9]+.[0-9]+.[0-9]+
 
@@ -20,7 +21,7 @@ jobs:
 
   all-tests:
     runs-on: ubuntu-latest
-    needs: [build, e2e, test]
+    needs: [build, test]
     if: always()
     steps:
       - run: sh -c ${{ needs.build.result == 'success' && needs.test.result == 'success' }}
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ app:
 	@cd app && yarn && yarn build && cd ..
 
 python: app
-	@python setup.py sdist bdist_wheel
+	@python -Im build
 
 docker: python
 	@docker build -t voxel51/fiftyone .

diff --git a/README.md b/README.md
@@ -206,6 +206,11 @@ script:
 bash install.bash -d
 ```
 
+Although not required, developers typically prefer to configure their FiftyOne
+installation to connect to a self-installed and managed instance of MongoDB,
+which you can do by following
+[these simple steps](https://docs.voxel51.com/user_guide/config.html#configuring-a-mongodb-connection).
+
 ### Source installs in Google Colab
 
 You can install from source in

diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md
@@ -97,7 +97,7 @@ For example, an import block might look like this:
 """
 Module docstring.
 
-| Copyright 2017-2023, Voxel51, Inc.
+| Copyright 2017-2024, Voxel51, Inc.
 | `voxel51.com <https://voxel51.com/>`_
 |
 """
@@ -184,7 +184,7 @@ Short module description here (generally one sentence max).
 
 A longer section can also be added here as appropriate.
 
-| Copyright 2017-2023, Voxel51, Inc.
+| Copyright 2017-2024, Voxel51, Inc.
 | `voxel51.com <https://voxel51.com/>`_
 |
 """

diff --git a/app/CONTRIBUTING.md b/app/CONTRIBUTING.md
@@ -64,4 +64,4 @@ the event.
 
 ## Copyright
 
-Copyright 2017-2023, Voxel51, Inc.<br> voxel51.com
+Copyright 2017-2024, Voxel51, Inc.<br> voxel51.com
diff --git a/app/__mocks__/recoil.ts b/app/__mocks__/recoil.ts
@@ -23,7 +23,13 @@ export const getValue = (atom) => {
   if (atom.params !== undefined) {
     return mockValues[atom.key](atom.params);
   }
-  return mockValues[atom.key];
+
+  const mockValue = mockValues[atom.key];
+  if (mockValue instanceof Function) {
+    return mockValue();
+  }
+
+  return mockValue;
 };
 
 const resetValue = (atom) => {
@@ -37,9 +43,12 @@ const resetValue = (atom) => {
 const setValue = (atom, value) => {
   if (atom.params) {
     if (!mockValuesStore[atom.key]) mockValuesStore[atom.key] = {};
-    mockValuesStore[atom.key][JSON.stringify(atom.params)] = value;
+    const current = mockValuesStore[atom.key][JSON.stringify(atom.params)];
+    mockValuesStore[atom.key][JSON.stringify(atom.params)] =
+      value instanceof Function ? value(current) : value;
   } else {
-    mockValues[atom.key] = value;
+    const current = mockValues[atom.key];
+    mockValues[atom.key] = value instanceof Function ? value(current) : value;
   }
 };
 
@@ -103,7 +112,10 @@ export function selectorFamily<
     resolver.key = options.key;
     resolver.params = params;
     resolver.set = (value) =>
-      options.set({ set: setValue, get: getValue, reset: resetValue }, value);
+      options.set(params)(
+        { set: setValue, get: getValue, reset: resetValue },
+        value
+      );
     return resolver;
   };
 }
@@ -119,6 +131,7 @@ export type TestSelectorFamily<
   P = any
 > = {
   (): ReturnType<T>["__tag"][0];
+  set: (params: ReturnType<T>["__tag"][0]) => void;
   key: string;
   params: P;
 };
diff --git a/app/package.json b/app/package.json
@@ -42,7 +42,7 @@
         "typedoc": "^0.23.21",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.7",
+        "vite": "^3.2.10",
         "vite-plugin-eslint": "^1.8.1",
         "vite-plugin-relay": "^2.0.0",
         "vitest": "^0.34.6"

diff --git a/app/packages/aggregations/package.json b/app/packages/aggregations/package.json
@@ -27,6 +27,6 @@
         "lodash": "^4.17.21",
         "prettier": "2.2.1",
         "typescript": "4.2.4",
-        "vite": "^3.2.7"
+        "vite": "^3.2.10"
     }
 }
diff --git a/app/packages/app/package.json b/app/packages/app/package.json
@@ -15,65 +15,50 @@
     "dependencies": {
         "@fiftyone/components": "*",
         "@fiftyone/core": "*",
-        "@fiftyone/flashlight": "*",
-        "@fiftyone/looker": "*",
-        "@fiftyone/map": "*",
         "@fiftyone/relay": "*",
-        "@fiftyone/spaces": "*",
         "@fiftyone/state": "*",
         "@fiftyone/utilities": "*",
-        "@material-ui/core": "4.11.4",
-        "@material-ui/icons": "^4.9.1",
-        "@react-spring/web": "^9.4.3",
-        "@recoiljs/refine": "^0.1.1",
+        "@material-ui/core": "4.12.4",
         "@use-gesture/react": "10.1.1",
-        "@xstate/react": "1.3.3",
         "classnames": "^2.2.6",
-        "framer-motion": "^6.2.8",
         "history": "^5.3.0",
-        "html2canvas": "1.0.0-rc.7",
         "lodash": "^4.17.21",
-        "lru-cache": "^6.0.0",
         "notistack": "^3.0.1",
         "numeral": "^2.0.6",
         "path-to-regexp": "^6.2.0",
-        "re-resizable": "^6.8.0",
-        "react": "18.1.0",
-        "react-dom": "18.1.0",
+        "react": "18.2.0",
+        "react-dom": "18.2.0",
         "react-error-boundary": "^3.1.4",
         "react-ga4": "^2.1.0",
-        "react-hotkeys": "^2.0.0",
-        "react-input-autosize": "^3.0.0",
         "react-is": "^17.0.1",
-        "react-laag": "^2.0.3",
         "react-relay": "14.1.0",
         "react-use-measure": "^2.0.1",
         "react-uuid": "^1.0.2",
-        "recharts": "2.0.9",
-        "recoil": "0.7.6",
+        "recoil": "0.7.7",
         "recoil-relay": "^0.1.0",
-        "recoil-sync": "^0.2.0",
         "resize-observer-polyfill": "^1.5.1",
-        "searchable-react-json-view": "^0.0.8",
-        "styled-components": "^5.3.3",
-        "uuid": "^8.3.2",
-        "xstate": "^4.14.0"
+        "styled-components": "^6.1.8",
+        "uuid": "^8.3.2"
     },
     "devDependencies": {
         "@types/lodash": "^4.14.182",
         "@types/mime": "^2.0.3",
-        "@types/react": "^18.0.9",
-        "@types/react-dom": "^18.0.3",
-        "@types/react-router": "^5.1.18",
+        "@types/react": "^18.2.48",
+        "@types/react-dom": "^18.2.18",
+        "@types/react-router": "^5.1.20",
         "@types/styled-components": "^5.1.23",
         "@vitejs/plugin-react-refresh": "^1.3.3",
         "prettier": "2.2.1",
         "relay-compiler": "^14.1.0",
         "rollup-plugin-polyfill-node": "^0.6.2",
         "typescript": "^4.7.4",
         "typescript-plugin-css-modules": "^5.0.2",
-        "vite": "^3.2.7",
+        "vite": "^3.2.10",
         "vite-plugin-relay": "^1.0.7",
-        "vite-plugin-rewrite-all": "^1.0.0"
+        "vite-plugin-rewrite-all": "^1.0.2"
+    },
+    "peerDependencies": {
+        "@mui/icons-material": "*",
+        "@react-spring/web": "*"
     }
 }