03c98fb5 · permissionBRICK/SillyTavern

public/index.html+1 -1 Viewed

                                             </span>
                                         </div>
                                     </div>
-                                    <div class="range-block" data-source="makersuite,deepseek">
+                                    <div class="range-block" data-source="makersuite,deepseek,openrouter">
                                         <label for="openai_show_thoughts" class="checkbox_label widthFreeExpand">
                                             <input id="openai_show_thoughts" type="checkbox" />
                                             <span>

public/script.js+10 -13 Viewed

     isElementInViewport,
     copyText,
 } from './scripts/utils.js';
-import { debounce_timeout, THINK_BREAK } from './scripts/constants.js';
+import { debounce_timeout } from './scripts/constants.js';
 import { doDailyExtensionUpdatesCheck, extension_settings, initExtensions, loadExtensionSettings, runGenerationInterceptors, saveMetadataDebounced } from './scripts/extensions.js';
 import { COMMENT_NAME_DEFAULT, executeSlashCommandsOnChatInput, getSlashCommandsHelp, initDefaultSlashCommands, isExecutingCommandsFromChatInput, pauseScriptExecution, processChatSlashCommands, stopScriptExecution } from './scripts/slash-commands.js';

 function extractMessageFromData(data){
     const content = String(getTextContextFromData(data) ?? '');
-    if (content.includes(THINK_BREAK)) {
-        return content.split(THINK_BREAK)[1];
-    }
     return content;
+}

  * @returns {string} Extracted reasoning
  */
 function extractReasoningFromData(data) {
-    const content = String(getTextContextFromData(data) ?? '');
+    if (main_api === 'openai' && oai_settings.show_thoughts) {
+        switch (oai_settings.chat_completion_source) {
-    if (content.includes(THINK_BREAK)) {
+            case chat_completion_sources.DEEPSEEK:
-        return content.split(THINK_BREAK)[0];
+                return data?.choices?.[0]?.message?.reasoning_content ?? '';
-    }
+            case chat_completion_sources.OPENROUTER:
+                return data?.choices?.[0]?.message?.reasoning ?? '';
-    if (main_api === 'openai' && oai_settings.chat_completion_source === chat_completion_sources.DEEPSEEK && oai_settings.show_thoughts) {
+            case chat_completion_sources.MAKERSUITE:
-        return data?.choices?.[0]?.message?.reasoning_content ?? '';
+                return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
+        }
+    }
     return '';

public/scripts/constants.js+0 -5 Viewed

     /** [5 sec] For delayed tasks, like auto-saving or completing batch operations that need a significant pause. */
     extended: 5000,
 };
-/**
- * Custom boundary for splitting the text between the model's reasoning and the actual response.
- */
-export const THINK_BREAK = '##�THINK_BREAK�##';

public/scripts/openai.js+5 -0 Viewed

             state.reasoning += (data.choices?.filter(x => x?.delta?.reasoning_content)?.[0]?.delta?.reasoning_content || '');
+        }
         return data.choices?.[0]?.delta?.content || '';
+    } else if (oai_settings.chat_completion_source === chat_completion_sources.OPENROUTER) {
+        if (oai_settings.show_thoughts) {
+            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  {
         return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
+    }

public/scripts/sse-stream.js+15 -0 Viewed

+                }
                 return;
+            }
+            else if (typeof json.choices[0].delta.reasoning === 'string' && json.choices[0].delta.reasoning.length > 0) {
+                for (let j = 0; j < json.choices[0].delta.reasoning.length; j++) {
+                    const str = json.choices[0].delta.reasoning[j];
+                    const isLastSymbol = j === json.choices[0].delta.reasoning.length - 1;
+                    const choiceClone = structuredClone(json.choices[0]);
+                    choiceClone.delta.reasoning = str;
+                    choiceClone.delta.content = isLastSymbol ? choiceClone.delta.content : '';
+                    const choices = [choiceClone];
+                    yield {
+                        data: { ...json, choices },
+                        chunk: str,
+                    };
+                }
+                return;
+            }
             else if (typeof json.choices[0].delta.content === 'string' && json.choices[0].delta.content.length > 0) {
                 for (let j = 0; j < json.choices[0].delta.content.length; j++) {
                     const str = json.choices[0].delta.content[j];

src/constants.js+0 -5 Viewed

     'guided_decoding_backend',
     'guided_whitespace_pattern',
 ];
-/**
- * Custom boundary for splitting the text between the model's reasoning and the actual response.
- */
-export const THINK_BREAK = '##�THINK_BREAK�##';

src/endpoints/backends/chat-completions.js+6 -7 Viewed

     CHAT_COMPLETION_SOURCES,
     GEMINI_SAFETY,
     OPENROUTER_HEADERS,
-    THINK_BREAK,
 } from '../../constants.js';
 import {
     forwardFetchResponse,

             const responseContent = candidates[0].content ?? candidates[0].output;
             console.log('Google AI Studio response:', responseContent);
-            if (Array.isArray(responseContent?.parts) && isThinking && !showThoughts) {
+            const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.filter(part => !part.thought)?.map(part => part.text)?.join('\n\n');
-                responseContent.parts = responseContent.parts.filter(part => !part.thought);
-            }
-            const responseText = typeof responseContent === 'string' ? responseContent : responseContent?.parts?.map(part => part.text)?.join(THINK_BREAK);
             if (!responseText) {
                 let message = 'Google AI Studio Candidate text empty';
                 console.log(message, generateResponseJson);

@@ -404,7 +399,7 @@ async function sendMakerSuiteRequest(request, response) {
404	}	399	}
405		400
406	// Wrap it back to OAI format	401	// Wrap it back to OAI format
407	const reply = { choices: [{ 'message': { 'content': responseText } }] };	402	const reply = { choices: [{ 'message': { 'content': responseText } }], responseContent };
408	return response.send(reply);	403	return response.send(reply);
409	}	404	}
410	} catch (error) {	405	} catch (error) {

             bodyParams['route'] = 'fallback';
+        }
+        if (request.body.show_thoughts) {
+            bodyParams['include_reasoning'] = true;
+        }
         let cachingAtDepth = getConfigValue('claude.cachingAtDepth', -1);
         if (Number.isInteger(cachingAtDepth) && cachingAtDepth >= 0 && request.body.model?.startsWith('anthropic/claude-3')) {
             cachingAtDepthForOpenRouterClaude(request.body.messages, cachingAtDepth);

OpenRouter: Support reasoning blocks