vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-29 19:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: normalize provider catalog config lookup

Browse Source
This commit is contained in:
Tak Hoffman
2026-03-27 21:03:49 -05:00
parent 59a0411a78
commit 7ccf4552ac
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/provider-catalog.test.ts
View File

@@ -121,6 +121,36 @@ describe("buildSingleProviderApiKeyCatalog", () => {
});
});
it("matches explicit base url config across canonical provider aliases", async () => {
const result = await buildSingleProviderApiKeyCatalog({
ctx: createCatalogContext({
apiKeys: { zai: "secret-key" },
config: {
models: {
providers: {
"z.ai": {
baseUrl: " https://api.z.ai/custom ",
models: [],
},
},
},
},
}),
providerId: "z-ai",
buildProvider: () => createProviderConfig({ baseUrl: "https://default.example/zai" }),
allowExplicitBaseUrl: true,
});
expect(result).toEqual({
provider: {
api: "openai-completions",
baseUrl: "https://api.z.ai/custom",
models: [],
apiKey: "secret-key",
},
});
});
it("adds api key to each paired provider", async () => {
const result = await buildPairedProviderApiKeyCatalog({
ctx: createCatalogContext({

14
src/plugins/provider-catalog.ts
View File

@@ -24,14 +24,18 @@ export async function buildSingleProviderApiKeyCatalog(params: {
buildProvider: () => ModelProviderConfig | Promise<ModelProviderConfig>;
allowExplicitBaseUrl?: boolean;
}): Promise<ProviderCatalogResult> {
const apiKey = params.ctx.resolveProviderApiKey(params.providerId).apiKey;
const providerId = normalizeProviderId(params.providerId);
const apiKey = params.ctx.resolveProviderApiKey(providerId).apiKey;
if (!apiKey) {
return null;
}
const explicitProvider = params.allowExplicitBaseUrl
? params.ctx.config.models?.providers?.[params.providerId]
: undefined;
const explicitProvider =
params.allowExplicitBaseUrl && params.ctx.config.models?.providers
? Object.entries(params.ctx.config.models.providers).find(
([configuredProviderId]) => normalizeProviderId(configuredProviderId) === providerId,
)?.[1]
: undefined;
const explicitBaseUrl =
typeof explicitProvider?.baseUrl === "string" ? explicitProvider.baseUrl.trim() : "";
@@ -51,7 +55,7 @@ export async function buildPairedProviderApiKeyCatalog(params: {
| Record<string, ModelProviderConfig>
| Promise<Record<string, ModelProviderConfig>>;
}): Promise<ProviderCatalogResult> {
const apiKey = params.ctx.resolveProviderApiKey(params.providerId).apiKey;
const apiKey = params.ctx.resolveProviderApiKey(normalizeProviderId(params.providerId)).apiKey;
if (!apiKey) {
return null;
}