c886de5d · permissionBRICK/SillyTavern

public/script.js+1 -2 Viewed

     loadProxyPresets,
     selected_proxy,
     initOpenAI,
-    isHiddenReasoningModel,
 } from './scripts/openai.js';
 import {

 import { initBulkEdit } from './scripts/bulk-edit.js';
 import { deriveTemplatesFromChatTemplate } from './scripts/chat-templates.js';
 import { getContext } from './scripts/st-context.js';
-import { extractReasoningFromData, initReasoning, PromptReasoning, updateReasoningTimeUI, updateReasoningUI } from './scripts/reasoning.js';
+import { extractReasoningFromData, initReasoning, isHiddenReasoningModel, PromptReasoning, updateReasoningUI } from './scripts/reasoning.js';
 // API OBJECT FOR EXTERNAL WIRING
 globalThis.SillyTavern = {

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

+    }
+}
-/**
- * Check if the model supports reasoning, but does not send back the reasoning
- * @returns {boolean} True if the model supports reasoning
- */
-export function isHiddenReasoningModel() {
-    if (main_api !== 'openai') {
-        return false;
-    }
-    /** @typedef {Object.<chat_completion_sources, { currentModel: string; models: ({ name: string; startsWith: boolean?; matchingFunc: (model: string) => boolean?; }|string)[]; }>} */
-    const hiddenReasoningModels = {
-        [chat_completion_sources.OPENAI]: {
-            currentModel: oai_settings.openai_model,
-            models: [
-                { name: 'o1', startsWith: true },
-                { name: 'o3', startsWith: true },
-            ],
-        },
-        [chat_completion_sources.MAKERSUITE]: {
-            currentModel: oai_settings.google_model,
-            models: [
-                { name: 'gemini-2.0-flash-thinking-exp', startsWith: true },
-                { name: 'gemini-2.0-pro-exp', startsWith: true },
-            ],
-        },
-    };
-    const sourceConfig = hiddenReasoningModels[oai_settings.chat_completion_source];
-    if (!sourceConfig) {
-        return false;
-    }
-    return sourceConfig.models.some(model => {
-        if (typeof model === 'string') {
-            return sourceConfig.currentModel === model;
-        }
-        if (model.startsWith) {
-            return (sourceConfig.currentModel).startsWith(model.name);
-        }
-        if (model.matchingFunc) {
-            return model.matchingFunc(sourceConfig.currentModel);
-        }
-        return false;
-    });
-}
 /**
  * Proxy stuff
  */

public/scripts/reasoning.js+47 -1 Viewed

 import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
 import { getCurrentLocale, t } from './i18n.js';
 import { MacrosParser } from './macros.js';
-import { chat_completion_sources, isHiddenReasoningModel, oai_settings } from './openai.js';
+import { chat_completion_sources, oai_settings } from './openai.js';
 import { Popup } from './popup.js';
 import { power_user } from './power-user.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';

+}
 /**
+ * Check if the model supports reasoning, but does not send back the reasoning
+ * @returns {boolean} True if the model supports reasoning
+ */
+export function isHiddenReasoningModel() {
+    if (main_api !== 'openai') {
+        return false;
+    }
+    /** @typedef {Object.<chat_completion_sources, { currentModel: string; models: ({ name: string; startsWith: boolean?; matchingFunc: (model: string) => boolean?; }|string)[]; }>} */
+    const hiddenReasoningModels = {
+        [chat_completion_sources.OPENAI]: {
+            currentModel: oai_settings.openai_model,
+            models: [
+                { name: 'o1', startsWith: true },
+                { name: 'o3', startsWith: true },
+            ],
+        },
+        [chat_completion_sources.MAKERSUITE]: {
+            currentModel: oai_settings.google_model,
+            models: [
+                { name: 'gemini-2.0-flash-thinking-exp', startsWith: true },
+                { name: 'gemini-2.0-pro-exp', startsWith: true },
+            ],
+        },
+    };
+    const sourceConfig = hiddenReasoningModels[oai_settings.chat_completion_source];
+    if (!sourceConfig) {
+        return false;
+    }
+    return sourceConfig.models.some(model => {
+        if (typeof model === 'string') {
+            return sourceConfig.currentModel === model;
+        }
+        if (model.startsWith) {
+            return (sourceConfig.currentModel).startsWith(model.name);
+        }
+        if (model.matchingFunc) {
+            return model.matchingFunc(sourceConfig.currentModel);
+        }
+        return false;
+    });
+}
+/**
  * Updates the Reasoning UI.
  * @param {number|JQuery<HTMLElement>|HTMLElement} messageIdOrElement The message ID or the message element.
  * @param {string|null} [reasoning=null] The reasoning content.

Move isHiddenReasoningModel