Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions helm-frontend/src/components/Instances.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState } from "react";
import { useEffect, useMemo, useState } from "react";
import { useSearchParams } from "react-router-dom";
import type Instance from "@/types/Instance";
import type MetricFieldMap from "@/types/MetricFieldMap";
Expand All @@ -10,6 +10,7 @@ import DisplayRequest from "@/types/DisplayRequest";
import getInstances from "@/services/getInstances";
import getDisplayPredictionsByName from "@/services/getDisplayPredictionsByName";
import getDisplayRequestsByName from "@/services/getDisplayRequestsByName";
import { matchesInstanceSearch } from "./instanceFilters";

const INSTANCES_PAGE_SIZE = 10;

Expand Down Expand Up @@ -41,6 +42,9 @@ export default function Instances({
undefined | Record<string, Record<string, DisplayRequest[]>>
>();
const [currentInstancesPage, setCurrentInstancesPage] = useState<number>(1);
const [instanceQuery, setInstanceQuery] = useState<string>(
searchParams.get("instanceQuery") ?? "",
);

useEffect(() => {
const controller = new AbortController();
Expand Down Expand Up @@ -101,11 +105,26 @@ export default function Instances({
return () => controller.abort();
}, [runName, suite, userAgreed]);

const pagedInstances = instances.slice(
const filteredInstances = useMemo(
() =>
instances.filter((instance) =>
matchesInstanceSearch(instance, instanceQuery),
),
[instanceQuery, instances],
);

useEffect(() => {
setCurrentInstancesPage(1);
}, [instanceQuery]);

const pagedInstances = filteredInstances.slice(
(currentInstancesPage - 1) * INSTANCES_PAGE_SIZE,
(currentInstancesPage - 1) * INSTANCES_PAGE_SIZE + INSTANCES_PAGE_SIZE,
);
const totalInstancesPages = Math.ceil(instances.length / INSTANCES_PAGE_SIZE);
const totalInstancesPages = Math.max(
1,
Math.ceil(filteredInstances.length / INSTANCES_PAGE_SIZE),
);

// Handle scrolling to anchored instance
useEffect(() => {
Expand Down Expand Up @@ -145,6 +164,35 @@ export default function Instances({

return (
<>
<div className="mb-6">
<label className="form-control w-full max-w-xl">
<div className="label">
<span className="label-text font-medium">Search instances</span>
</div>
<input
className="input input-bordered w-full"
type="search"
placeholder="Filter by instance id, input text, or reference"
value={instanceQuery}
onChange={(event) => {
const nextQuery = event.target.value;
setInstanceQuery(nextQuery);

if (nextQuery) {
searchParams.set("instanceQuery", nextQuery);
} else {
searchParams.delete("instanceQuery");
}

searchParams.set("instancesPage", "1");
setSearchParams(searchParams);
}}
/>
</label>
<p className="mt-2 text-sm text-gray-600">
Showing {filteredInstances.length} of {instances.length} instances.
</p>
</div>
<div className="grid gap-8">
{pagedInstances.map((instance, idx) => (
<div id={"instance-" + instance.id} className="border p-4">
Expand Down Expand Up @@ -183,6 +231,11 @@ export default function Instances({
</div>
))}
</div>
{filteredInstances.length === 0 ? (
<p className="rounded-md border border-dashed p-4 text-sm text-gray-600">
No instances match the current search.
</p>
) : null}
<Pagination
className="flex justify-center my-8"
onNextPage={() => {
Expand Down
39 changes: 39 additions & 0 deletions helm-frontend/src/components/instanceFilters.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import "@testing-library/jest-dom";
import { describe, expect, it } from "vitest";

import type Instance from "@/types/Instance";

import { matchesInstanceSearch } from "./instanceFilters";

const baseInstance: Instance = {
id: "instance-42",
split: "test",
input: {
text: "The capital of France is Paris.",
multimedia_content: undefined,
messages: undefined,
},
references: [{ output: { text: "Paris" }, tags: [] }],
};

describe("matchesInstanceSearch", () => {
it("matches the instance id", () => {
expect(matchesInstanceSearch(baseInstance, "instance-42")).toBe(true);
});

it("matches the input text case-insensitively", () => {
expect(matchesInstanceSearch(baseInstance, "capital of france")).toBe(true);
});

it("matches reference text", () => {
expect(matchesInstanceSearch(baseInstance, "paris")).toBe(true);
});

it("returns true for an empty query", () => {
expect(matchesInstanceSearch(baseInstance, "")).toBe(true);
});

it("returns false for unrelated text", () => {
expect(matchesInstanceSearch(baseInstance, "tokyo")).toBe(false);
});
});
34 changes: 34 additions & 0 deletions helm-frontend/src/components/instanceFilters.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import type Instance from "@/types/Instance";

function normalize(value: string): string {
return value.trim().toLowerCase();
}

function getSearchableText(instance: Instance): string {
const referenceText = instance.references
.map((reference) => reference.output.text)
.join(" ");

return normalize(
[
instance.id,
instance.split,
instance.perturbation?.name ?? "",
instance.input.text,
referenceText,
].join(" "),
);
}

export function matchesInstanceSearch(
instance: Instance,
query: string,
): boolean {
const normalizedQuery = normalize(query);

if (!normalizedQuery) {
return true;
}

return getSearchableText(instance).includes(normalizedQuery);
}