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

8de551fc9405984acd003667d2cf25d4c8887925

ceruleandeep <deep@cerulean.navy>

public/scripts/extensions/stable-diffusion/index.js+6 -2 Viewed

         imagePath = await sendGenerationRequest(generationType, prompt, negativePromptPrefix, characterName, callback, initiator, abortController.signal);
     } catch (err) {
         console.trace(err);
-        toastr.error('SD prompt text generation failed. Reason: ' + err, 'Image Generation');
+        // errors here are most likely due to text generation failure
-        throw new Error('SD prompt text generation failed. Reason: ' + err);
+        // sendGenerationRequest mostly deals with its own errors
+        const reason = err.error?.message || err.message || 'Unknown error';
+        const errorText = 'SD prompt text generation failed. ' + reason;
+        toastr.error(errorText, 'Image Generation');
+        throw new Error(errorText);
+    }
     finally {
         $(stopButton).hide();

public/scripts/openai.js+3 -2 Viewed

         checkModerationError(data);
         if (data.error) {
-            toastr.error(data.error.message || response.statusText, t`API returned an error`);
+            const message = data.error.message || response.statusText || t`Unknown error`;
-            throw new Error(data);
+            toastr.error(message, t`API returned an error`);
+            throw new Error(message);
+        }
         if (type !== 'quiet') {

src/endpoints/backends/chat-completions.js+6 -2 Viewed

+            }
         } 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();
+            }

         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 });