From afe1de5ed3ec7f9529d34a46dc4bc3c3708e7b25 Mon Sep 17 00:00:00 2001 From: perf3ct Date: Tue, 1 Apr 2025 19:41:30 +0000 Subject: [PATCH] get rid of silly ollamaIsEnabled --- src/public/app/widgets/llm_chat_panel.ts | 6 +++--- src/services/llm/providers/providers.ts | 7 +++---- src/services/options_init.ts | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/public/app/widgets/llm_chat_panel.ts b/src/public/app/widgets/llm_chat_panel.ts index 7ff0f8470..4c9eb5c4d 100644 --- a/src/public/app/widgets/llm_chat_panel.ts +++ b/src/public/app/widgets/llm_chat_panel.ts @@ -790,9 +790,9 @@ export default class LlmChatPanel extends BasicWidget { enabledProviders.push('anthropic'); } - // Ollama is enabled if the setting is true - const ollamaEnabled = options.is('ollamaEnabled'); - if (ollamaEnabled) { + // Ollama is enabled if base URL is set + const ollamaBaseUrl = options.get('ollamaBaseUrl'); + if (ollamaBaseUrl) { enabledProviders.push('ollama'); } diff --git a/src/services/llm/providers/providers.ts b/src/services/llm/providers/providers.ts index ad8f9e4f4..73ca01e44 100644 --- a/src/services/llm/providers/providers.ts +++ b/src/services/llm/providers/providers.ts @@ -287,10 +287,9 @@ export async function initializeDefaultProviders() { } } - // Register Ollama provider if enabled - if (await options.getOptionBool('ollamaEnabled')) { - const ollamaBaseUrl = await options.getOption('ollamaBaseUrl') || 'http://localhost:11434'; - + // Register Ollama provider if base URL is configured + const ollamaBaseUrl = await options.getOption('ollamaBaseUrl'); + if (ollamaBaseUrl) { // Use specific embedding models if available const embeddingModel = await options.getOption('ollamaEmbeddingModel') || 'nomic-embed-text'; diff --git a/src/services/options_init.ts b/src/services/options_init.ts index 672e9470b..6262ece2b 100644 --- a/src/services/options_init.ts +++ b/src/services/options_init.ts @@ -189,7 +189,7 @@ const defaultOptions: DefaultOption[] = [ { name: "anthropicBaseUrl", value: "https://api.anthropic.com/v1", isSynced: true }, { name: "ollamaEnabled", value: "false", isSynced: true }, { name: "ollamaDefaultModel", value: "llama3", isSynced: true }, - { name: "ollamaBaseUrl", value: "http://localhost:11434", isSynced: true }, + { name: "ollamaBaseUrl", value: "", isSynced: true }, { name: "ollamaEmbeddingModel", value: "nomic-embed-text", isSynced: true }, { name: "embeddingAutoUpdateEnabled", value: "true", isSynced: true },