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 @@
28052805 <optgroup label="Latest">
28062806 <!-- Doesn't work without "latest". Maybe my key is scuffed? -->
28072807 <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>
28082809 <!-- Points to 1.0, no default 1.5 endpoint -->
28092810 <option value="gemini-pro">Gemini Pro</option>
28102811 <option value="gemini-pro-vision">Gemini Pro Vision</option>
@@ -2813,6 +2814,7 @@
28132814 <option value="chat-bison-001">Bison Chat</option>
28142815 </optgroup>
28152816 <optgroup label="Sub-versions">
2817+ <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
28162818 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro</option>
28172819 <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro</option>
28182820 <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 @@
4444 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
4545 <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>
4646 <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>
4749 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
4850 <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>
4951 <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() {
46654665 // gultra just isn't being offered as multimodal, thanks google.
46664666 const visionSupportedModels = [
46674667 'gpt-4-vision',
4668- 'gemini-1.5-flash-latest',
46694668 'gemini-1.5-flash',
4669+ 'gemini-1.5-flash-latest',
4670+ 'gemini-1.5-flash-001',
46704671 'gemini-1.0-pro-vision-latest',
4672+ 'gemini-1.5-pro',
46714673 'gemini-1.5-pro-latest',
4674+ 'gemini-1.5-pro-001',
4675+ 'gemini-1.5-pro-exp-0801',
46724676 'gemini-pro-vision',
46734677 'claude-3',
46744678 'claude-3-5',
src/endpoints/backends/chat-completions.js+1 -1
@@ -271,7 +271,7 @@ async function sendMakerSuiteRequest(request, response) {
271271 };
272272
273273 function getGeminiBody() {
274274 const should_use_system_prompt = ['gemini-1.5-flash-latest', 'gemini-1.5-pro-latest'].includes(model) && request.body.use_makersuite_sysprompt;
275275 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
276276 let body = {
277277 contents: prompt.contents,
src/prompt-converters.js+5 -0
@@ -264,8 +264,13 @@ function convertGooglePrompt(messages, model, useSysPrompt = false, charName = '
264264 const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
265265
266266 const visionSupportedModels = [
267+ 'gemini-1.5-flash',
267268 'gemini-1.5-flash-latest',
269+ 'gemini-1.5-flash-001',
270+ 'gemini-1.5-pro',
268271 'gemini-1.5-pro-latest',
272+ 'gemini-1.5-pro-001',
273+ 'gemini-1.5-pro-exp-0801',
269274 'gemini-1.0-pro-vision-latest',
270275 'gemini-pro-vision',
271276 ];