Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

👥 fix(assistants): Improve Error handling (#2012)

Browse source 
* feat: make assistants endpoint appendable since message state is not managed by LibreChat

* fix(ask): search currentMessages for thread_id if it's not defined

* refactor(abortMiddleware): remove use of `overrideProps` and spread unknown fields instead

* chore: remove console.log in `abortConversation`

* refactor(assistants): improve error handling/cancellation flow
This commit is contained in:
Danny Avila 2024-03-07 10:50:01 -05:00 • committed by GitHub
parent d4fe8fc82d
commit 18edd2660b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 77 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
api/server/utils/streamResponse.js
View file

@ -32,6 +32,13 @@ const sendMessage = (res, message, event = 'message') => {
* @async
* @param {object} res - The server response.
* @param {object} options - The options for handling the error containing message properties.
* @param {object} options.user - The user ID.
* @param {string} options.sender - The sender of the message.
* @param {string} options.conversationId - The conversation ID.
* @param {string} options.messageId - The message ID.
* @param {string} options.parentMessageId - The parent message ID.
* @param {string} options.text - The error message.
* @param {boolean} options.shouldSaveMessage - [Optional] Whether the message should be saved. Default is true.
* @param {function} callback - [Optional] The callback function to be executed.
*/
const sendError = async (res, options, callback) => {
@ -43,7 +50,7 @@ const sendError = async (res, options, callback) => {
parentMessageId,
text,
shouldSaveMessage,
overrideProps = {},
...rest
} = options;
const errorMessage = {
sender,
@ -55,7 +62,7 @@ const sendError = async (res, options, callback) => {
final: true,
text,
isCreatedByUser: false,
...overrideProps,
...rest,
};
if (callback && typeof callback === 'function') {
await callback();
@ -88,7 +95,28 @@ const sendError = async (res, options, callback) => {
handleError(res, errorMessage);
};
/**
* Sends the response based on whether headers have been sent or not.
* @param {Express.Response} res - The server response.
* @param {Object} data - The data to be sent.
* @param {string} [errorMessage] - The error message, if any.
*/
const sendResponse = (res, data, errorMessage) => {
if (!res.headersSent) {
if (errorMessage) {
return res.status(500).json({ error: errorMessage });
}
return res.json(data);
}
if (errorMessage) {
return sendError(res, { ...data, text: errorMessage });
}
return sendMessage(res, data);
};
module.exports = {
sendResponse,
handleError,
sendMessage,
sendError,