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

Parse reasoning in multi-swipe swipes

Browse Source
This commit is contained in:
Cohee
2025-03-08 23:06:56 +02:00
parent d0068ecbab
commit 0ea64050ff
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/script.js
View File

@ -271,7 +271,7 @@ import { initSettingsSearch } from './scripts/setting-search.js';
import { initBulkEdit } from './scripts/bulk-edit.js'; import { initBulkEdit } from './scripts/bulk-edit.js';
import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js'; import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
import { getContext } from './scripts/st-context.js'; import { getContext } from './scripts/st-context.js';
import { extractReasoningFromData, initReasoning, PromptReasoning, ReasoningHandler, removeReasoningFromString, updateReasoningUI } from './scripts/reasoning.js'; import { extractReasoningFromData, initReasoning, parseReasoningInSwipes, PromptReasoning, ReasoningHandler, removeReasoningFromString, updateReasoningUI } from './scripts/reasoning.js';
import { accountStorage } from './scripts/util/AccountStorage.js'; import { accountStorage } from './scripts/util/AccountStorage.js';
// API OBJECT FOR EXTERNAL WIRING // API OBJECT FOR EXTERNAL WIRING
@ -3346,7 +3346,7 @@ class StreamingProcessor {
if (Array.isArray(this.swipes) && this.swipes.length > 0) { if (Array.isArray(this.swipes) && this.swipes.length > 0) {
const message = chat[messageId]; const message = chat[messageId];
const swipeInfoExtra = structuredClone(message.extra); const swipeInfoExtra = structuredClone(message.extra ?? {});
delete swipeInfoExtra.token_count; delete swipeInfoExtra.token_count;
delete swipeInfoExtra.reasoning; delete swipeInfoExtra.reasoning;
delete swipeInfoExtra.reasoning_duration; delete swipeInfoExtra.reasoning_duration;
@ -3356,9 +3356,8 @@ class StreamingProcessor {
gen_finished: message.gen_finished, gen_finished: message.gen_finished,
extra: swipeInfoExtra, extra: swipeInfoExtra,
}; };
const swipeInfoArray = []; const swipeInfoArray = Array(this.swipes.length).fill().map(() => structuredClone(swipeInfo));
swipeInfoArray.length = this.swipes.length; parseReasoningInSwipes(this.swipes, swipeInfoArray, message.extra?.reasoning_duration);
swipeInfoArray.fill(swipeInfo);
chat[messageId].swipes.push(...this.swipes); chat[messageId].swipes.push(...this.swipes);
chat[messageId].swipe_info.push(...swipeInfoArray); chat[messageId].swipe_info.push(...swipeInfoArray);
} }
@ -6122,7 +6121,7 @@ export async function saveReply(type, getMessage, fromStreaming, title, swipes,
} }
if (Array.isArray(swipes) && swipes.length > 0) { if (Array.isArray(swipes) && swipes.length > 0) {
const swipeInfoExtra = structuredClone(item.extra); const swipeInfoExtra = structuredClone(item.extra ?? {});
delete swipeInfoExtra.token_count; delete swipeInfoExtra.token_count;
delete swipeInfoExtra.reasoning; delete swipeInfoExtra.reasoning;
delete swipeInfoExtra.reasoning_duration; delete swipeInfoExtra.reasoning_duration;
@ -6132,9 +6131,8 @@ export async function saveReply(type, getMessage, fromStreaming, title, swipes,
gen_finished: item.gen_finished, gen_finished: item.gen_finished,
extra: swipeInfoExtra, extra: swipeInfoExtra,
}; };
const swipeInfoArray = []; const swipeInfoArray = Array(swipes.length).fill().map(() => structuredClone(swipeInfo));
swipeInfoArray.length = swipes.length; parseReasoningInSwipes(swipes, swipeInfoArray, item.extra?.reasoning_duration);
swipeInfoArray.fill(swipeInfo, 0, swipes.length);
item.swipes.push(...swipes); item.swipes.push(...swipes);
item.swipe_info.push(...swipeInfoArray); item.swipe_info.push(...swipeInfoArray);
} }

26
public/scripts/reasoning.js
View File

@ -1048,6 +1048,32 @@ function parseReasoningFromString(str, { strict = true } = {}) {
} }
} }
/**
* Parse reasoning in an array of swipe strings if auto-parsing is enabled.
* @param {string[]} swipes Array of swipe strings
* @param {{extra: {reasoning: string, reasoning_duration: number}}[]} swipeInfoArray Array of swipe info objects
* @param {number?} duration Duration of the reasoning
*/
export function parseReasoningInSwipes(swipes, swipeInfoArray, duration) {
if (!power_user.reasoning.auto_parse) {
return;
}
// Something ain't right, don't parse
if (!Array.isArray(swipes) || !Array.isArray(swipeInfoArray) || swipes.length !== swipeInfoArray.length) {
return;
}
for (let index = 0; index < swipes.length; index++) {
const parsedReasoning = parseReasoningFromString(swipes[index]);
if (parsedReasoning) {
swipes[index] = parsedReasoning.content;
swipeInfoArray[index].extra.reasoning = parsedReasoning.reasoning;
swipeInfoArray[index].extra.reasoning_duration = duration;
}
}
}
function registerReasoningAppEvents() { function registerReasoningAppEvents() {
const eventHandler = (/** @type {number} */ idx) => { const eventHandler = (/** @type {number} */ idx) => {
if (!power_user.reasoning.auto_parse) { if (!power_user.reasoning.auto_parse) {