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 @@
35913591 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
35923592 },
35933593 "node_modules/express": {
35943594 "version": "4.21.12",
35953595 "resolved": "https://registry.npmjs.org/express/-/express-4.21.12.tgz",
35963596 "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+BwuM1IPw8fmQBiQrXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
35973597 "license": "MIT",
35983598 "dependencies": {
35993599 "accepts": "~1.3.8",
@@ -3615,7 +3615,7 @@
36153615 "methods": "~1.1.2",
36163616 "on-finished": "2.4.1",
36173617 "parseurl": "~1.3.3",
36183618 "path-to-regexp": "0.1.1012",
36193619 "proxy-addr": "~2.0.7",
36203620 "qs": "6.13.0",
36213621 "range-parser": "~1.2.1",
@@ -3630,6 +3630,10 @@
36303630 },
36313631 "engines": {
36323632 "node": ">= 0.10.0"
3633+ },
3634+ "funding": {
3635+ "type": "opencollective",
3636+ "url": "https://opencollective.com/express"
36333637 }
36343638 },
36353639 "node_modules/express/node_modules/cookie": {
@@ -5725,9 +5729,9 @@
57255729 }
57265730 },
57275731 "node_modules/path-to-regexp": {
57285732 "version": "0.1.1012",
57295733 "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.1012.tgz",
57305734 "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfaRA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/BSsIwjuh56VU7katFvuM8hULfkwB3FnsTt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/rsVF7PwPKVw1sl5KQS9wbSeOZwt1pmEQ==",
57315735 "license": "MIT"
57325736 },
57335737 "node_modules/peek-readable": {
public/index.html+2 -1
@@ -2987,6 +2987,7 @@
29872987 <optgroup label="Subversions">
29882988 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
29892989 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
2990+ <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>
29902991 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
29912992 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
29922993 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
@@ -4183,7 +4184,7 @@
41834184 </label>
41844185 <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.">
41854186 <input id="show_swipe_num_all_messages" type="checkbox" />
41864187 <small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small><i class="fa-solid fa-mobile-screen-button"></i>
41874188 </label>
41884189 <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">
41894190 <input id="hotswapEnabled" type="checkbox" />
public/script.js+3 -6
@@ -94,7 +94,6 @@ import {
9494 resetMovableStyles,
9595 forceCharacterEditorTokenize,
9696 applyPowerUserSettings,
97- switchSwipeNumAllMessages,
9897} from './scripts/power-user.js';
9998
10099import {
@@ -7663,14 +7662,12 @@ export function showSwipeButtons() {
76637662 //allows for writing individual swipe counters for past messages
76647663 const lastSwipeCounter = $('.last_mes .swipes-counter');
76657664 lastSwipeCounter.text(swipeCounterText).show();
7666-
7667- switchSwipeNumAllMessages();
76687665}
76697666
76707667export function hideSwipeButtons() {
76717668 $('#chat')chatElement.find('.swipe_right').hide();
76727669 $('#chat')chatElement.find('.last_mes .swipes-counter').hide();
76737670 $('#chat')chatElement.find('.swipe_left').hide();
76747671}
76757672
76767673/**
public/scripts/extensions/caption/settings.html+1 -0
@@ -62,6 +62,7 @@
6262 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
6363 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>
6464 <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>
6566 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
6667 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
6768 <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';
6060export { MODULE_NAME };
6161
6262const MODULE_NAME = 'sd';
63-const UPDATE_INTERVAL = 1000;
6463// This is a 1x1 transparent PNG
6564const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
6665const CUSTOM_STOP_EVENT = 'sd_stop_generation';
@@ -3687,8 +3686,6 @@ async function addSDGenButtons() {
36873686 const button = $('#sd_gen');
36883687 const dropdown = $('#sd_dropdown');
36893688 dropdown.hide();
3690- button.hide();
3691- messageButton.hide();
36923689
36933690 let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
36943691 placement: 'top',
@@ -3770,18 +3767,6 @@ function isValidState() {
37703767 }
37713768}
37723769
3773-async 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-
3784-setInterval(moduleWorker, UPDATE_INTERVAL);
37853770let buttonAbortController = null;
37863771
37873772async function sdMessageButton(e) {
public/scripts/openai.js+1 -1
@@ -4077,7 +4077,7 @@ async function onModelChange() {
40774077 $('#openai_max_context').attr('max', max_2mil);
40784078 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {
40794079 $('#openai_max_context').attr('max', max_32k);
40804080 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
40814081 $('#openai_max_context').attr('max', max_2mil);
40824082 } else if (value.includes('gemini-1.5-flash')) {
40834083 $('#openai_max_context').attr('max', max_1mil);
public/scripts/power-user.js+2 -2
@@ -472,9 +472,9 @@ function switchCompactInputArea() {
472472 $('#compact_input_area').prop('checked', power_user.compact_input_area);
473473}
474474
475475export function switchSwipeNumAllMessages() {
476476 $('#show_swipe_num_all_messages').prop('checked', power_user.show_swipe_num_all_messages);
477477 $('.mes:not(.last_mes) .swipes-counterbody').csstoggleClass('opacityswipeAllMessages', '').toggle(!!power_user.show_swipe_num_all_messages);
478478}
479479
480480var originalSliderValues = [];
public/scripts/tool-calling.js+1 -1
@@ -947,7 +947,7 @@ export class ToolManager {
947947 enumProvider: toolsEnumProvider,
948948 }),
949949 ],
950950 callback: async (_, name) => {
951951 if (typeof name !== 'string' || !name) {
952952 throw new Error('The unnamed argument must be a non-empty string.');
953953 }
public/style.css+8 -2
@@ -1040,8 +1040,14 @@ body .panelControlBar {
10401040 height: var(--swipeCounterHeight);
10411041}
10421042
10431043body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
10441044 opacityvisibility: 0.3hidden;
1045+}
1046+
1047+body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {
1048+ /* Avoid expensive DOM queries */
1049+ opacity: 0.3 !important;
1050+ display: flex !important;
10451051}
10461052
10471053.swipe_left {
src/endpoints/backends/chat-completions.js+1 -1
@@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) {
280280 delete generationConfig.stopSequences;
281281 }
282282
283283 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.includes('gemini-exp-1114') || model.includesstartsWith('gemini-exp-1121')) && request.body.use_makersuite_sysprompt;
284284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
285285 let body = {
286286 contents: prompt.contents,
src/prompt-converters.js+1 -0
@@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
347347 'gemini-1.5-flash-8b-exp-0924',
348348 'gemini-exp-1114',
349349 'gemini-exp-1121',
350+ 'gemini-exp-1206',
350351 'gemini-1.5-pro',
351352 'gemini-1.5-pro-latest',
352353 'gemini-1.5-pro-001',