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 pull request #205 from mdude1324/mdude/avoid-memory-last-chat

Browse Source 
Avoid memory on most recent chat
This commit is contained in:
Cohee
2023-05-02 18:19:17 +03:00
committed by GitHub
parent d159ddf4d1 336f0d3fd0
commit 2080a1e77e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ function getLatestMemoryFromChat(chat) {
} }
const reversedChat = chat.slice().reverse(); const reversedChat = chat.slice().reverse();
reversedChat.shift();
for (let mes of reversedChat) { for (let mes of reversedChat) {
if (mes.extra && mes.extra.memory) { if (mes.extra && mes.extra.memory) {
return mes.extra.memory; return mes.extra.memory;
@ -194,7 +195,8 @@ async function summarizeChat(context) {
const chat = context.chat; const chat = context.chat;
const longMemory = getLatestMemoryFromChat(chat); const longMemory = getLatestMemoryFromChat(chat);
const reversedChat = chat.slice().reverse(); const reversedChat = chat.slice().reverse();
const preSummaryLastMessage = getStringHash(chat.length ? chat[chat.length - 1] : ''); reversedChat.shift();
const preSummaryLastMessage = getStringHash(reversedChat.length ? reversedChat[reversedChat.length - 1] : '');
let memoryBuffer = []; let memoryBuffer = [];
for (let mes of reversedChat) { for (let mes of reversedChat) {
@ -254,7 +256,7 @@ async function summarizeChat(context) {
const summary = data.summary; const summary = data.summary;
const newContext = getContext(); const newContext = getContext();
const postSummaryLastMessage = getStringHash(newContext.chat.length ? newContext.chat[newContext.chat.length - 1] : ''); const postSummaryLastMessage = getStringHash(newContext.chat.length ? newContext.chat[newContext.chat.length - 2] : '');
// something changed during summarization request // something changed during summarization request
if (postSummaryLastMessage !== preSummaryLastMessage if (postSummaryLastMessage !== preSummaryLastMessage
@ -280,6 +282,7 @@ function onMemoryRestoreClick() {
const context = getContext(); const context = getContext();
const content = $('#memory_contents').val(); const content = $('#memory_contents').val();
const reversedChat = context.chat.slice().reverse(); const reversedChat = context.chat.slice().reverse();
reversedChat.shift();
for (let mes of reversedChat) { for (let mes of reversedChat) {
if (mes.extra && mes.extra.memory == content) { if (mes.extra && mes.extra.memory == content) {
@ -303,7 +306,8 @@ function setMemoryContext(value, saveToMessage) {
$('#memory_contents').val(value); $('#memory_contents').val(value);
if (saveToMessage && context.chat.length) { if (saveToMessage && context.chat.length) {
const mes = context.chat[context.chat.length - 1]; const idx = context.chat.length - 2;
const mes = context.chat[idx < 0 ? 0 : idx];
if (!mes.extra) { if (!mes.extra) {
mes.extra = {}; mes.extra = {};