Merge pull request #2600 from Succubyss/gemini-1.5-pro-exp-0801

4b61bcc7418a78aa030d49d2fd204ec4aee7dcae

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 8cbdf6bb8188b660c8d1cd9073f9a9bfdf9a8cab 3f6e4fabb85f23785d18263090f4c8500dc53a18
5 files changed, +15 -2Ignore whitespace
public/index.html+2 -0
@@ -2805,6 +2805,7 @@
2805 <optgroup label="Latest">2805 <optgroup label="Latest">
2806 <!-- Doesn't work without "latest". Maybe my key is scuffed? -->2806 <!-- Doesn't work without "latest". Maybe my key is scuffed? -->
2807 <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash</option>2807 <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash</option>
2808 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
2808 <!-- Points to 1.0, no default 1.5 endpoint -->2809 <!-- Points to 1.0, no default 1.5 endpoint -->
2809 <option value="gemini-pro">Gemini Pro</option>2810 <option value="gemini-pro">Gemini Pro</option>
2810 <option value="gemini-pro-vision">Gemini Pro Vision</option>2811 <option value="gemini-pro-vision">Gemini Pro Vision</option>
@@ -2813,6 +2814,7 @@
2813 <option value="chat-bison-001">Bison Chat</option>2814 <option value="chat-bison-001">Bison Chat</option>
2814 </optgroup>2815 </optgroup>
2815 <optgroup label="Sub-versions">2816 <optgroup label="Sub-versions">
2817 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
2816 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>2818 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
2817 <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro</option>2819 <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro</option>
2818 <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision</option>2820 <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision</option>
public/scripts/extensions/caption/settings.html+2 -0
@@ -44,6 +44,8 @@
44 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>44 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
45 <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>45 <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>
46 <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>46 <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
47 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
48 <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>
47 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>49 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
48 <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>50 <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>
49 <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>51 <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>
public/scripts/openai.js+5 -1
@@ -4665,10 +4665,14 @@ export function isImageInliningSupported() {
4665 // gultra just isn't being offered as multimodal, thanks google.4665 // gultra just isn't being offered as multimodal, thanks google.
4666 const visionSupportedModels = [4666 const visionSupportedModels = [
4667 'gpt-4-vision',4667 'gpt-4-vision',
4668 'gemini-1.5-flash-latest',
4669 'gemini-1.5-flash',4668 'gemini-1.5-flash',
4669 'gemini-1.5-flash-latest',
4670 'gemini-1.5-flash-001',
4670 'gemini-1.0-pro-vision-latest',4671 'gemini-1.0-pro-vision-latest',
4672 'gemini-1.5-pro',
4671 'gemini-1.5-pro-latest',4673 'gemini-1.5-pro-latest',
4674 'gemini-1.5-pro-001',
4675 'gemini-1.5-pro-exp-0801',
4672 'gemini-pro-vision',4676 'gemini-pro-vision',
4673 'claude-3',4677 'claude-3',
4674 'claude-3-5',4678 'claude-3-5',
src/endpoints/backends/chat-completions.js+1 -1
@@ -271,7 +271,7 @@ async function sendMakerSuiteRequest(request, response) {
271 };271 };
272272
273 function getGeminiBody() {273 function getGeminiBody() {
274 const should_use_system_prompt = ['gemini-1.5-flash-latest', 'gemini-1.5-pro-latest'].includes(model) && request.body.use_makersuite_sysprompt;274 const should_use_system_prompt = ['gemini-1.5-flash', 'gemini-1.5-pro'].includes(model) && request.body.use_makersuite_sysprompt;
275 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);275 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
276 let body = {276 let body = {
277 contents: prompt.contents,277 contents: prompt.contents,
src/prompt-converters.js+5 -0
@@ -264,8 +264,13 @@ function convertGooglePrompt(messages, model, useSysPrompt = false, charName = '
264 const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';264 const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
265265
266 const visionSupportedModels = [266 const visionSupportedModels = [
267 'gemini-1.5-flash',
267 'gemini-1.5-flash-latest',268 'gemini-1.5-flash-latest',
269 'gemini-1.5-flash-001',
270 'gemini-1.5-pro',
268 'gemini-1.5-pro-latest',271 'gemini-1.5-pro-latest',
272 'gemini-1.5-pro-001',
273 'gemini-1.5-pro-exp-0801',
269 'gemini-1.0-pro-vision-latest',274 'gemini-1.0-pro-vision-latest',
270 'gemini-pro-vision',275 'gemini-pro-vision',
271 ];276 ];