mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Add another ugli ahh list for no grounding models
This commit is contained in:
@@ -364,6 +364,7 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
'gemini-2.0-flash-exp-image-generation',
|
'gemini-2.0-flash-exp-image-generation',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// These models do not support setting the threshold to OFF at all.
|
||||||
const blockNoneModels = [
|
const blockNoneModels = [
|
||||||
'gemini-1.5-pro-001',
|
'gemini-1.5-pro-001',
|
||||||
'gemini-1.5-flash-001',
|
'gemini-1.5-flash-001',
|
||||||
@@ -374,6 +375,14 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
const thinkingBudgetModels = [
|
const thinkingBudgetModels = [
|
||||||
'gemini-2.5-flash-preview-04-17',
|
'gemini-2.5-flash-preview-04-17',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
const noSearchModels = [
|
||||||
|
'gemini-2.0-flash-lite',
|
||||||
|
'gemini-2.0-flash-lite-001',
|
||||||
|
'gemini-2.0-flash-lite-preview-02-05',
|
||||||
|
'gemini-1.5-flash-8b-exp-0924',
|
||||||
|
'gemini-1.5-flash-8b-exp-0827',
|
||||||
|
];
|
||||||
// #endregion
|
// #endregion
|
||||||
|
|
||||||
if (!Array.isArray(generationConfig.stopSequences) || !generationConfig.stopSequences.length) {
|
if (!Array.isArray(generationConfig.stopSequences) || !generationConfig.stopSequences.length) {
|
||||||
@@ -391,12 +400,11 @@ async function sendMakerSuiteRequest(request, response) {
|
|||||||
const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request));
|
const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request));
|
||||||
let safetySettings = GEMINI_SAFETY;
|
let safetySettings = GEMINI_SAFETY;
|
||||||
|
|
||||||
// These models do not support setting the threshold to OFF at all.
|
|
||||||
if (blockNoneModels.includes(model)) {
|
if (blockNoneModels.includes(model)) {
|
||||||
safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
|
safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !model.includes('gemini-2.0-flash-lite')) {
|
if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !noSearchModels.includes(model)) {
|
||||||
const searchTool = model.includes('1.5')
|
const searchTool = model.includes('1.5')
|
||||||
? ({ google_search_retrieval: {} })
|
? ({ google_search_retrieval: {} })
|
||||||
: ({ google_search: {} });
|
: ({ google_search: {} });
|
||||||
|
Reference in New Issue
Block a user