From 9fc8978d1d59dbe0a126a241fd158e3678d7a2a1 Mon Sep 17 00:00:00 2001 From: Kwaroran Date: Tue, 7 Jan 2025 00:05:20 +0900 Subject: [PATCH] Add GeminiBlockOff --- src/lib/Setting/Pages/BotSettings.svelte | 5 +++++ src/ts/model/modellist.ts | 9 +++++---- src/ts/process/request.ts | 6 ++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte index 9b3aee5b..5612bfb2 100644 --- a/src/lib/Setting/Pages/BotSettings.svelte +++ b/src/lib/Setting/Pages/BotSettings.svelte @@ -617,6 +617,11 @@ {@render CustomFlagButton('hasStreaming', 8)} {@render CustomFlagButton('requiresAlternateRole', 9)} {@render CustomFlagButton('mustStartWithUserInput', 10)} + {@render CustomFlagButton('hasVideoInput', 12)} + {@render CustomFlagButton('OAICompletionTokens', 13)} + {@render CustomFlagButton('DeveloperRole', 14)} + {@render CustomFlagButton('geminiThinking', 15)} + {@render CustomFlagButton('geminiBlockOff', 16)} {/if} diff --git a/src/ts/model/modellist.ts b/src/ts/model/modellist.ts index 30d4425f..2a8ca003 100644 --- a/src/ts/model/modellist.ts +++ b/src/ts/model/modellist.ts @@ -17,7 +17,8 @@ export enum LLMFlags{ hasVideoInput, OAICompletionTokens, DeveloperRole, - geminiThinking + geminiThinking, + geminiBlockOff } export enum LLMProvider{ @@ -787,7 +788,7 @@ export const LLMModels: LLMModel[] = [ id: 'gemini-exp-1121', provider: LLMProvider.GoogleCloud, format: LLMFormat.GoogleCloud, - flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], + flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], parameters: ['temperature', 'top_k', 'top_p'], tokenizer: LLMTokenizer.GoogleCloud, }, @@ -796,7 +797,7 @@ export const LLMModels: LLMModel[] = [ id: 'gemini-exp-1206', provider: LLMProvider.GoogleCloud, format: LLMFormat.GoogleCloud, - flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], + flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], parameters: ['temperature', 'top_k', 'top_p'], tokenizer: LLMTokenizer.GoogleCloud }, @@ -805,7 +806,7 @@ export const LLMModels: LLMModel[] = [ id: 'gemini-2.0-flash-exp', provider: LLMProvider.GoogleCloud, format: LLMFormat.GoogleCloud, - flags: [LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasAudioInput, LLMFlags.hasVideoInput, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], + flags: [LLMFlags.geminiBlockOff,LLMFlags.hasImageInput, LLMFlags.hasFirstSystemPrompt, LLMFlags.poolSupported, LLMFlags.hasAudioInput, LLMFlags.hasVideoInput, LLMFlags.hasStreaming, LLMFlags.requiresAlternateRole], parameters: ['temperature', 'top_k', 'top_p', 'presence_penalty', 'frequency_penalty'], tokenizer: LLMTokenizer.GoogleCloud, recommended: true diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts index ba03c381..b4ca7ea3 100644 --- a/src/ts/process/request.ts +++ b/src/ts/process/request.ts @@ -1625,6 +1625,12 @@ async function requestGoogleCloudVertex(arg:RequestDataArgumentExtended):Promise } ] + if(arg.modelInfo.flags.includes(LLMFlags.geminiBlockOff)){ + for(let i=0;i {