Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(evals): list each decision model once when a custom model matches a default (#17915)

David Trainae17342230204
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.clienttest.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.clienttest.tsx
index 4684af8475..2ec3947d37 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.clienttest.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.clienttest.tsx
@@ -33,6 +33,31 @@ describe("DecisionModelSelector", () => {
);
});
+ beforeEach(() => {
+ connection.withDefaultModels = true;
+ connection.customModels = [];
+ });
+
+ const renderWithSelectedModel = (model: string) => {
+ const store = createEvaluatorSetupStore({
+ initialEvaluator: null,
+ initialType: "DECISION_MODEL",
+ mode: "edit",
+ });
+ store.getState().actions.selectModel({ provider: "jev", model });
+
+ render(
+ <DecisionModelSelector
+ projectId="project"
+ store={store}
+ onConfigureProviders={vi.fn()}
+ />,
+ { wrapper: LayerProvider },
+ );
+
+ return screen.getByRole("combobox", { name: "Decision model" });
+ };
+
it.each([
["lists only default models", true],
["lists no models", false],
@@ -40,28 +65,27 @@ describe("DecisionModelSelector", () => {
"shows the evaluator's model when its connection %s",
(_, withDefaultModels) => {
connection.withDefaultModels = withDefaultModels;
- const store = createEvaluatorSetupStore({
- initialEvaluator: null,
- initialType: "DECISION_MODEL",
- mode: "edit",
- });
- store.getState().actions.selectModel({
- provider: "jev",
- model: "jev-1.13.0",
- });
- render(
- <DecisionModelSelector
- projectId="project"
- store={store}
- onConfigureProviders={vi.fn()}
- />,
- { wrapper: LayerProvider },
+ expect(renderWithSelectedModel("jev-1.13.0")).toHaveTextContent(
+ "jev: jev-1.13.0",
);
+ },
+ );
+
+ // Duplicate option values make Radix check both rows and render both labels
+ // in the trigger.
+ it.each([
+ ["is also a default model", true, ["jev-latest"]],
+ ["is listed twice", false, ["jev-latest", "jev-latest"]],
+ ])(
+ "lists a custom model once when it %s",
+ (_, withDefaultModels, customModels) => {
+ connection.withDefaultModels = withDefaultModels;
+ connection.customModels = customModels;
- expect(
- screen.getByRole("combobox", { name: "Decision model" }),
- ).toHaveTextContent("jev: jev-1.13.0");
+ expect(renderWithSelectedModel("jev-latest").textContent).toBe(
+ "jev: jev-latest",
+ );
},
);
});
diff --git a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.tsx b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.tsx
index a807585b35..1b33c28cab 100644
--- a/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.tsx
+++ b/web/src/features/evals/v2/components/Evaluators/EvaluatorSetupEditor/components/DefinitionStep/components/DecisionModelSelector/DecisionModelSelector.tsx
@@ -37,9 +37,14 @@ export function DecisionModelSelector({
const connectionOptions = (connections.data?.data ?? [])
.filter((connection) => isDecisionModelAdapter(connection.adapter))
.flatMap((connection) => {
- const models = connection.withDefaultModels
- ? [...connection.customModels, ...supportedModels[connection.adapter]]
- : connection.customModels;
+ const models = Array.from(
+ new Set([
+ ...connection.customModels,
+ ...(connection.withDefaultModels
+ ? supportedModels[connection.adapter]
+ : []),
+ ]),
+ );
return models.map((model) => toOption(connection.provider, model));
});
const selectedOption = selectedModel