Merge branch 'main' into dev

public/scripts/extensions/caption/index.js

@@ -91,12 +91,6 @@ async function onSelectImage(e) {
 }
 
 $(document).ready(function () {
-    function patchSendForm() {
-        const columns = $('#send_form').css('grid-template-columns').split(' ');
-        columns[columns.length - 1] = `${parseInt(columns[columns.length - 1]) + 40}px`;
-        columns[1] = 'auto';
-        $('#send_form').css('grid-template-columns', columns.join(' '));
-    }
     function addSendPictureButton() {
         const sendButton = document.createElement('div');
         sendButton.id = 'send_picture';
@@ -118,7 +112,6 @@ $(document).ready(function () {
     addPictureSendForm();
     addSendPictureButton();
     setImageIcon();
-    patchSendForm();
     moduleWorker();
     setInterval(moduleWorker, UPDATE_INTERVAL);
 });

public/scripts/extensions/dice/index.js

@@ -79,13 +79,6 @@ function addDiceScript() {
     }
 }
 
-function patchSendForm() {
-    const columns = $('#send_form').css('grid-template-columns').split(' ');
-    columns[columns.length - 1] = `${parseInt(columns[columns.length - 1]) + 40}px`;
-    columns[1] = 'auto';
-    $('#send_form').css('grid-template-columns', columns.join(' '));
-}
-
 async function moduleWorker() {
     const context = getContext();
 
@@ -97,7 +90,6 @@ async function moduleWorker() {
 $(document).ready(function () {
     addDiceScript();
     addDiceRollButton();
-    patchSendForm();
     setDiceIcon();
     moduleWorker();
     setInterval(moduleWorker, UPDATE_INTERVAL);

public/scripts/openai.js

@@ -55,6 +55,7 @@ const default_impersonation_prompt = "[Write your next reply from the point of v
 
 const gpt3_max = 4095;
 const gpt4_max = 8191;
+const gpt4_32k_max = 32767;
 
 const tokenCache = {};
 
@@ -435,7 +436,12 @@ function getSystemPrompt(nsfw_toggle_prompt, enhance_definitions_prompt, wiBefor
     return whole_prompt;
 }
 
-async function sendOpenAIRequest(openai_msgs_tosend) {
+async function sendOpenAIRequest(openai_msgs_tosend, signal) {
+    // Provide default abort signal
+    if (!signal) {
+        signal = new AbortController().signal;
+    }
+
     if (oai_settings.reverse_proxy) {
         validateReverseProxy();
     }
@@ -458,7 +464,8 @@ async function sendOpenAIRequest(openai_msgs_tosend) {
         headers: {
             'Content-Type': 'application/json',
             "X-CSRF-Token": token,
-        }
+        },
+        signal: signal,
     });
 
     if (oai_settings.stream_openai) {
@@ -772,6 +779,9 @@ $(document).ready(function () {
         if (value == 'gpt-4') {
             $('#openai_max_context').attr('max', gpt4_max);
         }
+        else if (value == 'gpt-4-32k') {
+            $('#openai_max_context').attr('max', gpt4_32k_max);
+        }
         else {
             $('#openai_max_context').attr('max', gpt3_max);
             oai_settings.openai_max_context = Math.max(oai_settings.openai_max_context, gpt3_max);

public/scripts/poe.js

@@ -86,7 +86,7 @@ function onBotChange() {
     saveSettingsDebounced();
 }
 
-async function generatePoe(type, finalPrompt) {
+async function generatePoe(type, finalPrompt, signal) {
     if (poe_settings.auto_purge) {
         let count_to_delete = -1;
 
@@ -136,7 +136,7 @@ async function generatePoe(type, finalPrompt) {
         finalPrompt = sentences.join('');
     }
 
-    const reply = await sendMessage(finalPrompt, true);
+    const reply = await sendMessage(finalPrompt, true, signal);
     got_reply = true;
     return reply;
 }
@@ -160,7 +160,11 @@ async function purgeConversation(count = -1) {
     return response.ok;
 }
 
-async function sendMessage(prompt, withStreaming) {
+async function sendMessage(prompt, withStreaming, signal) {
+    if (!signal) {
+        signal = new AbortController().signal;
+    }
+
     const body = JSON.stringify({
         bot: poe_settings.bot,
         token: poe_settings.token,
@@ -175,6 +179,7 @@ async function sendMessage(prompt, withStreaming) {
         },
         body: body,
         method: 'POST',
+        signal: signal,
     });
 
     if (withStreaming && poe_settings.streaming) {

public/scripts/textgen-settings.js

@@ -147,7 +147,7 @@ function setSettingByName(i, value, trigger) {
     }
 }
 
-async function generateTextGenWithStreaming(generate_data) {
+async function generateTextGenWithStreaming(generate_data, signal) {
     const response = await fetch('/generate_textgenerationwebui', {
         headers: {
             'X-CSRF-Token': token,
@@ -157,6 +157,7 @@ async function generateTextGenWithStreaming(generate_data) {
         },
         body: JSON.stringify(generate_data),
         method: 'POST',
+        signal: signal,
     });
 
     return async function* streamData() {