{this.state.error instanceof Error
? this.state.error.message
diff --git a/app/packages/looker-3d/src/Logs.tsx b/app/packages/looker-3d/src/Logs.tsx
new file mode 100644
index 0000000000..fd9cc12fe4
--- /dev/null
+++ b/app/packages/looker-3d/src/Logs.tsx
@@ -0,0 +1,85 @@
+import { currentSampleId } from "@fiftyone/state";
+import DoneIcon from "@mui/icons-material/Done";
+import FeedbackIcon from "@mui/icons-material/Feedback";
+import { CircularProgress, Typography } from "@mui/material";
+import { useMemo } from "react";
+import { useRecoilValue } from "recoil";
+import styled from "styled-components";
+import { ALL_LOADING_COMPLETE } from "./hooks";
+import { fo3dAssetsParseStatusLog } from "./state";
+
+const LogContainer = styled.div`
+ width: 70%;
+ margin-left: 0.25em;
+ display: flex;
+ align-content: center;
+ overflow: hidden;
+ align-items: center;
+`;
+
+export const Logs = () => {
+ const currentSample = useRecoilValue(currentSampleId);
+ const logs = useRecoilValue(fo3dAssetsParseStatusLog(currentSample));
+
+ const errorLogs = useMemo(() => {
+ return logs.filter((log) => log.status === "error");
+ }, [logs]);
+
+ const isStillLoading = useMemo(() => {
+ if (logs.length === 0) {
+ return false;
+ }
+
+ if (logs[logs.length - 1].status === "error") {
+ return false;
+ }
+
+ return logs[logs.length - 1].message !== ALL_LOADING_COMPLETE;
+ }, [logs]);
+
+ const isFinalStatusSuccess = useMemo(() => {
+ if (logs.some((log) => log.status === "error")) {
+ return false;
+ }
+
+ return true;
+ }, [logs]);
+
+ const indicatorIcon = useMemo(() => {
+ if (logs.length === 0) {
+ return null;
+ }
+
+ if (isStillLoading) {
+ return
;
+ }
+
+ if (isFinalStatusSuccess) {
+ return
;
+ }
+
+ return
;
+ }, [logs, isFinalStatusSuccess, isStillLoading]);
+
+ if (logs.length === 0) {
+ return null;
+ }
+
+ return (
+
+ {indicatorIcon}
+
+ {isStillLoading
+ ? logs[logs.length - 1].message
+ : isFinalStatusSuccess
+ ? "All assets loaded successfully!"
+ : errorLogs[errorLogs.length - 1].message}
+
+
+ );
+};
diff --git a/app/packages/looker-3d/src/Looker3d.tsx b/app/packages/looker-3d/src/Looker3d.tsx
index 18d6c5564e..ee1660c246 100644
--- a/app/packages/looker-3d/src/Looker3d.tsx
+++ b/app/packages/looker-3d/src/Looker3d.tsx
@@ -1,7 +1,7 @@
import * as fos from "@fiftyone/state";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useRecoilValue, useSetRecoilState } from "recoil";
-import { ErrorBoundary } from "./ErrorBoundary";
+import { Fo3dErrorBoundary } from "./ErrorBoundary";
import { MediaTypePcdComponent } from "./MediaTypePcd";
import { ActionBar } from "./action-bar";
import { Container } from "./containers";
@@ -167,7 +167,7 @@ export const Looker3d = () => {
);
return (
-
+
{component}
{
}}
/>
-
+
);
};
diff --git a/app/packages/looker-3d/src/SpinningCube.tsx b/app/packages/looker-3d/src/SpinningCube.tsx
index 9c2d9c98f6..bc99abdd2f 100644
--- a/app/packages/looker-3d/src/SpinningCube.tsx
+++ b/app/packages/looker-3d/src/SpinningCube.tsx
@@ -1,7 +1,10 @@
+import { currentSampleId } from "@fiftyone/state";
import { MeshWobbleMaterial } from "@react-three/drei";
import { useFrame } from "@react-three/fiber";
-import { useRef } from "react";
+import { useMemo, useRef } from "react";
+import { useRecoilValue } from "recoil";
import { Color, Mesh } from "three";
+import { fo3dAssetsParseStatusLog } from "./state";
/**
* This spinning cube is to be used as a loading indicator.
@@ -9,13 +12,29 @@ import { Color, Mesh } from "three";
export const SpinningCube = () => {
const meshRef = useRef
();
+ const thisSampleId = useRecoilValue(currentSampleId);
+ const logs = useRecoilValue(fo3dAssetsParseStatusLog(thisSampleId));
+
+ const errorsExist = useMemo(
+ () => logs.some((log) => log.status === "error"),
+ [logs]
+ );
+
useFrame(() => {
+ if (errorsExist) {
+ return;
+ }
+
// this rotates the loading cube
meshRef.current.rotation.x = meshRef.current.rotation.y +=
Math.random() / 30;
meshRef.current.rotation.y = meshRef.current.rotation.y += 0.007;
});
+ if (errorsExist) {
+ return null;
+ }
+
return (
diff --git a/app/packages/looker-3d/src/StatusBar.tsx b/app/packages/looker-3d/src/StatusBar.tsx
index a638c20d16..65fb99f71e 100644
--- a/app/packages/looker-3d/src/StatusBar.tsx
+++ b/app/packages/looker-3d/src/StatusBar.tsx
@@ -62,27 +62,27 @@ export const StatusBar = ({
cameraRef: RefObject;
}) => {
const containerRef = useRef(null);
- const [showStatus, setShowStatus] = useRecoilState(isStatusBarOnAtom);
+ const [showPerfStatus, setShowPerfStatus] = useRecoilState(isStatusBarOnAtom);
const setActiveNode = useSetRecoilState(activeNodeAtom);
const springProps = useSpring({
- transform: showStatus ? "translateY(10%)" : "translateY(0%)",
+ transform: showPerfStatus ? "translateY(10%)" : "translateY(0%)",
});
const onClickHandler = useCallback(() => {
- setShowStatus((prev) => !prev);
+ setShowPerfStatus((prev) => !prev);
setActiveNode(null);
}, []);
return (
- {!showStatus && (
+ {!showPerfStatus && (
)}
- {showStatus && (
+ {showPerfStatus && (
{hasMultiplePcdSlices &&
}
+
{componentsToRender}
diff --git a/app/packages/looker-3d/src/containers.ts b/app/packages/looker-3d/src/containers.ts
index f05746da11..771b6aca0a 100644
--- a/app/packages/looker-3d/src/containers.ts
+++ b/app/packages/looker-3d/src/containers.ts
@@ -36,7 +36,8 @@ export const ActionBarContainer = styled.div`
width: 100%;
opacity: 0.95;
- height: 37px;
+ min-height: 37px;
+ max-height: 200px;
background-color: var(--fo-palette-background-level3);
border: 1px solid var(--fo-palette-primary-plainBorder);
border-left: 0;
@@ -93,6 +94,7 @@ export const StatusBarRootContainer = styled.div`
margin-bottom: 3vh;
left: 1vw;
z-index: 1000;
+ width: 100%;
& .looker-3d-core-stats-panel {
position: relative !important;
diff --git a/app/packages/looker-3d/src/fo3d/Background.tsx b/app/packages/looker-3d/src/fo3d/Background.tsx
index b8d8249ef4..50ebffc9fc 100644
--- a/app/packages/looker-3d/src/fo3d/Background.tsx
+++ b/app/packages/looker-3d/src/fo3d/Background.tsx
@@ -5,7 +5,7 @@ import { Color, CubeTexture, CubeTextureLoader, TextureLoader } from "three";
import type { FoSceneBackground } from "../utils";
interface Fo3dBackgroundProps {
- background: FoSceneBackground;
+ background: Partial;
}
const CubeBackground = ({
diff --git a/app/packages/looker-3d/src/fo3d/FoScene.tsx b/app/packages/looker-3d/src/fo3d/FoScene.tsx
index 66f3603d0b..cff00ec016 100644
--- a/app/packages/looker-3d/src/fo3d/FoScene.tsx
+++ b/app/packages/looker-3d/src/fo3d/FoScene.tsx
@@ -1,6 +1,7 @@
import { useControls } from "leva";
-import { useEffect, useMemo } from "react";
+import { Suspense, useEffect, useMemo } from "react";
import { useRecoilValue, useSetRecoilState } from "recoil";
+import { Fo3dErrorBoundary } from "../ErrorBoundary";
import { PANEL_ORDER_VISIBILITY } from "../constants";
import {
BoxGeometryAsset,
@@ -183,7 +184,11 @@ const getAssetForNode = (node: FoSceneNode, children: React.ReactNode) => {
return null;
}
- return {jsx};
+ return (
+
+ {jsx}
+
+ );
};
const R3fNode = ({
@@ -276,7 +281,11 @@ export const FoSceneComponent = ({ scene }: FoSceneProps) => {
return (
<>
{isFo3dBackgroundOn && scene.background && (
-
+
+
+
+
+
)}
diff --git a/app/packages/looker-3d/src/fo3d/MediaTypeFo3d.tsx b/app/packages/looker-3d/src/fo3d/MediaTypeFo3d.tsx
index 4f4102be19..9f88224d29 100644
--- a/app/packages/looker-3d/src/fo3d/MediaTypeFo3d.tsx
+++ b/app/packages/looker-3d/src/fo3d/MediaTypeFo3d.tsx
@@ -4,7 +4,6 @@ import { AdaptiveDpr, AdaptiveEvents, CameraControls } from "@react-three/drei";
import { Canvas, RootState } from "@react-three/fiber";
import CameraControlsImpl from "camera-controls";
import {
- Suspense,
useCallback,
useEffect,
useLayoutEffect,
@@ -24,10 +23,14 @@ import {
SET_TOP_VIEW_EVENT,
} from "../constants";
import { StatusBarRootContainer } from "../containers";
-import { useFo3d, useHotkey } from "../hooks";
+import { useFo3d, useHotkey, useTrackStatus } from "../hooks";
import { useFo3dBounds } from "../hooks/use-bounds";
import { ThreeDLabels } from "../labels";
-import { activeNodeAtom, isFo3dBackgroundOnAtom } from "../state";
+import {
+ activeNodeAtom,
+ cameraPositionAtom,
+ isFo3dBackgroundOnAtom,
+} from "../state";
import { FoSceneComponent } from "./FoScene";
import { Gizmos } from "./Gizmos";
import Leva from "./Leva";
@@ -173,11 +176,14 @@ export const MediaTypeFo3dComponent = () => {
}
}, [sceneBoundingBox, upVector]);
+ const overridenCameraPosition = useRecoilValue(cameraPositionAtom);
+
const defaultCameraPositionComputed = useMemo(() => {
/**
* (todo: we should discard (2) since per-dataset camera position no longer makes sense)
*
* This is the order of precedence for the camera position:
+ * 0. If the user has set a camera position via operator by writing to `cameraPositionAtom`, use that
* 1. If the user has set a default camera position in the sceneĀ itself, use that
* 2. If the user has set a default camera position in the plugin settings, use that
* 3. Compute a default camera position based on the bounding box of the scene
@@ -188,6 +194,14 @@ export const MediaTypeFo3dComponent = () => {
return DEFAULT_CAMERA_POSITION();
}
+ if (overridenCameraPosition?.length === 3) {
+ return new Vector3(
+ overridenCameraPosition[0],
+ overridenCameraPosition[1],
+ overridenCameraPosition[2]
+ );
+ }
+
const defaultCameraPosition = foScene?.cameraProps.position;
if (defaultCameraPosition) {
@@ -233,7 +247,14 @@ export const MediaTypeFo3dComponent = () => {
}
return DEFAULT_CAMERA_POSITION();
- }, [settings, isParsingFo3d, foScene, sceneBoundingBox, upVector]);
+ }, [
+ settings,
+ overridenCameraPosition,
+ isParsingFo3d,
+ foScene,
+ sceneBoundingBox,
+ upVector,
+ ]);
const onCanvasCreated = useCallback((state: RootState) => {
cameraRef.current = state.camera as PerspectiveCamera;
@@ -366,6 +387,8 @@ export const MediaTypeFo3dComponent = () => {
}
}, [foScene, onChangeView]);
+ useTrackStatus();
+
if (isParsingFo3d) {
return (
diff --git a/app/packages/looker-3d/src/fo3d/tests/get-fo3d-root.test.ts b/app/packages/looker-3d/src/fo3d/tests/get-fo3d-root.test.ts
index a191ba50a9..002d9c7fe6 100644
--- a/app/packages/looker-3d/src/fo3d/tests/get-fo3d-root.test.ts
+++ b/app/packages/looker-3d/src/fo3d/tests/get-fo3d-root.test.ts
@@ -13,4 +13,10 @@ describe("getFo3dRoot", () => {
const expectedRoot = "s3://bucket/path/to/file/";
expect(getFo3dRoot(url)).toBe(expectedRoot);
});
+
+ it("should extract the root of a valid fo3d file with backslashes", () => {
+ const url = "c:\\Users\\johndoe\\fiftyone\\store\\assets\\file.fo3d";
+ const expectedRoot = "c:\\Users\\johndoe\\fiftyone\\store\\assets/";
+ expect(getFo3dRoot(url)).toBe(expectedRoot);
+ });
});
diff --git a/app/packages/looker-3d/src/fo3d/utils.ts b/app/packages/looker-3d/src/fo3d/utils.ts
index b5a2699ff1..5bd8dc20c1 100644
--- a/app/packages/looker-3d/src/fo3d/utils.ts
+++ b/app/packages/looker-3d/src/fo3d/utils.ts
@@ -125,7 +125,7 @@ export const getMediaPathForFo3dSample = (
export const getFo3dRoot = (fo3dPath: string) => {
// remove filename and the last slash to get the root
- const root = fo3dPath.replace(/\/[^/]*\.fo3d$/, "/");
+ const root = fo3dPath.replace(/(\/[^/]*\.fo3d$|\\[^\\]*\.fo3d$)/, "/");
return root;
};
diff --git a/app/packages/looker-3d/src/hooks/index.ts b/app/packages/looker-3d/src/hooks/index.ts
index 2fe3166a71..7f752db2c6 100644
--- a/app/packages/looker-3d/src/hooks/index.ts
+++ b/app/packages/looker-3d/src/hooks/index.ts
@@ -1,3 +1,4 @@
export * from "./use-fo3d";
export * from "./use-hot-key";
export * from "./use-path-filter";
+export * from "./use-track-status";
diff --git a/app/packages/looker-3d/src/hooks/use-track-status.ts b/app/packages/looker-3d/src/hooks/use-track-status.ts
new file mode 100644
index 0000000000..393cfc0d24
--- /dev/null
+++ b/app/packages/looker-3d/src/hooks/use-track-status.ts
@@ -0,0 +1,39 @@
+import { currentSampleId } from "@fiftyone/state";
+import { useRecoilState, useRecoilValue } from "recoil";
+import * as THREE from "three";
+import { fo3dAssetsParseStatusLog } from "../state";
+
+export const ALL_LOADING_COMPLETE = "All loading complete!";
+
+export const useTrackStatus = () => {
+ const currentSample = useRecoilValue(currentSampleId);
+ const [logs, setLogs] = useRecoilState(
+ fo3dAssetsParseStatusLog(currentSample)
+ );
+
+ THREE.DefaultLoadingManager.onStart = function (url) {
+ const log = "Started loading file: " + url;
+
+ setLogs([...logs, { message: log, status: "info" }]);
+ };
+
+ THREE.DefaultLoadingManager.onLoad = function () {
+ const log = ALL_LOADING_COMPLETE;
+ setLogs([...logs, { message: log, status: "success" }]);
+ };
+
+ THREE.DefaultLoadingManager.onProgress = function (
+ url,
+ itemsLoaded,
+ itemsTotal
+ ) {
+ const log = `Loading file: ${url}. Loaded ${itemsLoaded} of ${itemsTotal} files.`;
+
+ setLogs([...logs, { message: log, status: "info" }]);
+ };
+
+ THREE.DefaultLoadingManager.onError = function (url) {
+ const log = "There was an error loading " + url;
+ setLogs([...logs, { message: log, status: "error" }]);
+ };
+};
diff --git a/app/packages/looker-3d/src/state.ts b/app/packages/looker-3d/src/state.ts
index 44cf163184..71a55d0032 100644
--- a/app/packages/looker-3d/src/state.ts
+++ b/app/packages/looker-3d/src/state.ts
@@ -1,9 +1,19 @@
import { Range } from "@fiftyone/core/src/components/Common/RangeSlider";
import { getBrowserStorageEffectForKey } from "@fiftyone/state";
-import { atom } from "recoil";
+import { atom, atomFamily } from "recoil";
import { SHADE_BY_HEIGHT } from "./constants";
import { FoSceneNode } from "./hooks";
-import { Actions, ShadeBy } from "./types";
+import { Actions, AssetLoadingLog, ShadeBy } from "./types";
+
+export const fo3dAssetsParseStatusLog = atomFamily({
+ key: "fo3d-assetsParseStatusLog",
+ default: [],
+});
+
+export const cameraPositionAtom = atom<[number, number, number] | null>({
+ key: "fo3d-cameraPosition",
+ default: null,
+});
export const shadeByAtom = atom({
key: "fo3d-shadeBy",
diff --git a/app/packages/looker-3d/src/types.ts b/app/packages/looker-3d/src/types.ts
index c7814b0da1..76792ac5e5 100644
--- a/app/packages/looker-3d/src/types.ts
+++ b/app/packages/looker-3d/src/types.ts
@@ -30,3 +30,8 @@ export type NodeName = string;
export type VisibilityMap = Record;
export type NodeUuid = string;
+
+export type AssetLoadingLog = {
+ message: string;
+ status: "info" | "success" | "error";
+};
diff --git a/app/packages/looker/src/lookers/imavid/controller.ts b/app/packages/looker/src/lookers/imavid/controller.ts
index 074f10ff95..7309579d1d 100644
--- a/app/packages/looker/src/lookers/imavid/controller.ts
+++ b/app/packages/looker/src/lookers/imavid/controller.ts
@@ -119,7 +119,7 @@ export class ImaVidFramesController {
);
// subtract by two because 1) cursor is one based and 2) cursor here translates to "after" the cursor
- return this.fetchMore(range[0] - 2, range[1] - range[0] || 1).finally(
+ return this.fetchMore(range[0] - 2, range[1] - range[0] || 2).finally(
() => {
this.fetchBufferManager.removeMetadataFromBufferRange(index);
}
diff --git a/app/packages/looker/src/worker/index.ts b/app/packages/looker/src/worker/index.ts
index 7d686b6473..940fdd6d1c 100644
--- a/app/packages/looker/src/worker/index.ts
+++ b/app/packages/looker/src/worker/index.ts
@@ -154,7 +154,7 @@ const imputeOverlayFromPath = async (
let overlayData;
- if (overlayImageUrl.endsWith(".jpg")) {
+ if (overlayImageUrl.endsWith(".jpg") || overlayImageUrl.endsWith(".jpeg")) {
overlayData = decodeJpg(overlayImageBuffer, { useTArray: true });
} else {
overlayData = decodePng(overlayImageBuffer);
diff --git a/app/packages/operators/src/OperatorBrowser.tsx b/app/packages/operators/src/OperatorBrowser.tsx
index 31a8225186..3cb3704ba7 100644
--- a/app/packages/operators/src/OperatorBrowser.tsx
+++ b/app/packages/operators/src/OperatorBrowser.tsx
@@ -168,7 +168,19 @@ export default function OperatorBrowser() {
)}
diff --git a/app/packages/state/src/hooks/useCreateLooker.ts b/app/packages/state/src/hooks/useCreateLooker.ts
index 9d135dc6b8..4ce6586604 100644
--- a/app/packages/state/src/hooks/useCreateLooker.ts
+++ b/app/packages/state/src/hooks/useCreateLooker.ts
@@ -13,6 +13,7 @@ import { BaseState, ImaVidConfig } from "@fiftyone/looker/src/state";
import {
EMBEDDED_DOCUMENT_FIELD,
LIST_FIELD,
+ getFieldInfo,
getMimeType,
isNullish,
} from "@fiftyone/utilities";
@@ -31,7 +32,7 @@ import * as dynamicGroupAtoms from "../recoil/dynamicGroups";
import * as schemaAtoms from "../recoil/schema";
import { datasetName } from "../recoil/selectors";
import { State } from "../recoil/types";
-import { getSampleSrc, getSanitizedGroupByExpression } from "../recoil/utils";
+import { getSampleSrc } from "../recoil/utils";
import * as viewAtoms from "../recoil/view";
import { getStandardizedUrls } from "../utils";
@@ -176,9 +177,10 @@ export default >(
const { groupBy } = snapshot
.getLoadable(dynamicGroupAtoms.dynamicGroupParameters)
.valueMaybe();
+ const groupByKeyFieldInfo = getFieldInfo(groupBy, fieldSchema);
const groupByFieldValue = get(
sample,
- getSanitizedGroupByExpression(groupBy)
+ groupByKeyFieldInfo.pathWithDbField
);
const groupByFieldValueTransformed =
groupByFieldValue !== null ? String(groupByFieldValue) : null;
diff --git a/app/packages/state/src/hooks/useExpandSample.ts b/app/packages/state/src/hooks/useExpandSample.ts
index 652dbcfcbe..fcfe0f7531 100644
--- a/app/packages/state/src/hooks/useExpandSample.ts
+++ b/app/packages/state/src/hooks/useExpandSample.ts
@@ -1,7 +1,9 @@
import { FlashlightConfig } from "@fiftyone/flashlight";
+import { getFieldInfo } from "@fiftyone/utilities";
import { get } from "lodash";
import { useRelayEnvironment } from "react-relay";
import { CallbackInterface, RecoilState, useRecoilCallback } from "recoil";
+import { State } from "../recoil";
import * as atoms from "../recoil/atoms";
import * as dynamicGroupAtoms from "../recoil/dynamicGroups";
import * as filterAtoms from "../recoil/filters";
@@ -10,7 +12,6 @@ import * as modalAtoms from "../recoil/modal";
import * as schemaAtoms from "../recoil/schema";
import * as selectors from "../recoil/selectors";
import * as sidebarAtoms from "../recoil/sidebar";
-import { getSanitizedGroupByExpression } from "../recoil/utils";
import { LookerStore, Lookers } from "./useLookerStore";
import useSetExpandedSample from "./useSetExpandedSample";
@@ -138,12 +139,15 @@ export default (store: LookerStore) => {
let groupByFieldValue: string;
if (dynamicGroupParameters?.groupBy) {
- groupByFieldValue = String(
- get(
- sample.sample,
- getSanitizedGroupByExpression(dynamicGroupParameters.groupBy)
- )
+ const fieldSchema = await snapshot.getPromise(
+ schemaAtoms.fieldSchema({ space: State.SPACE.SAMPLE })
);
+ const fieldInfo = getFieldInfo(
+ dynamicGroupParameters.groupBy,
+ fieldSchema
+ );
+ const groupByKeyDbField = fieldInfo.pathWithDbField;
+ groupByFieldValue = String(get(sample.sample, groupByKeyDbField));
}
return { id, groupId, groupByFieldValue };
diff --git a/app/packages/state/src/hooks/useHoveredSample.ts b/app/packages/state/src/hooks/useHoveredSample.ts
index feae96f606..7f00196fc0 100644
--- a/app/packages/state/src/hooks/useHoveredSample.ts
+++ b/app/packages/state/src/hooks/useHoveredSample.ts
@@ -4,21 +4,20 @@ import * as fos from "../..";
export default function useHoveredSample(
sample: Sample,
- auxHandlers: any = {}
+ args?: { update?: () => void; clear?: () => void }
) {
const setSample = useSetRecoilState(fos.hoveredSample);
- const { update, clear } = auxHandlers;
function onMouseEnter() {
setSample(sample);
- update && update();
+ args?.update?.();
}
function onMouseLeave() {
setSample(null);
- clear && clear();
+ args?.clear?.();
}
function onMouseMove() {
setSample(sample);
- update && update();
+ args?.update?.();
}
return { handlers: { onMouseEnter, onMouseLeave, onMouseMove } };
diff --git a/app/packages/state/src/recoil/dynamicGroups.ts b/app/packages/state/src/recoil/dynamicGroups.ts
index fcb5e5c37d..10d175033a 100644
--- a/app/packages/state/src/recoil/dynamicGroups.ts
+++ b/app/packages/state/src/recoil/dynamicGroups.ts
@@ -4,6 +4,7 @@ import {
EMBEDDED_DOCUMENT_FIELD,
GROUP,
LIST_FIELD,
+ getFieldInfo,
} from "@fiftyone/utilities";
import { atom, atomFamily, selector, selectorFamily } from "recoil";
import {
@@ -14,10 +15,9 @@ import {
} from "./groups";
import { modalLooker } from "./modal";
import { dynamicGroupsViewMode } from "./options";
-import { fieldPaths } from "./schema";
+import { fieldPaths, fieldSchema } from "./schema";
import { datasetName, parentMediaTypeSelector } from "./selectors";
import { State } from "./types";
-import { getSanitizedGroupByExpression } from "./utils";
import {
GROUP_BY_VIEW_STAGE,
LIMIT_VIEW_STAGE,
@@ -75,7 +75,7 @@ export const dynamicGroupPageSelector = selectorFamily<
after: string | null;
count: number;
dataset: string;
- filter: { group: { slice?: string } };
+ filter: { group: { slice?: string; slices?: string[] } };
view: State.Stage[];
},
{ modal: boolean; value: string }
@@ -84,12 +84,18 @@ export const dynamicGroupPageSelector = selectorFamily<
get:
({ modal, value }) =>
({ get }) => {
+ const slice = get(modal ? modalGroupSlice : groupSlice);
+
const params = {
dataset: get(datasetName),
view: get(dynamicGroupViewQuery(value)),
- filter: { group: { slice: get(modal ? modalGroupSlice : groupSlice) } },
+ filter: { group: { slice } },
};
+ if (get(hasGroupSlices)) {
+ params.filter.group.slices = [slice];
+ }
+
return (cursor: number, pageSize: number) => ({
...params,
after: cursor ? String(cursor) : null,
@@ -136,9 +142,8 @@ export const dynamicGroupViewQuery = selectorFamily<
const { groupBy, orderBy } = params;
- // todo: fix sample_id issue
- // todo: sanitize expressions
- const groupBySanitized = getSanitizedGroupByExpression(groupBy);
+ const schema = get(fieldSchema({ space: State.SPACE.SAMPLE }));
+ const groupByFieldKeyInfo = getFieldInfo(groupBy, schema);
let groupByValue;
@@ -161,7 +166,7 @@ export const dynamicGroupViewQuery = selectorFamily<
$expr: {
$let: {
vars: {
- expr: `$${groupBySanitized}`,
+ expr: `$${groupByFieldKeyInfo.pathWithDbField}`,
},
in: {
$in: [
diff --git a/app/packages/state/src/recoil/groups.ts b/app/packages/state/src/recoil/groups.ts
index 6164f82660..ba3d4588d3 100644
--- a/app/packages/state/src/recoil/groups.ts
+++ b/app/packages/state/src/recoil/groups.ts
@@ -454,6 +454,10 @@ export const fo3dSample = selector({
get: ({ get }) => {
if (!get(isGroup)) return get(modalSample);
+ if (get(isDynamicGroup) && !get(hasFo3dSlice)) {
+ return get(modalSample);
+ }
+
if (!get(hasFo3dSlice)) return null;
const sample = get(
diff --git a/app/packages/state/src/recoil/utils.ts b/app/packages/state/src/recoil/utils.ts
index 5c2e74def9..3bfd56c741 100644
--- a/app/packages/state/src/recoil/utils.ts
+++ b/app/packages/state/src/recoil/utils.ts
@@ -24,14 +24,6 @@ export const getSampleSrc = (url: string) => {
return `${params.origin}${path}?filepath=${encodeURIComponent(url)}`;
};
-export const getSanitizedGroupByExpression = (expression: string) => {
- // todo: why this special case for sample_id...?
- if (expression === "sample_id") {
- return "_sample_id";
- }
- return expression;
-};
-
export const mapSampleResponse = <
T extends Nullable<{
readonly sample?: Sample;
diff --git a/app/packages/utilities/src/fetch.ts b/app/packages/utilities/src/fetch.ts
index 10f8df0a28..1d4926a485 100644
--- a/app/packages/utilities/src/fetch.ts
+++ b/app/packages/utilities/src/fetch.ts
@@ -114,8 +114,8 @@ export const setFetchFunction = (
retryDelay: 0,
retryOn: (attempt, error, response) => {
if (
- error !== null ||
- (retryCodes.includes(response.status) && attempt < retries)
+ (error !== null || retryCodes.includes(response.status)) &&
+ attempt < retries
) {
return true;
}
@@ -248,6 +248,8 @@ const polling =
hasWindow &&
typeof new URLSearchParams(window.location.search).get("polling") ===
"string";
+const MAX_REOPEN_ATTEMPTS = 10;
+let eventSourceFetchErrorCount = 0;
export const getEventSource = (
path: string,
@@ -275,6 +277,7 @@ export const getEventSource = (
async onopen(response) {
if (response.ok) {
events.onopen && events.onopen();
+ eventSourceFetchErrorCount = 0;
return;
}
@@ -300,7 +303,11 @@ export const getEventSource = (
["Failed to fetch", "network error"].includes(err.message)
) {
events.onclose && events.onclose();
- return;
+ if (eventSourceFetchErrorCount <= MAX_REOPEN_ATTEMPTS) {
+ eventSourceFetchErrorCount++;
+ return;
+ }
+ throw err; // close event source
}
events.onerror && events.onerror(err);
diff --git a/app/packages/utilities/src/schema.test.ts b/app/packages/utilities/src/schema.test.ts
index c74ba6b823..f1d9624663 100644
--- a/app/packages/utilities/src/schema.test.ts
+++ b/app/packages/utilities/src/schema.test.ts
@@ -35,6 +35,30 @@ const SCHEMA: schema.Schema = {
},
},
},
+ embeddedWithDbFields: {
+ dbField: "embeddedWithDbFields",
+ description: "description",
+ embeddedDocType:
+ "fiftyone.core.odm.embedded_document.DynamicEmbeddedDocument",
+ ftype: "fiftyone.core.fields.EmbeddedDocumentField",
+ info: {},
+ name: "top",
+ path: "embeddedWithDbFields",
+ subfield: null,
+ fields: {
+ sample_id: {
+ dbField: "_sample_id",
+ pathWithDbField: "",
+ description: "description",
+ embeddedDocType: "fiftyone.core.labels.EmbeddedLabel",
+ ftype: "fiftyone.core.fields.EmbeddedDocumentField",
+ info: {},
+ name: "sample_id",
+ path: "sample_id",
+ subfield: null,
+ },
+ },
+ },
};
describe("schema", () => {
@@ -57,13 +81,17 @@ describe("schema", () => {
describe("getFieldInfo ", () => {
it("should get top level field info", () => {
- expect(schema.getFieldInfo("top", SCHEMA)).toBe(SCHEMA.top);
+ expect(schema.getFieldInfo("top", SCHEMA)).toEqual({
+ ...SCHEMA.top,
+ pathWithDbField: "",
+ });
});
it("should get embedded field info", () => {
- expect(schema.getFieldInfo("embedded.field", SCHEMA)).toBe(
- SCHEMA.embedded.fields.field
- );
+ expect(schema.getFieldInfo("embedded.field", SCHEMA)).toEqual({
+ ...SCHEMA.embedded.fields.field,
+ pathWithDbField: "",
+ });
});
it("should return undefined for missing field paths", () => {
@@ -72,5 +100,13 @@ describe("schema", () => {
expect(schema.getCls("missing.path", {})).toBe(undefined);
expect(schema.getFieldInfo("missing.path", SCHEMA)).toBe(undefined);
});
+
+ it("should return correct pathWithDbField", () => {
+ const field = schema.getFieldInfo(
+ "embeddedWithDbFields.sample_id",
+ SCHEMA
+ );
+ expect(field?.pathWithDbField).toBe("embeddedWithDbFields._sample_id");
+ });
});
});
diff --git a/app/packages/utilities/src/schema.ts b/app/packages/utilities/src/schema.ts
index 02dce4bfba..d65d2d9c7f 100644
--- a/app/packages/utilities/src/schema.ts
+++ b/app/packages/utilities/src/schema.ts
@@ -8,6 +8,7 @@ export interface Field {
subfield: string | null;
path: string;
fields?: Schema;
+ pathWithDbField?: string | null;
}
export interface StrictField extends Omit {
@@ -24,13 +25,20 @@ export function getFieldInfo(
): Field | undefined {
const keys = fieldPath.split(".");
let field: Field;
+
+ const dbFields = [];
+
for (let index = 0; index < keys.length; index++) {
- if (!schema) return undefined;
+ if (!schema || !schema[keys[index]]) return undefined;
- field = schema[keys[index]];
+ field = { ...schema[keys[index]] };
schema = field?.fields;
+
+ dbFields.push(field?.dbField);
}
+ field.pathWithDbField = dbFields.filter(Boolean).join(".");
+
return field;
}
diff --git a/app/yarn.lock b/app/yarn.lock
index 926acd6334..c0462574cb 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -2496,7 +2496,6 @@ __metadata:
eslint-plugin-react-hooks: ^4.6.0
jpeg-js: ^0.4.4
jsdom: ^20.0.2
- patch-package: ^6.4.7
prettier: ^2.8.0
react-player: ^2.16.0
react-plotly.js: ^2.6.0
@@ -2529,12 +2528,12 @@ __metadata:
dependencies:
"@emotion/react": ^11.11.3
"@emotion/styled": ^11.11.0
- "@react-three/drei": ^9.105.6
- "@react-three/fiber": ^8.16.6
+ "@react-three/drei": ^9.107.2
+ "@react-three/fiber": ^8.16.8
"@types/node": ^20.11.10
"@types/react": ^18.2.48
"@types/react-dom": ^18.2.18
- "@types/three": ^0.163.0
+ "@types/three": ^0.165.0
"@vitejs/plugin-react": ^1.3.0
leva: ^0.9.35
lodash: ^4.17.21
@@ -2543,7 +2542,7 @@ __metadata:
react-color: ^2.19.3
rollup-plugin-external-globals: ^0.6.1
styled-components: ^6.1.8
- three: ^0.164.1
+ three: ^0.165.0
tunnel-rat: ^0.1.2
typescript: ^5.4.5
vite: ^5.2.12
@@ -4359,7 +4358,7 @@ __metadata:
languageName: node
linkType: hard
-"@react-three/drei@npm:^9.103.0, @react-three/drei@npm:^9.105.6":
+"@react-three/drei@npm:^9.103.0":
version: 9.106.0
resolution: "@react-three/drei@npm:9.106.0"
dependencies:
@@ -4398,7 +4397,46 @@ __metadata:
languageName: node
linkType: hard
-"@react-three/fiber@npm:^8.16.6":
+"@react-three/drei@npm:^9.107.2":
+ version: 9.109.2
+ resolution: "@react-three/drei@npm:9.109.2"
+ dependencies:
+ "@babel/runtime": ^7.11.2
+ "@mediapipe/tasks-vision": 0.10.8
+ "@monogrid/gainmap-js": ^3.0.5
+ "@react-spring/three": ~9.6.1
+ "@use-gesture/react": ^10.2.24
+ camera-controls: ^2.4.2
+ cross-env: ^7.0.3
+ detect-gpu: ^5.0.28
+ glsl-noise: ^0.0.0
+ hls.js: 1.3.5
+ maath: ^0.10.7
+ meshline: ^3.1.6
+ react-composer: ^5.0.3
+ stats-gl: ^2.0.0
+ stats.js: ^0.17.0
+ suspend-react: ^0.1.3
+ three-mesh-bvh: ^0.7.0
+ three-stdlib: ^2.29.9
+ troika-three-text: ^0.49.0
+ tunnel-rat: ^0.1.2
+ utility-types: ^3.10.0
+ uuid: ^9.0.1
+ zustand: ^3.7.1
+ peerDependencies:
+ "@react-three/fiber": ">=8.0"
+ react: ">=18.0"
+ react-dom: ">=18.0"
+ three: ">=0.137"
+ peerDependenciesMeta:
+ react-dom:
+ optional: true
+ checksum: c798551e879045341984e61329a67e2ef3da826d438cb5bce4681001dc1efb87b49afb71e14110b29e86ba4c0c9fbae4e4df810bb224f18f1fb2ec581474489d
+ languageName: node
+ linkType: hard
+
+"@react-three/fiber@npm:^8.16.8":
version: 8.16.8
resolution: "@react-three/fiber@npm:8.16.8"
dependencies:
@@ -6749,6 +6787,19 @@ __metadata:
languageName: node
linkType: hard
+"@types/three@npm:^0.165.0":
+ version: 0.165.0
+ resolution: "@types/three@npm:0.165.0"
+ dependencies:
+ "@tweenjs/tween.js": ~23.1.1
+ "@types/stats.js": "*"
+ "@types/webxr": "*"
+ fflate: ~0.8.2
+ meshoptimizer: ~0.18.1
+ checksum: ed86979c5cee78070b9fe9fd94f6049d27c392eeb3061f10fc4b54b85daae2433b6f184c1a00407cbf856778c5bc113fdf46b8b87e778ed91a311e06b9ae938b
+ languageName: node
+ linkType: hard
+
"@types/unist@npm:^2, @types/unist@npm:^2.0.0":
version: 2.0.10
resolution: "@types/unist@npm:2.0.10"
@@ -7161,13 +7212,6 @@ __metadata:
languageName: node
linkType: hard
-"@yarnpkg/lockfile@npm:^1.1.0":
- version: 1.1.0
- resolution: "@yarnpkg/lockfile@npm:1.1.0"
- checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a
- languageName: node
- linkType: hard
-
"FiftyOne@workspace:packages/desktop":
version: 0.0.0-use.local
resolution: "FiftyOne@workspace:packages/desktop"
@@ -8373,13 +8417,6 @@ __metadata:
languageName: node
linkType: hard
-"ci-info@npm:^2.0.0":
- version: 2.0.0
- resolution: "ci-info@npm:2.0.0"
- checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
- languageName: node
- linkType: hard
-
"ci-info@npm:^3.2.0":
version: 3.9.0
resolution: "ci-info@npm:3.9.0"
@@ -8915,19 +8952,6 @@ __metadata:
languageName: node
linkType: hard
-"cross-spawn@npm:^6.0.5":
- version: 6.0.5
- resolution: "cross-spawn@npm:6.0.5"
- dependencies:
- nice-try: ^1.0.4
- path-key: ^2.0.1
- semver: ^5.5.0
- shebang-command: ^1.2.0
- which: ^1.2.9
- checksum: f893bb0d96cd3d5751d04e67145bdddf25f99449531a72e82dcbbd42796bbc8268c1076c6b3ea51d4d455839902804b94bc45dfb37ecbb32ea8e54a6741c3ab9
- languageName: node
- linkType: hard
-
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
@@ -10926,15 +10950,6 @@ __metadata:
languageName: node
linkType: hard
-"find-yarn-workspace-root@npm:^2.0.0":
- version: 2.0.0
- resolution: "find-yarn-workspace-root@npm:2.0.0"
- dependencies:
- micromatch: ^4.0.2
- checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242
- languageName: node
- linkType: hard
-
"flat-cache@npm:^3.0.4":
version: 3.2.0
resolution: "flat-cache@npm:3.2.0"
@@ -11629,7 +11644,7 @@ __metadata:
languageName: node
linkType: hard
-"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
version: 4.2.11
resolution: "graceful-fs@npm:4.2.11"
checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -12250,17 +12265,6 @@ __metadata:
languageName: node
linkType: hard
-"is-ci@npm:^2.0.0":
- version: 2.0.0
- resolution: "is-ci@npm:2.0.0"
- dependencies:
- ci-info: ^2.0.0
- bin:
- is-ci: bin.js
- checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144
- languageName: node
- linkType: hard
-
"is-ci@npm:^3.0.0":
version: 3.0.1
resolution: "is-ci@npm:3.0.1"
@@ -12313,15 +12317,6 @@ __metadata:
languageName: node
linkType: hard
-"is-docker@npm:^2.0.0":
- version: 2.2.1
- resolution: "is-docker@npm:2.2.1"
- bin:
- is-docker: cli.js
- checksum: 3fef7ddbf0be25958e8991ad941901bf5922ab2753c46980b60b05c1bf9c9c2402d35e6dc32e4380b980ef5e1970a5d9d5e5aa2e02d77727c3b6b5e918474c56
- languageName: node
- linkType: hard
-
"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
version: 0.1.1
resolution: "is-extendable@npm:0.1.1"
@@ -12639,15 +12634,6 @@ __metadata:
languageName: node
linkType: hard
-"is-wsl@npm:^2.1.1":
- version: 2.2.0
- resolution: "is-wsl@npm:2.2.0"
- dependencies:
- is-docker: ^2.0.0
- checksum: 20849846ae414997d290b75e16868e5261e86ff5047f104027026fd61d8b5a9b0b3ade16239f35e1a067b3c7cc02f70183cb661010ed16f4b6c7c93dad1b19d8
- languageName: node
- linkType: hard
-
"isarray@npm:0.0.1":
version: 0.0.1
resolution: "isarray@npm:0.0.1"
@@ -13618,15 +13604,6 @@ __metadata:
languageName: node
linkType: hard
-"klaw-sync@npm:^6.0.0":
- version: 6.0.0
- resolution: "klaw-sync@npm:6.0.0"
- dependencies:
- graceful-fs: ^4.1.11
- checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475
- languageName: node
- linkType: hard
-
"kleur@npm:^3.0.3":
version: 3.0.3
resolution: "kleur@npm:3.0.3"
@@ -14632,7 +14609,7 @@ __metadata:
languageName: node
linkType: hard
-"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4":
+"micromatch@npm:^4.0.4":
version: 4.0.7
resolution: "micromatch@npm:4.0.7"
dependencies:
@@ -15071,13 +15048,6 @@ __metadata:
languageName: node
linkType: hard
-"nice-try@npm:^1.0.4":
- version: 1.0.5
- resolution: "nice-try@npm:1.0.5"
- checksum: 0b4af3b5bb5d86c289f7a026303d192a7eb4417231fe47245c460baeabae7277bcd8fd9c728fb6bd62c30b3e15cd6620373e2cf33353b095d8b403d3e8a15aff
- languageName: node
- linkType: hard
-
"node-addon-api@npm:^1.6.3":
version: 1.7.2
resolution: "node-addon-api@npm:1.7.2"
@@ -15378,16 +15348,6 @@ __metadata:
languageName: node
linkType: hard
-"open@npm:^7.4.2":
- version: 7.4.2
- resolution: "open@npm:7.4.2"
- dependencies:
- is-docker: ^2.0.0
- is-wsl: ^2.1.1
- checksum: 3333900ec0e420d64c23b831bc3467e57031461d843c801f569b2204a1acc3cd7b3ec3c7897afc9dde86491dfa289708eb92bba164093d8bd88fb2c231843c91
- languageName: node
- linkType: hard
-
"optionator@npm:^0.9.3":
version: 0.9.4
resolution: "optionator@npm:0.9.4"
@@ -15402,13 +15362,6 @@ __metadata:
languageName: node
linkType: hard
-"os-tmpdir@npm:~1.0.2":
- version: 1.0.2
- resolution: "os-tmpdir@npm:1.0.2"
- checksum: 5666560f7b9f10182548bf7013883265be33620b1c1b4a4d405c25be2636f970c5488ff3e6c48de75b55d02bde037249fe5dbfbb4c0fb7714953d56aed062e6d
- languageName: node
- linkType: hard
-
"p-cancelable@npm:^2.0.0":
version: 2.1.1
resolution: "p-cancelable@npm:2.1.1"
@@ -15591,30 +15544,6 @@ __metadata:
languageName: node
linkType: hard
-"patch-package@npm:^6.4.7":
- version: 6.5.1
- resolution: "patch-package@npm:6.5.1"
- dependencies:
- "@yarnpkg/lockfile": ^1.1.0
- chalk: ^4.1.2
- cross-spawn: ^6.0.5
- find-yarn-workspace-root: ^2.0.0
- fs-extra: ^9.0.0
- is-ci: ^2.0.0
- klaw-sync: ^6.0.0
- minimist: ^1.2.6
- open: ^7.4.2
- rimraf: ^2.6.3
- semver: ^5.6.0
- slash: ^2.0.0
- tmp: ^0.0.33
- yaml: ^1.10.2
- bin:
- patch-package: index.js
- checksum: 8530ffa30f11136b527c6eddf6da48fa12856ee510a47edb1f9cdf8a025636adb82968f5fae778b5e04ce8c87915ebdf5911422b54add59a5a42e372a8f30eb2
- languageName: node
- linkType: hard
-
"path-browserify@npm:^1.0.1":
version: 1.0.1
resolution: "path-browserify@npm:1.0.1"
@@ -15643,13 +15572,6 @@ __metadata:
languageName: node
linkType: hard
-"path-key@npm:^2.0.1":
- version: 2.0.1
- resolution: "path-key@npm:2.0.1"
- checksum: f7ab0ad42fe3fb8c7f11d0c4f849871e28fbd8e1add65c370e422512fc5887097b9cf34d09c1747d45c942a8c1e26468d6356e2df3f740bf177ab8ca7301ebfd
- languageName: node
- linkType: hard
-
"path-key@npm:^3.0.0, path-key@npm:^3.1.0":
version: 3.1.1
resolution: "path-key@npm:3.1.1"
@@ -17260,17 +17182,6 @@ __metadata:
languageName: node
linkType: hard
-"rimraf@npm:^2.6.3":
- version: 2.7.1
- resolution: "rimraf@npm:2.7.1"
- dependencies:
- glob: ^7.1.3
- bin:
- rimraf: ./bin.js
- checksum: cdc7f6eacb17927f2a075117a823e1c5951792c6498ebcce81ca8203454a811d4cf8900314154d3259bb8f0b42ab17f67396a8694a54cae3283326e57ad250cd
- languageName: node
- linkType: hard
-
"rimraf@npm:^3.0.2":
version: 3.0.2
resolution: "rimraf@npm:3.0.2"
@@ -17603,7 +17514,7 @@ __metadata:
languageName: node
linkType: hard
-"semver@npm:^5.5.0, semver@npm:^5.6.0":
+"semver@npm:^5.6.0":
version: 5.7.2
resolution: "semver@npm:5.7.2"
bin:
@@ -17714,15 +17625,6 @@ __metadata:
languageName: node
linkType: hard
-"shebang-command@npm:^1.2.0":
- version: 1.2.0
- resolution: "shebang-command@npm:1.2.0"
- dependencies:
- shebang-regex: ^1.0.0
- checksum: 9eed1750301e622961ba5d588af2212505e96770ec376a37ab678f965795e995ade7ed44910f5d3d3cb5e10165a1847f52d3348c64e146b8be922f7707958908
- languageName: node
- linkType: hard
-
"shebang-command@npm:^2.0.0":
version: 2.0.0
resolution: "shebang-command@npm:2.0.0"
@@ -17732,13 +17634,6 @@ __metadata:
languageName: node
linkType: hard
-"shebang-regex@npm:^1.0.0":
- version: 1.0.0
- resolution: "shebang-regex@npm:1.0.0"
- checksum: 404c5a752cd40f94591dfd9346da40a735a05139dac890ffc229afba610854d8799aaa52f87f7e0c94c5007f2c6af55bdcaeb584b56691926c5eaf41dc8f1372
- languageName: node
- linkType: hard
-
"shebang-regex@npm:^3.0.0":
version: 3.0.0
resolution: "shebang-regex@npm:3.0.0"
@@ -17841,13 +17736,6 @@ __metadata:
languageName: node
linkType: hard
-"slash@npm:^2.0.0":
- version: 2.0.0
- resolution: "slash@npm:2.0.0"
- checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6
- languageName: node
- linkType: hard
-
"slash@npm:^3.0.0":
version: 3.0.0
resolution: "slash@npm:3.0.0"
@@ -18597,10 +18485,10 @@ __metadata:
languageName: node
linkType: hard
-"three@npm:^0.164.1":
- version: 0.164.1
- resolution: "three@npm:0.164.1"
- checksum: 64a1b713cd14b53af12858ad1b89a9daaa493ee2a42384480e408ec3add6cd474811b34a5faa4a3611398db39ed86afb3a96b4d0a54a2feaacc9c5dc54cf5c8a
+"three@npm:^0.165.0":
+ version: 0.165.0
+ resolution: "three@npm:0.165.0"
+ checksum: 1dcfe9ef046a49036e527cf0f72e07475546a16ede694f24630330ece7635ab8ee5c3a3422d43c65c2d267a255e4859820ddb35381defadbd3515d91e2c2bd2e
languageName: node
linkType: hard
@@ -18703,15 +18591,6 @@ __metadata:
languageName: node
linkType: hard
-"tmp@npm:^0.0.33":
- version: 0.0.33
- resolution: "tmp@npm:0.0.33"
- dependencies:
- os-tmpdir: ~1.0.2
- checksum: 902d7aceb74453ea02abbf58c203f4a8fc1cead89b60b31e354f74ed5b3fb09ea817f94fb310f884a5d16987dd9fa5a735412a7c2dd088dd3d415aa819ae3a28
- languageName: node
- linkType: hard
-
"tmp@npm:^0.2.0":
version: 0.2.3
resolution: "tmp@npm:0.2.3"
@@ -20028,17 +19907,6 @@ __metadata:
languageName: node
linkType: hard
-"which@npm:^1.2.9":
- version: 1.3.1
- resolution: "which@npm:1.3.1"
- dependencies:
- isexe: ^2.0.0
- bin:
- which: ./bin/which
- checksum: f2e185c6242244b8426c9df1510e86629192d93c1a986a7d2a591f2c24869e7ffd03d6dac07ca863b2e4c06f59a4cc9916c585b72ee9fa1aa609d0124df15e04
- languageName: node
- linkType: hard
-
"which@npm:^2.0.1":
version: 2.0.2
resolution: "which@npm:2.0.2"
diff --git a/docs/source/_templates/layout.html b/docs/source/_templates/layout.html
index f1b6f385c3..3377cd783f 100644
--- a/docs/source/_templates/layout.html
+++ b/docs/source/_templates/layout.html
@@ -1,8 +1,5 @@
{% extends "!layout.html" %} {% block extrahead %}
-
+
+
{% endblock %} {% block custom_header %}
@@ -94,18 +90,15 @@
data-size="large"
data-show-count="true"
aria-label="Star voxel51/fiftyone on GitHub"
- >Star
+ >Star