🧹fix: Handle Abort Message Edge Cases (#1462)

* chore: bump langchain to v0.0.213 from v0.0.186

* fix: handle abort edge cases:
- abort message server-side if response experienced error mid-generation
- attempt to recover message if aborting resulted in error
- if abortKey is not provided, use conversationId if it exists
- if headers were already sent, send an Event stream message
- issue warning for possible Google censor/filter

refactor(streamResponse): for `sendError`, allow passing overrides so that error can include partial generation, improve typing for `sendMessage`

* chore(MessageContent): remove eslint warning for unused `i`, rephrase unfinished message text

* fix(useSSE): avoid invoking cancelHandler if the abort response was 404

* chore(TMessage): remove unnecessary, unused legacy message property `submitting`

* chore(TMessage): remove unnecessary legacy message property `cancelled`

* chore(abortMiddleware): remove unused `errorText` property to avoid confusion
This commit is contained in:
Danny Avila 2023-12-30 12:34:23 -05:00 committed by GitHub
parent f19f5dca8e
commit 379e470e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 529 additions and 207 deletions

View file

@ -62,7 +62,6 @@ const AskController = async (req, res, next, initializeClient, addTitle) => {
text: partialText,
model: client.modelOptions.model,
unfinished: true,
cancelled: false,
error: false,
user,
});

View file

@ -61,7 +61,6 @@ const EditController = async (req, res, next, initializeClient) => {
text: partialText,
model: endpointOption.modelOptions.model,
unfinished: true,
cancelled: false,
isEdited: true,
error: false,
user,

View file

@ -7,17 +7,26 @@ const spendTokens = require('~/models/spendTokens');
const { logger } = require('~/config');
async function abortMessage(req, res) {
const { abortKey } = req.body;
let { abortKey, conversationId } = req.body;
if (!abortKey && conversationId) {
abortKey = conversationId;
}
if (!abortControllers.has(abortKey) && !res.headersSent) {
return res.status(404).send({ message: 'Request not found' });
}
const { abortController } = abortControllers.get(abortKey);
const ret = await abortController.abortCompletion();
const finalEvent = await abortController.abortCompletion();
logger.debug('[abortMessage] Aborted request', { abortKey });
abortControllers.delete(abortKey);
res.send(JSON.stringify(ret));
if (res.headersSent && finalEvent) {
return sendMessage(res, finalEvent);
}
res.send(JSON.stringify(finalEvent));
}
const handleAbort = () => {
@ -58,7 +67,6 @@ const createAbortController = (req, res, getAbortData) => {
finish_reason: 'incomplete',
model: endpointOption.modelOptions.model,
unfinished: false,
cancelled: true,
error: false,
isCreatedByUser: false,
tokenCount: completionTokens,
@ -84,10 +92,16 @@ const createAbortController = (req, res, getAbortData) => {
};
const handleAbortError = async (res, req, error, data) => {
logger.error('[handleAbortError] response error and aborting request', error);
logger.error('[handleAbortError] AI response error; aborting request:', error);
const { sender, conversationId, messageId, parentMessageId, partialText } = data;
const respondWithError = async () => {
if (error.stack && error.stack.includes('google')) {
logger.warn(
`AI Response error for conversation ${conversationId} likely caused by Google censor/filter`,
);
}
const respondWithError = async (partialText) => {
const options = {
sender,
messageId,
@ -97,6 +111,15 @@ const handleAbortError = async (res, req, error, data) => {
shouldSaveMessage: true,
user: req.user.id,
};
if (partialText) {
options.overrideProps = {
error: false,
unfinished: true,
text: partialText,
};
}
const callback = async () => {
if (abortControllers.has(conversationId)) {
const { abortController } = abortControllers.get(conversationId);
@ -113,7 +136,7 @@ const handleAbortError = async (res, req, error, data) => {
return await abortMessage(req, res);
} catch (err) {
logger.error('[handleAbortError] error while trying to abort message', err);
return respondWithError();
return respondWithError(partialText);
}
} else {
return respondWithError();

View file

@ -99,7 +99,6 @@ const ask = async ({
parentMessageId: overrideParentMessageId || userMessageId,
text: text,
unfinished: true,
cancelled: false,
error: false,
isCreatedByUser: false,
user,
@ -155,7 +154,6 @@ const ask = async ({
text: await handleText(response),
sender: endpointOption?.chatGptLabel || 'ChatGPT',
unfinished: false,
cancelled: false,
error: false,
isCreatedByUser: false,
};
@ -226,7 +224,6 @@ const ask = async ({
conversationId,
parentMessageId: overrideParentMessageId || userMessageId,
unfinished: false,
cancelled: false,
error: true,
isCreatedByUser: false,
text: `${getPartialMessage() ?? ''}\n\nError message: "${error.message}"`,

View file

@ -125,7 +125,6 @@ const ask = async ({
model,
text: text,
unfinished: true,
cancelled: false,
error: false,
isCreatedByUser: false,
user,
@ -193,7 +192,6 @@ const ask = async ({
response.details.suggestedResponses &&
response.details.suggestedResponses.map((s) => s.text),
unfinished,
cancelled: false,
error: false,
isCreatedByUser: false,
};
@ -263,7 +261,6 @@ const ask = async ({
text: partialText,
model,
unfinished: true,
cancelled: false,
error: false,
isCreatedByUser: false,
};
@ -285,7 +282,6 @@ const ask = async ({
conversationId,
parentMessageId: overrideParentMessageId || userMessageId,
unfinished: false,
cancelled: false,
error: true,
text: error.message,
model,

View file

@ -81,7 +81,6 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
text: partialText,
model: endpointOption.modelOptions.model,
unfinished: true,
cancelled: false,
error: false,
plugins,
user,

View file

@ -88,7 +88,6 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
text: partialText,
model: endpointOption.modelOptions.model,
unfinished: true,
cancelled: false,
isEdited: true,
error: false,
user,

View file

@ -1,5 +1,6 @@
const crypto = require('crypto');
const { saveMessage } = require('~/models/Message');
const { saveMessage, getMessages } = require('~/models/Message');
const { getConvo } = require('~/models/Conversation');
/**
* Sends error data in Server Sent Events format and ends the response.
@ -15,7 +16,7 @@ const handleError = (res, message) => {
* Sends message data in Server Sent Events format.
* @param {object} res - - The server response.
* @param {string} message - The message to be sent.
* @param {string} event - [Optional] The type of event. Default is 'message'.
* @param {'message' | 'error' | 'cancel'} event - [Optional] The type of event. Default is 'message'.
*/
const sendMessage = (res, message, event = 'message') => {
if (message.length === 0) {
@ -32,19 +33,27 @@ const sendMessage = (res, message, event = 'message') => {
* @param {function} callback - [Optional] The callback function to be executed.
*/
const sendError = async (res, options, callback) => {
const { user, sender, conversationId, messageId, parentMessageId, text, shouldSaveMessage } =
options;
const {
user,
sender,
conversationId,
messageId,
parentMessageId,
text,
shouldSaveMessage,
overrideProps = {},
} = options;
const errorMessage = {
sender,
messageId: messageId ?? crypto.randomUUID(),
conversationId,
parentMessageId,
unfinished: false,
cancelled: false,
error: true,
final: true,
text,
isCreatedByUser: false,
...overrideProps,
};
if (callback && typeof callback === 'function') {
await callback();
@ -54,6 +63,17 @@ const sendError = async (res, options, callback) => {
await saveMessage({ ...errorMessage, user });
}
if (!errorMessage.error) {
const requestMessage = { messageId: parentMessageId, conversationId };
const query = await getMessages(requestMessage);
return sendMessage(res, {
final: true,
requestMessage: query?.[0] ? query[0] : requestMessage,
responseMessage: errorMessage,
conversation: await getConvo(user, conversationId),
});
}
handleError(res, errorMessage);
};