rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-16 19:57:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix and shorten isHiddenReasoningModel

Browse Source
This commit is contained in:
Wolfsblvt 2025-02-10 06:15:47 +01:00
parent d4e77280fc
commit 703e876f4a
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/openai.js
View File

@ -82,7 +82,6 @@ export {
setOpenAIMessageExamples, setOpenAIMessageExamples,
setupChatCompletionPromptManager, setupChatCompletionPromptManager,
sendOpenAIRequest, sendOpenAIRequest,
getChatCompletionModel,
TokenHandler, TokenHandler,
IdentifierNotFoundError, IdentifierNotFoundError,
Message, Message,
@ -1497,7 +1496,7 @@ async function sendWindowAIRequest(messages, signal, stream) {
} }
} }
function getChatCompletionModel() { export function getChatCompletionModel() {
switch (oai_settings.chat_completion_source) { switch (oai_settings.chat_completion_source) {
case chat_completion_sources.CLAUDE: case chat_completion_sources.CLAUDE:
return oai_settings.claude_model; return oai_settings.claude_model;

30
public/scripts/reasoning.js
View File

@ -5,7 +5,7 @@ import { chat, closeMessageEditor, event_types, eventSource, main_api, messageFo
import { getRegexedString, regex_placement } from './extensions/regex/engine.js'; import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
import { getCurrentLocale, t } from './i18n.js'; import { getCurrentLocale, t } from './i18n.js';
import { MacrosParser } from './macros.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 { Popup } from './popup.js';
import { power_user } from './power-user.js'; import { power_user } from './power-user.js';
import { SlashCommand } from './slash-commands/SlashCommand.js'; import { SlashCommand } from './slash-commands/SlashCommand.js';
@ -80,13 +80,13 @@ export function isHiddenReasoningModel() {
} }
/** @typedef {{ (currentModel: string, supportedModel: string): boolean }} MatchingFunc */ /** @typedef {{ (currentModel: string, supportedModel: string): boolean }} MatchingFunc */
/** @type {Record.<string, MatchingFunc>} */ /** @type {Record.<string, MatchingFunc>} */
const FUNCS = { const FUNCS = {
equals: (currentModel, supportedModel) => currentModel === supportedModel,
startsWith: (currentModel, supportedModel) => currentModel.startsWith(supportedModel), startsWith: (currentModel, supportedModel) => currentModel.startsWith(supportedModel),
}; };
/** @type {({ name: string; func?: MatchingFunc; }|string)[]} */ /** @type {{ name: string; func: MatchingFunc; }[]} */
const hiddenReasoningModels = [ const hiddenReasoningModels = [
{ name: 'o1', func: FUNCS.startsWith }, { name: 'o1', func: FUNCS.startsWith },
{ name: 'o3', func: FUNCS.startsWith }, { name: 'o3', func: FUNCS.startsWith },
@ -94,28 +94,10 @@ export function isHiddenReasoningModel() {
{ name: 'gemini-2.0-pro-exp', 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;
}
} }
/** /**