mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Remove reasoning from raw builder summaries
This commit is contained in:
@@ -28,6 +28,7 @@ import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from '
|
|||||||
import { MacrosParser } from '../../macros.js';
|
import { MacrosParser } from '../../macros.js';
|
||||||
import { countWebLlmTokens, generateWebLlmChatPrompt, getWebLlmContextSize, isWebLlmSupported } from '../shared.js';
|
import { countWebLlmTokens, generateWebLlmChatPrompt, getWebLlmContextSize, isWebLlmSupported } from '../shared.js';
|
||||||
import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
|
import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
|
||||||
|
import { removeReasoningFromString } from '../../reasoning.js';
|
||||||
export { MODULE_NAME };
|
export { MODULE_NAME };
|
||||||
|
|
||||||
const MODULE_NAME = '1_memory';
|
const MODULE_NAME = '1_memory';
|
||||||
@@ -504,7 +505,7 @@ async function summarizeCallback(args, text) {
|
|||||||
case summary_sources.extras:
|
case summary_sources.extras:
|
||||||
return await callExtrasSummarizeAPI(text);
|
return await callExtrasSummarizeAPI(text);
|
||||||
case summary_sources.main:
|
case summary_sources.main:
|
||||||
return await generateRaw(text, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
|
return removeReasoningFromString(await generateRaw(text, '', false, false, prompt, extension_settings.memory.overrideResponseLength));
|
||||||
case summary_sources.webllm: {
|
case summary_sources.webllm: {
|
||||||
const messages = [{ role: 'system', content: prompt }, { role: 'user', content: text }].filter(m => m.content);
|
const messages = [{ role: 'system', content: prompt }, { role: 'user', content: text }].filter(m => m.content);
|
||||||
const params = extension_settings.memory.overrideResponseLength > 0 ? { max_tokens: extension_settings.memory.overrideResponseLength } : {};
|
const params = extension_settings.memory.overrideResponseLength > 0 ? { max_tokens: extension_settings.memory.overrideResponseLength } : {};
|
||||||
@@ -699,7 +700,8 @@ async function summarizeChatMain(context, force, skipWIAN) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
summary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
|
const rawSummary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
|
||||||
|
summary = removeReasoningFromString(rawSummary);
|
||||||
index = lastUsedIndex;
|
index = lastUsedIndex;
|
||||||
} finally {
|
} finally {
|
||||||
inApiCall = false;
|
inApiCall = false;
|
||||||
|
@@ -36,6 +36,7 @@ import { slashCommandReturnHelper } from '../../slash-commands/SlashCommandRetur
|
|||||||
import { callGenericPopup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
|
import { callGenericPopup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
|
||||||
import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js';
|
import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js';
|
||||||
import { WebLlmVectorProvider } from './webllm.js';
|
import { WebLlmVectorProvider } from './webllm.js';
|
||||||
|
import { removeReasoningFromString } from '../../reasoning.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef {object} HashedMessage
|
* @typedef {object} HashedMessage
|
||||||
@@ -260,7 +261,7 @@ async function summarizeExtra(element) {
|
|||||||
* @returns {Promise<boolean>} Sucess
|
* @returns {Promise<boolean>} Sucess
|
||||||
*/
|
*/
|
||||||
async function summarizeMain(element) {
|
async function summarizeMain(element) {
|
||||||
element.text = await generateRaw(element.text, '', false, false, settings.summary_prompt);
|
element.text = removeReasoningFromString(await generateRaw(element.text, '', false, false, settings.summary_prompt));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user