Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

get rid of silly ollamaIsEnabled

Browse Source
This commit is contained in:
perf3ct 2025-04-01 19:41:30 +00:00
parent 9719859a39
commit afe1de5ed3
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/public/app/widgets/llm_chat_panel.ts
View File

@ -790,9 +790,9 @@ export default class LlmChatPanel extends BasicWidget {
enabledProviders.push('anthropic'); enabledProviders.push('anthropic');
} }
// Ollama is enabled if the setting is true // Ollama is enabled if base URL is set
const ollamaEnabled = options.is('ollamaEnabled'); const ollamaBaseUrl = options.get('ollamaBaseUrl');
if (ollamaEnabled) { if (ollamaBaseUrl) {
enabledProviders.push('ollama'); enabledProviders.push('ollama');
} }

7
src/services/llm/providers/providers.ts
View File

@ -287,10 +287,9 @@ export async function initializeDefaultProviders() {
} }
} }
// Register Ollama provider if enabled // Register Ollama provider if base URL is configured
if (await options.getOptionBool('ollamaEnabled')) { const ollamaBaseUrl = await options.getOption('ollamaBaseUrl');
const ollamaBaseUrl = await options.getOption('ollamaBaseUrl') || 'http://localhost:11434'; if (ollamaBaseUrl) {
// Use specific embedding models if available // Use specific embedding models if available
const embeddingModel = await options.getOption('ollamaEmbeddingModel') || 'nomic-embed-text'; const embeddingModel = await options.getOption('ollamaEmbeddingModel') || 'nomic-embed-text';

2
src/services/options_init.ts
View File

@ -189,7 +189,7 @@ const defaultOptions: DefaultOption[] = [
{ name: "anthropicBaseUrl", value: "https://api.anthropic.com/v1", isSynced: true }, { name: "anthropicBaseUrl", value: "https://api.anthropic.com/v1", isSynced: true },
{ name: "ollamaEnabled", value: "false", isSynced: true }, { name: "ollamaEnabled", value: "false", isSynced: true },
{ name: "ollamaDefaultModel", value: "llama3", 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: "ollamaEmbeddingModel", value: "nomic-embed-text", isSynced: true },
{ name: "embeddingAutoUpdateEnabled", value: "true", isSynced: true }, { name: "embeddingAutoUpdateEnabled", value: "true", isSynced: true },