Merge branch 'staging' into getcontext-typed

0da45905971e0f03c02fa814a3213667579a5e16

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

Parents: 77841dbc2169003bc78970958dc9c68fe55a1a08 3ed095bb0e59d2ca91cf6d576f67e44c4dd87efa
11 files changed, +31 -36Ignore whitespace
package-lock.json+11 -7
@@ -3591,9 +3591,9 @@
3591 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="3591 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
3592 },3592 },
3593 "node_modules/express": {3593 "node_modules/express": {
3594 "version": "4.21.1",3594 "version": "4.21.2",
3595 "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",3595 "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
3596 "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",3596 "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
3597 "license": "MIT",3597 "license": "MIT",
3598 "dependencies": {3598 "dependencies": {
3599 "accepts": "~1.3.8",3599 "accepts": "~1.3.8",
@@ -3615,7 +3615,7 @@
3615 "methods": "~1.1.2",3615 "methods": "~1.1.2",
3616 "on-finished": "2.4.1",3616 "on-finished": "2.4.1",
3617 "parseurl": "~1.3.3",3617 "parseurl": "~1.3.3",
3618 "path-to-regexp": "0.1.10",3618 "path-to-regexp": "0.1.12",
3619 "proxy-addr": "~2.0.7",3619 "proxy-addr": "~2.0.7",
3620 "qs": "6.13.0",3620 "qs": "6.13.0",
3621 "range-parser": "~1.2.1",3621 "range-parser": "~1.2.1",
@@ -3630,6 +3630,10 @@
3630 },3630 },
3631 "engines": {3631 "engines": {
3632 "node": ">= 0.10.0"3632 "node": ">= 0.10.0"
3633 },
3634 "funding": {
3635 "type": "opencollective",
3636 "url": "https://opencollective.com/express"
3633 }3637 }
3634 },3638 },
3635 "node_modules/express/node_modules/cookie": {3639 "node_modules/express/node_modules/cookie": {
@@ -5725,9 +5729,9 @@
5725 }5729 }
5726 },5730 },
5727 "node_modules/path-to-regexp": {5731 "node_modules/path-to-regexp": {
5728 "version": "0.1.10",5732 "version": "0.1.12",
5729 "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",5733 "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
5730 "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",5734 "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
5731 "license": "MIT"5735 "license": "MIT"
5732 },5736 },
5733 "node_modules/peek-readable": {5737 "node_modules/peek-readable": {
public/index.html+2 -1
@@ -2987,6 +2987,7 @@
2987 <optgroup label="Subversions">2987 <optgroup label="Subversions">
2988 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>2988 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
2989 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>2989 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
2990 <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>
2990 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>2991 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
2991 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>2992 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
2992 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>2993 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
@@ -4183,7 +4184,7 @@
4183 </label>4184 </label>
4184 <label for="show_swipe_num_all_messages" class="checkbox_label" title="Display swipe numbers for all messages, not just the last." data-i18n="[title]Display swipe numbers for all messages, not just the last.">4185 <label for="show_swipe_num_all_messages" class="checkbox_label" title="Display swipe numbers for all messages, not just the last." data-i18n="[title]Display swipe numbers for all messages, not just the last.">
4185 <input id="show_swipe_num_all_messages" type="checkbox" />4186 <input id="show_swipe_num_all_messages" type="checkbox" />
4186 <small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small><i class="fa-solid fa-mobile-screen-button"></i>4187 <small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small>
4187 </label>4188 </label>
4188 <label for="hotswapEnabled" class="checkbox_label" title="In the Character Management panel, show quick selection buttons for favorited characters." data-i18n="[title]In the Character Management panel, show quick selection buttons for favorited characters">4189 <label for="hotswapEnabled" class="checkbox_label" title="In the Character Management panel, show quick selection buttons for favorited characters." data-i18n="[title]In the Character Management panel, show quick selection buttons for favorited characters">
4189 <input id="hotswapEnabled" type="checkbox" />4190 <input id="hotswapEnabled" type="checkbox" />
public/script.js+3 -6
@@ -94,7 +94,6 @@ import {
94 resetMovableStyles,94 resetMovableStyles,
95 forceCharacterEditorTokenize,95 forceCharacterEditorTokenize,
96 applyPowerUserSettings,96 applyPowerUserSettings,
97 switchSwipeNumAllMessages,
98} from './scripts/power-user.js';97} from './scripts/power-user.js';
9998
100import {99import {
@@ -7663,14 +7662,12 @@ export function showSwipeButtons() {
7663 //allows for writing individual swipe counters for past messages7662 //allows for writing individual swipe counters for past messages
7664 const lastSwipeCounter = $('.last_mes .swipes-counter');7663 const lastSwipeCounter = $('.last_mes .swipes-counter');
7665 lastSwipeCounter.text(swipeCounterText).show();7664 lastSwipeCounter.text(swipeCounterText).show();
7666
7667 switchSwipeNumAllMessages();
7668}7665}
76697666
7670export function hideSwipeButtons() {7667export function hideSwipeButtons() {
7671 $('#chat').find('.swipe_right').hide();7668 chatElement.find('.swipe_right').hide();
7672 $('#chat').find('.last_mes .swipes-counter').hide();7669 chatElement.find('.last_mes .swipes-counter').hide();
7673 $('#chat').find('.swipe_left').hide();7670 chatElement.find('.swipe_left').hide();
7674}7671}
76757672
7676/**7673/**
public/scripts/extensions/caption/settings.html+1 -0
@@ -62,6 +62,7 @@
62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
63 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>63 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>
64 <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>64 <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>
65 <option data-type="google" value="gemini-exp-1206">gemini-exp-1206</option>
65 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>66 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
66 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>67 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
67 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>68 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
public/scripts/extensions/stable-diffusion/index.js+0 -15
@@ -60,7 +60,6 @@ import { ToolManager } from '../../tool-calling.js';
60export { MODULE_NAME };60export { MODULE_NAME };
6161
62const MODULE_NAME = 'sd';62const MODULE_NAME = 'sd';
63const UPDATE_INTERVAL = 1000;
64// This is a 1x1 transparent PNG63// This is a 1x1 transparent PNG
65const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';64const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
66const CUSTOM_STOP_EVENT = 'sd_stop_generation';65const CUSTOM_STOP_EVENT = 'sd_stop_generation';
@@ -3687,8 +3686,6 @@ async function addSDGenButtons() {
3687 const button = $('#sd_gen');3686 const button = $('#sd_gen');
3688 const dropdown = $('#sd_dropdown');3687 const dropdown = $('#sd_dropdown');
3689 dropdown.hide();3688 dropdown.hide();
3690 button.hide();
3691 messageButton.hide();
36923689
3693 let popper = Popper.createPopper(button.get(0), dropdown.get(0), {3690 let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
3694 placement: 'top',3691 placement: 'top',
@@ -3770,18 +3767,6 @@ function isValidState() {
3770 }3767 }
3771}3768}
37723769
3773async function moduleWorker() {
3774 if (isValidState()) {
3775 $('#sd_gen').show();
3776 $('.sd_message_gen').show();
3777 }
3778 else {
3779 $('#sd_gen').hide();
3780 $('.sd_message_gen').hide();
3781 }
3782}
3783
3784setInterval(moduleWorker, UPDATE_INTERVAL);
3785let buttonAbortController = null;3770let buttonAbortController = null;
37863771
3787async function sdMessageButton(e) {3772async function sdMessageButton(e) {
public/scripts/openai.js+1 -1
@@ -4077,7 +4077,7 @@ async function onModelChange() {
4077 $('#openai_max_context').attr('max', max_2mil);4077 $('#openai_max_context').attr('max', max_2mil);
4078 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {4078 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {
4079 $('#openai_max_context').attr('max', max_32k);4079 $('#openai_max_context').attr('max', max_32k);
4080 } else if (value.includes('gemini-1.5-pro')) {4080 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
4081 $('#openai_max_context').attr('max', max_2mil);4081 $('#openai_max_context').attr('max', max_2mil);
4082 } else if (value.includes('gemini-1.5-flash')) {4082 } else if (value.includes('gemini-1.5-flash')) {
4083 $('#openai_max_context').attr('max', max_1mil);4083 $('#openai_max_context').attr('max', max_1mil);
public/scripts/power-user.js+2 -2
@@ -472,9 +472,9 @@ function switchCompactInputArea() {
472 $('#compact_input_area').prop('checked', power_user.compact_input_area);472 $('#compact_input_area').prop('checked', power_user.compact_input_area);
473}473}
474474
475export function switchSwipeNumAllMessages() {475function switchSwipeNumAllMessages() {
476 $('#show_swipe_num_all_messages').prop('checked', power_user.show_swipe_num_all_messages);476 $('#show_swipe_num_all_messages').prop('checked', power_user.show_swipe_num_all_messages);
477 $('.mes:not(.last_mes) .swipes-counter').css('opacity', '').toggle(power_user.show_swipe_num_all_messages);477 $('body').toggleClass('swipeAllMessages', !!power_user.show_swipe_num_all_messages);
478}478}
479479
480var originalSliderValues = [];480var originalSliderValues = [];
public/scripts/tool-calling.js+1 -1
@@ -947,7 +947,7 @@ export class ToolManager {
947 enumProvider: toolsEnumProvider,947 enumProvider: toolsEnumProvider,
948 }),948 }),
949 ],949 ],
950 callback: async (name) => {950 callback: async (_, name) => {
951 if (typeof name !== 'string' || !name) {951 if (typeof name !== 'string' || !name) {
952 throw new Error('The unnamed argument must be a non-empty string.');952 throw new Error('The unnamed argument must be a non-empty string.');
953 }953 }
public/style.css+8 -2
@@ -1040,8 +1040,14 @@ body .panelControlBar {
1040 height: var(--swipeCounterHeight);1040 height: var(--swipeCounterHeight);
1041}1041}
10421042
1043.mes:not(.last_mes) .swipes-counter {1043body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
1044 opacity: 0.3;1044 visibility: hidden;
1045}
1046
1047body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {
1048 /* Avoid expensive DOM queries */
1049 opacity: 0.3 !important;
1050 display: flex !important;
1045}1051}
10461052
1047.swipe_left {1053.swipe_left {
src/endpoints/backends/chat-completions.js+1 -1
@@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) {
280 delete generationConfig.stopSequences;280 delete generationConfig.stopSequences;
281 }281 }
282282
283 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.includes('gemini-exp-1114') || model.includes('gemini-exp-1121')) && request.body.use_makersuite_sysprompt;283 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.startsWith('gemini-exp')) && request.body.use_makersuite_sysprompt;
284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
285 let body = {285 let body = {
286 contents: prompt.contents,286 contents: prompt.contents,
src/prompt-converters.js+1 -0
@@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
347 'gemini-1.5-flash-8b-exp-0924',347 'gemini-1.5-flash-8b-exp-0924',
348 'gemini-exp-1114',348 'gemini-exp-1114',
349 'gemini-exp-1121',349 'gemini-exp-1121',
350 'gemini-exp-1206',
350 'gemini-1.5-pro',351 'gemini-1.5-pro',
351 'gemini-1.5-pro-latest',352 'gemini-1.5-pro-latest',
352 'gemini-1.5-pro-001',353 'gemini-1.5-pro-001',