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

More fixes on reasoning

Browse Source 
- Fix resetting reasoning on swipes
- Fix not updating reasoning time/end on gen when trim spaces was enabled
- Fix hidden model checking not working
This commit is contained in:
Wolfsblvt
2025-02-09 08:26:51 +01:00
parent d48db9aded
commit 31f19d0d8a
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -2506,8 +2506,8 @@ export function addOneMessage(mes, { type = 'normal', insertAfter = null, scroll
const swipeMessage = chatElement.find(`[mesid="${chat.length - 1}"]`);
swipeMessage.attr('swipeid', params.swipeId);
swipeMessage.find('.mes_text').html(messageText).attr('title', title);
swipeMessage.find('.mes_reasoning').html(reasoning);
swipeMessage.find('.timestamp').text(timestamp).attr('title', `${params.extra.api} - ${params.extra.model}`);
updateReasoningUI(swipeMessage, { reset: true });
appendMediaToMessage(mes, swipeMessage);
if (power_user.timestamp_model_icon && params.extra?.api) {
insertSVGIcon(swipeMessage, params.extra);
@ -8722,7 +8722,7 @@ const swipe_right = () => {
// resets the timer
swipeMessage.find('.mes_timer').html('');
swipeMessage.find('.tokenCounterDisplay').text('');
updateReasoningUI(swipeMessage);
updateReasoningUI(swipeMessage, { reset: true });
} else {
//console.log('showing previously generated swipe candidate, or "..."');
//console.log('onclick right swipe calling addOneMessage');

47
public/scripts/reasoning.js
View File

@ -96,11 +96,11 @@ export function isHiddenReasoningModel() {
function isModelSupported(model) {
for (const hiddenReasoningModel of hiddenReasoningModels) {
if (typeof model === 'string') {
if (typeof hiddenReasoningModel === 'string') {
return hiddenReasoningModel === model;
}
if (model.matchingFunc) {
return model.matchingFunc(model, hiddenReasoningModel);
if (hiddenReasoningModel.func) {
return hiddenReasoningModel.func(model, hiddenReasoningModel.name);
}
}
return false;
@ -121,10 +121,12 @@ export function isHiddenReasoningModel() {
/**
* Updates the Reasoning UI for a specific message
* @param {number|JQuery<HTMLElement>|HTMLElement} messageIdOrElement The message ID or the message element
* @param {Object} [options={}] - Optional arguments
* @param {boolean} [options.reset=false] - Whether to reset state, and not take the current mess properties (for example when swiping)
*/
export function updateReasoningUI(messageIdOrElement) {
export function updateReasoningUI(messageIdOrElement, { reset = false } = {}) {
const handler = new ReasoningHandler();
handler.initHandleMessage(messageIdOrElement);
handler.initHandleMessage(messageIdOrElement, { reset });
}
@ -185,8 +187,10 @@ export class ReasoningHandler {
* The state will always be either done/hidden or none.
*
* @param {number|JQuery<HTMLElement>|HTMLElement} messageIdOrElement - The message ID or the message element
* @param {Object} [options={}] - Optional arguments
* @param {boolean} [options.reset=false] - Whether to reset state of the handler, and not take the current mess properties (for example when swiping)
*/
initHandleMessage(messageIdOrElement) {
initHandleMessage(messageIdOrElement, { reset = false } = {}) {
/** @type {HTMLElement} */
const messageElement = typeof messageIdOrElement === 'number'
? document.querySelector(`#chat [mesid="${messageIdOrElement}"]`)
@ -197,7 +201,7 @@ export class ReasoningHandler {
if (isNaN(messageId)) return;
const extra = chat[messageId]['extra'];
const extra = chat[messageId].extra;
if (extra.reasoning) {
this.state = ReasoningState.Done;
@ -216,6 +220,15 @@ export class ReasoningHandler {
// Prefill main dom element, as message might not have been rendered yet
this.messageDom = messageElement;
// Make sure reset correctly clears all relevant states
if (reset) {
this.state = this.#isHiddenReasoningModel ? ReasoningState.Thinking : ReasoningState.None;
this.reasoning = '';
this.initialTime = new Date();
this.startTime = null;
this.endTime = null;
}
this.updateDom(messageId);
}
@ -242,19 +255,21 @@ export class ReasoningHandler {
*/
updateReasoning(messageId, reasoning = null, { persist = false } = {}) {
reasoning = reasoning ?? this.reasoning;
const reasoningChanged = this.reasoning !== reasoning;
reasoning = power_user.trim_spaces ? reasoning.trim() : reasoning;
// Ensure the chat extra exists
if (!chat[messageId].extra) {
chat[messageId].extra = {};
}
const extra = chat[messageId].extra;
const reasoningChanged = extra.reasoning !== reasoning;
this.reasoning = getRegexedString(reasoning ?? '', regex_placement.REASONING);
if (persist) {
// Ensure the chat extra exists
if (!chat[messageId]['extra']) {
chat[messageId]['extra'] = {};
}
// Build and save the reasoning data to message extras
const extra = chat[messageId]['extra'];
extra['reasoning'] = power_user.trim_spaces ? this.reasoning.trim() : this.reasoning;
extra['reasoning_duration'] = this.getDuration();
extra.reasoning = this.reasoning;
extra.reasoning_duration = this.getDuration();
}
return reasoningChanged;