Handle non-streaming errors as 500

a0a184763481ef11bdbd6df7f3b0c20a54b9bafe

Cohee <18619528+Cohee1207@users.noreply.github.com>

src/endpoints/backends/chat-completions.js+11 -10 Viewed

 const express = require('express');
 const fetch = require('node-fetch').default;
 -const Readable = require('stream').Readable;
 const { jsonParser } = require('../../express-common');
 const { CHAT_COMPLETION_SOURCES, GEMINI_SAFETY, BISON_SAFETY, OPENROUTER_HEADERS } = require('../../constants');

         if (!generateResponse.ok) {
             console.log(`Scale API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
             return response.status(generateResponse.status500).send({ error: true });
+        }
         const generateResponseJson = await generateResponse.json();

             forwardFetchResponse(generateResponse, response);
         } else {
             if (!generateResponse.ok) {
 -                console.log(`AI21 API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
 +                const errorText = await generateResponse.text();
 -                return response.status(500).send({ error: true });
 +                console.log(`AI21 API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
 +                const errorJson = tryParse(errorText) ?? { error: true };
 +                return response.status(500).send(errorJson);
+            }
             const generateResponseJson = await generateResponse.json();
             console.log('AI21 response:', generateResponseJson);
             return response.send(generateResponseJson);
+        }
     } catch (error) {
         console.log('Error communicating with MistralAIAI21 API: ', error);
         if (!response.headersSent) {
             response.send({ error: true });
         } else {

             forwardFetchResponse(generateResponse, response);
         } else {
             if (!generateResponse.ok) {
 -                console.log(`MistralAI API returned error: ${generateResponse.status} ${generateResponse.statusText} ${await generateResponse.text()}`);
 +                const errorText = await generateResponse.text();
 -                // a 401 unauthorized response breaks the frontend auth, so return a 500 instead. prob a better way of dealing with this.
 +                console.log(`MistralAI API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
 -                // 401s are already handled by the streaming processor and dont pop up an error toast, that should probably be fixed too.
 +                const errorJson = tryParse(errorText) ?? { error: true };
                 return response.status(generateResponse.status === 401 ? 500 : generateResponse.status).send({ error: true }errorJson);
+            }
             const generateResponseJson = await generateResponse.json();
             console.log('MistralAI response:', generateResponseJson);

                 const errorText = await generateResponse.text();
                 console.log(`Cohere API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
                 const errorJson = tryParse(errorText) ?? { error: true };
                 return response.status(generateResponse.status === 401 ? 500 : generateResponse.status).send(errorJson);
+            }
             const generateResponseJson = await generateResponse.json();
             console.log('Cohere response:', generateResponseJson);