Fix and shorten isHiddenReasoningModel

703e876f4a827bd6751f52c4f20ced7d36e14cf1

Wolfsblvt <wolfsblvt@gmail.com>

public/scripts/openai.js+1 -2 Viewed

     setOpenAIMessageExamples,
     setupChatCompletionPromptManager,
     sendOpenAIRequest,
-    getChatCompletionModel,
     TokenHandler,
     IdentifierNotFoundError,
     Message,

@@ -1497,7 +1496,7 @@ async function sendWindowAIRequest(messages, signal, stream) {
1497	}	1496	}
1498	}	1497	}
1499		1498
1500	function getChatCompletionModel() {	1499	export function getChatCompletionModel() {
1501	switch (oai_settings.chat_completion_source) {	1500	switch (oai_settings.chat_completion_source) {
1502	case chat_completion_sources.CLAUDE:	1501	case chat_completion_sources.CLAUDE:
1503	return oai_settings.claude_model;	1502	return oai_settings.claude_model;

public/scripts/reasoning.js+6 -24 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, oai_settings } from './openai.js';
+import { chat_completion_sources, getChatCompletionModel, oai_settings } from './openai.js';
 import { Popup } from './popup.js';
 import { power_user } from './power-user.js';
 import { SlashCommand } from './slash-commands/SlashCommand.js';

+    }
     /** @typedef {{ (currentModel: string, supportedModel: string): boolean }} MatchingFunc */
     /** @type {Record.<string, MatchingFunc>} */
     const FUNCS = {
+        equals: (currentModel, supportedModel) => currentModel === supportedModel,
         startsWith: (currentModel, supportedModel) => currentModel.startsWith(supportedModel),
     };
-    /** @type {({ name: string; func?: MatchingFunc; }|string)[]} */
+    /** @type {{ name: string; func: MatchingFunc; }[]} */
     const hiddenReasoningModels = [
         { name: 'o1', func: FUNCS.startsWith },
         { name: 'o3', func: FUNCS.startsWith },

         { name: 'gemini-2.0-pro-exp', func: FUNCS.startsWith },
     ];
-    function isModelSupported(model) {
+    const model = getChatCompletionModel();
-        for (const hiddenReasoningModel of hiddenReasoningModels) {
-            if (typeof hiddenReasoningModel === 'string') {
-                return hiddenReasoningModel === model;
-            }
-            if (hiddenReasoningModel.func) {
-                return hiddenReasoningModel.func(model, hiddenReasoningModel.name);
-            }
-        }
-        return false;
-    }
-    switch (oai_settings.chat_completion_source) {
+    const isHidden = hiddenReasoningModels.some(({ name, func }) => func(model, name));
-        case chat_completion_sources.OPENAI: return isModelSupported(oai_settings.openai_model);
+    return isHidden;
-        case chat_completion_sources.MAKERSUITE: return isModelSupported(oai_settings.google_model);
-        case chat_completion_sources.CLAUDE: return isModelSupported(oai_settings.claude_model);
-        case chat_completion_sources.OPENROUTER: return isModelSupported(oai_settings.openrouter_model);
-        case chat_completion_sources.ZEROONEAI: return isModelSupported(oai_settings.zerooneai_model);
-        case chat_completion_sources.MISTRALAI: return isModelSupported(oai_settings.mistralai_model);
-        case chat_completion_sources.CUSTOM: return isModelSupported(oai_settings.custom_model);
-        default: return false;
-    }
+}
 /**