Hide API key field for Ollama

obsidianmd · Jan 16, 2025 · 6d7a820 · 6d7a820
1 parent 1541ff5
commit 6d7a820
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/managers/interpreter-settings.ts b/src/managers/interpreter-settings.ts
@@ -356,10 +356,11 @@ async function showProviderModal(provider: Provider, index?: number) {
 		const apiKeyInput = form.querySelector('[name="apiKey"]') as HTMLInputElement;
 		const presetSelect = form.querySelector('[name="preset"]') as HTMLSelectElement;
 		const nameContainer = nameInput.closest('.setting-item') as HTMLElement;
-		const apiKeyContainer = form.querySelector('.setting-item:has([name="apiKey"]) .setting-item-description') as HTMLElement;
+		const apiKeyContainer = apiKeyInput.closest('.setting-item') as HTMLElement;
+		const apiKeyDescription = form.querySelector('.setting-item:has([name="apiKey"]) .setting-item-description') as HTMLElement;
 
-		if (!apiKeyContainer) {
-			console.error('API key description container not found');
+		if (!apiKeyContainer || !apiKeyDescription) {
+			console.error('API key containers not found');
 			return;
 		}
 
@@ -380,28 +381,33 @@ async function showProviderModal(provider: Provider, index?: number) {
 				presetSelect.value = 'anthropic';
 			}
 
-			// Hide/show name field based on preset selection
-			const updateNameVisibility = () => {
+			// Hide/show name field and update API key visibility based on preset selection
+			const updateVisibility = () => {
 				nameContainer.style.display = presetSelect.value ? 'none' : 'block';
 				if (presetSelect.value) {
 					const selectedPreset = PRESET_PROVIDERS[presetSelect.value as keyof typeof PRESET_PROVIDERS];
 					nameInput.value = selectedPreset.name;
 					baseUrlInput.value = selectedPreset.baseUrl;
 
-					// Update API key link
-					if (selectedPreset.apiKeyUrl) {
+					// Show/hide API key field based on whether it's required
+					apiKeyContainer.style.display = selectedPreset.apiKeyRequired === false ? 'none' : 'block';
+
+					// Update API key link if available
+					if (selectedPreset.apiKeyRequired !== false && selectedPreset.apiKeyUrl) {
 						const message = getMessage('getApiKeyHere').replace('$1', selectedPreset.name);
-						apiKeyContainer.innerHTML = `${getMessage('providerApiKeyDescription')} <a href="${selectedPreset.apiKeyUrl}" target="_blank">${message}</a>`;
+						apiKeyDescription.innerHTML = `${getMessage('providerApiKeyDescription')} <a href="${selectedPreset.apiKeyUrl}" target="_blank">${message}</a>`;
 					} else {
-						apiKeyContainer.innerHTML = getMessage('providerApiKeyDescription');
+						apiKeyDescription.innerHTML = getMessage('providerApiKeyDescription');
 					}
 				} else {
-					apiKeyContainer.innerHTML = getMessage('providerApiKeyDescription');
+					// For custom providers, show API key field by default
+					apiKeyContainer.style.display = 'block';
+					apiKeyDescription.innerHTML = getMessage('providerApiKeyDescription');
 				}
 			};
 
-			presetSelect.addEventListener('change', updateNameVisibility);
-			updateNameVisibility(); // Initial visibility update
+			presetSelect.addEventListener('change', updateVisibility);
+			updateVisibility();
 
 			// Only set these values if editing an existing provider
 			if (index !== undefined) {

diff --git a/src/settings.html b/src/settings.html
@@ -633,7 +633,7 @@ <h2 id="template-editor-title" data-i18n="editTemplate">Edit template</h2>
 								<input type="text" id="provider-base-url" name="baseUrl" data-i18n="providerBaseUrl" placeholder="Base URL" required>
 							</div>
 						</div>
-						<div class="setting-item" id="provider-api-key-container">
+						<div class="setting-item">
 							<div class="setting-item-info">
 								<label for="provider-api-key" data-i18n="providerApiKey">API key</label>
 								<div class="setting-item-description" data-i18n="providerApiKeyDescription">Your API key for this provider.</div>