mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Add backend-provided websearch connectors for OpenRouter and Gemini
This commit is contained in:
@ -1951,6 +1951,17 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="range-block" data-source="makersuite,openrouter">
|
||||||
|
<label for="openai_enable_web_search" class="checkbox_label flexWrap widthFreeExpand">
|
||||||
|
<input id="openai_enable_web_search" type="checkbox" />
|
||||||
|
<span data-i18n="Enable web search">Enable web search</span>
|
||||||
|
</label>
|
||||||
|
<div class="flexBasis100p toggle-description justifyLeft">
|
||||||
|
<span>
|
||||||
|
Use search capabilities provided by the backend.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq,deepseek">
|
<div class="range-block" data-source="openai,cohere,mistralai,custom,claude,openrouter,groq,deepseek">
|
||||||
<label for="openai_function_calling" class="checkbox_label flexWrap widthFreeExpand">
|
<label for="openai_function_calling" class="checkbox_label flexWrap widthFreeExpand">
|
||||||
<input id="openai_function_calling" type="checkbox" />
|
<input id="openai_function_calling" type="checkbox" />
|
||||||
|
@ -300,6 +300,7 @@ export const settingsToUpdate = {
|
|||||||
function_calling: ['#openai_function_calling', 'function_calling', true],
|
function_calling: ['#openai_function_calling', 'function_calling', true],
|
||||||
show_thoughts: ['#openai_show_thoughts', 'show_thoughts', true],
|
show_thoughts: ['#openai_show_thoughts', 'show_thoughts', true],
|
||||||
reasoning_effort: ['#openai_reasoning_effort', 'reasoning_effort', false],
|
reasoning_effort: ['#openai_reasoning_effort', 'reasoning_effort', false],
|
||||||
|
enable_web_search: ['#openai_enable_web_search', 'enable_web_search', true],
|
||||||
seed: ['#seed_openai', 'seed', false],
|
seed: ['#seed_openai', 'seed', false],
|
||||||
n: ['#n_openai', 'n', false],
|
n: ['#n_openai', 'n', false],
|
||||||
bypass_status_check: ['#openai_bypass_status_check', 'bypass_status_check', true],
|
bypass_status_check: ['#openai_bypass_status_check', 'bypass_status_check', true],
|
||||||
@ -380,6 +381,7 @@ const default_settings = {
|
|||||||
custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
|
custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
|
||||||
show_thoughts: true,
|
show_thoughts: true,
|
||||||
reasoning_effort: 'medium',
|
reasoning_effort: 'medium',
|
||||||
|
enable_web_search: false,
|
||||||
seed: -1,
|
seed: -1,
|
||||||
n: 1,
|
n: 1,
|
||||||
};
|
};
|
||||||
@ -459,6 +461,7 @@ const oai_settings = {
|
|||||||
custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
|
custom_prompt_post_processing: custom_prompt_post_processing_types.NONE,
|
||||||
show_thoughts: true,
|
show_thoughts: true,
|
||||||
reasoning_effort: 'medium',
|
reasoning_effort: 'medium',
|
||||||
|
enable_web_search: false,
|
||||||
seed: -1,
|
seed: -1,
|
||||||
n: 1,
|
n: 1,
|
||||||
};
|
};
|
||||||
@ -2000,6 +2003,7 @@ async function sendOpenAIRequest(type, messages, signal) {
|
|||||||
'group_names': getGroupNames(),
|
'group_names': getGroupNames(),
|
||||||
'include_reasoning': Boolean(oai_settings.show_thoughts),
|
'include_reasoning': Boolean(oai_settings.show_thoughts),
|
||||||
'reasoning_effort': String(oai_settings.reasoning_effort),
|
'reasoning_effort': String(oai_settings.reasoning_effort),
|
||||||
|
'enable_web_search': Boolean(oai_settings.enable_web_search),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {
|
if (!canMultiSwipe && ToolManager.canPerformToolCalls(type)) {
|
||||||
@ -3222,6 +3226,7 @@ function loadOpenAISettings(data, settings) {
|
|||||||
oai_settings.bypass_status_check = settings.bypass_status_check ?? default_settings.bypass_status_check;
|
oai_settings.bypass_status_check = settings.bypass_status_check ?? default_settings.bypass_status_check;
|
||||||
oai_settings.show_thoughts = settings.show_thoughts ?? default_settings.show_thoughts;
|
oai_settings.show_thoughts = settings.show_thoughts ?? default_settings.show_thoughts;
|
||||||
oai_settings.reasoning_effort = settings.reasoning_effort ?? default_settings.reasoning_effort;
|
oai_settings.reasoning_effort = settings.reasoning_effort ?? default_settings.reasoning_effort;
|
||||||
|
oai_settings.enable_web_search = settings.enable_web_search ?? default_settings.enable_web_search;
|
||||||
oai_settings.seed = settings.seed ?? default_settings.seed;
|
oai_settings.seed = settings.seed ?? default_settings.seed;
|
||||||
oai_settings.n = settings.n ?? default_settings.n;
|
oai_settings.n = settings.n ?? default_settings.n;
|
||||||
|
|
||||||
@ -3349,6 +3354,7 @@ function loadOpenAISettings(data, settings) {
|
|||||||
$('#seed_openai').val(oai_settings.seed);
|
$('#seed_openai').val(oai_settings.seed);
|
||||||
$('#n_openai').val(oai_settings.n);
|
$('#n_openai').val(oai_settings.n);
|
||||||
$('#openai_show_thoughts').prop('checked', oai_settings.show_thoughts);
|
$('#openai_show_thoughts').prop('checked', oai_settings.show_thoughts);
|
||||||
|
$('#openai_enable_web_search').prop('checked', oai_settings.enable_web_search);
|
||||||
|
|
||||||
$('#openai_reasoning_effort').val(oai_settings.reasoning_effort);
|
$('#openai_reasoning_effort').val(oai_settings.reasoning_effort);
|
||||||
$(`#openai_reasoning_effort option[value="${oai_settings.reasoning_effort}"]`).prop('selected', true);
|
$(`#openai_reasoning_effort option[value="${oai_settings.reasoning_effort}"]`).prop('selected', true);
|
||||||
@ -3613,6 +3619,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
|
|||||||
function_calling: settings.function_calling,
|
function_calling: settings.function_calling,
|
||||||
show_thoughts: settings.show_thoughts,
|
show_thoughts: settings.show_thoughts,
|
||||||
reasoning_effort: settings.reasoning_effort,
|
reasoning_effort: settings.reasoning_effort,
|
||||||
|
enable_web_search: settings.enable_web_search,
|
||||||
seed: settings.seed,
|
seed: settings.seed,
|
||||||
n: settings.n,
|
n: settings.n,
|
||||||
};
|
};
|
||||||
@ -5572,6 +5579,11 @@ export function initOpenAI() {
|
|||||||
saveSettingsDebounced();
|
saveSettingsDebounced();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('#openai_enable_web_search').on('input', function () {
|
||||||
|
oai_settings.enable_web_search = !!$(this).prop('checked');
|
||||||
|
saveSettingsDebounced();
|
||||||
|
});
|
||||||
|
|
||||||
if (!CSS.supports('field-sizing', 'content')) {
|
if (!CSS.supports('field-sizing', 'content')) {
|
||||||
$(document).on('input', '#openai_settings .autoSetHeight', function () {
|
$(document).on('input', '#openai_settings .autoSetHeight', function () {
|
||||||
resetScrollHeight($(this));
|
resetScrollHeight($(this));
|
||||||
|
@ -98,6 +98,21 @@ function getOpenRouterTransforms(request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets OpenRouter plugins based on the request.
|
||||||
|
* @param {import('express').Request} request
|
||||||
|
* @returns {any[]} OpenRouter plugins
|
||||||
|
*/
|
||||||
|
function getOpenRouterPlugins(request) {
|
||||||
|
const plugins = [];
|
||||||
|
|
||||||
|
if (request.body.enable_web_search) {
|
||||||
|
plugins.push({ 'id': 'web' });
|
||||||
|
}
|
||||||
|
|
||||||
|
return plugins;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends a request to Claude API.
|
* Sends a request to Claude API.
|
||||||
* @param {express.Request} request Express request
|
* @param {express.Request} request Express request
|
||||||
@ -323,6 +338,7 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
|
|
||||||
const model = String(request.body.model);
|
const model = String(request.body.model);
|
||||||
const stream = Boolean(request.body.stream);
|
const stream = Boolean(request.body.stream);
|
||||||
|
const enableWebSearch = Boolean(request.body.enable_web_search);
|
||||||
const isThinking = model.includes('thinking');
|
const isThinking = model.includes('thinking');
|
||||||
|
|
||||||
const generationConfig = {
|
const generationConfig = {
|
||||||
@ -348,6 +364,7 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
model.startsWith('gemini-exp')
|
model.startsWith('gemini-exp')
|
||||||
) && request.body.use_makersuite_sysprompt;
|
) && request.body.use_makersuite_sysprompt;
|
||||||
|
|
||||||
|
const tools = [];
|
||||||
const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, getPromptNames(request));
|
const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, getPromptNames(request));
|
||||||
let safetySettings = GEMINI_SAFETY;
|
let safetySettings = GEMINI_SAFETY;
|
||||||
|
|
||||||
@ -361,6 +378,13 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
}
|
}
|
||||||
// Most of the other models allow for setting the threshold of filters, except for HARM_CATEGORY_CIVIC_INTEGRITY, to OFF.
|
// Most of the other models allow for setting the threshold of filters, except for HARM_CATEGORY_CIVIC_INTEGRITY, to OFF.
|
||||||
|
|
||||||
|
if (enableWebSearch) {
|
||||||
|
const searchTool = model.includes('1.5') || model.includes('1.0')
|
||||||
|
? ({ google_search_retrieval: {} })
|
||||||
|
: ({ google_search: {} });
|
||||||
|
tools.push(searchTool);
|
||||||
|
}
|
||||||
|
|
||||||
let body = {
|
let body = {
|
||||||
contents: prompt.contents,
|
contents: prompt.contents,
|
||||||
safetySettings: safetySettings,
|
safetySettings: safetySettings,
|
||||||
@ -371,6 +395,10 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
body.systemInstruction = prompt.system_instruction;
|
body.systemInstruction = prompt.system_instruction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tools.length) {
|
||||||
|
body.tools = tools;
|
||||||
|
}
|
||||||
|
|
||||||
return body;
|
return body;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1014,6 +1042,7 @@ router.post('/generate', jsonParser, function (request, response) {
|
|||||||
headers = { ...OPENROUTER_HEADERS };
|
headers = { ...OPENROUTER_HEADERS };
|
||||||
bodyParams = {
|
bodyParams = {
|
||||||
'transforms': getOpenRouterTransforms(request),
|
'transforms': getOpenRouterTransforms(request),
|
||||||
|
'plugins': getOpenRouterPlugins(request),
|
||||||
'include_reasoning': Boolean(request.body.include_reasoning),
|
'include_reasoning': Boolean(request.body.include_reasoning),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user