mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Include Smart Context in prompt summary when possible.
This commit is contained in:
@@ -2649,6 +2649,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
|
|||||||
allAnchors: allAnchors,
|
allAnchors: allAnchors,
|
||||||
summarizeString: (extension_prompts['1_memory']?.value || ''),
|
summarizeString: (extension_prompts['1_memory']?.value || ''),
|
||||||
authorsNoteString: (extension_prompts['2_floating_prompt']?.value || ''),
|
authorsNoteString: (extension_prompts['2_floating_prompt']?.value || ''),
|
||||||
|
smartContextString: (extension_prompts['chromadb']?.value || ''),
|
||||||
worldInfoString: worldInfoString,
|
worldInfoString: worldInfoString,
|
||||||
storyString: storyString,
|
storyString: storyString,
|
||||||
worldInfoAfter: worldInfoAfter,
|
worldInfoAfter: worldInfoAfter,
|
||||||
@@ -3146,6 +3147,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
|
|||||||
var allAnchorsTokens = getTokenCount(itemizedPrompts[thisPromptSet].allAnchors);
|
var allAnchorsTokens = getTokenCount(itemizedPrompts[thisPromptSet].allAnchors);
|
||||||
var summarizeStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].summarizeString);
|
var summarizeStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].summarizeString);
|
||||||
var authorsNoteStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].authorsNoteString);
|
var authorsNoteStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].authorsNoteString);
|
||||||
|
var smartContextStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].smartContextString);
|
||||||
var afterScenarioAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor);
|
var afterScenarioAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor);
|
||||||
var zeroDepthAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor);
|
var zeroDepthAnchorTokens = getTokenCount(itemizedPrompts[thisPromptSet].afterScenarioAnchor);
|
||||||
var worldInfoStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].worldInfoString);
|
var worldInfoStringTokens = getTokenCount(itemizedPrompts[thisPromptSet].worldInfoString);
|
||||||
@@ -3320,6 +3322,10 @@ function promptItemize(itemizedPrompts, requestedMesId) {
|
|||||||
<div class=" flex1 tokenItemizingSubclass">-- Author's Note:</div>
|
<div class=" flex1 tokenItemizingSubclass">-- Author's Note:</div>
|
||||||
<div class="tokenItemizingSubclass"> ${authorsNoteStringTokens}</div>
|
<div class="tokenItemizingSubclass"> ${authorsNoteStringTokens}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex-container ">
|
||||||
|
<div class=" flex1 tokenItemizingSubclass">-- Smart Context:</div>
|
||||||
|
<div class="tokenItemizingSubclass"> ${smartContextStringTokens}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wide100p flex-container">
|
<div class="wide100p flex-container">
|
||||||
<div class="flex1" style="color: mediumpurple;">{{}} Bias:</div><div class="">${oaiBiasTokens}</div>
|
<div class="flex1" style="color: mediumpurple;">{{}} Bias:</div><div class="">${oaiBiasTokens}</div>
|
||||||
@@ -3407,6 +3413,10 @@ function promptItemize(itemizedPrompts, requestedMesId) {
|
|||||||
<div class=" flex1 tokenItemizingSubclass">-- Author's Note:</div>
|
<div class=" flex1 tokenItemizingSubclass">-- Author's Note:</div>
|
||||||
<div class="tokenItemizingSubclass"> ${authorsNoteStringTokens}</div>
|
<div class="tokenItemizingSubclass"> ${authorsNoteStringTokens}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex-container ">
|
||||||
|
<div class=" flex1 tokenItemizingSubclass">-- Smart Context:</div>
|
||||||
|
<div class="tokenItemizingSubclass"> ${smartContextStringTokens}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="wide100p flex-container">
|
<div class="wide100p flex-container">
|
||||||
<div class="flex1" style="color: mediumpurple;">{{}} Bias:</div><div class="">${promptBiasTokens}</div>
|
<div class="flex1" style="color: mediumpurple;">{{}} Bias:</div><div class="">${promptBiasTokens}</div>
|
||||||
|
Reference in New Issue
Block a user