Skip to content

Commit d2391fb

Browse files
committed
refactor(types): centralize provider model definitions
1 parent abaf732 commit d2391fb

5 files changed

Lines changed: 540 additions & 323 deletions

File tree

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { getModelId, providerIdentifiers, type ProviderSettings } from "../index.js"
2+
3+
describe("getModelId", () => {
4+
it("uses the provider-specific model ID field", () => {
5+
const settings: ProviderSettings = {
6+
apiProvider: providerIdentifiers.openrouter,
7+
apiModelId: "unrelated-model",
8+
openRouterModelId: "openrouter-model",
9+
}
10+
11+
expect(getModelId(settings)).toBe("openrouter-model")
12+
})
13+
14+
it("uses the active provider when other model ID fields are present", () => {
15+
const settings: ProviderSettings = {
16+
apiProvider: providerIdentifiers.ollama,
17+
apiModelId: "anthropic-model",
18+
ollamaModelId: "ollama-model",
19+
}
20+
21+
expect(getModelId(settings)).toBe("ollama-model")
22+
})
23+
24+
it("uses the nested model selector for VS Code LM", () => {
25+
const settings: ProviderSettings = {
26+
apiProvider: providerIdentifiers.vscodeLm,
27+
vsCodeLmModelSelector: { vendor: "copilot", family: "gpt-4o", id: "vscode-model", version: "1" },
28+
}
29+
30+
expect(getModelId(settings)).toBe("vscode-model")
31+
})
32+
33+
it.each([providerIdentifiers.openai, providerIdentifiers.fakeAi])("uses apiModelId for %s", (apiProvider) => {
34+
const settings: ProviderSettings = { apiProvider, apiModelId: "shared-model" }
35+
36+
expect(getModelId(settings)).toBe("shared-model")
37+
})
38+
39+
it("returns undefined when no provider is selected", () => {
40+
expect(getModelId({})).toBeUndefined()
41+
})
42+
43+
it("resolves a model ID for every provider definition without throwing", () => {
44+
for (const apiProvider of Object.values(providerIdentifiers)) {
45+
expect(() => getModelId({ apiProvider })).not.toThrow()
46+
}
47+
})
48+
})

‎packages/types/src/__tests__/provider-settings.test.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ANTHROPIC_API_PROTOCOL, OPENAI_API_PROTOCOL, providerIdentifiers } from "../index.js"
1+
import { ANTHROPIC_API_PROTOCOL, OPENAI_API_PROTOCOL, providerIdentifiers, providerNames } from "../index.js"
22
import {
33
getApiProtocol,
44
OPEN_AI_CODEX_SERVICE_TIER_KEY,
@@ -8,6 +8,12 @@ import {
88
} from "../provider-settings.js"
99
import { OpenAiCodexServiceTier, OpenAiServiceTier } from "../model.js"
1010

11+
describe("provider settings discriminated union", () => {
12+
it.each(providerNames)("accepts the %s provider branch", (apiProvider) => {
13+
expect(providerSettingsSchemaDiscriminated.safeParse({ apiProvider }).success).toBe(true)
14+
})
15+
})
16+
1117
describe("OpenAI Codex provider settings", () => {
1218
it("preserves the Fast preference in general and provider-specific schemas", () => {
1319
const settings = {

0 commit comments

Comments
 (0)