mirror of
https://github.com/zadam/trilium.git
synced 2025-11-02 11:26:15 +01:00
well this works for tool calling the "readNote" func
This commit is contained in:
@@ -91,25 +91,14 @@ export class ModelSelectionStage extends BasePipelineStage<ModelSelectionInput,
|
|||||||
if (model) {
|
if (model) {
|
||||||
defaultModel = `ollama:${model}`;
|
defaultModel = `ollama:${model}`;
|
||||||
|
|
||||||
// Special configuration for Ollama
|
// Enable tools for all Ollama models
|
||||||
// Since Ollama models have different requirements for tool calling,
|
// The Ollama API will handle models that don't support tool calling
|
||||||
// configure based on the model being used
|
log.info(`Using Ollama model ${model} with tool calling enabled`);
|
||||||
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;
|
updatedOptions.enableTools = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// If any error occurs, use the fallback default
|
// If any error occurs, use the fallback default
|
||||||
log.error(`Error determining default model: ${error}`);
|
log.error(`Error determining default model: ${error}`);
|
||||||
|
|||||||
@@ -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);
|
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 ==========`);
|
log.info(`========== END OLLAMA REQUEST ==========`);
|
||||||
|
|
||||||
// Make API request
|
// Make API request
|
||||||
|
|||||||
Reference in New Issue
Block a user