Skip to content

Commit 6d1192d

Browse files
committed
test(friendli): cover model catalog paths
1 parent d50342f commit 6d1192d

5 files changed

Lines changed: 51 additions & 13 deletions

File tree

‎src/api/providers/__tests__/friendli.spec.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
1414

1515
// Create mock functions
1616
const mockCreate = vi.fn()
17-
const { mockGetModels } = vi.hoisted(() => ({ mockGetModels: vi.fn(async () => ({})) }))
17+
const { mockGetModels, mockGetFriendliModels } = vi.hoisted(() => ({
18+
mockGetModels: vi.fn(async () => ({})),
19+
mockGetFriendliModels: vi.fn(),
20+
}))
1821

1922
vi.mock("../fetchers/modelCache", () => ({ getModels: mockGetModels }))
23+
vi.mock("../fetchers/friendli", () => ({ getFriendliModels: mockGetFriendliModels }))
2024

2125
// Mock OpenAI module
2226
vi.mock("openai", () => ({
@@ -92,6 +96,15 @@ describe("FriendliHandler", () => {
9296
expect(handlerWithModel.getModel().id).toBe("vendor/new-model")
9397
})
9498

99+
it("fetchModels should load the public /v1/models catalog", async () => {
100+
const fetched = { "vendor/new-model": { contextWindow: 100_000, supportsPromptCache: false } }
101+
mockGetFriendliModels.mockResolvedValueOnce(fetched)
102+
const signal = new AbortController().signal
103+
104+
expect(await handler.fetchModels({ provider: providerIdentifiers.friendli }, signal)).toBe(fetched)
105+
expect(mockGetFriendliModels).toHaveBeenCalledWith({ signal })
106+
})
107+
95108
it("should return default model when no model is specified", () => {
96109
const model = handler.getModel()
97110
expect(model.id).toBe(friendliDefaultModelId)

‎src/api/providers/fetchers/__tests__/friendli.spec.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@ describe("getFriendliModels", () => {
5454
expect(models["google/gemma-4-31B-it"].supportsPromptCache).toBe(false)
5555
})
5656

57+
it("returns an empty record on an invalid response", async () => {
58+
vi.spyOn(console, "error").mockImplementation(() => {})
59+
vi.mocked(axios.get).mockResolvedValueOnce({ data: { invalid: true } })
60+
61+
expect(await getFriendliModels()).toEqual({})
62+
})
63+
5764
it("returns an empty record on request failure", async () => {
5865
vi.spyOn(console, "error").mockImplementation(() => {})
5966
vi.mocked(axios.get).mockRejectedValueOnce(new Error("Network error"))

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -773,17 +773,12 @@ const ApiOptions = ({
773773
apiConfiguration={apiConfiguration}
774774
setApiConfigurationField={setApiConfigurationField}
775775
defaultModelId={getDefaultModelIdForProvider(activeSelectedProvider, apiConfiguration)}
776-
models={
777-
activeSelectedProvider === providerIdentifiers.friendli &&
778-
routerModels?.friendli &&
779-
Object.keys(routerModels.friendli).length > 0
780-
? routerModels.friendli
781-
: getStaticModelsForProvider(
782-
activeSelectedProvider,
783-
t("settings:labels.useCustomArn"),
784-
apiConfiguration,
785-
)
786-
}
776+
models={getStaticModelsForProvider(
777+
activeSelectedProvider,
778+
t("settings:labels.useCustomArn"),
779+
apiConfiguration,
780+
routerModels,
781+
)}
787782
modelIdKey="apiModelId"
788783
serviceName={getProviderServiceConfig(activeSelectedProvider).serviceName}
789784
serviceUrl={getProviderServiceConfig(activeSelectedProvider).serviceUrl}

‎webview-ui/src/components/settings/utils/__tests__/providerModelConfig.spec.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import {
2+
type RouterModels,
23
anthropicDefaultModelId,
4+
friendliModels,
35
ioIntelligenceDefaultModelId,
46
mainlandZAiDefaultModelId,
57
nanoGptDefaultModelId,
@@ -212,6 +214,16 @@ describe("providerModelConfig", () => {
212214
expect(models["custom-arn"].description).toBe("Use Custom ARN")
213215
})
214216

217+
it("prefers fetched Friendli models over the static fallback", () => {
218+
const fetched = { "vendor/new-model": { contextWindow: 100_000, supportsPromptCache: false } }
219+
const routerModels = { friendli: fetched } as unknown as RouterModels
220+
221+
expect(getStaticModelsForProvider(providerIdentifiers.friendli, undefined, undefined, routerModels)).toBe(
222+
fetched,
223+
)
224+
expect(getStaticModelsForProvider(providerIdentifiers.friendli)).toBe(friendliModels)
225+
})
226+
215227
it("returns empty object for providers without static models", () => {
216228
const models = getStaticModelsForProvider(providerIdentifiers.openrouter)
217229
expect(Object.keys(models).length).toBe(0)

‎webview-ui/src/components/settings/utils/providerModelConfig.ts‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ProviderName, ModelInfo, ProviderSettings } from "@roo-code/types"
1+
import type { ProviderName, ModelInfo, ProviderSettings, RouterModels } from "@roo-code/types"
22
import {
33
providerIdentifiers,
44
anthropicDefaultModelId,
@@ -183,7 +183,18 @@ export const getStaticModelsForProvider = (
183183
provider: ProviderName,
184184
customArnLabel?: string,
185185
apiConfiguration?: ProviderSettings,
186+
routerModels?: RouterModels,
186187
): Record<string, ModelInfo> => {
188+
// Friendli's static list is only a fallback for its fetched /v1/models list.
189+
const friendliRouterModels = routerModels?.friendli
190+
if (
191+
provider === providerIdentifiers.friendli &&
192+
friendliRouterModels &&
193+
Object.keys(friendliRouterModels).length > 0
194+
) {
195+
return friendliRouterModels
196+
}
197+
187198
if (provider === providerIdentifiers.zai) {
188199
return getZAiModels(apiConfiguration?.zaiApiLine)
189200
}

0 commit comments

Comments
 (0)