mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Support reasoning for OpenRouter text completion
This commit is contained in:
@ -1587,6 +1587,10 @@
|
|||||||
<input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
|
<input type="checkbox" id="skip_special_tokens_textgenerationwebui" />
|
||||||
<small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
|
<small data-i18n="Skip Special Tokens">Skip Special Tokens</small>
|
||||||
</label>
|
</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">
|
<label data-tg-type="ooba, aphrodite, tabby" class="checkbox_label flexGrow flexShrink" for="temperature_last_textgenerationwebui">
|
||||||
<input type="checkbox" id="temperature_last_textgenerationwebui" />
|
<input type="checkbox" id="temperature_last_textgenerationwebui" />
|
||||||
<label>
|
<label>
|
||||||
|
@ -5704,15 +5704,26 @@ function extractMessageFromData(data) {
|
|||||||
* @returns {string} Extracted reasoning
|
* @returns {string} Extracted reasoning
|
||||||
*/
|
*/
|
||||||
function extractReasoningFromData(data) {
|
function extractReasoningFromData(data) {
|
||||||
if (main_api === 'openai' && oai_settings.show_thoughts) {
|
switch (main_api) {
|
||||||
switch (oai_settings.chat_completion_source) {
|
case 'textgenerationwebui':
|
||||||
case chat_completion_sources.DEEPSEEK:
|
switch (textgen_settings.type) {
|
||||||
return data?.choices?.[0]?.message?.reasoning_content ?? '';
|
case textgen_types.OPENROUTER:
|
||||||
case chat_completion_sources.OPENROUTER:
|
return data?.choices?.[0]?.reasoning ?? '';
|
||||||
return data?.choices?.[0]?.message?.reasoning ?? '';
|
}
|
||||||
case chat_completion_sources.MAKERSUITE:
|
break;
|
||||||
return data?.responseContent?.parts?.filter(part => part.thought)?.map(part => part.text)?.join('\n\n') ?? '';
|
|
||||||
}
|
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 '';
|
return '';
|
||||||
|
@ -1913,7 +1913,7 @@ async function sendOpenAIRequest(type, messages, signal) {
|
|||||||
'user_name': name1,
|
'user_name': name1,
|
||||||
'char_name': name2,
|
'char_name': name2,
|
||||||
'group_names': getGroupNames(),
|
'group_names': getGroupNames(),
|
||||||
'show_thoughts': Boolean(oai_settings.show_thoughts),
|
'include_reasoning': Boolean(oai_settings.show_thoughts),
|
||||||
};
|
};
|
||||||
|
|
||||||
// Empty array will produce a validation error
|
// Empty array will produce a validation error
|
||||||
@ -2151,7 +2151,7 @@ function getStreamingReply(data, state) {
|
|||||||
return data?.delta?.text || '';
|
return data?.delta?.text || '';
|
||||||
} else if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) {
|
} else if (oai_settings.chat_completion_source === chat_completion_sources.MAKERSUITE) {
|
||||||
if (oai_settings.show_thoughts) {
|
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] || '';
|
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) {
|
} 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 || '');
|
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 ?? '';
|
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 ?? '';
|
return data.choices?.[0]?.delta?.content ?? data.choices?.[0]?.message?.content ?? data.choices?.[0]?.text ?? '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -172,6 +172,7 @@ const settings = {
|
|||||||
//truncation_length: 2048,
|
//truncation_length: 2048,
|
||||||
ban_eos_token: false,
|
ban_eos_token: false,
|
||||||
skip_special_tokens: true,
|
skip_special_tokens: true,
|
||||||
|
include_reasoning: true,
|
||||||
streaming: false,
|
streaming: false,
|
||||||
mirostat_mode: 0,
|
mirostat_mode: 0,
|
||||||
mirostat_tau: 5,
|
mirostat_tau: 5,
|
||||||
@ -263,6 +264,7 @@ export const setting_names = [
|
|||||||
'add_bos_token',
|
'add_bos_token',
|
||||||
'ban_eos_token',
|
'ban_eos_token',
|
||||||
'skip_special_tokens',
|
'skip_special_tokens',
|
||||||
|
'include_reasoning',
|
||||||
'streaming',
|
'streaming',
|
||||||
'mirostat_mode',
|
'mirostat_mode',
|
||||||
'mirostat_tau',
|
'mirostat_tau',
|
||||||
@ -740,6 +742,7 @@ jQuery(function () {
|
|||||||
'add_bos_token_textgenerationwebui': true,
|
'add_bos_token_textgenerationwebui': true,
|
||||||
'temperature_last_textgenerationwebui': true,
|
'temperature_last_textgenerationwebui': true,
|
||||||
'skip_special_tokens_textgenerationwebui': true,
|
'skip_special_tokens_textgenerationwebui': true,
|
||||||
|
'include_reasoning_textgenerationwebui': true,
|
||||||
'top_a_textgenerationwebui': 0,
|
'top_a_textgenerationwebui': 0,
|
||||||
'top_a_counter_textgenerationwebui': 0,
|
'top_a_counter_textgenerationwebui': 0,
|
||||||
'mirostat_mode_textgenerationwebui': 0,
|
'mirostat_mode_textgenerationwebui': 0,
|
||||||
@ -986,7 +989,7 @@ export async function generateTextGenWithStreaming(generate_data, signal) {
|
|||||||
let logprobs = null;
|
let logprobs = null;
|
||||||
const swipes = [];
|
const swipes = [];
|
||||||
const toolCalls = [];
|
const toolCalls = [];
|
||||||
const state = {};
|
const state = { reasoning: '' };
|
||||||
while (true) {
|
while (true) {
|
||||||
const { done, value } = await reader.read();
|
const { done, value } = await reader.read();
|
||||||
if (done) return;
|
if (done) return;
|
||||||
@ -1003,6 +1006,7 @@ export async function generateTextGenWithStreaming(generate_data, signal) {
|
|||||||
const newText = data?.choices?.[0]?.text || data?.content || '';
|
const newText = data?.choices?.[0]?.text || data?.content || '';
|
||||||
text += newText;
|
text += newText;
|
||||||
logprobs = parseTextgenLogprobs(newText, data.choices?.[0]?.logprobs || data?.completion_probabilities);
|
logprobs = parseTextgenLogprobs(newText, data.choices?.[0]?.logprobs || data?.completion_probabilities);
|
||||||
|
state.reasoning += data?.choices?.[0]?.reasoning ?? '';
|
||||||
}
|
}
|
||||||
|
|
||||||
yield { text, swipes, logprobs, toolCalls, state };
|
yield { text, swipes, logprobs, toolCalls, state };
|
||||||
@ -1266,6 +1270,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
|
|||||||
'truncation_length': max_context,
|
'truncation_length': max_context,
|
||||||
'ban_eos_token': settings.ban_eos_token,
|
'ban_eos_token': settings.ban_eos_token,
|
||||||
'skip_special_tokens': settings.skip_special_tokens,
|
'skip_special_tokens': settings.skip_special_tokens,
|
||||||
|
'include_reasoning': settings.include_reasoning,
|
||||||
'top_a': settings.top_a,
|
'top_a': settings.top_a,
|
||||||
'tfs': settings.tfs,
|
'tfs': settings.tfs,
|
||||||
'epsilon_cutoff': [OOBA, MANCER].includes(settings.type) ? settings.epsilon_cutoff : undefined,
|
'epsilon_cutoff': [OOBA, MANCER].includes(settings.type) ? settings.epsilon_cutoff : undefined,
|
||||||
|
@ -369,6 +369,7 @@ export const OPENROUTER_KEYS = [
|
|||||||
'prompt',
|
'prompt',
|
||||||
'stop',
|
'stop',
|
||||||
'provider',
|
'provider',
|
||||||
|
'include_reasoning',
|
||||||
];
|
];
|
||||||
|
|
||||||
// https://github.com/vllm-project/vllm/blob/0f8a91401c89ac0a8018def3756829611b57727f/vllm/entrypoints/openai/protocol.py#L220
|
// https://github.com/vllm-project/vllm/blob/0f8a91401c89ac0a8018def3756829611b57727f/vllm/entrypoints/openai/protocol.py#L220
|
||||||
|
@ -998,7 +998,7 @@ router.post('/generate', jsonParser, function (request, response) {
|
|||||||
bodyParams['route'] = 'fallback';
|
bodyParams['route'] = 'fallback';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request.body.show_thoughts) {
|
if (request.body.include_reasoning) {
|
||||||
bodyParams['include_reasoning'] = true;
|
bodyParams['include_reasoning'] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user