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

Reimplement railguards for temporary API service unavailable errors.

Browse Source
This commit is contained in:
Zixaphir
2023-06-12 11:59:25 -07:00
parent 524cc881d4
commit 3a33b7cd3e
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server.js
View File

@@ -385,14 +385,17 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
signal: controller.signal, signal: controller.signal,
}; };
const MAX_RETRIES = 10;
const delayAmount = 3000;
let fetch, url, response;
for (let i = 0; i < MAX_RETRIES; i++) {
try { try {
const fetch = require('node-fetch').default; fetch = require('node-fetch').default;
const url = request.body.streaming ? `${api_server}/extra/generate/stream` : `${api_server}/v1/generate`; url = request.body.streaming ? `${api_server}/extra/generate/stream` : `${api_server}/v1/generate`;
const response = await fetch(url, { method: 'POST', timeout: 0, ...args }); response = await fetch(url, { method: 'POST', timeout: 0, ...args });
if (request.body.streaming) { if (request.body.streaming) {
// Pipe remote SSE stream to Express response
response.body.pipe(response_generate);
request.socket.on('close', function () { request.socket.on('close', function () {
response.body.destroy(); // Close the remote stream response.body.destroy(); // Close the remote stream
@@ -403,6 +406,9 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
console.log("Streaming request finished"); console.log("Streaming request finished");
response_generate.end(); response_generate.end();
}); });
// Pipe remote SSE stream to Express response
return response.body.pipe(response_generate);
} else { } else {
if (!response.ok) { if (!response.ok) {
console.log(`Kobold returned error: ${response.status} ${response.statusText} ${await response.text()}`); console.log(`Kobold returned error: ${response.status} ${response.statusText} ${await response.text()}`);
@@ -413,8 +419,16 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
return response_generate.send(data); return response_generate.send(data);
} }
} catch (error) { } catch (error) {
// response
switch (error.statusCode) {
case 503: // retry in case of temporary service issue, possibly caused by a queue failure?
await delay(delayAmount);
break;
default:
return response_generate.send({ error: true }); return response_generate.send({ error: true });
} }
}
}
}); });
//************** Text generation web UI //************** Text generation web UI
@@ -590,7 +604,7 @@ app.post("/getstatus", jsonParser, async function (request, response_getstatus =
version = '0.0.0'; version = '0.0.0';
} }
try { try {
koboldVersion = await getAsync(api_server + "/extra/version"); koboldVersion = (await getAsync(api_server + "/extra/version"));
} }
catch { catch {
koboldVersion = { koboldVersion = {