mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Reimplement railguards for temporary API service unavailable errors.
This commit is contained in:
66
server.js
66
server.js
@@ -385,35 +385,49 @@ app.post("/generate", jsonParser, async function (request, response_generate = r
|
|||||||
signal: controller.signal,
|
signal: controller.signal,
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
const MAX_RETRIES = 10;
|
||||||
const fetch = require('node-fetch').default;
|
const delayAmount = 3000;
|
||||||
const url = request.body.streaming ? `${api_server}/extra/generate/stream` : `${api_server}/v1/generate`;
|
|
||||||
const response = await fetch(url, { method: 'POST', timeout: 0, ...args });
|
|
||||||
|
|
||||||
if (request.body.streaming) {
|
let fetch, url, response;
|
||||||
// Pipe remote SSE stream to Express response
|
for (let i = 0; i < MAX_RETRIES; i++) {
|
||||||
response.body.pipe(response_generate);
|
try {
|
||||||
|
fetch = require('node-fetch').default;
|
||||||
|
url = request.body.streaming ? `${api_server}/extra/generate/stream` : `${api_server}/v1/generate`;
|
||||||
|
response = await fetch(url, { method: 'POST', timeout: 0, ...args });
|
||||||
|
|
||||||
request.socket.on('close', function () {
|
if (request.body.streaming) {
|
||||||
response.body.destroy(); // Close the remote stream
|
|
||||||
response_generate.end(); // End the Express response
|
|
||||||
});
|
|
||||||
|
|
||||||
response.body.on('end', function () {
|
request.socket.on('close', function () {
|
||||||
console.log("Streaming request finished");
|
response.body.destroy(); // Close the remote stream
|
||||||
response_generate.end();
|
response_generate.end(); // End the Express response
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
if (!response.ok) {
|
|
||||||
console.log(`Kobold returned error: ${response.status} ${response.statusText} ${await response.text()}`);
|
|
||||||
return response.status(response.status).send({ error: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
response.body.on('end', function () {
|
||||||
return response_generate.send(data);
|
console.log("Streaming request finished");
|
||||||
}
|
response_generate.end();
|
||||||
} catch (error) {
|
});
|
||||||
return response_generate.send({ error: true });
|
|
||||||
|
// Pipe remote SSE stream to Express response
|
||||||
|
return response.body.pipe(response_generate);
|
||||||
|
} else {
|
||||||
|
if (!response.ok) {
|
||||||
|
console.log(`Kobold returned error: ${response.status} ${response.statusText} ${await response.text()}`);
|
||||||
|
return response.status(response.status).send({ error: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
return response_generate.send(data);
|
||||||
|
}
|
||||||
|
} 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 });
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -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 = {
|
||||||
|
Reference in New Issue
Block a user