Refactor reasoning placeholder clean-up

8b5e0df2d70b80d265a208cc021537c967e5a4d8

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/script.js+7 -4 Viewed

             this.#checkDomElements(messageId);
             this.#updateMessageBlockVisibility();
             const currentTime = new Date();
 -            // Don't waste time calculating token count for streaming
 -            const tokenCountText = (this.reasoning || '') + processedText;
 -            const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(tokenCountText, 0) : 0;
 -            const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount);
             chat[messageId]['mes'] = processedText;
             chat[messageId]['gen_started'] = this.timeStarted;
             chat[messageId]['gen_finished'] = currentTime;

@@ -3214,6 +3210,10 @@ class StreamingProcessor {
3214	3210	}
3215	3211	}
3216	3212
	3213	+ // Don't waste time calculating token count for streaming
	3214	+ const tokenCountText = (this.reasoning \|\| '') + processedText;
	3215	+ const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(tokenCountText, 0) : 0;
	3216	+
3217	3217	if (currentTokenCount) {
3218	3218	chat[messageId]['extra']['token_count'] = currentTokenCount;
3219	3219	if (this.messageTokenCounterDom instanceof HTMLElement) {

@@ -3236,10 +3236,13 @@ class StreamingProcessor {
3236	3236	if (this.messageTextDom instanceof HTMLElement) {
3237	3237	this.messageTextDom.innerHTML = formattedText;
3238	3238	}
	3239	+
	3240	+ const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount);
3239	3241	if (this.messageTimerDom instanceof HTMLElement) {
3240	3242	this.messageTimerDom.textContent = timePassed.timerValue;
3241	3243	this.messageTimerDom.title = timePassed.timerTitle;
3242	3244	}
	3245	+
3243	3246	this.setFirstSwipe(messageId);
3244	3247	}
3245	3248

public/scripts/reasoning.js+7 -6 Viewed

  */
 export class PromptReasoning {
     static REASONING_PLACEHOLDER = '\u200B';
 +    static REASONING_PLACEHOLDER_REGEX = new RegExp(`${PromptReasoning.REASONING_PLACEHOLDER}$`);
     constructor() {
         this.counter = 0;

         callback: (_args, value) => {
             const messageId = !isNaN(Number(value)) ? Number(value) : chat.length - 1;
             const message = chat[messageId];
             const reasoning = String(message?.extra?.reasoning ?? '');
             return reasoning !== .replace(PromptReasoning.REASONING_PLACEHOLDER ? reasoning :REASONING_PLACEHOLDER_REGEX, '');
         },
     }));

                 return '';
+            }
             message.extra.reasoning = String(value ?? '');
             await saveChatConditional();
             closeMessageEditor('reasoning');

             return;
+        }
         const reasoning = String(message?.extra?.reasoning ?? '');
         const chatElement = document.getElementById('chat');
         const textarea = document.createElement('textarea');
         const reasoningBlock = messageBlock.find('.mes_reasoning');
         textarea.classList.add('reasoning_edit_textarea');
         textarea.value = reasoning === .replace(PromptReasoning.REASONING_PLACEHOLDER ?REASONING_PLACEHOLDER_REGEX, '' : reasoning);
         $(textarea).insertBefore(reasoningBlock);
         if (!CSS.supports('field-sizing', 'content')) {

     $(document).on('pointerup', '.mes_reasoning_copy', async function () {
         const { message } = getMessageFromJquery(this);
         const reasoning = String(message?.extra?.reasoning ?? '').replace(PromptReasoning.REASONING_PLACEHOLDER_REGEX, '');
         if (!reasoning) {
             return;