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

feat(db & e2e): Enhance DB Schemas/Controllers and Improve E2E Tests (#966)

Browse source 
* feat: add global teardown to remove test data and add registration/log-out to auth flow

* refactor(models/Conversation): index user field and add JSDoc to deleteConvos

* refactor: add user index to message schema and ensure user is saved to each Message

* refactor: add user to each saveMessage call

* fix: handle case where title is null in zod schema

* feat(e2e): ensure messages are deleted on cleanUp

* fix: set last convo for all endpoints on conversation update

* fix: enable registration for CI env
This commit is contained in:
Danny Avila 2023-09-18 15:19:50 -04:00 • committed by GitHub
parent fd70e21732
commit 6358383001
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 229 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/server/routes/ask/anthropic.js
View file

@ -30,6 +30,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
let responseMessageId;
let lastSavedTimestamp = 0;
let saveDelay = 100;
const user = req.user.id;
const getIds = (data) => {
userMessage = data.userMessage;
@ -55,6 +56,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
unfinished: true,
cancelled: false,
error: false,
user,
});
}
@ -80,7 +82,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
let response = await client.sendMessage(text, {
getIds,
// debug: true,
user: req.user.id,
user,
conversationId,
parentMessageId,
overrideParentMessageId,
@ -98,18 +100,18 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
response.parentMessageId = overrideParentMessageId;
}
await saveConvo(req.user.id, {
await saveConvo(user, {
...endpointOption,
...endpointOption.modelOptions,
conversationId,
endpoint: 'anthropic',
});
await saveMessage(response);
await saveMessage({ ...response, user });
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: response,
});

20
api/server/routes/ask/askChatGPTBrowser.js
View file

@ -48,7 +48,7 @@ router.post('/', setHeaders, async (req, res) => {
});
if (!overrideParentMessageId) {
await saveMessage(userMessage);
await saveMessage({ ...userMessage, user: req.user.id });
await saveConvo(req.user.id, {
...userMessage,
...endpointOption,
@ -80,7 +80,7 @@ const ask = async ({
res,
}) => {
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
const userId = req.user.id;
const user = req.user.id;
let responseMessageId = crypto.randomUUID();
let getPartialMessage = null;
try {
@ -100,6 +100,7 @@ const ask = async ({
cancelled: false,
error: false,
isCreatedByUser: false,
user,
});
}
},
@ -114,7 +115,7 @@ const ask = async ({
conversationId,
...endpointOption,
abortController,
userId,
userId: user,
onProgress: progressCallback.call(null, { res, text }),
onEventMessage: (eventMessage) => {
let data = null;
@ -157,7 +158,7 @@ const ask = async ({
isCreatedByUser: false,
};
await saveMessage(responseMessage);
await saveMessage({ ...responseMessage, user });
responseMessage.messageId = newResponseMessageId;
// STEP2 update the conversation
@ -181,7 +182,7 @@ const ask = async ({
}
}
await saveConvo(req.user.id, conversationUpdate);
await saveConvo(user, conversationUpdate);
conversationId = newConversationId;
// STEP3 update the user message
@ -192,6 +193,7 @@ const ask = async ({
if (!overrideParentMessageId) {
await saveMessage({
...userMessage,
user,
messageId: userMessageId,
newMessageId: newUserMassageId,
});
@ -199,9 +201,9 @@ const ask = async ({
userMessageId = newUserMassageId;
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: responseMessage,
});
@ -210,7 +212,7 @@ const ask = async ({
if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
// const title = await titleConvo({ endpoint: endpointOption?.endpoint, text, response: responseMessage });
const title = await response.details.title;
await saveConvo(req.user.id, {
await saveConvo(user, {
conversationId: conversationId,
title,
});
@ -227,7 +229,7 @@ const ask = async ({
isCreatedByUser: false,
text: `${getPartialMessage() ?? ''}\n\nError message: "${error.message}"`,
};
await saveMessage(errorMessage);
await saveMessage({ ...errorMessage, user });
handleError(res, errorMessage);
}
};

27
api/server/routes/ask/bingAI.js
View file

@ -67,7 +67,7 @@ router.post('/', setHeaders, async (req, res) => {
});
if (!overrideParentMessageId) {
await saveMessage(userMessage);
await saveMessage({ ...userMessage, user: req.user.id });
await saveConvo(req.user.id, {
...userMessage,
...endpointOption,
@ -100,6 +100,7 @@ const ask = async ({
res,
}) => {
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
const user = req.user.id;
let responseMessageId = crypto.randomUUID();
const model = endpointOption?.jailbreak ? 'Sydney' : 'BingAI';
@ -125,6 +126,7 @@ const ask = async ({
cancelled: false,
error: false,
isCreatedByUser: false,
user,
});
}
},
@ -132,14 +134,14 @@ const ask = async ({
const abortController = new AbortController();
let bingConversationId = null;
if (!isNewConversation) {
const convo = await getConvo(req.user.id, conversationId);
const convo = await getConvo(user, conversationId);
bingConversationId = convo.bingConversationId;
}
try {
let response = await askBing({
text,
userId: req.user.id,
userId: user,
parentMessageId: userParentMessageId,
conversationId: bingConversationId ?? conversationId,
...endpointOption,
@ -194,7 +196,7 @@ const ask = async ({
isCreatedByUser: false,
};
await saveMessage(responseMessage);
await saveMessage({ ...responseMessage, user });
responseMessage.messageId = newResponseMessageId;
let conversationUpdate = {
@ -213,13 +215,14 @@ const ask = async ({
conversationUpdate.invocationId = response.invocationId;
}
await saveConvo(req.user.id, conversationUpdate);
await saveConvo(user, conversationUpdate);
userMessage.messageId = newUserMessageId;
// If response has parentMessageId, the fake userMessage.messageId should be updated to the real one.
if (!overrideParentMessageId) {
await saveMessage({
...userMessage,
user,
messageId: userMessageId,
newMessageId: newUserMessageId,
});
@ -227,9 +230,9 @@ const ask = async ({
userMessageId = newUserMessageId;
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: responseMessage,
});
@ -241,7 +244,7 @@ const ask = async ({
response: responseMessage,
});
await saveConvo(req.user.id, {
await saveConvo(user, {
conversationId: conversationId,
title,
});
@ -263,12 +266,12 @@ const ask = async ({
isCreatedByUser: false,
};
saveMessage(responseMessage);
saveMessage({ ...responseMessage, user });
return {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: responseMessage,
};
@ -286,7 +289,7 @@ const ask = async ({
model,
isCreatedByUser: false,
};
await saveMessage(errorMessage);
await saveMessage({ ...errorMessage, user });
handleError(res, errorMessage);
}
}

16
api/server/routes/ask/google.js
View file

@ -55,6 +55,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
let responseMessageId;
let lastSavedTimestamp = 0;
const { overrideParentMessageId = null } = req.body;
const user = req.user.id;
try {
const getIds = (data) => {
@ -82,6 +83,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
unfinished: true,
cancelled: false,
error: false,
user,
});
}
},
@ -97,7 +99,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
endpointOption.key,
'Your GOOGLE_TOKEN has expired. Please provide your token again.',
);
key = await getUserKey({ userId: req.user.id, name: 'google' });
key = await getUserKey({ userId: user, name: 'google' });
key = JSON.parse(key);
delete endpointOption.key;
console.log('Using service account key provided by User for PaLM models');
@ -120,7 +122,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
let response = await client.sendMessage(text, {
getIds,
user: req.user.id,
user,
conversationId,
parentMessageId,
overrideParentMessageId,
@ -136,18 +138,18 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
response.parentMessageId = overrideParentMessageId;
}
await saveConvo(req.user.id, {
await saveConvo(user, {
...endpointOption,
...endpointOption.modelOptions,
conversationId,
endpoint: 'google',
});
await saveMessage(response);
await saveMessage({ ...response, user });
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: response,
});
@ -164,7 +166,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
error: true,
text: error.message,
};
await saveMessage(errorMessage);
await saveMessage({ ...errorMessage, user });
handleError(res, errorMessage);
}
};

9
api/server/routes/ask/gptPlugins.js
View file

@ -76,6 +76,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
cancelled: false,
error: false,
plugins,
user,
});
}
@ -129,7 +130,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
};
const onChainEnd = () => {
saveMessage(userMessage);
saveMessage({ ...userMessage, user });
sendIntermediateMessage(res, { plugins });
};
@ -182,12 +183,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
console.log('CLIENT RESPONSE');
console.dir(response, { depth: null });
response.plugins = plugins.map((p) => ({ ...p, loading: false }));
await saveMessage(response);
await saveMessage({ ...response, user });
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: response,
});

7
api/server/routes/ask/openAI.js
View file

@ -61,6 +61,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
unfinished: true,
cancelled: false,
error: false,
user,
});
}
@ -113,12 +114,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
response.promptTokens,
response.completionTokens,
);
await saveMessage(response);
await saveMessage({ ...response, user });
sendMessage(res, {
title: await getConvoTitle(req.user.id, conversationId),
title: await getConvoTitle(user, conversationId),
final: true,
conversation: await getConvo(req.user.id, conversationId),
conversation: await getConvo(user, conversationId),
requestMessage: userMessage,
responseMessage: response,
});