Return 502 with error description when connection to remote CC API fails

If chat-completions/generate returns an error, throw the error message

Reformat display of exceptions during SD prompt text generation
This commit is contained in:
ceruleandeep
2024-11-22 11:51:05 +11:00
parent 0383ea52e9
commit 8de551fc94
3 changed files with 15 additions and 6 deletions

View File

@@ -1051,8 +1051,12 @@ router.post('/generate', jsonParser, function (request, response) {
}
} catch (error) {
console.log('Generation failed', error);
const message = error.code === 'ECONNREFUSED'
? `Connection refused: ${error.message}`
: error.message || 'Unknown error occurred';
if (!response.headersSent) {
response.send({ error: true });
response.status(502).send({ error: { message, ...error } });
} else {
response.end();
}
@@ -1068,7 +1072,7 @@ router.post('/generate', jsonParser, function (request, response) {
const message = errorResponse.statusText || 'Unknown error occurred';
const quota_error = errorResponse.status === 429 && errorData?.error?.type === 'insufficient_quota';
console.log(message, responseText);
console.log('Chat completion request error: ', message, responseText);
if (!response.headersSent) {
response.send({ error: { message }, quota_error: quota_error });