Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-03 22:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(llm): streamline model selection by utilizing the new configuration system and enhance error handling

Browse Source
This commit is contained in:
perf3ct 2025-06-02 21:44:43 +00:00
parent ce7c4a31a1
commit 5a5a69ebb8
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
1 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
apps/server/src/services/llm/chat/rest_chat_service.ts
View File

@ -20,6 +20,12 @@ import type { NoteSource } from "../interfaces/chat_session.js";
import type { LLMStreamMessage } from "../interfaces/chat_ws_messages.js"; import type { LLMStreamMessage } from "../interfaces/chat_ws_messages.js";
import type { ChatMessage } from '../interfaces/chat_session.js'; import type { ChatMessage } from '../interfaces/chat_session.js';
import type { ChatSession } from '../interfaces/chat_session.js'; import type { ChatSession } from '../interfaces/chat_session.js';
import {
isAIEnabled,
getFirstValidModelConfig,
getDefaultModelForProvider,
getPreferredProvider
} from '../config/configuration_helpers.js';
/** /**
* Service to handle chat API interactions * Service to handle chat API interactions
@ -705,7 +711,7 @@ class RestChatService {
} }
/** /**
* Get the user's preferred model * Get the user's preferred model using the new configuration system
*/ */
async getPreferredModel(sessionModel?: string): Promise<string | undefined> { async getPreferredModel(sessionModel?: string): Promise<string | undefined> {
// If the session already has a valid model (not 'default'), use it // If the session already has a valid model (not 'default'), use it
@ -714,46 +720,19 @@ class RestChatService {
} }
try { try {
// Get provider precedence list (same logic as model selection stage) // Use the new configuration system - no string parsing!
const providerPrecedence = await options.getOption('aiProviderPrecedence'); const validConfig = await getFirstValidModelConfig();
let defaultProvider = 'openai';
let defaultModelName = 'gpt-3.5-turbo';
if (providerPrecedence) { if (!validConfig) {
// Parse provider precedence list log.error('No valid AI model configuration found. Please configure your AI settings.');
let providers: string[] = []; return undefined; // Don't provide fallback defaults
if (providerPrecedence.includes(',')) {
providers = providerPrecedence.split(',').map(p => p.trim());
} else if (providerPrecedence.startsWith('[') && providerPrecedence.endsWith(']')) {
providers = JSON.parse(providerPrecedence);
} else {
providers = [providerPrecedence];
}
// Get first available provider
if (providers.length > 0) {
const firstProvider = providers[0];
defaultProvider = firstProvider;
// Get provider-specific default model
if (firstProvider === 'openai') {
const model = await options.getOption('openaiDefaultModel');
if (model) defaultModelName = model;
} else if (firstProvider === 'anthropic') {
const model = await options.getOption('anthropicDefaultModel');
if (model) defaultModelName = model;
} else if (firstProvider === 'ollama') {
const model = await options.getOption('ollamaDefaultModel');
if (model) defaultModelName = model;
}
}
} }
log.info(`Selected user's preferred model: ${defaultModelName} from provider: ${defaultProvider}`); log.info(`Selected user's preferred model: ${validConfig.model} from provider: ${validConfig.provider}`);
return defaultModelName; return validConfig.model;
} catch (error) { } catch (error) {
log.error(`Error getting user's preferred model: ${error}`); log.error(`Error getting user's preferred model: ${error}`);
return 'gpt-3.5-turbo'; // Fallback return undefined; // Don't provide fallback defaults, let the caller handle it
} }
} }
} }