More fixes on reasoning - Fix resetting reasoning on swipes - Fix not updating reasoning time/end on gen when trim spaces was enabled - Fix hidden model checking not working

31f19d0d8ae2386fe016472268d94a11b7dbc0b9

Wolfsblvt <wolfsblvt@gmail.com>

public/script.js+2 -2 Viewed

         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);

                     // 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');

public/scripts/reasoning.js+30 -15 Viewed

@@ -96,11 +96,11 @@ export function isHiddenReasoningModel() {
96		96
97	function isModelSupported(model) {	97	function isModelSupported(model) {
98	for (const hiddenReasoningModel of hiddenReasoningModels) {	98	for (const hiddenReasoningModel of hiddenReasoningModels) {
99	if (typeof model === 'string') {	99	if (typeof hiddenReasoningModel === 'string') {
100	return hiddenReasoningModel === model;	100	return hiddenReasoningModel === model;
101	}	101	}
102	if (model.matchingFunc) {	102	if (hiddenReasoningModel.func) {
103	return model.matchingFunc(model, hiddenReasoningModel);	103	return hiddenReasoningModel.func(model, hiddenReasoningModel.name);
104	}	104	}
105	}	105	}
106	return false;	106	return false;

 /**
  * 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 });
+}

      * 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}"]`)

         if (isNaN(messageId)) return;
-        const extra = chat[messageId]['extra'];
+        const extra = chat[messageId].extra;
         if (extra.reasoning) {
             this.state = ReasoningState.Done;

         // 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);
+    }

      */
     updateReasoning(messageId, reasoning = null, { persist = false } = {}) {
         reasoning = reasoning ?? this.reasoning;
-        const reasoningChanged = this.reasoning !== reasoning;
+        reasoning = power_user.trim_spaces ? reasoning.trim() : reasoning;
-        this.reasoning = getRegexedString(reasoning ?? '', regex_placement.REASONING);
-        if (persist) {
         // Ensure the chat extra exists
-            if (!chat[messageId]['extra']) {
+        if (!chat[messageId].extra) {
-                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) {
             // Build and save the reasoning data to message extras
-            const extra = chat[messageId]['extra'];
+            extra.reasoning = this.reasoning;
-            extra['reasoning'] = power_user.trim_spaces ? this.reasoning.trim() : this.reasoning;
+            extra.reasoning_duration = this.getDuration();
-            extra['reasoning_duration'] = this.getDuration();
+        }
         return reasoningChanged;