Merge bcbe39ac4d into eafed9705c

src/api/providers/fetchers/__tests__/litellm.spec.ts

@@ -697,4 +697,44 @@ describe("getLiteLLMModels", () => {
 			description: "model-with-only-max-output-tokens via LiteLLM proxy",
 		})
 	})
+
+	it("sends request without Authorization header when apiKey is undefined", async () => {
+		const mockResponse = {
+			data: {
+				data: [],
+			},
+		}
+
+		mockedAxios.get.mockResolvedValue(mockResponse)
+
+		await getLiteLLMModels(undefined, "http://localhost:4000")
+
+		expect(mockedAxios.get).toHaveBeenCalledWith("http://localhost:4000/v1/model/info", {
+			headers: {
+				"Content-Type": "application/json",
+				...DEFAULT_HEADERS,
+			},
+			timeout: 5000,
+		})
+	})
+
+	it("sends request without Authorization header when apiKey is empty string", async () => {
+		const mockResponse = {
+			data: {
+				data: [],
+			},
+		}
+
+		mockedAxios.get.mockResolvedValue(mockResponse)
+
+		await getLiteLLMModels("", "http://localhost:4000")
+
+		expect(mockedAxios.get).toHaveBeenCalledWith("http://localhost:4000/v1/model/info", {
+			headers: {
+				"Content-Type": "application/json",
+				...DEFAULT_HEADERS,
+			},
+			timeout: 5000,
+		})
+	})
 })

src/api/providers/fetchers/litellm.ts

@@ -11,7 +11,7 @@ import { DEFAULT_HEADERS } from "../constants"
  * @returns A promise that resolves to a record of model IDs to model info
  * @throws Will throw an error if the request fails or the response is not as expected.
  */
-export async function getLiteLLMModels(apiKey: string, baseUrl: string): Promise<ModelRecord> {
+export async function getLiteLLMModels(apiKey: string | undefined, baseUrl: string): Promise<ModelRecord> {
 	try {
 		const headers: Record<string, string> = {
 			"Content-Type": "application/json",

src/api/providers/lite-llm.ts

@@ -26,7 +26,7 @@ export class LiteLLMHandler extends RouterProvider implements SingleCompletionHa
 			options,
 			name: "litellm",
 			baseURL: `${options.litellmBaseUrl || "http://localhost:4000"}`,
-			apiKey: options.litellmApiKey || "dummy-key",
+			apiKey: options.litellmApiKey || "not-needed",
 			modelId: options.litellmModelId,
 			defaultModelId: litellmDefaultModelId,
 			defaultModelInfo: litellmDefaultModelInfo,

src/core/webview/webviewMessageHandler.ts

@@ -1002,11 +1002,11 @@ export const webviewMessageHandler = async (
 				},
 			]
 
-			// LiteLLM is conditional on baseUrl+apiKey
+			// LiteLLM is conditional on baseUrl (apiKey is optional)
 			const litellmApiKey = apiConfiguration.litellmApiKey || message?.values?.litellmApiKey
 			const litellmBaseUrl = apiConfiguration.litellmBaseUrl || message?.values?.litellmBaseUrl
 
-			if (litellmApiKey && litellmBaseUrl) {
+			if (litellmBaseUrl) {
 				// If explicit credentials are provided in message.values (from Refresh Models button),
 				// flush the cache first to ensure we fetch fresh data with the new credentials
 				if (message?.values?.litellmApiKey || message?.values?.litellmBaseUrl) {

src/shared/api.ts

@@ -171,7 +171,7 @@ type CommonFetchParams = {
 const dynamicProviderExtras = {
 	openrouter: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
 	"vercel-ai-gateway": {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
-	litellm: {} as { apiKey: string; baseUrl: string },
+	litellm: {} as { apiKey?: string; baseUrl: string },
 	requesty: {} as { apiKey?: string; baseUrl?: string },
 	unbound: {} as { apiKey?: string },
 	ollama: {} as {}, // eslint-disable-line @typescript-eslint/no-empty-object-type

webview-ui/src/components/settings/providers/LiteLLM.tsx

@@ -86,13 +86,16 @@ export const LiteLLM = ({
 		const key = apiConfiguration.litellmApiKey
 		const url = apiConfiguration.litellmBaseUrl
 
-		if (!key || !url) {
+		if (!url) {
 			setRefreshStatus("error")
 			setRefreshError(t("settings:providers.refreshModels.missingConfig"))
 			return
 		}
 
-		vscode.postMessage({ type: "requestRouterModels", values: { litellmApiKey: key, litellmBaseUrl: url } })
+		vscode.postMessage({
+			type: "requestRouterModels",
+			values: { ...(key ? { litellmApiKey: key } : {}), litellmBaseUrl: url },
+		})
 	}, [apiConfiguration, setRefreshStatus, setRefreshError, t])
 
 	return (
@@ -121,9 +124,7 @@ export const LiteLLM = ({
 			<Button
 				variant="outline"
 				onClick={handleRefreshModels}
-				disabled={
+				disabled={refreshStatus === "loading" || !apiConfiguration.litellmBaseUrl}
-					refreshStatus === "loading" || !apiConfiguration.litellmApiKey || !apiConfiguration.litellmBaseUrl
-				}
 				className="w-full">
 				<div className="flex items-center gap-2">
 					{refreshStatus === "loading" ? (

webview-ui/src/i18n/locales/ca/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Heu de proporcionar una clau API vàlida.",
+		"baseUrl": "Heu de proporcionar una URL base vàlida.",
 		"awsRegion": "Heu de triar una regió per utilitzar Amazon Bedrock.",
 		"googleCloud": "Heu de proporcionar un ID de projecte i regió de Google Cloud vàlids.",
 		"modelId": "Heu de proporcionar un ID de model vàlid.",

webview-ui/src/i18n/locales/de/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Du musst einen gültigen API-Schlüssel angeben.",
+		"baseUrl": "Du musst eine gültige Basis-URL angeben.",
 		"awsRegion": "Du musst eine Region für die Verwendung mit Amazon Bedrock auswählen.",
 		"googleCloud": "Du musst eine gültige Google Cloud Projekt-ID und Region angeben.",
 		"modelId": "Du musst eine gültige Modell-ID angeben.",

webview-ui/src/i18n/locales/en/settings.json

@@ -947,6 +947,7 @@
 	},
 	"validation": {
 		"apiKey": "You must provide a valid API key.",
+		"baseUrl": "You must provide a valid base URL.",
 		"awsRegion": "You must choose a region to use with Amazon Bedrock.",
 		"googleCloud": "You must provide a valid Google Cloud Project ID and Region.",
 		"modelId": "You must provide a valid model ID.",

webview-ui/src/i18n/locales/es/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Debe proporcionar una clave API válida.",
+		"baseUrl": "Debe proporcionar una URL base válida.",
 		"awsRegion": "Debe elegir una región para usar con Amazon Bedrock.",
 		"googleCloud": "Debe proporcionar un ID de proyecto y región de Google Cloud válidos.",
 		"modelId": "Debe proporcionar un ID de modelo válido.",

webview-ui/src/i18n/locales/fr/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Vous devez fournir une clé API valide.",
+		"baseUrl": "Vous devez fournir une URL de base valide.",
 		"awsRegion": "Vous devez choisir une région pour utiliser Amazon Bedrock.",
 		"googleCloud": "Vous devez fournir un ID de projet et une région Google Cloud valides.",
 		"modelId": "Vous devez fournir un ID de modèle valide.",

webview-ui/src/i18n/locales/hi/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "आपको एक मान्य API कुंजी प्रदान करनी होगी।",
+		"baseUrl": "आपको एक मान्य बेस URL प्रदान करना होगा।",
 		"awsRegion": "Amazon Bedrock का उपयोग करने के लिए आपको एक क्षेत्र चुनना होगा।",
 		"googleCloud": "आपको एक मान्य Google Cloud प्रोजेक्ट ID और क्षेत्र प्रदान करना होगा।",
 		"modelId": "आपको एक मान्य मॉडल ID प्रदान करनी होगी।",

webview-ui/src/i18n/locales/id/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Kamu harus menyediakan API key yang valid.",
+		"baseUrl": "Kamu harus menyediakan base URL yang valid.",
 		"awsRegion": "Kamu harus memilih region untuk digunakan dengan Amazon Bedrock.",
 		"googleCloud": "Kamu harus menyediakan Google Cloud Project ID dan Region yang valid.",
 		"modelId": "Kamu harus menyediakan model ID yang valid.",

webview-ui/src/i18n/locales/it/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "È necessario fornire una chiave API valida.",
+		"baseUrl": "È necessario fornire un URL base valido.",
 		"awsRegion": "È necessario scegliere una regione per utilizzare Amazon Bedrock.",
 		"googleCloud": "È necessario fornire un ID progetto e una regione Google Cloud validi.",
 		"modelId": "È necessario fornire un ID modello valido.",

webview-ui/src/i18n/locales/ja/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "有効なAPIキーを入力してください。",
+		"baseUrl": "有効なベースURLを入力してください。",
 		"awsRegion": "Amazon Bedrockを使用するにはリージョンを選択してください。",
 		"googleCloud": "有効なGoogle CloudプロジェクトIDとリージョンを入力してください。",
 		"modelId": "有効なモデルIDを入力してください。",

webview-ui/src/i18n/locales/ko/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "유효한 API 키를 입력해야 합니다.",
+		"baseUrl": "유효한 기본 URL을 입력해야 합니다.",
 		"awsRegion": "Amazon Bedrock을 사용하려면 리전을 선택해야 합니다.",
 		"googleCloud": "유효한 Google Cloud 프로젝트 ID와 리전을 입력해야 합니다.",
 		"modelId": "유효한 모델 ID를 입력해야 합니다.",

webview-ui/src/i18n/locales/nl/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Je moet een geldige API-sleutel opgeven.",
+		"baseUrl": "Je moet een geldige basis-URL opgeven.",
 		"awsRegion": "Je moet een regio kiezen om Amazon Bedrock te gebruiken.",
 		"googleCloud": "Je moet een geldig Google Cloud Project-ID en regio opgeven.",
 		"modelId": "Je moet een geldig model-ID opgeven.",

webview-ui/src/i18n/locales/pl/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Musisz podać prawidłowy klucz API.",
+		"baseUrl": "Musisz podać prawidłowy bazowy URL.",
 		"awsRegion": "Musisz wybrać region, aby korzystać z Amazon Bedrock.",
 		"googleCloud": "Musisz podać prawidłowe ID projektu i region Google Cloud.",
 		"modelId": "Musisz podać prawidłowe ID modelu.",

webview-ui/src/i18n/locales/pt-BR/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Você deve fornecer uma chave de API válida.",
+		"baseUrl": "Você deve fornecer uma URL base válida.",
 		"awsRegion": "Você deve escolher uma região para usar o Amazon Bedrock.",
 		"googleCloud": "Você deve fornecer um ID de projeto e região do Google Cloud válidos.",
 		"modelId": "Você deve fornecer um ID de modelo válido.",

webview-ui/src/i18n/locales/ru/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Вы должны указать действительный API-ключ.",
+		"baseUrl": "Вы должны указать действительный базовый URL.",
 		"awsRegion": "Вы должны выбрать регион для использования с Amazon Bedrock.",
 		"googleCloud": "Вы должны указать действительный Project ID и регион Google Cloud.",
 		"modelId": "Вы должны указать действительный ID модели.",

webview-ui/src/i18n/locales/tr/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Geçerli bir API anahtarı sağlamalısınız.",
+		"baseUrl": "Geçerli bir temel URL sağlamalısınız.",
 		"awsRegion": "Amazon Bedrock kullanmak için bir bölge seçmelisiniz.",
 		"googleCloud": "Geçerli bir Google Cloud proje kimliği ve bölge sağlamalısınız.",
 		"modelId": "Geçerli bir model kimliği sağlamalısınız.",

webview-ui/src/i18n/locales/vi/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "Bạn phải cung cấp khóa API hợp lệ.",
+		"baseUrl": "Bạn phải cung cấp URL cơ sở hợp lệ.",
 		"awsRegion": "Bạn phải chọn một vùng để sử dụng Amazon Bedrock.",
 		"googleCloud": "Bạn phải cung cấp ID dự án và vùng Google Cloud hợp lệ.",
 		"modelId": "Bạn phải cung cấp ID mô hình hợp lệ.",

webview-ui/src/i18n/locales/zh-CN/settings.json

@@ -884,6 +884,7 @@
 	},
 	"validation": {
 		"apiKey": "您必须提供有效的 API 密钥。",
+		"baseUrl": "您必须提供有效的基础 URL。",
 		"awsRegion": "您必须选择一个区域来使用 Amazon Bedrock。",
 		"googleCloud": "您必须提供有效的 Google Cloud 项目 ID 和区域。",
 		"modelId": "您必须提供有效的模型 ID。",

webview-ui/src/i18n/locales/zh-TW/settings.json

@@ -894,6 +894,7 @@
 	},
 	"validation": {
 		"apiKey": "請提供有效的 API 金鑰。",
+		"baseUrl": "請提供有效的基礎 URL。",
 		"awsRegion": "請選擇要用於 Amazon Bedrock 的區域。",
 		"googleCloud": "請提供有效的 Google Cloud 專案 ID 和區域。",
 		"modelId": "請提供有效的模型 ID。",

webview-ui/src/utils/validate.ts

@@ -54,8 +54,8 @@ function validateModelsAndKeysProvided(apiConfiguration: ProviderSettings): stri
 			}
 			break
 		case "litellm":
-			if (!apiConfiguration.litellmApiKey) {
+			if (!apiConfiguration.litellmBaseUrl) {
-				return i18next.t("settings:validation.apiKey")
+				return i18next.t("settings:validation.baseUrl")
 			}
 			break
 		case "anthropic":