sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

well this works for tool calling the "readNote" func

pull/1325/head
perf3ct 2025-04-08 22:08:52 +07:00
parent 683d1a5481
commit 7373249dee
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/services/llm/pipeline/stages/model_selection_stage.ts
Unescape Escape View File

@ -27,17 +27,17 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
// Get default model based on provider precedence
let defaultModel = 'openai:gpt-3.5-turbo'; // Fallback default
// Enable tools by default unless explicitly disabled
updatedOptions.enableTools = updatedOptions.enableTools !== false;
// Add tools if not already provided
if (updatedOptions.enableTools && (!updatedOptions.tools || updatedOptions.tools.length === 0)) {
try {
// Import tool registry and fetch tool definitions
const toolRegistry = (await import('../../tools/tool_registry.js')).default;
const toolDefinitions = toolRegistry.getAllToolDefinitions();
if (toolDefinitions.length > 0) {
updatedOptions.tools = toolDefinitions;
log.info(`Added ${toolDefinitions.length} tools to options`);
@ -47,7 +47,7 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
try {
const toolInitializer = await import('../../tools/tool_initializer.js');
await toolInitializer.default.initializeTools();
// Try again after initialization
const reinitToolDefinitions = toolRegistry.getAllToolDefinitions();
updatedOptions.tools = reinitToolDefinitions;
@ -90,22 +90,11 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
const model = await options.getOption('ollamaDefaultModel');
if (model) {
defaultModel = `ollama:${model}`;
// Special configuration for Ollama
// Since Ollama models have different requirements for tool calling,
// configure based on the model being used
const modelLower = model.toLowerCase();
if (modelLower.includes('llama3') ||
modelLower.includes('mistral') ||
modelLower.includes('dolphin') ||
modelLower.includes('neural') ||
modelLower.includes('mist') ||
modelLower.includes('wizard')) {
// These models are known to support tool calling
log.info(`Using Ollama model ${model} with tool calling support`);
updatedOptions.enableTools = true;
}
// Enable tools for all Ollama models
// The Ollama API will handle models that don't support tool calling
log.info(`Using Ollama model ${model} with tool calling enabled`);
updatedOptions.enableTools = true;
}
}
}

18
src/services/llm/providers/ollama_service.ts
Unescape Escape View File

@ -200,9 +200,23 @@ export class OllamaService extends BaseAIService {
});
}
// Log full request body (this will create large logs but is helpful for debugging)
// Log full request body (with improved logging for debug purposes)
const requestStr = JSON.stringify(requestBody);
log.info(`Full Ollama request (truncated): ${requestStr.substring(0, 1000)}...`);
log.info(`========== FULL OLLAMA REQUEST ==========`);
// Log request in manageable chunks
const maxChunkSize = 4000;
if (requestStr.length > maxChunkSize) {
let i = 0;
while (i < requestStr.length) {
const chunk = requestStr.substring(i, i + maxChunkSize);
log.info(`Request part ${Math.floor(i/maxChunkSize) + 1}/${Math.ceil(requestStr.length/maxChunkSize)}: ${chunk}`);
i += maxChunkSize;
}
} else {
log.info(`Full request: ${requestStr}`);
}
log.info(`========== END FULL OLLAMA REQUEST ==========`);
log.info(`========== END OLLAMA REQUEST ==========`);
// Make API request