Merge branch 'staging' into connection-manager

1af59f303ffaebe225b04ac367d0401f8101cc2b

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

Parents: 7e64d216c31fbf72fd8cdb4fdbc161b1383ec8a4 4f5097915ecfc4bbef005c75a12f4d4e2575746e
2 files changed, +17 -5Ignore whitespace
public/index.html+3 -3
@@ -1301,7 +1301,7 @@
13011301 </div>
13021302
13031303 <!-- Enable for llama.cpp when the PR is merged: https://github.com/ggerganov/llama.cpp/pull/6839 -->
13041304 <div data-tg-type="ooba, koboldcpp, tabby" id="dryBlock" class="wide100p">
13051305 <h4 class="wide100p textAlignCenter" title="DRY penalizes tokens that would extend the end of the input into a sequence that has previously occurred in the input. Set multiplier to 0 to disable." data-i18n="[title]DRY_Repetition_Penalty_desc">
13061306 <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>
13071307 <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">
@@ -1324,7 +1324,7 @@
13241324 <input class="neo-range-slider" type="range" id="dry_allowed_length_textgenerationwebui" min="1" max="20" step="1" />
13251325 <input class="neo-range-input" type="number" min="1" max="20" step="1" data-for="dry_allowed_length_textgenerationwebui" id="dry_allowed_length_counter_textgenerationwebui">
13261326 </div>
13271327 <div class="alignItemsCenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-tg-type="llamacpp, koboldcpp, tabby">
13281328 <small data-i18n="Penalty Range">Penalty Range</small>
13291329 <input class="neo-range-slider" type="range" id="dry_penalty_last_n_textgenerationwebui" min="0" max="8192" step="1" />
13301330 <input class="neo-range-input" type="number" min="0" max="8192" step="1" data-for="dry_penalty_last_n_textgenerationwebui" id="dry_penalty_last_n_counter_textgenerationwebui">
@@ -1448,7 +1448,7 @@
14481448 <div class="fa-solid fa-circle-info opacity50p " data-i18n="[title]Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative" title="Add the bos_token to the beginning of prompts. Disabling this can make the replies more creative."></div>
14491449 </label>
14501450 </label>
14511451 <label data-tg-type="ooba, llamacpp, tabby, koboldcpp" class="checkbox_label flexGrow flexShrink" for="ban_eos_token_textgenerationwebui">
14521452 <input type="checkbox" id="ban_eos_token_textgenerationwebui" />
14531453 <label>
14541454 <small data-i18n="Ban EOS Token">Ban EOS Token</small>
public/scripts/extensions/caption/settings.html+14 -2
@@ -43,17 +43,25 @@
4343 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
4444 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
4545 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
4646 <option data-type="google" value="gemini-pro1.5-visionflash">gemini-pro1.5-visionflash</option>
4747 <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
48+ <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
4849 <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>
4950 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
51+ <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
5052 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
53+ <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
5154 <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>
5255 <option data-type="google" value="gemini-1.5-pro-exp-0827">gemini-1.5-pro-exp-0827</option>
56+ <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>
5357 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
5458 <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>
59+ <option data-type="openrouter" value="openai/gpt-4o-2024-05-13">openai/gpt-4o-2024-05-13</option>
60+ <option data-type="openrouter" value="openai/gpt-4o-2024-08-06">openai/gpt-4o-2024-08-06</option>
5561 <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>
5662 <option data-type="openrouter" value="openai/gpt-4o-mini">openai/gpt-4o-mini</option>
63+ <option data-type="openrouter" value="openai/gpt-4o-mini-2024-07-18">openai/gpt-4o-mini-2024-07-18</option>
64+ <option data-type="openrouter" value="openai/chatgpt-4o-latest">openai/chatgpt-4o-latest</option>
5765 <option data-type="openrouter" value="haotian-liu/llava-13b">haotian-liu/llava-13b</option>
5866 <option data-type="openrouter" value="fireworks/firellava-13b">fireworks/firellava-13b</option>
5967 <option data-type="openrouter" value="anthropic/claude-3.5-sonnet">anthropic/claude-3.5-sonnet</option>
@@ -65,8 +73,12 @@
6573 <option data-type="openrouter" value="anthropic/claude-3-sonnet:beta">anthropic/claude-3-sonnet:beta</option>
6674 <option data-type="openrouter" value="anthropic/claude-3-opus:beta">anthropic/claude-3-opus:beta</option>
6775 <option data-type="openrouter" value="nousresearch/nous-hermes-2-vision-7b">nousresearch/nous-hermes-2-vision-7b</option>
6876 <option data-type="openrouter" value="google/gemini-proflash-vision8b-1.5-exp">google/gemini-proflash-vision8b-1.5-exp</option>
6977 <option data-type="openrouter" value="google/gemini-flash-1.5">google/gemini-flash-1.5</option>
78+ <option data-type="openrouter" value="google/gemini-flash-1.5-exp">google/gemini-flash-1.5-exp</option>
79+ <option data-type="openrouter" value="google/gemini-pro-1.5">google/gemini-pro-1.5</option>
80+ <option data-type="openrouter" value="google/gemini-pro-1.5-exp">google/gemini-pro-1.5-exp</option>
81+ <option data-type="openrouter" value="google/gemini-pro-vision">google/gemini-pro-vision</option>
7082 <option data-type="openrouter" value="liuhaotian/llava-yi-34b">liuhaotian/llava-yi-34b</option>
7183 <option data-type="ollama" value="ollama_current" data-i18n="currently_selected">[Currently selected]</option>
7284 <option data-type="ollama" value="bakllava">bakllava</option>