Refactor CC API async route handlers (#4885) * Improve error handling in CC /status and /generate endpoints * Cancel pending status check on switching CC source

9046fe8d2de22b166e588839c8579c9b1da754c0

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

Signed

Parents: 10a2f0f7406035ca064eecc2e85f52a707ae770b

public/script.js+1 -1 Viewed

@@ -744,7 +744,7 @@ function initStandaloneMode() {
744	744	}
745	745	}
746	746
747	747	export function cancelStatusCheck(reason = 'Manually cancelled status check') {
748	748	abortStatusCheck?.abort(new AbortReason(reason));
749	749	abortStatusCheck = new AbortController();
750	750	setOnlineStatus('no_connection');

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

 import {
     abortStatusCheck,
 +    cancelStatusCheck,
     characters,
     event_types,
     eventSource,

     });
     $('#chat_completion_source').on('change', function () {
 +        cancelStatusCheck('Chat Completion source changed');
         model_list = [];
         oai_settings.chat_completion_source = String($(this).find(':selected').val());
         toggleChatCompletionForms();

src/endpoints/backends/chat-completions.js+32 -52 Viewed

 export const router = express.Router();
 router.post('/status', async function (request, statusResponse) {
 +    try {
         if (!request.body) return statusResponse.sendStatus(400);
         let apiUrl = '';

             return statusResponse.status(400).send({ error: true });
+        }
 -    try {
         const modelsUrl = new URL(urlJoin(apiUrl, '/models'));
         Object.keys(queryParams).forEach(key => {
             modelsUrl.searchParams.append(key, queryParams[key]);

+    }
 });
+-
 +router.post('/generate', async function (request, response) {
 -router.post('/generate', function (request, response) {
 +    try {
         if (!request.body) return response.status(400).send({ error: true });
         const postProcessingType = request.body.custom_prompt_post_processing;

+        }
         switch (request.body.chat_completion_source) {
                     case CHAT_COMPLETION_SOURCES.CLAUDE: return await sendClaudeRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.AI21: return await sendAI21Request(request, response);
                     case CHAT_COMPLETION_SOURCES.MAKERSUITE: return await sendMakerSuiteRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.VERTEXAI: return await sendMakerSuiteRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.MISTRALAI: return await sendMistralAIRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.COHERE: return await sendCohereRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.DEEPSEEK: return await sendDeepSeekRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.AIMLAPI: return await sendAimlapiRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.XAI: return await sendXaiRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.CHUTES: return await sendChutesRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.ELECTRONHUB: return await sendElectronHubRequest(request, response);
                     case CHAT_COMPLETION_SOURCES.AZURE_OPENAI: return await sendAzureOpenAIRequest(request, response);
+        }
         let apiUrl;

         console.debug('Chat Completion request:', requestBody);
 -    makeRequest(config, response, request);
+-
 -    /**
 -     * Makes a fetch request to the OpenAI API endpoint.
 -     * @param {import('node-fetch').RequestInit} config Fetch config
 -     * @param {express.Response} response Express response
 -     * @param {express.Request} request Express request
 -     */
 -    async function makeRequest(config, response, request) {
 -        try {
 -            controller.signal.throwIfAborted();
         const fetchResponse = await fetch(endpointUrl, config);
         if (request.body.stream) {
             console.info('Streaming request in progress');
                             return forwardFetchResponse(fetchResponse, response);
 -                return;
+        }
         if (fetchResponse.ok) {
             /** @type {any} */
                 let            const json = await fetchResponse.json();
 -                response.send(json);
             console.debug('Chat Completion response:', json);
 +            return response.send(json);
 +        } else {
 +            const responseText = await fetchResponse.text();
 +            const errorData = tryParse(responseText);
++
 +            const message = fetchResponse.statusText || 'Unknown error occurred';
 +            const quota_error = fetchResponse.status === 429 && errorData?.error?.type === 'insufficient_quota';
 +            console.error('Chat completion request error: ', message, responseText);
++
 +            if (!response.headersSent) {
 +                response.send({ error: { message }, quota_error: quota_error });
 +            } else if (!response.writableEnded) {
 +                response.write(responseText);
             } else {
                 await handleErrorResponseresponse.end(fetchResponse);
 +            }
+        }
     } catch (error) {
         console.error('Generation failed', error);

             response.end();
+        }
+    }
 -    }
+-
 -    /**
 -     * @param {import("node-fetch").Response} errorResponse
 -     */
 -    async function handleErrorResponse(errorResponse) {
 -        const responseText = await errorResponse.text();
 -        const errorData = tryParse(responseText);
+-
 -        const message = errorResponse.statusText || 'Unknown error occurred';
 -        const quota_error = errorResponse.status === 429 && errorData?.error?.type === 'insufficient_quota';
 -        console.error('Chat completion request error: ', message, responseText);
+-
 -        if (!response.headersSent) {
 -            response.send({ error: { message }, quota_error: quota_error });
 -        } else if (!response.writableEnded) {
 -            response.write(responseText);
 -        } else {
 -            response.end();
 -        }
 -    }
 });
 const multimodalModels = express.Router();