rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#2013 Fix smooth stream event processing.

This commit is contained in:
Cohee 2024-04-05 01:25:48 +03:00
parent 144d115d6a
commit 7221549c65
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/scripts/sse-stream.js
View File

@ -106,7 +106,7 @@ function getDelay(s) {
/** /**
* Parses the stream data and returns the parsed data and the chunk to be sent. * Parses the stream data and returns the parsed data and the chunk to be sent.
* @param {object} json The JSON data. * @param {object} json The JSON data.
* @returns {AsyncGenerator<{data: object, chunk: string} | null>} The parsed data and the chunk to be sent. * @returns {AsyncGenerator<{data: object, chunk: string}>} The parsed data and the chunk to be sent.
*/ */
async function* parseStreamData(json) { async function* parseStreamData(json) {
// Claude // Claude
@ -120,6 +120,7 @@ async function* parseStreamData(json) {
}; };
} }
} }
return;
} }
// MakerSuite // MakerSuite
else if (Array.isArray(json.candidates)) { else if (Array.isArray(json.candidates)) {
@ -145,6 +146,7 @@ async function* parseStreamData(json) {
} }
} }
} }
return;
} }
// NovelAI / KoboldCpp Classic // NovelAI / KoboldCpp Classic
else if (typeof json.token === 'string' && json.token.length > 0) { else if (typeof json.token === 'string' && json.token.length > 0) {
@ -155,6 +157,7 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
// llama.cpp? // llama.cpp?
else if (typeof json.content === 'string' && json.content.length > 0) { else if (typeof json.content === 'string' && json.content.length > 0) {
@ -165,6 +168,7 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
// OpenAI-likes // OpenAI-likes
else if (Array.isArray(json.choices)) { else if (Array.isArray(json.choices)) {
@ -184,6 +188,7 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
else if (typeof json.choices[0].delta === 'object') { else if (typeof json.choices[0].delta === 'object') {
if (typeof json.choices[0].delta.text === 'string' && json.choices[0].delta.text.length > 0) { if (typeof json.choices[0].delta.text === 'string' && json.choices[0].delta.text.length > 0) {
@ -197,6 +202,7 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
else if (typeof json.choices[0].delta.content === 'string' && json.choices[0].delta.content.length > 0) { else if (typeof json.choices[0].delta.content === 'string' && json.choices[0].delta.content.length > 0) {
for (let j = 0; j < json.choices[0].delta.content.length; j++) { for (let j = 0; j < json.choices[0].delta.content.length; j++) {
@ -209,6 +215,7 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
} }
else if (typeof json.choices[0].message === 'object') { else if (typeof json.choices[0].message === 'object') {
@ -223,11 +230,12 @@ async function* parseStreamData(json) {
chunk: str, chunk: str,
}; };
} }
return;
} }
} }
} }
yield null; throw new Error('Unknown event data format');
} }
/** /**
@ -257,11 +265,6 @@ export class SmoothEventSourceStream extends EventSourceStream {
} }
for await (const parsed of parseStreamData(json)) { for await (const parsed of parseStreamData(json)) {
if (!parsed) {
lastStr = '';
return controller.enqueue(event);
}
hasFocus && await delay(getDelay(lastStr)); hasFocus && await delay(getDelay(lastStr));
controller.enqueue(new MessageEvent(event.type, { data: JSON.stringify(parsed.data) })); controller.enqueue(new MessageEvent(event.type, { data: JSON.stringify(parsed.data) }));
lastStr = parsed.chunk; lastStr = parsed.chunk;