mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-12 08:42:18 +00:00
Fix MCP connect base URL normalization
This commit is contained in:
parent
7ad1b5c32c
commit
4b137dd983
2 changed files with 29 additions and 3 deletions
|
|
@ -49,4 +49,26 @@ describe("resolveMCPConnectBaseUrl", () => {
|
|||
),
|
||||
).toBe(fallbackBaseUrl);
|
||||
});
|
||||
|
||||
it("trims trailing slashes before endpoint paths are appended", () => {
|
||||
expect(
|
||||
resolveMCPConnectBaseUrl(
|
||||
{
|
||||
LITELLM_UI_API_DOC_BASE_URL: " https://docs.litellm.test/// ",
|
||||
},
|
||||
fallbackBaseUrl,
|
||||
),
|
||||
).toBe("https://docs.litellm.test");
|
||||
|
||||
expect(
|
||||
resolveMCPConnectBaseUrl(
|
||||
{
|
||||
PROXY_BASE_URL: "https://proxy.litellm.test/",
|
||||
},
|
||||
`${fallbackBaseUrl}/`,
|
||||
),
|
||||
).toBe("https://proxy.litellm.test");
|
||||
|
||||
expect(resolveMCPConnectBaseUrl(undefined, `${fallbackBaseUrl}/`)).toBe(fallbackBaseUrl);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,19 +3,23 @@ export interface MCPConnectProxySettings {
|
|||
LITELLM_UI_API_DOC_BASE_URL?: string | null;
|
||||
}
|
||||
|
||||
function normalizeBaseUrl(baseUrl: string): string {
|
||||
return baseUrl.trim().replace(/\/+$/, "");
|
||||
}
|
||||
|
||||
export function resolveMCPConnectBaseUrl(
|
||||
proxySettings: MCPConnectProxySettings | undefined,
|
||||
fallbackBaseUrl: string,
|
||||
): string {
|
||||
const customDocBaseUrl = proxySettings?.LITELLM_UI_API_DOC_BASE_URL;
|
||||
if (customDocBaseUrl && customDocBaseUrl.trim()) {
|
||||
return customDocBaseUrl.trim();
|
||||
return normalizeBaseUrl(customDocBaseUrl);
|
||||
}
|
||||
|
||||
const proxyBaseUrl = proxySettings?.PROXY_BASE_URL;
|
||||
if (proxyBaseUrl && proxyBaseUrl.trim()) {
|
||||
return proxyBaseUrl.trim();
|
||||
return normalizeBaseUrl(proxyBaseUrl);
|
||||
}
|
||||
|
||||
return fallbackBaseUrl;
|
||||
return normalizeBaseUrl(fallbackBaseUrl);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue