From 14c3b094144bee5f0c5370152d75ddc64b530c3d Mon Sep 17 00:00:00 2001
From: Concedo
Date: Fri, 27 Oct 2023 15:26:57 +0800
Subject: [PATCH] support for abort controllers
---
index.html | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/index.html b/index.html
index 41dde28..748cb6b 100644
--- a/index.html
+++ b/index.html
@@ -2835,13 +2835,17 @@
let new_submit_payload = JSON.parse(JSON.stringify(submit_payload));
new_submit_payload.prompt += synchro_streaming_response;
new_submit_payload.max_length = Math.min(tokens_per_tick,synchro_streaming_tokens_left);
- fetch(sub_endpt, {
+
+ let reqOpt = {
method: 'POST', // or 'PUT'
- headers: {
- 'Content-Type': 'application/json',
- },
+ headers: {'Content-Type': 'application/json',},
body: JSON.stringify(new_submit_payload),
- })
+ };
+ if(globalabortcontroller)
+ {
+ reqOpt.signal = globalabortcontroller.signal;
+ }
+ fetch(sub_endpt, reqOpt)
.then((response) => response.json())
.then((data) => {
console.log("sync kobold_api_stream response: " + JSON.stringify(data));
@@ -2946,9 +2950,15 @@
function kobold_api_stream_sse(sub_endpt,submit_payload)
{
synchro_pending_stream = "";
- fetch(sub_endpt, {method: 'POST',
+ let reqOpt =
+ {method: 'POST',
headers: {'Content-Type': 'application/json'},
- body: JSON.stringify(submit_payload)})
+ body: JSON.stringify(submit_payload)};
+ if(globalabortcontroller)
+ {
+ reqOpt.signal = globalabortcontroller.signal;
+ }
+ fetch(sub_endpt, reqOpt)
.then(resp => {
resp.body
.pipeThrough(new TextDecoderStream())
@@ -3230,6 +3240,8 @@
var koboldcpp_version = ""; //detect if we are using koboldcpp
var last_request_str = "No Requests Available"; //full context of last submitted request
var lastcheckgenkey = ""; //for checking polled-streaming unique id when generating in kcpp
+ var globalabortcontroller = null;
+ var passed_ai_warning_local = false;
var localsettings = {
my_api_key: "0000000000", //put here so it can be saved and loaded in persistent mode
@@ -3402,11 +3414,24 @@
}
+ function prepare_abort_controller()
+ {
+ try { //setup global abort controller
+ const controller = new AbortController();
+ const signal = controller.signal;
+ globalabortcontroller = controller;
+ } catch (e) {
+ console.log("AbortController Not Supported: " + e);
+ }
+ }
+
//attempt to load settings
function init() {
polyfills();
+ prepare_abort_controller();
+
//uncompress compacted scenarios
for(let i=0;iDisclaimer: The AI is not suitable to be used as an actual therapist, counselor or advisor of any kind.
While some find it comforting to talk about their issues with an AI, the responses are unpredictable.
@@ -5111,6 +5136,7 @@
{
confirm_scenario();
localsettings.passed_ai_warning = true; //remember flag for session
+ passed_ai_warning_local = true;
}
},true);
} else {
@@ -7662,7 +7688,14 @@
}),
})
.then((response) => response.json())
- .then((data) => {})
+ .then((data) => {
+ if(globalabortcontroller)
+ {
+ globalabortcontroller.abort();
+ console.log("Abort Signal");
+ prepare_abort_controller();
+ }
+ })
.catch((error) => {
console.error('Error:', error);
});