gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fix(llm): always fetch the user's selected model

Browse Source
This commit is contained in:
perf3ct 2025-06-07 23:36:53 +00:00
parent c2eed44150
commit 414781936b
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
2 changed files with 23 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
apps/server/src/services/llm/pipeline/stages/model_selection_stage.ts
View File

@ -111,18 +111,12 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
const { getValidModelConfig } = await import('../../config/configuration_helpers.js'); const { getValidModelConfig } = await import('../../config/configuration_helpers.js');
const modelConfig = await getValidModelConfig(selectedProvider); const modelConfig = await getValidModelConfig(selectedProvider);
if (modelConfig) { if (!modelConfig) {
// We have a valid configured model throw new Error(`No default model configured for provider ${selectedProvider}. Please set a default model in your AI settings.`);
}
// Use the configured model
updatedOptions.model = modelConfig.model; updatedOptions.model = modelConfig.model;
} else {
// No model configured, try to fetch and set a default from the service
const fetchedModel = await this.fetchAndSetDefaultModel(selectedProvider);
if (!fetchedModel) {
throw new Error(`No default model configured for provider ${selectedProvider}. Please set a default model in your AI settings or ensure the provider service is available.`);
}
// Use the fetched model
updatedOptions.model = fetchedModel;
}
log.info(`Selected provider: ${selectedProvider}, model: ${updatedOptions.model}`); log.info(`Selected provider: ${selectedProvider}, model: ${updatedOptions.model}`);
@ -183,20 +177,8 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
return; return;
} }
// If no provider could be determined, try to use precedence // Use the explicitly provided provider - no automatic fallbacks
let selectedProvider = provider; let selectedProvider = provider;
if (!selectedProvider) {
// List of providers in precedence order
const providerPrecedence = ['anthropic', 'openai', 'ollama'];
// Find the first available provider
for (const p of providerPrecedence) {
if (aiServiceManager.isProviderAvailable(p)) {
selectedProvider = p as ServiceProviders;
break;
}
}
}
// Set the provider metadata in the options // Set the provider metadata in the options
if (selectedProvider) { if (selectedProvider) {
@ -218,47 +200,7 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
} }
} }
/**
* Determine model based on selected provider using the new configuration system
* This method is now simplified and delegates to the main model selection logic
*/
private async determineDefaultModel(input: ModelSelectionInput): Promise<string> {
try {
// Use the same logic as the main process method
const { getValidModelConfig, getSelectedProvider } = await import('../../config/configuration_helpers.js');
const selectedProvider = await getSelectedProvider();
if (!selectedProvider) {
throw new Error('No AI provider is selected. Please select a provider in your AI settings.');
}
// Check if the provider is available through the service manager
if (!aiServiceManager.isProviderAvailable(selectedProvider)) {
throw new Error(`Selected provider ${selectedProvider} is not available`);
}
// Try to get a valid model config
const modelConfig = await getValidModelConfig(selectedProvider);
if (!modelConfig) {
throw new Error(`No default model configured for provider ${selectedProvider}. Please configure a default model in your AI settings.`);
}
// Set provider metadata
if (!input.options.providerMetadata) {
input.options.providerMetadata = {
provider: selectedProvider as 'openai' | 'anthropic' | 'ollama' | 'local',
modelId: modelConfig.model
};
}
log.info(`Selected default model ${modelConfig.model} from provider ${selectedProvider}`);
return modelConfig.model;
} catch (error) {
log.error(`Error determining default model: ${error}`);
throw error; // Don't provide fallback defaults, let the error propagate
}
}
/** /**
* Get estimated context window for Ollama models * Get estimated context window for Ollama models
@ -283,48 +225,5 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
} }
} }
/**
* Use AI service manager to get a configured model for the provider
* This eliminates duplication and uses the existing service layer
*/
private async fetchAndSetDefaultModel(provider: ProviderType): Promise<string | null> {
try {
log.info(`Getting default model for provider ${provider} using AI service manager`);
// Use the existing AI service manager instead of duplicating API calls
const service = await aiServiceManager.getInstance().getService(provider);
if (!service || !service.isAvailable()) {
log.info(`Provider ${provider} service is not available`);
return null;
}
// Check if the service has a method to get available models
if (typeof (service as any).getAvailableModels === 'function') {
try {
const models = await (service as any).getAvailableModels();
if (models && models.length > 0) {
// Use the first available model - no hardcoded preferences
const selectedModel = models[0];
// Import server-side options to update the default model
const optionService = (await import('../../../options.js')).default;
const optionKey = `${provider}DefaultModel` as const;
await optionService.setOption(optionKey, selectedModel);
log.info(`Set default ${provider} model to: ${selectedModel}`);
return selectedModel;
}
} catch (modelError) {
log.error(`Error fetching models from ${provider} service: ${modelError}`);
}
}
log.info(`Provider ${provider} does not support dynamic model fetching`);
return null;
} catch (error) {
log.error(`Error getting default model for provider ${provider}: ${error}`);
return null;
}
}
} }

20
apps/server/src/services/llm/providers/providers.ts
View File

@ -26,7 +26,11 @@ export function getOpenAIOptions(
} }
const baseUrl = options.getOption('openaiBaseUrl') || PROVIDER_CONSTANTS.OPENAI.BASE_URL; const baseUrl = options.getOption('openaiBaseUrl') || PROVIDER_CONSTANTS.OPENAI.BASE_URL;
const modelName = opts.model || options.getOption('openaiDefaultModel') || PROVIDER_CONSTANTS.OPENAI.DEFAULT_MODEL; const modelName = opts.model || options.getOption('openaiDefaultModel');
if (!modelName) {
throw new Error('No OpenAI model configured. Please set a default model in your AI settings.');
}
// Create provider metadata // Create provider metadata
const providerMetadata: ModelMetadata = { const providerMetadata: ModelMetadata = {
@ -87,7 +91,11 @@ export function getAnthropicOptions(
} }
const baseUrl = options.getOption('anthropicBaseUrl') || PROVIDER_CONSTANTS.ANTHROPIC.BASE_URL; const baseUrl = options.getOption('anthropicBaseUrl') || PROVIDER_CONSTANTS.ANTHROPIC.BASE_URL;
const modelName = opts.model || options.getOption('anthropicDefaultModel') || PROVIDER_CONSTANTS.ANTHROPIC.DEFAULT_MODEL; const modelName = opts.model || options.getOption('anthropicDefaultModel');
if (!modelName) {
throw new Error('No Anthropic model configured. Please set a default model in your AI settings.');
}
// Create provider metadata // Create provider metadata
const providerMetadata: ModelMetadata = { const providerMetadata: ModelMetadata = {
@ -150,8 +158,12 @@ export async function getOllamaOptions(
throw new Error('Ollama API URL is not configured'); throw new Error('Ollama API URL is not configured');
} }
// Get the model name - no prefix handling needed now // Get the model name - no defaults, must be configured by user
let modelName = opts.model || options.getOption('ollamaDefaultModel') || 'llama3'; let modelName = opts.model || options.getOption('ollamaDefaultModel');
if (!modelName) {
throw new Error('No Ollama model configured. Please set a default model in your AI settings.');
}
// Create provider metadata // Create provider metadata
const providerMetadata: ModelMetadata = { const providerMetadata: ModelMetadata = {