bug, add frontend check

voxel51 · Jan 30, 2025 · 8b28480 · 8b28480
1 parent 9ddc487
commit 8b28480
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/packages/core/src/components/Filters/StringFilter/state.ts b/app/packages/core/src/components/Filters/StringFilter/state.ts
@@ -1,6 +1,6 @@
 import * as fos from "@fiftyone/state";
 import { isMatchingAtom, stringExcludeAtom } from "@fiftyone/state";
-import { getFetchFunction } from "@fiftyone/utilities";
+import { getFetchFunction, isObjectIdString } from "@fiftyone/utilities";
 import { atomFamily, selectorFamily } from "recoil";
 import { labelTagsCount } from "../../Sidebar/Entries/EntryCounts";
 import { nullSort } from "../utils";
@@ -57,6 +57,11 @@ export const stringSearchResults = selectorFamily<
     ({ path, modal, filter }) =>
     async ({ get }) => {
       const search = filter ? "" : get(stringSearch({ modal, path }));
+      // for object id searches, skip request when the string is not <= 24 hex
+      if (get(fos.isObjectIdField(path)) && !isObjectIdString(search, false)) {
+        return { values: [] };
+      }
+
       const sorting = get(fos.sortFilterResults(modal));
       const mixed = get(fos.groupStatistics(modal)) === "group";
       const selected = get(fos.stringSelectedValuesAtom({ path, modal }));

diff --git a/app/packages/core/src/components/Filters/StringFilter/useOnSelect.ts b/app/packages/core/src/components/Filters/StringFilter/useOnSelect.ts
@@ -1,8 +1,9 @@
 import { SelectorValidationError } from "@fiftyone/components";
 import { isObjectIdField, snackbarErrors } from "@fiftyone/state";
 import { isObjectIdString } from "@fiftyone/utilities";
-import { RecoilState, useRecoilCallback } from "recoil";
-import { Result } from "./Result";
+import type { RecoilState } from "recoil";
+import { useRecoilCallback } from "recoil";
+import type { Result } from "./Result";
 
 export default function (
   modal: boolean,

diff --git a/app/packages/utilities/src/type-check.ts b/app/packages/utilities/src/type-check.ts
@@ -14,8 +14,8 @@ export function isHex(value: string) {
   return /[0-9a-f]{24}/g.test(value);
 }
 
-export function isObjectIdString(value: string) {
-  return isHex(value) && value.length === 24;
+export function isObjectIdString(value: string, strict = true) {
+  return isHex(value) && strict ? value.length === 24 : value.length <= 24;
 }
 
 export type NumberKeyObjectType<V = unknown> = {

diff --git a/fiftyone/server/lightning.py b/fiftyone/server/lightning.py
@@ -427,8 +427,8 @@ async def _do_distinct_pipeline(
 
 def _add_search(query: DistinctQuery):
     # strip chars after 24
-    search = query.search[:_TWENTY_FOUR]
     if query.is_object_id_field:
+        search = query.search[:_TWENTY_FOUR]
         add = (_TWENTY_FOUR - len(search)) * "0"
         if add:
             search = f"{search}{add}"