Skip to content

Commit 82ddeb2

Browse files
committed
refactor(cli): resolve the model ID through the provider definitions
getContextWindow carried its own switch mapping each provider to the settings field holding its model ID. That duplicated the per-provider accessors in @roo-code/types and had to be updated by hand whenever a provider was added. Call the canonical getModelId() instead, which dispatches to each provider definition's accessor, and drop the switch. Cover the shared apiModelId providers, VS Code LM selectors, cross- provider field isolation, retired providers, and missing inputs.
1 parent ca05b73 commit 82ddeb2

2 files changed

Lines changed: 71 additions & 82 deletions

File tree

‎apps/cli/src/lib/utils/__tests__/context-window.test.ts‎

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { providerIdentifiers, type ProviderSettings } from "@roo-code/types"
1+
import { providerIdentifiers, retiredProviderIdentifiers, type ProviderSettings } from "@roo-code/types"
22

33
import { DEFAULT_CONTEXT_WINDOW, getContextWindow } from "../context-window.js"
44

@@ -24,6 +24,60 @@ describe("getContextWindow", () => {
2424
expect(getContextWindow(routerModels, config)).toBe(123_456)
2525
})
2626

27+
it.each([
28+
providerIdentifiers.anthropic,
29+
providerIdentifiers.bedrock,
30+
providerIdentifiers.deepseek,
31+
providerIdentifiers.fireworks,
32+
providerIdentifiers.gemini,
33+
providerIdentifiers.mistral,
34+
providerIdentifiers.openaiNative,
35+
providerIdentifiers.vertex,
36+
providerIdentifiers.xai,
37+
] as const)("uses the shared apiModelId field for %s", (provider) => {
38+
const config: ProviderSettings = { apiProvider: provider, apiModelId: "selected-model" }
39+
const routerModels = { [provider]: { "selected-model": { contextWindow: 64_000 } } }
40+
41+
expect(getContextWindow(routerModels, config)).toBe(64_000)
42+
})
43+
44+
it("ignores another provider's model field", () => {
45+
const config: ProviderSettings = {
46+
apiProvider: providerIdentifiers.ollama,
47+
openRouterModelId: "openrouter-model",
48+
ollamaModelId: "ollama-model",
49+
}
50+
const routerModels = {
51+
[providerIdentifiers.ollama]: { "ollama-model": { contextWindow: 32_000 } },
52+
}
53+
54+
expect(getContextWindow(routerModels, config)).toBe(32_000)
55+
})
56+
57+
describe("VS Code LM", () => {
58+
const provider = providerIdentifiers.vscodeLm
59+
const routerModels = { [provider]: { "selected-model": { contextWindow: 123_456 } } }
60+
61+
it("takes the model from the saved selector", () => {
62+
const config: ProviderSettings = {
63+
apiProvider: provider,
64+
vsCodeLmModelSelector: { vendor: "copilot", id: "selected-model" },
65+
}
66+
67+
expect(getContextWindow(routerModels, config)).toBe(123_456)
68+
})
69+
70+
it("ignores apiModelId, which the selector replaces", () => {
71+
const config: ProviderSettings = {
72+
apiProvider: provider,
73+
apiModelId: "other-model",
74+
vsCodeLmModelSelector: { vendor: "copilot", id: "selected-model" },
75+
}
76+
77+
expect(getContextWindow(routerModels, config)).toBe(123_456)
78+
})
79+
})
80+
2781
describe("GitHub Copilot", () => {
2882
const provider = providerIdentifiers.githubCopilot
2983
const routerModels = { [provider]: { "selected-model": { contextWindow: 123_456 } } }
@@ -66,19 +120,25 @@ describe("getContextWindow", () => {
66120
})
67121
})
68122

69-
it("uses apiModelId for providers without a specialized model field", () => {
123+
it("returns the default when the selected model is unavailable", () => {
124+
expect(getContextWindow({}, { apiProvider: providerIdentifiers.openrouter })).toBe(DEFAULT_CONTEXT_WINDOW)
125+
})
126+
127+
it("returns the default when no provider is selected", () => {
128+
expect(getContextWindow({}, {})).toBe(DEFAULT_CONTEXT_WINDOW)
129+
})
130+
131+
it("returns the default for a retired provider instead of throwing", () => {
70132
const config: ProviderSettings = {
71-
apiProvider: providerIdentifiers.anthropic,
133+
apiProvider: retiredProviderIdentifiers.groq,
72134
apiModelId: "selected-model",
73135
}
74-
const routerModels = {
75-
[providerIdentifiers.anthropic]: { "selected-model": { contextWindow: 64_000 } },
76-
}
77136

78-
expect(getContextWindow(routerModels, config)).toBe(64_000)
137+
expect(getContextWindow({}, config)).toBe(DEFAULT_CONTEXT_WINDOW)
79138
})
80139

81-
it("returns the default when the selected model is unavailable", () => {
82-
expect(getContextWindow({}, { apiProvider: providerIdentifiers.openrouter })).toBe(DEFAULT_CONTEXT_WINDOW)
140+
it("returns the default when router models or configuration is missing", () => {
141+
expect(getContextWindow(null, { apiProvider: providerIdentifiers.anthropic })).toBe(DEFAULT_CONTEXT_WINDOW)
142+
expect(getContextWindow({}, null)).toBe(DEFAULT_CONTEXT_WINDOW)
83143
})
84144
})
Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { providerIdentifiers, retiredProviderIdentifiers, type ProviderSettings } from "@roo-code/types"
1+
import { getModelId, type ProviderSettings } from "@roo-code/types"
22

33
import type { RouterModels } from "@/ui/store.js"
44

@@ -17,7 +17,7 @@ export function getContextWindow(routerModels: RouterModels | null, apiConfigura
1717
}
1818

1919
const provider = apiConfiguration.apiProvider
20-
const modelId = getModelIdForProvider(apiConfiguration)
20+
const modelId = getModelId(apiConfiguration)
2121

2222
if (!provider || !modelId) {
2323
return DEFAULT_CONTEXT_WINDOW
@@ -29,75 +29,4 @@ export function getContextWindow(routerModels: RouterModels | null, apiConfigura
2929
return modelInfo?.contextWindow ?? DEFAULT_CONTEXT_WINDOW
3030
}
3131

32-
/**
33-
* Gets the model ID from the API configuration based on the provider type.
34-
*
35-
* Different providers store their model ID in different fields of ProviderSettings.
36-
*/
37-
function getModelIdForProvider(config: ProviderSettings): string | undefined {
38-
switch (config.apiProvider) {
39-
case providerIdentifiers.openrouter:
40-
return config.openRouterModelId
41-
case providerIdentifiers.ollama:
42-
return config.ollamaModelId
43-
case providerIdentifiers.lmstudio:
44-
return config.lmStudioModelId
45-
case providerIdentifiers.openai:
46-
return config.openAiModelId
47-
case providerIdentifiers.requesty:
48-
return config.requestyModelId
49-
case providerIdentifiers.unbound:
50-
return config.unboundModelId
51-
case providerIdentifiers.litellm:
52-
return config.litellmModelId
53-
case providerIdentifiers.ioIntelligence:
54-
return config.ioIntelligenceModelId
55-
case providerIdentifiers.vercelAiGateway:
56-
return config.vercelAiGatewayModelId
57-
case providerIdentifiers.opencodeGo:
58-
return config.opencodeGoModelId
59-
case providerIdentifiers.kenari:
60-
return config.kenariModelId
61-
case providerIdentifiers.nanogpt:
62-
return config.nanoGptModelId
63-
case providerIdentifiers.zooGateway:
64-
return config.zooGatewayModelId
65-
case providerIdentifiers.githubCopilot:
66-
return config.vsCodeLmModelSelector?.id
67-
case providerIdentifiers.anthropic:
68-
case providerIdentifiers.bedrock:
69-
case providerIdentifiers.baseten:
70-
case providerIdentifiers.deepseek:
71-
case providerIdentifiers.fireworks:
72-
case providerIdentifiers.friendli:
73-
case providerIdentifiers.gemini:
74-
case providerIdentifiers.geminiCli:
75-
case providerIdentifiers.mistral:
76-
case providerIdentifiers.moonshot:
77-
case providerIdentifiers.kimiCode:
78-
case providerIdentifiers.minimax:
79-
case providerIdentifiers.mimo:
80-
case providerIdentifiers.openaiCodex:
81-
case providerIdentifiers.openaiNative:
82-
case providerIdentifiers.poe:
83-
case providerIdentifiers.qwenCode:
84-
case providerIdentifiers.sambanova:
85-
case providerIdentifiers.vertex:
86-
case providerIdentifiers.xai:
87-
case providerIdentifiers.zai:
88-
case retiredProviderIdentifiers.cerebras:
89-
case retiredProviderIdentifiers.chutes:
90-
case retiredProviderIdentifiers.deepinfra:
91-
case retiredProviderIdentifiers.doubao:
92-
case retiredProviderIdentifiers.featherless:
93-
case retiredProviderIdentifiers.groq:
94-
case retiredProviderIdentifiers.huggingface:
95-
case retiredProviderIdentifiers.roo:
96-
case providerIdentifiers.vscodeLm:
97-
case providerIdentifiers.fakeAi:
98-
case undefined:
99-
return config.apiModelId
100-
}
101-
}
102-
10332
export { DEFAULT_CONTEXT_WINDOW }

0 commit comments

Comments
 (0)