Merge branch 'staging' into connection-manager

1af59f303ffaebe225b04ac367d0401f8101cc2b

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

Parents: 7e64d216c31fbf72fd8cdb4fdbc161b1383ec8a4 4f5097915ecfc4bbef005c75a12f4d4e2575746e
2 files changed, +17 -5Showing whitespace changes
public/index.html+3 -3
@@ -1301,7 +1301,7 @@
1301 </div>1301 </div>
13021302
1303 <!-- Enable for llama.cpp when the PR is merged: https://github.com/ggerganov/llama.cpp/pull/6839 -->1303 <!-- Enable for llama.cpp when the PR is merged: https://github.com/ggerganov/llama.cpp/pull/6839 -->
1304 <div data-tg-type="ooba, koboldcpp" id="dryBlock" class="wide100p">1304 <div data-tg-type="ooba, koboldcpp, tabby" id="dryBlock" class="wide100p">
1305 <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">1305 <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">
1306 <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>1306 <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>
1307 <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">1307 <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">
@@ -1324,7 +1324,7 @@
1324 <input class="neo-range-slider" type="range" id="dry_allowed_length_textgenerationwebui" min="1" max="20" step="1" />1324 <input class="neo-range-slider" type="range" id="dry_allowed_length_textgenerationwebui" min="1" max="20" step="1" />
1325 <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">1325 <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">
1326 </div>1326 </div>
1327 <div class="alignItemsCenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-tg-type="llamacpp, koboldcpp">1327 <div class="alignItemsCenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-tg-type="llamacpp, koboldcpp, tabby">
1328 <small data-i18n="Penalty Range">Penalty Range</small>1328 <small data-i18n="Penalty Range">Penalty Range</small>
1329 <input class="neo-range-slider" type="range" id="dry_penalty_last_n_textgenerationwebui" min="0" max="8192" step="1" />1329 <input class="neo-range-slider" type="range" id="dry_penalty_last_n_textgenerationwebui" min="0" max="8192" step="1" />
1330 <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">1330 <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 @@
1448 <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>1448 <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>
1449 </label>1449 </label>
1450 </label>1450 </label>
1451 <label data-tg-type="ooba, llamacpp, tabby" class="checkbox_label flexGrow flexShrink" for="ban_eos_token_textgenerationwebui">1451 <label data-tg-type="ooba, llamacpp, tabby, koboldcpp" class="checkbox_label flexGrow flexShrink" for="ban_eos_token_textgenerationwebui">
1452 <input type="checkbox" id="ban_eos_token_textgenerationwebui" />1452 <input type="checkbox" id="ban_eos_token_textgenerationwebui" />
1453 <label>1453 <label>
1454 <small data-i18n="Ban EOS Token">Ban EOS Token</small>1454 <small data-i18n="Ban EOS Token">Ban EOS Token</small>
public/scripts/extensions/caption/settings.html+14 -2
@@ -43,17 +43,25 @@
43 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>43 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
44 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>44 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
45 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>45 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
46 <option data-type="google" value="gemini-pro-vision">gemini-pro-vision</option>46 <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
47 <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-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>
48 <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>49 <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>
49 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>50 <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>
50 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>52 <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>
51 <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>54 <option data-type="google" value="gemini-1.5-pro-exp-0801">gemini-1.5-pro-exp-0801</option>
52 <option data-type="google" value="gemini-1.5-pro-exp-0827">gemini-1.5-pro-exp-0827</option>55 <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>
53 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>57 <option data-type="openrouter" value="openai/gpt-4-vision-preview">openai/gpt-4-vision-preview</option>
54 <option data-type="openrouter" value="openai/gpt-4o">openai/gpt-4o</option>58 <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>
55 <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>61 <option data-type="openrouter" value="openai/gpt-4-turbo">openai/gpt-4-turbo</option>
56 <option data-type="openrouter" value="openai/gpt-4o-mini">openai/gpt-4o-mini</option>62 <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>
57 <option data-type="openrouter" value="haotian-liu/llava-13b">haotian-liu/llava-13b</option>65 <option data-type="openrouter" value="haotian-liu/llava-13b">haotian-liu/llava-13b</option>
58 <option data-type="openrouter" value="fireworks/firellava-13b">fireworks/firellava-13b</option>66 <option data-type="openrouter" value="fireworks/firellava-13b">fireworks/firellava-13b</option>
59 <option data-type="openrouter" value="anthropic/claude-3.5-sonnet">anthropic/claude-3.5-sonnet</option>67 <option data-type="openrouter" value="anthropic/claude-3.5-sonnet">anthropic/claude-3.5-sonnet</option>
@@ -65,8 +73,12 @@
65 <option data-type="openrouter" value="anthropic/claude-3-sonnet:beta">anthropic/claude-3-sonnet:beta</option>73 <option data-type="openrouter" value="anthropic/claude-3-sonnet:beta">anthropic/claude-3-sonnet:beta</option>
66 <option data-type="openrouter" value="anthropic/claude-3-opus:beta">anthropic/claude-3-opus:beta</option>74 <option data-type="openrouter" value="anthropic/claude-3-opus:beta">anthropic/claude-3-opus:beta</option>
67 <option data-type="openrouter" value="nousresearch/nous-hermes-2-vision-7b">nousresearch/nous-hermes-2-vision-7b</option>75 <option data-type="openrouter" value="nousresearch/nous-hermes-2-vision-7b">nousresearch/nous-hermes-2-vision-7b</option>
68 <option data-type="openrouter" value="google/gemini-pro-vision">google/gemini-pro-vision</option>76 <option data-type="openrouter" value="google/gemini-flash-8b-1.5-exp">google/gemini-flash-8b-1.5-exp</option>
69 <option data-type="openrouter" value="google/gemini-flash-1.5">google/gemini-flash-1.5</option>77 <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>
70 <option data-type="openrouter" value="liuhaotian/llava-yi-34b">liuhaotian/llava-yi-34b</option>82 <option data-type="openrouter" value="liuhaotian/llava-yi-34b">liuhaotian/llava-yi-34b</option>
71 <option data-type="ollama" value="ollama_current" data-i18n="currently_selected">[Currently selected]</option>83 <option data-type="ollama" value="ollama_current" data-i18n="currently_selected">[Currently selected]</option>
72 <option data-type="ollama" value="bakllava">bakllava</option>84 <option data-type="ollama" value="bakllava">bakllava</option>