vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert lite change

Browse source
This commit is contained in:
Concedo 2023-10-20 22:13:56 +08:00
parent 6fa681b692
commit 6119a2b5b2
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
klite.embd
View file

@ -2927,7 +2927,7 @@ Current version: 83
} }
} }
function kobold_api_stream_sse(sub_endpt,submit_payload,trackedgenid) function kobold_api_stream_sse(sub_endpt,submit_payload)
{ {
synchro_pending_stream = ""; synchro_pending_stream = "";
fetch(sub_endpt, {method: 'POST', fetch(sub_endpt, {method: 'POST',
@ -2941,19 +2941,17 @@ Current version: 83
ctrl.buf = ''; ctrl.buf = '';
}, },
transform(chunk, ctrl) { transform(chunk, ctrl) {
if (pending_response_id == trackedgenid) {
ctrl.buf += chunk; ctrl.buf += chunk;
let evs = []; let evs = [];
let m; let m;
while ((m = /^event: (.*)\ndata: (.*)\n\n/.exec(ctrl.buf)) !== null) { while ((m = /^event: (.*)\ndata: (.*)\n\n/.exec(ctrl.buf)) !== null) {
evs.push({ event: m[1], data: JSON.parse(m[2]) }); evs.push({event: m[1], data: JSON.parse(m[2])});
ctrl.buf = ctrl.buf.substring(m.index + m[0].length); ctrl.buf = ctrl.buf.substring(m.index + m[0].length);
} }
if (evs.length) { if (evs.length) {
ctrl.enqueue(evs); ctrl.enqueue(evs);
} }
} }
}
})) }))
.pipeTo(new WritableStream({ .pipeTo(new WritableStream({
write(chunk) { write(chunk) {
@ -8073,12 +8071,12 @@ Current version: 83
streamchunk = ((pstreamamount != null && pstreamamount > 0) ? pstreamamount:8); //8 tokens per stream tick by default streamchunk = ((pstreamamount != null && pstreamamount > 0) ? pstreamamount:8); //8 tokens per stream tick by default
} }
last_request_str = JSON.stringify(submit_payload); last_request_str = JSON.stringify(submit_payload);
let trackedgenid = pending_response_id; //if it changes, stop streaming
if (localsettings.tokenstreammode==2 && is_using_kcpp_with_sse()) { if (localsettings.tokenstreammode==2 && is_using_kcpp_with_sse()) {
let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_stream_endpoint); let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_stream_endpoint);
kobold_api_stream_sse(sub_endpt, submit_payload, trackedgenid); kobold_api_stream_sse(sub_endpt, submit_payload);
} else { } else {
let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_endpoint); let sub_endpt = apply_proxy_url(custom_kobold_endpoint + kobold_custom_gen_endpoint);
let trackedgenid = pending_response_id; //if it changes, stop streaming
kobold_api_stream(sub_endpt, submit_payload, submit_payload.max_length, trackedgenid, "", streamchunk); kobold_api_stream(sub_endpt, submit_payload, submit_payload.max_length, trackedgenid, "", streamchunk);
} }
} }