rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/SillyTavern/SillyTavern into staging

Browse Source
This commit is contained in:
Cohee
2023-08-25 20:34:33 +03:00
parent b32a085e41 f50db430eb
commit cb669cbcab
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions/memory/index.js
View File

@@ -567,7 +567,7 @@ jQuery(function () {
<div class="radio_group">
<label>
<input type="radio" name="memory_position" value="0" />
After scenario
After Main Prompt / Story String
</label>
<label>
<input type="radio" name="memory_position" value="1" />

4
public/scripts/openai.js
View File

@@ -683,9 +683,9 @@ function preparePromptsForChatCompletion({Scenario, charPersonality, name2, worl
// Tavern Extras - Summary
const summary = extensionPrompts['1_memory'];
if (summary && summary.content) systemPrompts.push({
if (summary && summary.value) systemPrompts.push({
role: 'system',
content: summary.content,
content: summary.value,
identifier: 'summary'
});