Merge pull request #2898 from M0ch0/staging Support gemini-1.5-series-002 and new 8B exp model

b697f1f7c7d7b4da9b5272c862ea758450395233

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

Signed
Parents: c2e5a0e64f1816544cc7b9957594eee00c4a7916 2ee3eb700433e6d3020be78df1e0f2a3518692b5
3 files changed, +11 -0Showing whitespace changes
public/index.html+3 -0
@@ -2894,10 +2894,13 @@
2894 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>2894 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
2895 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>2895 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
2896 <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>2896 <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>
2897 <option value="gemini-1.5-pro-002">Gemini 1.5 Pro [002]</option>
2897 <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experiment 2024-08-27</option>2898 <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experiment 2024-08-27</option>
2898 <option value="gemini-1.5-flash-8b-exp-0827">Gemini 1.5 Flash 8B Experiment 2024-08-27</option>2899 <option value="gemini-1.5-flash-8b-exp-0827">Gemini 1.5 Flash 8B Experiment 2024-08-27</option>
2900 <option value="gemini-1.5-flash-8b-exp-0924">Gemini 1.5 Flash 8B Experiment 2024-09-24</option>
2899 <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>2901 <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>
2900 <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>2902 <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>
2903 <option value="gemini-1.5-flash-002">Gemini 1.5 Flash [002]</option>
2901 <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest]</option>2904 <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest]</option>
2902 <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001]</option>2905 <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001]</option>
2903 <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision [latest]</option>2906 <option value="gemini-1.0-pro-vision-latest">Gemini 1.0 Pro Vision [latest]</option>
public/scripts/openai.js+5 -0
@@ -4128,6 +4128,8 @@ async function onModelChange() {
4128 $('#openai_max_context').attr('max', max_2mil);4128 $('#openai_max_context').attr('max', max_2mil);
4129 } else if (value.includes('gemini-1.5-pro')) {4129 } else if (value.includes('gemini-1.5-pro')) {
4130 $('#openai_max_context').attr('max', max_2mil);4130 $('#openai_max_context').attr('max', max_2mil);
4131 } else if (value.match('gemini-1.5-flash-002')) {
4132 $('#openai_max_context').attr('max', max_2mil);
4131 } else if (value.includes('gemini-1.5-flash')) {4133 } else if (value.includes('gemini-1.5-flash')) {
4132 $('#openai_max_context').attr('max', max_1mil);4134 $('#openai_max_context').attr('max', max_1mil);
4133 } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {4135 } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {
@@ -4774,12 +4776,15 @@ export function isImageInliningSupported() {
4774 'gemini-1.5-flash',4776 'gemini-1.5-flash',
4775 'gemini-1.5-flash-latest',4777 'gemini-1.5-flash-latest',
4776 'gemini-1.5-flash-001',4778 'gemini-1.5-flash-001',
4779 'gemini-1.5-flash-002',
4777 'gemini-1.5-flash-exp-0827',4780 'gemini-1.5-flash-exp-0827',
4778 'gemini-1.5-flash-8b-exp-0827',4781 'gemini-1.5-flash-8b-exp-0827',
4782 'gemini-1.5-flash-8b-exp-0924',
4779 'gemini-1.0-pro-vision-latest',4783 'gemini-1.0-pro-vision-latest',
4780 'gemini-1.5-pro',4784 'gemini-1.5-pro',
4781 'gemini-1.5-pro-latest',4785 'gemini-1.5-pro-latest',
4782 'gemini-1.5-pro-001',4786 'gemini-1.5-pro-001',
4787 'gemini-1.5-pro-002',
4783 'gemini-1.5-pro-exp-0801',4788 'gemini-1.5-pro-exp-0801',
4784 'gemini-1.5-pro-exp-0827',4789 'gemini-1.5-pro-exp-0827',
4785 'gemini-pro-vision',4790 'gemini-pro-vision',
src/prompt-converters.js+3 -0
@@ -267,11 +267,14 @@ function convertGooglePrompt(messages, model, useSysPrompt = false, charName = '
267 'gemini-1.5-flash',267 'gemini-1.5-flash',
268 'gemini-1.5-flash-latest',268 'gemini-1.5-flash-latest',
269 'gemini-1.5-flash-001',269 'gemini-1.5-flash-001',
270 'gemini-1.5-flash-002',
270 'gemini-1.5-flash-exp-0827',271 'gemini-1.5-flash-exp-0827',
271 'gemini-1.5-flash-8b-exp-0827',272 'gemini-1.5-flash-8b-exp-0827',
273 'gemini-1.5-flash-8b-exp-0924',
272 'gemini-1.5-pro',274 'gemini-1.5-pro',
273 'gemini-1.5-pro-latest',275 'gemini-1.5-pro-latest',
274 'gemini-1.5-pro-001',276 'gemini-1.5-pro-001',
277 'gemini-1.5-pro-002',
275 'gemini-1.5-pro-exp-0801',278 'gemini-1.5-pro-exp-0801',
276 'gemini-1.5-pro-exp-0827',279 'gemini-1.5-pro-exp-0827',
277 'gemini-1.0-pro-vision-latest',280 'gemini-1.0-pro-vision-latest',