Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging
This commit is contained in:
commit
c60d4e5bb9
|
@ -26,6 +26,7 @@ public/settings.json
|
||||||
/thumbnails
|
/thumbnails
|
||||||
whitelist.txt
|
whitelist.txt
|
||||||
.vscode
|
.vscode
|
||||||
|
.idea/
|
||||||
secrets.json
|
secrets.json
|
||||||
/dist
|
/dist
|
||||||
/backups/
|
/backups/
|
||||||
|
|
|
@ -636,6 +636,11 @@ function populateChatCompletion(prompts, chatCompletion, { bias, quietPrompt, ty
|
||||||
chatCompletion.insert(vectorsMemory, 'main');
|
chatCompletion.insert(vectorsMemory, 'main');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Smart Context (ChromaDB)
|
||||||
|
if (prompts.has('smartContext')) {
|
||||||
|
chatCompletion.insert(Message.fromPrompt(prompts.get('smartContext')), 'main');
|
||||||
|
}
|
||||||
|
|
||||||
// Decide whether dialogue examples should always be added
|
// Decide whether dialogue examples should always be added
|
||||||
if (power_user.pin_examples) {
|
if (power_user.pin_examples) {
|
||||||
populateDialogueExamples(prompts, chatCompletion);
|
populateDialogueExamples(prompts, chatCompletion);
|
||||||
|
@ -711,6 +716,14 @@ function preparePromptsForChatCompletion({Scenario, charPersonality, name2, worl
|
||||||
identifier: 'vectorsMemory',
|
identifier: 'vectorsMemory',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Smart Context (ChromaDB)
|
||||||
|
const smartContext = extensionPrompts['chromadb'];
|
||||||
|
if (smartContext && smartContext.value) systemPrompts.push({
|
||||||
|
role: 'system',
|
||||||
|
content: smartContext.value,
|
||||||
|
identifier: 'smartContext'
|
||||||
|
});
|
||||||
|
|
||||||
// Persona Description
|
// Persona Description
|
||||||
if (power_user.persona_description && power_user.persona_description_position === persona_description_positions.IN_PROMPT) {
|
if (power_user.persona_description && power_user.persona_description_position === persona_description_positions.IN_PROMPT) {
|
||||||
systemPrompts.push({ role: 'system', content: power_user.persona_description, identifier: 'personaDescription' });
|
systemPrompts.push({ role: 'system', content: power_user.persona_description, identifier: 'personaDescription' });
|
||||||
|
|
Loading…
Reference in New Issue