Skip to content

Commit a3e31e1

Browse files
zoomote[bot]roomote
andauthored
[Fix] Provider settings contact unselected model services (#1425)
* fix(settings): scope provider model requests * test(settings): fix provider filtering coverage --------- Co-authored-by: Roomote <[email protected]>
1 parent 4c7474d commit a3e31e1

11 files changed

Lines changed: 114 additions & 14 deletions

File tree

‎webview-ui/src/components/settings/ApiOptions.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ExternalLinkIcon } from "@radix-ui/react-icons"
77
import {
88
type ProviderName,
99
type ProviderSettings,
10+
isDynamicProvider,
1011
isRetiredProvider,
1112
providerIdentifiers,
1213
DEFAULT_CONSECUTIVE_MISTAKE_LIMIT,
@@ -180,8 +181,13 @@ const ApiOptions = ({
180181
: selectedProvider
181182
const isRetiredSelectedProvider =
182183
typeof apiConfiguration.apiProvider === "string" && isRetiredProvider(apiConfiguration.apiProvider)
184+
const routerProvider =
185+
activeSelectedProvider && isDynamicProvider(activeSelectedProvider) ? activeSelectedProvider : undefined
183186

184-
const { data: routerModels, refetch: refetchRouterModels } = useRouterModels()
187+
const { data: routerModels, refetch: refetchRouterModels } = useRouterModels({
188+
enabled: !!routerProvider,
189+
provider: routerProvider,
190+
})
185191
useZooGatewayRouterModelsSync()
186192

187193
const { data: openRouterModelProviders } = useOpenRouterModelProviders(
@@ -242,12 +248,16 @@ const ApiOptions = ({
242248
vscode.postMessage({
243249
type: RouterModelsMessageType.requestRouterModels,
244250
values: {
251+
provider: providerIdentifiers.litellm,
245252
litellmApiKey: apiConfiguration?.litellmApiKey,
246253
litellmBaseUrl: apiConfiguration?.litellmBaseUrl,
247254
},
248255
})
249256
} else if (selectedProvider === providerIdentifiers.poe) {
250-
vscode.postMessage({ type: RouterModelsMessageType.requestRouterModels })
257+
vscode.postMessage({
258+
type: RouterModelsMessageType.requestRouterModels,
259+
values: { provider: providerIdentifiers.poe },
260+
})
251261
}
252262
},
253263
250,

‎webview-ui/src/components/settings/__tests__/ApiOptions.interactions.spec.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,20 @@ describe("ApiOptions interactions", () => {
233233
configuration: { litellmBaseUrl: "http://litellm:4000", litellmApiKey: "litellm-key" },
234234
expectedMessage: {
235235
type: "requestRouterModels",
236-
values: { litellmApiKey: "litellm-key", litellmBaseUrl: "http://litellm:4000" },
236+
values: {
237+
provider: providerIdentifiers.litellm,
238+
litellmApiKey: "litellm-key",
239+
litellmBaseUrl: "http://litellm:4000",
240+
},
237241
},
238242
},
239243
{
240244
provider: providerIdentifiers.poe,
241245
configuration: { poeApiKey: "poe-key", poeBaseUrl: "https://api.poe.example/v1" },
242-
expectedMessage: { type: "requestRouterModels" },
246+
expectedMessage: {
247+
type: "requestRouterModels",
248+
values: { provider: providerIdentifiers.poe },
249+
},
243250
},
244251
])("requests models for $provider", ({ provider, configuration, expectedMessage }) => {
245252
vi.useFakeTimers()

‎webview-ui/src/components/settings/__tests__/ApiOptions.provider-filtering.spec.tsx‎

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { providerIdentifiers } from "@roo-code/types"
21
import { screen } from "@testing-library/react"
32

43
import { renderWithExtensionState } from "@/utils/test-utils"
54

6-
import type { ProviderSettings, OrganizationAllowList } from "@roo-code/types"
5+
import { providerIdentifiers, type ProviderSettings, type OrganizationAllowList } from "@roo-code/types"
76

87
import { useExtensionState } from "@src/context/ExtensionStateContext"
8+
import { useRouterModels } from "@src/components/ui/hooks/useRouterModels"
99
import { useSelectedModel } from "@src/components/ui/hooks/useSelectedModel"
1010

1111
import ApiOptions from "../ApiOptions"
@@ -36,10 +36,10 @@ vi.mock("@src/utils/vscode", () => ({
3636

3737
// Mock the router models hook
3838
vi.mock("@src/components/ui/hooks/useRouterModels", () => ({
39-
useRouterModels: () => ({
39+
useRouterModels: vi.fn(() => ({
4040
data: null,
4141
refetch: vi.fn(),
42-
}),
42+
})),
4343
}))
4444

4545
// Mock the selected model hook
@@ -113,6 +113,61 @@ describe("ApiOptions Provider Filtering", () => {
113113
return renderWithExtensionState(<ApiOptions {...props} />)
114114
}
115115

116+
beforeEach(() => {
117+
vi.clearAllMocks()
118+
vi.mocked(useSelectedModel).mockReturnValue({
119+
provider: providerIdentifiers.anthropic,
120+
id: "claude-3-5-sonnet-20241022",
121+
info: undefined,
122+
isLoading: false,
123+
isError: false,
124+
})
125+
})
126+
127+
it("does not request router models for a static provider", () => {
128+
renderWithProviders()
129+
130+
expect(useRouterModels).toHaveBeenCalledWith({ enabled: false, provider: undefined })
131+
})
132+
133+
it("requests router models only for the selected dynamic provider", () => {
134+
vi.mocked(useSelectedModel).mockReturnValue({
135+
provider: providerIdentifiers.kenari,
136+
id: "glm-5-2",
137+
info: undefined,
138+
isLoading: false,
139+
isError: false,
140+
})
141+
142+
renderWithProviders({
143+
...defaultProps,
144+
apiConfiguration: { apiProvider: providerIdentifiers.kenari } as ProviderSettings,
145+
})
146+
147+
expect(useRouterModels).toHaveBeenCalledWith({ enabled: true, provider: providerIdentifiers.kenari })
148+
})
149+
150+
it.each([providerIdentifiers.ollama, providerIdentifiers.lmstudio])(
151+
"does not make an aggregate router request for local provider %s",
152+
(provider) => {
153+
vi.mocked(useSelectedModel).mockReturnValue({
154+
provider,
155+
id: "local-model",
156+
info: undefined,
157+
isLoading: false,
158+
isError: false,
159+
})
160+
161+
renderWithProviders({
162+
...defaultProps,
163+
apiConfiguration: { apiProvider: provider } as ProviderSettings,
164+
})
165+
166+
expect(useRouterModels).toHaveBeenCalledWith({ provider })
167+
expect(useRouterModels).not.toHaveBeenCalledWith()
168+
},
169+
)
170+
116171
it("should show all providers when no organization allow list is provided", () => {
117172
renderWithProviders()
118173

‎webview-ui/src/components/settings/providers/LMStudio.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
type ExtensionMessage,
1010
type ModelRecord,
1111
LmStudioModelsMessageType,
12+
providerIdentifiers,
1213
} from "@roo-code/types"
1314

1415
import { useAppTranslation } from "@src/i18n/TranslationContext"
@@ -27,7 +28,7 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi
2728
const { t } = useAppTranslation()
2829

2930
const [lmStudioModels, setLmStudioModels] = useState<ModelRecord>({})
30-
const routerModels = useRouterModels()
31+
const routerModels = useRouterModels({ provider: providerIdentifiers.lmstudio })
3132
const initialBaseUrlRef = useRef(apiConfiguration?.lmStudioBaseUrl)
3233

3334
const handleInputChange = useCallback(

‎webview-ui/src/components/settings/providers/LiteLLM.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const LiteLLM = ({
115115

116116
vscode.postMessage({
117117
type: RouterModelsMessageType.requestRouterModels,
118-
values: { litellmApiKey: key, litellmBaseUrl: url },
118+
values: { provider: providerIdentifiers.litellm, litellmApiKey: key, litellmBaseUrl: url },
119119
})
120120
}, [apiConfiguration, setRefreshStatus, setRefreshError, t])
121121

‎webview-ui/src/components/settings/providers/Moonshot.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ export const Moonshot = ({ apiConfiguration, setApiConfigurationField, simplifyS
101101

102102
vscode.postMessage({
103103
type: RouterModelsMessageType.requestRouterModels,
104-
values: { moonshotApiKey: key, moonshotBaseUrl: apiConfiguration.moonshotBaseUrl },
104+
values: {
105+
provider: providerIdentifiers.moonshot,
106+
moonshotApiKey: key,
107+
moonshotBaseUrl: apiConfiguration.moonshotBaseUrl,
108+
},
105109
})
106110
}, [apiConfiguration, t])
107111

‎webview-ui/src/components/settings/providers/Ollama.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
type ModelRecord,
99
ollamaDefaultModelInfo,
1010
OllamaModelsMessageType,
11+
providerIdentifiers,
1112
} from "@roo-code/types"
1213

1314
import { useAppTranslation } from "@src/i18n/TranslationContext"
@@ -38,7 +39,7 @@ export const Ollama = ({ apiConfiguration, setApiConfigurationField }: OllamaPro
3839
const [refreshStatus, setRefreshStatus] = useState(RefreshStatus.Idle)
3940
const [refreshError, setRefreshError] = useState<string | undefined>()
4041
const refreshStatusRef = useRef(refreshStatus)
41-
const routerModels = useRouterModels()
42+
const routerModels = useRouterModels({ provider: providerIdentifiers.ollama })
4243

4344
const handleInputChange = useCallback(
4445
<K extends keyof ProviderSettings, E>(

‎webview-ui/src/components/settings/providers/Poe.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const Poe = ({
112112

113113
vscode.postMessage({
114114
type: RouterModelsMessageType.requestRouterModels,
115-
values: { poeApiKey: key, poeBaseUrl: apiConfiguration.poeBaseUrl },
115+
values: { provider: providerIdentifiers.poe, poeApiKey: key, poeBaseUrl: apiConfiguration.poeBaseUrl },
116116
})
117117
}, [apiConfiguration, t])
118118

‎webview-ui/src/components/settings/providers/__tests__/LiteLLM.spec.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,14 @@ describe("LiteLLM", () => {
7272
)
7373

7474
fireEvent.click(screen.getByTestId("refresh-button"))
75+
expect(postMessageMock).toHaveBeenCalledWith({
76+
type: "requestRouterModels",
77+
values: {
78+
provider: providerIdentifiers.litellm,
79+
litellmApiKey: "test-key",
80+
litellmBaseUrl: "http://localhost:4000",
81+
},
82+
})
7583
act(() => {
7684
window.dispatchEvent(new MessageEvent("message", { data: { type: "routerModels" } }))
7785
})

‎webview-ui/src/components/settings/providers/__tests__/Moonshot.spec.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ describe("Moonshot Component", () => {
466466
expect.objectContaining({
467467
type: "requestRouterModels",
468468
values: {
469+
provider: providerIdentifiers.moonshot,
469470
moonshotApiKey: "test-key",
470471
moonshotBaseUrl: "https://api.moonshot.cn/v1",
471472
},

0 commit comments

Comments
 (0)