mirror of
				https://github.com/SillyTavern/SillyTavern.git
				synced 2025-06-05 21:59:27 +02:00 
			
		
		
		
	Supports GEMINI EXP
This commit is contained in:
		| @@ -2979,6 +2979,7 @@ | |||||||
|                                         <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option> |                                         <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option> | ||||||
|                                     </optgroup> |                                     </optgroup> | ||||||
|                                     <optgroup label="Subversions"> |                                     <optgroup label="Subversions"> | ||||||
|  |                                         <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option> | ||||||
|                                         <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option> |                                         <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option> | ||||||
|                                         <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option> |                                         <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option> | ||||||
|                                         <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option> |                                         <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option> | ||||||
|   | |||||||
| @@ -58,6 +58,7 @@ | |||||||
|                         <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option> |                         <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option> | ||||||
|                         <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option> |                         <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option> | ||||||
|                         <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option> |                         <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option> | ||||||
|  |                         <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option> | ||||||
|                         <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option> |                         <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option> | ||||||
|                         <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option> |                         <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option> | ||||||
|                         <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option> |                         <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option> | ||||||
|   | |||||||
| @@ -4056,6 +4056,8 @@ async function onModelChange() { | |||||||
|     if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) { |     if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) { | ||||||
|         if (oai_settings.max_context_unlocked) { |         if (oai_settings.max_context_unlocked) { | ||||||
|             $('#openai_max_context').attr('max', max_2mil); |             $('#openai_max_context').attr('max', max_2mil); | ||||||
|  |         } else if (value.match('gemini-exp-1114')){ | ||||||
|  |             $('#openai_max_context').attr('max', max_32k); | ||||||
|         } else if (value.includes('gemini-1.5-pro')) { |         } else if (value.includes('gemini-1.5-pro')) { | ||||||
|             $('#openai_max_context').attr('max', max_2mil); |             $('#openai_max_context').attr('max', max_2mil); | ||||||
|         } else if (value.includes('gemini-1.5-flash')) { |         } else if (value.includes('gemini-1.5-flash')) { | ||||||
| @@ -4742,6 +4744,7 @@ export function isImageInliningSupported() { | |||||||
|         'gemini-1.5-flash-8b', |         'gemini-1.5-flash-8b', | ||||||
|         'gemini-1.5-flash-8b-exp-0827', |         'gemini-1.5-flash-8b-exp-0827', | ||||||
|         'gemini-1.5-flash-8b-exp-0924', |         'gemini-1.5-flash-8b-exp-0924', | ||||||
|  |         'gemini-exp-1114', | ||||||
|         'gemini-1.0-pro-vision-latest', |         'gemini-1.0-pro-vision-latest', | ||||||
|         'gemini-1.5-pro', |         'gemini-1.5-pro', | ||||||
|         'gemini-1.5-pro-latest', |         'gemini-1.5-pro-latest', | ||||||
|   | |||||||
| @@ -267,7 +267,7 @@ async function sendMakerSuiteRequest(request, response) { | |||||||
|             delete generationConfig.stopSequences; |             delete generationConfig.stopSequences; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro')) && request.body.use_makersuite_sysprompt; |         const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.match('gemini-exp-1114')) && request.body.use_makersuite_sysprompt; | ||||||
|         const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name); |         const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name); | ||||||
|         let body = { |         let body = { | ||||||
|             contents: prompt.contents, |             contents: prompt.contents, | ||||||
|   | |||||||
| @@ -346,6 +346,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN | |||||||
|         'gemini-1.5-flash-8b', |         'gemini-1.5-flash-8b', | ||||||
|         'gemini-1.5-flash-8b-exp-0827', |         'gemini-1.5-flash-8b-exp-0827', | ||||||
|         'gemini-1.5-flash-8b-exp-0924', |         'gemini-1.5-flash-8b-exp-0924', | ||||||
|  |         'gemini-exp-1114', | ||||||
|         'gemini-1.5-pro', |         'gemini-1.5-pro', | ||||||
|         'gemini-1.5-pro-latest', |         'gemini-1.5-pro-latest', | ||||||
|         'gemini-1.5-pro-001', |         'gemini-1.5-pro-001', | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user