OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
fix: make custom model selection provider-aware (#2360)
Edwin Joseffccefbd1b3f
diff --git a/frontend/app/onboarding/_components/advanced.test.tsx b/frontend/app/onboarding/_components/advanced.test.tsxnew file mode 100644index 000000000..73af59d06--- /dev/null+++ b/frontend/app/onboarding/_components/advanced.test.tsx@@ -0,0 +1,62 @@+import { describe, expect, it, vi } from "vitest";+import { TooltipProvider } from "@/components/ui/tooltip";+import { renderWithProviders, screen, userEvent } from "@/test-utils/render";+import { AdvancedOnboarding } from "./advanced";++describe("AdvancedOnboarding custom models", () => {+ it("accepts a language model that is absent from provider inventory", async () => {+ const setLanguageModel = vi.fn();+ const user = userEvent.setup();++ renderWithProviders(+ <TooltipProvider>+ <AdvancedOnboarding+ languageModels={[]}+ languageModel=""+ setLanguageModel={setLanguageModel}+ />+ </TooltipProvider>,+ );++ const selector = screen.getByTestId("language-model-selector");+ expect(selector).toBeEnabled();+ await user.click(selector);+ await user.type(+ screen.getByTestId("model-search-input"),+ "acme/private-model",+ );+ await user.click(+ screen.getByTestId("model-custom-option-acme/private-model"),+ );++ expect(setLanguageModel).toHaveBeenCalledWith("acme/private-model");+ });++ it("accepts an embedding model that is absent from provider inventory", async () => {+ const setEmbeddingModel = vi.fn();+ const user = userEvent.setup();++ renderWithProviders(+ <TooltipProvider>+ <AdvancedOnboarding+ embeddingModels={[]}+ embeddingModel=""+ setEmbeddingModel={setEmbeddingModel}+ />+ </TooltipProvider>,+ );++ const selector = screen.getByTestId("embedding-model-selector");+ expect(selector).toBeEnabled();+ await user.click(selector);+ await user.type(+ screen.getByTestId("model-search-input"),+ "acme/private-embedding",+ );+ await user.click(+ screen.getByTestId("model-custom-option-acme/private-embedding"),+ );++ expect(setEmbeddingModel).toHaveBeenCalledWith("acme/private-embedding");+ });+});diff --git a/frontend/app/onboarding/_components/advanced.tsx b/frontend/app/onboarding/_components/advanced.tsxindex 86d93ea63..d87ee424e 100644--- a/frontend/app/onboarding/_components/advanced.tsx+++ b/frontend/app/onboarding/_components/advanced.tsx@@ -38,6 +38,7 @@ export function AdvancedOnboarding({><ModelSelectoroptions={embeddingModels}+ customdata-testid="embedding-model-selector"icon={icon}value={embeddingModel}@@ -54,6 +55,7 @@ export function AdvancedOnboarding({><ModelSelectoroptions={languageModels}+ customdata-testid="language-model-selector"icon={icon}value={languageModel}diff --git a/frontend/components/models/model-selector.test.tsx b/frontend/components/models/model-selector.test.tsxnew file mode 100644index 000000000..2a7724ee9--- /dev/null+++ b/frontend/components/models/model-selector.test.tsx@@ -0,0 +1,52 @@+import { describe, expect, it, vi } from "vitest";+import { renderWithProviders, screen, userEvent } from "@/test-utils/render";+import { ModelSelector } from "./model-selector";++describe("ModelSelector custom entries", () => {+ it("offers a typed model under every configured provider group", async () => {+ const onValueChange = vi.fn();+ const user = userEvent.setup();++ renderWithProviders(+ <ModelSelector+ groupedOptions={[+ {+ group: "OpenAI",+ provider: "openai",+ options: [{ value: "gpt-4o", label: "gpt-4o" }],+ },+ {+ group: "Anthropic",+ provider: "anthropic",+ options: [{ value: "claude-sonnet-4", label: "Claude Sonnet 4" }],+ },+ ]}+ custom+ value=""+ onValueChange={onValueChange}+ defaultOpen+ />,+ );++ await user.type(+ screen.getByTestId("model-search-input"),+ "acme/private-model",+ );++ expect(+ screen.getByRole("option", {+ name: "Use openai:acme/private-model",+ }),+ ).toBeInTheDocument();+ await user.click(+ screen.getByRole("option", {+ name: "Use anthropic:acme/private-model",+ }),+ );++ expect(onValueChange).toHaveBeenCalledWith(+ "acme/private-model",+ "anthropic",+ );+ });+});diff --git a/frontend/components/models/model-selector.tsx b/frontend/components/models/model-selector.tsxindex c96a04a61..f24152065 100644--- a/frontend/components/models/model-selector.tsx+++ b/frontend/components/models/model-selector.tsx@@ -188,7 +188,16 @@ export function ModelSelector({!isRetiringSoon(option) ||isSelectedRow(option, value, selectedProvider, group),);- if (deferredSearch && matches.length === 0 && deprecatedCount === 0) {+ // A custom name still needs one action per configured provider. Keeping+ // otherwise-empty groups visible makes provider selection deterministic+ // instead of falling back to a single provider-less row whenever the+ // typed name has no catalogue match.+ if (+ deferredSearch &&+ matches.length === 0 &&+ deprecatedCount === 0 &&+ !allowCustomEntry+ ) {return [];}// Collapsed groups show a preview; the trailing row expands them. The cap@@ -209,6 +218,7 @@ export function ModelSelector({deprecatedGroups,value,selectedProvider,+ allowCustomEntry,]);const visibleOptions = useMemo(() => {if (groupedOptions) return [];@@ -435,8 +445,12 @@ export function ModelSelector({{showCustom && (<CommandItemvalue={`${group.group}-${customValue}`}- aria-label={customValue}- data-testid={`model-custom-option-${customValue}`}+ aria-label={+ groupProvider+ ? `Use ${groupProvider}:${customValue}`+ : `Use ${customValue}`+ }+ data-testid={`model-custom-option-${groupProvider ?? "unknown"}-${customValue}`}onSelect={() => {if (customValue !== value ||