Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/core/src/config/plugin/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,16 @@ export const Plugin = define({
providers.models.update(providerID, id, (model) => {
if (base) Object.assign(model, structuredClone(base))
if (item.package !== undefined) model.package = undefined
if (item.settings?.baseURL !== undefined && model.settings) delete model.settings.baseURL
})
}
// A configured provider baseURL replaces every catalog per-model endpoint, not only those of configured
// models. Configured per-model settings are applied later and still win.
if (item.settings?.baseURL !== undefined)
for (const [id, model] of providers.get(providerID)?.models ?? [])
if (model.settings?.baseURL !== undefined)
providers.models.update(providerID, id, (model) => {
delete model.settings?.baseURL
})
next.set(item, { providerID, models: definitions })
}
for (const [item, definition] of next) {
Expand Down
32 changes: 32 additions & 0 deletions packages/core/test/config/provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,38 @@ describe("ConfigProviderPlugin.Plugin", () => {
}),
)

it.effect("lets a configured provider baseURL override catalog model baseURLs", () =>
Effect.gen(function* () {
const providers = yield* Provider.Service
const models = yield* Model.Service
const providerID = Provider.ID.make("gateway")
yield* providers.transform((editor) => {
for (const id of ["chat", "pinned"])
editor.models.update(providerID, Model.ID.make(id), (model) => {
model.settings = { baseURL: "https://catalog.example/v1" }
})
})
yield* addPlugin([
new Document({
type: "document",
info: decode({
providers: {
gateway: {
settings: { baseURL: "http://127.0.0.1:17322" },
models: { pinned: { settings: { baseURL: "http://127.0.0.1:9000" } } },
},
},
}),
}),
])

const baseURL = (id: string) =>
models.get(providerID, Model.ID.make(id)).pipe(Effect.map((model) => required(model).settings?.baseURL))
expect(yield* baseURL("chat")).toBe("http://127.0.0.1:17322")
expect(yield* baseURL("pinned")).toBe("http://127.0.0.1:9000")
}),
)

it.effect("generates variants after rewriting a configured model package", () =>
Effect.gen(function* () {
const models = yield* Model.Service
Expand Down
Loading