From 753a99faf93ed4a6c0f36db4f2bf63d471ab5f0e Mon Sep 17 00:00:00 2001
From: pcpthm <pcpthm@gmail.com>
Date: Fri, 31 Jan 2025 21:41:42 +0900
Subject: [PATCH 1/4] Support reasoning for OpenRouter text completion

---
 public/index.html                          |  4 +++
 public/script.js                           | 29 +++++++++++++++-------
 public/scripts/openai.js                   |  6 ++---
 public/scripts/textgen-settings.js         |  7 +++++-
 src/constants.js                           |  1 +
 src/endpoints/backends/chat-completions.js |  2 +-
 6 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/public/index.html b/public/index.html
index cd9abb3e8..ee15ea62e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1587,6 +1587,10 @@
                                                 <input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
                                                 <small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
                                             </label>
+                                            <label data-tg-type="openrouter" class="checkbox_label flexGrow flexShrink" for="include_reasoning_textgenerationwebui">
+                                                <input type="checkbox" id="include_reasoning_textgenerationwebui" />
+                                                <small data-i18n="Request Model Reasoning">Request Model Reasoning</small>
+                                            </label>
                                             <label data-tg-type="ooba, aphrodite, tabby" class="checkbox_label  flexGrow flexShrink" for="temperature_last_textgenerationwebui">
                                                 <input type="checkbox" id="temperature_last_textgenerationwebui" />
                                                 <label>
diff --git a/public/script.js b/public/script.js
index 9c9f8fc3a..5960477ec 100644
--- a/public/script.js
+++ b/public/script.js
@@ -5704,15 +5704,26 @@ function extractMessageFromData(data) {
  * @returns {string} Extracted reasoning
  */
 function extractReasoningFromData(data) {
-    if (main_api === 'openai' && oai_settings.show_thoughts) {
-        switch (oai_settings.chat_completion_source) {
-            case chat_completion_sources.DEEPSEEK:
-                return data?.choices?.[0]?.message?.reasoning_content ?? '';
-            case chat_completion_sources.OPENROUTER:
-                return data?.choices?.[0]?.message?.reasoning ?? '';
-            case chat_completion_sources.MAKERSUITE:
-                return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
-        }
+    switch (main_api) {
+        case 'textgenerationwebui':
+            switch (textgen_settings.type) {
+                case textgen_types.OPENROUTER:
+                    return data?.choices?.[0]?.reasoning ?? '';
+            }
+            break;
+
+        case 'openai':
+            if (!oai_settings.show_thoughts) break;
+
+            switch (oai_settings.chat_completion_source) {
+                case chat_completion_sources.DEEPSEEK:
+                    return data?.choices?.[0]?.message?.reasoning_content ?? '';
+                case chat_completion_sources.OPENROUTER:
+                    return data?.choices?.[0]?.message?.reasoning ?? '';
+                case chat_completion_sources.MAKERSUITE:
+                    return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
+            }
+            break;
     }
 
     return '';
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index a58f3fcde..64c5a6a75 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -1913,7 +1913,7 @@ async function sendOpenAIRequest(type, messages, signal) {
         'user_name': name1,
         'char_name': name2,
         'group_names': getGroupNames(),
-        'show_thoughts': Boolean(oai_settings.show_thoughts),
+        'include_reasoning': Boolean(oai_settings.show_thoughts),
     };
 
     // Empty array will produce a validation error
@@ -2151,7 +2151,7 @@ function getStreamingReply(data, state) {
         return data?.delta?.text || '';
     } else if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) {
         if (oai_settings.show_thoughts) {
-            state.reasoning += (data?.candidates?.[0]?.content?.parts?.filter(x =>  x.thought)?.map(x => x.text)?.[0] || '');
+            state.reasoning += (data?.candidates?.[0]?.content?.parts?.filter(x => x.thought)?.map(x => x.text)?.[0] || '');
         }
         return data?.candidates?.[0]?.content?.parts?.filter(x => !x.thought)?.map(x => x.text)?.[0] || '';
     } else if (oai_settings.chat_completion_source === chat_completion_sources.COHERE) {
@@ -2166,7 +2166,7 @@ function getStreamingReply(data, state) {
             state.reasoning += (data.choices?.filter(x => x?.delta?.reasoning)?.[0]?.delta?.reasoning || '');
         }
         return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
-    } else  {
+    } else {
         return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
     }
 }
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 4a2f37660..29bce0858 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -172,6 +172,7 @@ const settings = {
     //truncation_length: 2048,
     ban_eos_token: false,
     skip_special_tokens: true,
+    include_reasoning: true,
     streaming: false,
     mirostat_mode: 0,
     mirostat_tau: 5,
@@ -263,6 +264,7 @@ export const setting_names = [
     'add_bos_token',
     'ban_eos_token',
     'skip_special_tokens',
+    'include_reasoning',
     'streaming',
     'mirostat_mode',
     'mirostat_tau',
@@ -740,6 +742,7 @@ jQuery(function () {
             'add_bos_token_textgenerationwebui': true,
             'temperature_last_textgenerationwebui': true,
             'skip_special_tokens_textgenerationwebui': true,
+            'include_reasoning_textgenerationwebui': true,
             'top_a_textgenerationwebui': 0,
             'top_a_counter_textgenerationwebui': 0,
             'mirostat_mode_textgenerationwebui': 0,
@@ -986,7 +989,7 @@ export async function generateTextGenWithStreaming(generate_data, signal) {
         let logprobs = null;
         const swipes = [];
         const toolCalls = [];
-        const state = {};
+        const state = { reasoning: '' };
         while (true) {
             const { done, value } = await reader.read();
             if (done) return;
@@ -1003,6 +1006,7 @@ export async function generateTextGenWithStreaming(generate_data, signal) {
                 const newText = data?.choices?.[0]?.text || data?.content || '';
                 text += newText;
                 logprobs = parseTextgenLogprobs(newText, data.choices?.[0]?.logprobs || data?.completion_probabilities);
+                state.reasoning += data?.choices?.[0]?.reasoning ?? '';
             }
 
             yield { text, swipes, logprobs, toolCalls, state };
@@ -1266,6 +1270,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'truncation_length': max_context,
         'ban_eos_token': settings.ban_eos_token,
         'skip_special_tokens': settings.skip_special_tokens,
+        'include_reasoning': settings.include_reasoning,
         'top_a': settings.top_a,
         'tfs': settings.tfs,
         'epsilon_cutoff': [OOBA, MANCER].includes(settings.type) ? settings.epsilon_cutoff : undefined,
diff --git a/src/constants.js b/src/constants.js
index 35118a04b..afb00cd5b 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -369,6 +369,7 @@ export const OPENROUTER_KEYS = [
     'prompt',
     'stop',
     'provider',
+    'include_reasoning',
 ];
 
 // https://github.com/vllm-project/vllm/blob/0f8a91401c89ac0a8018def3756829611b57727f/vllm/entrypoints/openai/protocol.py#L220
diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index a0561bbc8..b1d06e887 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -998,7 +998,7 @@ router.post('/generate', jsonParser, function (request, response) {
             bodyParams['route'] = 'fallback';
         }
 
-        if (request.body.show_thoughts) {
+        if (request.body.include_reasoning) {
             bodyParams['include_reasoning'] = true;
         }
 

From 9de142b9ad7c1a1b4893e718d3da5764d3b849c4 Mon Sep 17 00:00:00 2001
From: pcpthm <pcpthm@gmail.com>
Date: Fri, 31 Jan 2025 22:23:59 +0900
Subject: [PATCH 2/4] Fix MakerSuit show reasoning

---
 src/endpoints/backends/chat-completions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js
index b1d06e887..5c9f878e5 100644
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@@ -288,7 +288,7 @@ async function sendMakerSuiteRequest(request, response) {
 
     const model = String(request.body.model);
     const stream = Boolean(request.body.stream);
-    const showThoughts = Boolean(request.body.show_thoughts);
+    const showThoughts = Boolean(request.body.include_reasoning);
     const isThinking = model.includes('thinking');
 
     const generationConfig = {

From a83e7318b0ef5c9ac1a814e11095f79ea0f376fa Mon Sep 17 00:00:00 2001
From: pcpthm <pcpthm@gmail.com>
Date: Fri, 31 Jan 2025 22:38:11 +0900
Subject: [PATCH 3/4] Make "request model reasoning" default true

---
 public/scripts/openai.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 64c5a6a75..f1fed2799 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -298,7 +298,7 @@ const default_settings = {
     names_behavior: character_names_behavior.DEFAULT,
     continue_postfix: continue_postfix_types.SPACE,
     custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
-    show_thoughts: false,
+    show_thoughts: true,
     seed: -1,
     n: 1,
 };
@@ -377,7 +377,7 @@ const oai_settings = {
     names_behavior: character_names_behavior.DEFAULT,
     continue_postfix: continue_postfix_types.SPACE,
     custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
-    show_thoughts: false,
+    show_thoughts: true,
     seed: -1,
     n: 1,
 };

From 515a5f6943fa1e1f70e46c4883315ed3646265e8 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Fri, 31 Jan 2025 20:43:20 +0200
Subject: [PATCH 4/4] Exclude 'include_reasoning' from TC presets

---
 public/scripts/preset-manager.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/scripts/preset-manager.js b/public/scripts/preset-manager.js
index 0b6f3dcec..0d7d3c133 100644
--- a/public/scripts/preset-manager.js
+++ b/public/scripts/preset-manager.js
@@ -586,6 +586,7 @@ class PresetManager {
             'tabby_model',
             'derived',
             'generic_model',
+            'include_reasoning',
         ];
         const settings = Object.assign({}, getSettingsByApiId(this.apiId));