rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on poe streaming

Browse Source
This commit is contained in:
SillyLossy
2023-04-13 15:14:43 +03:00
parent 25ae214c12
commit 661b41341e
1 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
server.js
View File

@@ -353,6 +353,7 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
const SEND_PARAMS_GRADIO_FN = 29; const SEND_PARAMS_GRADIO_FN = 29;
response_generate.writeHead(200, { response_generate.writeHead(200, {
'Content-Type': 'text/plain;charset=utf-8',
'Transfer-Encoding': 'chunked', 'Transfer-Encoding': 'chunked',
'Cache-Control': 'no-transform', 'Cache-Control': 'no-transform',
}); });
@@ -363,7 +364,7 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
const websocket = new WebSocket(`ws://${url.host}/queue/join`, { perMessageDeflate: false }); const websocket = new WebSocket(`ws://${url.host}/queue/join`, { perMessageDeflate: false });
let text = ''; let text = '';
websocket.on('open', async function() { websocket.on('open', async function () {
console.log('websocket open'); console.log('websocket open');
}); });
@@ -405,13 +406,13 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
if (text == null) { if (text == null) {
break; break;
} }
let newText = text.substring(result.length); let newText = text.substring(result.length);
if (!newText) { if (!newText) {
continue; continue;
} }
result = text; result = text;
response_generate.write(newText); response_generate.write(newText);
} }
@@ -853,13 +854,13 @@ app.post("/getcharacters", jsonParser, function (request, response) {
const charStat = fs.statSync(path.join(charactersPath, item)); const charStat = fs.statSync(path.join(charactersPath, item));
characters[i]['date_added'] = charStat.birthtimeMs; characters[i]['date_added'] = charStat.birthtimeMs;
const char_dir = path.join(chatsPath, item.replace('.png', '')); const char_dir = path.join(chatsPath, item.replace('.png', ''));
let chat_size = 0; let chat_size = 0;
let date_last_chat = 0; let date_last_chat = 0;
if (fs.existsSync(char_dir)) { if (fs.existsSync(char_dir)) {
const chats = fs.readdirSync(char_dir); const chats = fs.readdirSync(char_dir);
if (Array.isArray(chats) && chats.length) { if (Array.isArray(chats) && chats.length) {
for (const chat of chats) { for (const chat of chats) {
const chatStat = fs.statSync(path.join(char_dir, chat)); const chatStat = fs.statSync(path.join(char_dir, chat));
@@ -868,7 +869,7 @@ app.post("/getcharacters", jsonParser, function (request, response) {
} }
} }
} }
characters[i]['date_last_chat'] = date_last_chat; characters[i]['date_last_chat'] = date_last_chat;
characters[i]['chat_size'] = chat_size; characters[i]['chat_size'] = chat_size;
} }
@@ -877,7 +878,7 @@ app.post("/getcharacters", jsonParser, function (request, response) {
characters[i]['date_last_chat'] = 0; characters[i]['date_last_chat'] = 0;
characters[i]['chat_size'] = 0; characters[i]['chat_size'] = 0;
} }
i++; i++;
} catch (error) { } catch (error) {
console.log(`Could not read character: ${item}`); console.log(`Could not read character: ${item}`);
@@ -1549,11 +1550,11 @@ app.post("/exportcharacter", jsonParser, async function (request, response) {
let inputWebpPath = `./uploads/${Date.now()}_input.webp`; let inputWebpPath = `./uploads/${Date.now()}_input.webp`;
let outputWebpPath = `./uploads/${Date.now()}_output.webp`; let outputWebpPath = `./uploads/${Date.now()}_output.webp`;
let metadataPath = `./uploads/${Date.now()}_metadata.exif`; let metadataPath = `./uploads/${Date.now()}_metadata.exif`;
let metadata = let metadata =
{ {
"Exif": { "Exif": {
[exif.ExifIFD.UserComment]: json, [exif.ExifIFD.UserComment]: json,
}, },
}; };
const exifString = exif.dump(metadata); const exifString = exif.dump(metadata);
fs.writeFileSync(metadataPath, exifString, 'binary'); fs.writeFileSync(metadataPath, exifString, 'binary');
@@ -1924,15 +1925,24 @@ app.post('/generate_poe', jsonParser, async (request, response) => {
const bot = request.body.bot ?? POE_DEFAULT_BOT; const bot = request.body.bot ?? POE_DEFAULT_BOT;
const streaming = request.body.streaming ?? false; const streaming = request.body.streaming ?? false;
try { let client;
const client = await getPoeClient(token);
if (streaming) { try {
client = await getPoeClient(token);
}
catch (error) {
console.error(error);
return response.sendStatus(500);
}
if (streaming) {
try {
response.writeHead(200, { response.writeHead(200, {
'Content-Type': 'text/plain;charset=utf-8',
'Transfer-Encoding': 'chunked', 'Transfer-Encoding': 'chunked',
'Cache-Control': 'no-transform', 'Cache-Control': 'no-transform',
}); });
let reply = ''; let reply = '';
for await (const mes of client.send_message(bot, prompt)) { for await (const mes of client.send_message(bot, prompt)) {
let newText = mes.text.substring(reply.length); let newText = mes.text.substring(reply.length);
@@ -1940,10 +1950,17 @@ app.post('/generate_poe', jsonParser, async (request, response) => {
response.write(newText); response.write(newText);
} }
console.log(reply); console.log(reply);
client.disconnect_ws();
response.end();
} }
else { catch (err) {
console.error(err);
}
finally {
client.disconnect_ws();
return response.end();
}
}
else {
try {
let reply; let reply;
for await (const mes of client.send_message(bot, prompt)) { for await (const mes of client.send_message(bot, prompt)) {
reply = mes.text; reply = mes.text;
@@ -1952,10 +1969,10 @@ app.post('/generate_poe', jsonParser, async (request, response) => {
client.disconnect_ws(); client.disconnect_ws();
return response.send({ 'reply': reply }); return response.send({ 'reply': reply });
} }
} catch {
catch (error) { client.disconnect_ws();
console.error(error); return response.sendStatus(500);
return response.sendStatus(500); }
} }
}); });