mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00
feat(db & e2e): Enhance DB Schemas/Controllers and Improve E2E Tests (#966)
* 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:
parent
fd70e21732
commit
6358383001
28 changed files with 229 additions and 72 deletions
|
@ -515,7 +515,7 @@ class BaseClient {
|
||||||
}
|
}
|
||||||
|
|
||||||
async saveMessageToDatabase(message, endpointOptions, user = null) {
|
async saveMessageToDatabase(message, endpointOptions, user = null) {
|
||||||
await saveMessage({ ...message, unfinished: false, cancelled: false });
|
await saveMessage({ ...message, user, unfinished: false, cancelled: false });
|
||||||
await saveConvo(user, {
|
await saveConvo(user, {
|
||||||
conversationId: message.conversationId,
|
conversationId: message.conversationId,
|
||||||
endpoint: this.options.endpoint,
|
endpoint: this.options.endpoint,
|
||||||
|
|
|
@ -108,6 +108,23 @@ module.exports = {
|
||||||
return { message: 'Error getting conversation title' };
|
return { message: 'Error getting conversation title' };
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
/**
|
||||||
|
* Asynchronously deletes conversations and associated messages for a given user and filter.
|
||||||
|
*
|
||||||
|
* @async
|
||||||
|
* @function
|
||||||
|
* @param {string|ObjectId} user - The user's ID.
|
||||||
|
* @param {Object} filter - Additional filter criteria for the conversations to be deleted.
|
||||||
|
* @returns {Promise<{ n: number, ok: number, deletedCount: number, messages: { n: number, ok: number, deletedCount: number } }>}
|
||||||
|
* An object containing the count of deleted conversations and associated messages.
|
||||||
|
* @throws {Error} Throws an error if there's an issue with the database operations.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* const user = 'someUserId';
|
||||||
|
* const filter = { someField: 'someValue' };
|
||||||
|
* const result = await deleteConvos(user, filter);
|
||||||
|
* console.log(result); // { n: 5, ok: 1, deletedCount: 5, messages: { n: 10, ok: 1, deletedCount: 10 } }
|
||||||
|
*/
|
||||||
deleteConvos: async (user, filter) => {
|
deleteConvos: async (user, filter) => {
|
||||||
let toRemove = await Conversation.find({ ...filter, user }).select('conversationId');
|
let toRemove = await Conversation.find({ ...filter, user }).select('conversationId');
|
||||||
const ids = toRemove.map((instance) => instance.conversationId);
|
const ids = toRemove.map((instance) => instance.conversationId);
|
||||||
|
|
|
@ -7,6 +7,7 @@ module.exports = {
|
||||||
Message,
|
Message,
|
||||||
|
|
||||||
async saveMessage({
|
async saveMessage({
|
||||||
|
user,
|
||||||
messageId,
|
messageId,
|
||||||
newMessageId,
|
newMessageId,
|
||||||
conversationId,
|
conversationId,
|
||||||
|
@ -33,6 +34,7 @@ module.exports = {
|
||||||
await Message.findOneAndUpdate(
|
await Message.findOneAndUpdate(
|
||||||
{ messageId },
|
{ messageId },
|
||||||
{
|
{
|
||||||
|
user,
|
||||||
messageId: newMessageId || messageId,
|
messageId: newMessageId || messageId,
|
||||||
conversationId,
|
conversationId,
|
||||||
parentMessageId,
|
parentMessageId,
|
||||||
|
|
|
@ -17,6 +17,7 @@ const convoSchema = mongoose.Schema(
|
||||||
},
|
},
|
||||||
user: {
|
user: {
|
||||||
type: String,
|
type: String,
|
||||||
|
index: true,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
|
messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
|
||||||
|
|
|
@ -14,6 +14,11 @@ const messageSchema = mongoose.Schema(
|
||||||
required: true,
|
required: true,
|
||||||
meiliIndex: true,
|
meiliIndex: true,
|
||||||
},
|
},
|
||||||
|
user: {
|
||||||
|
type: String,
|
||||||
|
index: true,
|
||||||
|
default: null,
|
||||||
|
},
|
||||||
model: {
|
model: {
|
||||||
type: String,
|
type: String,
|
||||||
},
|
},
|
||||||
|
|
|
@ -54,7 +54,7 @@ const createAbortController = (req, res, getAbortData) => {
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
saveMessage(responseMessage);
|
saveMessage({ ...responseMessage, user: req.user.id });
|
||||||
|
|
||||||
return {
|
return {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(req.user.id, conversationId),
|
||||||
|
@ -80,6 +80,7 @@ const handleAbortError = async (res, req, error, data) => {
|
||||||
parentMessageId,
|
parentMessageId,
|
||||||
text: error.message,
|
text: error.message,
|
||||||
shouldSaveMessage: true,
|
shouldSaveMessage: true,
|
||||||
|
user: req.user.id,
|
||||||
};
|
};
|
||||||
const callback = async () => {
|
const callback = async () => {
|
||||||
if (abortControllers.has(conversationId)) {
|
if (abortControllers.has(conversationId)) {
|
||||||
|
|
|
@ -42,7 +42,7 @@ const denyRequest = async (req, res, errorMessage) => {
|
||||||
_convoId && parentMessageId && parentMessageId !== '00000000-0000-0000-0000-000000000000';
|
_convoId && parentMessageId && parentMessageId !== '00000000-0000-0000-0000-000000000000';
|
||||||
|
|
||||||
if (shouldSaveMessage) {
|
if (shouldSaveMessage) {
|
||||||
await saveMessage(userMessage);
|
await saveMessage({ ...userMessage, user: req.user.id });
|
||||||
}
|
}
|
||||||
|
|
||||||
return await sendError(res, {
|
return await sendError(res, {
|
||||||
|
@ -52,6 +52,7 @@ const denyRequest = async (req, res, errorMessage) => {
|
||||||
parentMessageId: userMessage.messageId,
|
parentMessageId: userMessage.messageId,
|
||||||
text: responseText,
|
text: responseText,
|
||||||
shouldSaveMessage,
|
shouldSaveMessage,
|
||||||
|
user: req.user.id,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
let responseMessageId;
|
let responseMessageId;
|
||||||
let lastSavedTimestamp = 0;
|
let lastSavedTimestamp = 0;
|
||||||
let saveDelay = 100;
|
let saveDelay = 100;
|
||||||
|
const user = req.user.id;
|
||||||
|
|
||||||
const getIds = (data) => {
|
const getIds = (data) => {
|
||||||
userMessage = data.userMessage;
|
userMessage = data.userMessage;
|
||||||
|
@ -55,6 +56,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
unfinished: true,
|
unfinished: true,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +82,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
let response = await client.sendMessage(text, {
|
let response = await client.sendMessage(text, {
|
||||||
getIds,
|
getIds,
|
||||||
// debug: true,
|
// debug: true,
|
||||||
user: req.user.id,
|
user,
|
||||||
conversationId,
|
conversationId,
|
||||||
parentMessageId,
|
parentMessageId,
|
||||||
overrideParentMessageId,
|
overrideParentMessageId,
|
||||||
|
@ -98,18 +100,18 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
response.parentMessageId = overrideParentMessageId;
|
response.parentMessageId = overrideParentMessageId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(user, {
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
...endpointOption.modelOptions,
|
...endpointOption.modelOptions,
|
||||||
conversationId,
|
conversationId,
|
||||||
endpoint: 'anthropic',
|
endpoint: 'anthropic',
|
||||||
});
|
});
|
||||||
|
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -48,7 +48,7 @@ router.post('/', setHeaders, async (req, res) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!overrideParentMessageId) {
|
if (!overrideParentMessageId) {
|
||||||
await saveMessage(userMessage);
|
await saveMessage({ ...userMessage, user: req.user.id });
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(req.user.id, {
|
||||||
...userMessage,
|
...userMessage,
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
|
@ -80,7 +80,7 @@ const ask = async ({
|
||||||
res,
|
res,
|
||||||
}) => {
|
}) => {
|
||||||
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
|
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
|
||||||
const userId = req.user.id;
|
const user = req.user.id;
|
||||||
let responseMessageId = crypto.randomUUID();
|
let responseMessageId = crypto.randomUUID();
|
||||||
let getPartialMessage = null;
|
let getPartialMessage = null;
|
||||||
try {
|
try {
|
||||||
|
@ -100,6 +100,7 @@ const ask = async ({
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -114,7 +115,7 @@ const ask = async ({
|
||||||
conversationId,
|
conversationId,
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
abortController,
|
abortController,
|
||||||
userId,
|
userId: user,
|
||||||
onProgress: progressCallback.call(null, { res, text }),
|
onProgress: progressCallback.call(null, { res, text }),
|
||||||
onEventMessage: (eventMessage) => {
|
onEventMessage: (eventMessage) => {
|
||||||
let data = null;
|
let data = null;
|
||||||
|
@ -157,7 +158,7 @@ const ask = async ({
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
await saveMessage(responseMessage);
|
await saveMessage({ ...responseMessage, user });
|
||||||
responseMessage.messageId = newResponseMessageId;
|
responseMessage.messageId = newResponseMessageId;
|
||||||
|
|
||||||
// STEP2 update the conversation
|
// STEP2 update the conversation
|
||||||
|
@ -181,7 +182,7 @@ const ask = async ({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveConvo(req.user.id, conversationUpdate);
|
await saveConvo(user, conversationUpdate);
|
||||||
conversationId = newConversationId;
|
conversationId = newConversationId;
|
||||||
|
|
||||||
// STEP3 update the user message
|
// STEP3 update the user message
|
||||||
|
@ -192,6 +193,7 @@ const ask = async ({
|
||||||
if (!overrideParentMessageId) {
|
if (!overrideParentMessageId) {
|
||||||
await saveMessage({
|
await saveMessage({
|
||||||
...userMessage,
|
...userMessage,
|
||||||
|
user,
|
||||||
messageId: userMessageId,
|
messageId: userMessageId,
|
||||||
newMessageId: newUserMassageId,
|
newMessageId: newUserMassageId,
|
||||||
});
|
});
|
||||||
|
@ -199,9 +201,9 @@ const ask = async ({
|
||||||
userMessageId = newUserMassageId;
|
userMessageId = newUserMassageId;
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: responseMessage,
|
responseMessage: responseMessage,
|
||||||
});
|
});
|
||||||
|
@ -210,7 +212,7 @@ const ask = async ({
|
||||||
if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
|
if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
|
||||||
// const title = await titleConvo({ endpoint: endpointOption?.endpoint, text, response: responseMessage });
|
// const title = await titleConvo({ endpoint: endpointOption?.endpoint, text, response: responseMessage });
|
||||||
const title = await response.details.title;
|
const title = await response.details.title;
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(user, {
|
||||||
conversationId: conversationId,
|
conversationId: conversationId,
|
||||||
title,
|
title,
|
||||||
});
|
});
|
||||||
|
@ -227,7 +229,7 @@ const ask = async ({
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
text: `${getPartialMessage() ?? ''}\n\nError message: "${error.message}"`,
|
text: `${getPartialMessage() ?? ''}\n\nError message: "${error.message}"`,
|
||||||
};
|
};
|
||||||
await saveMessage(errorMessage);
|
await saveMessage({ ...errorMessage, user });
|
||||||
handleError(res, errorMessage);
|
handleError(res, errorMessage);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -67,7 +67,7 @@ router.post('/', setHeaders, async (req, res) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!overrideParentMessageId) {
|
if (!overrideParentMessageId) {
|
||||||
await saveMessage(userMessage);
|
await saveMessage({ ...userMessage, user: req.user.id });
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(req.user.id, {
|
||||||
...userMessage,
|
...userMessage,
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
|
@ -100,6 +100,7 @@ const ask = async ({
|
||||||
res,
|
res,
|
||||||
}) => {
|
}) => {
|
||||||
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
|
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
|
||||||
|
const user = req.user.id;
|
||||||
|
|
||||||
let responseMessageId = crypto.randomUUID();
|
let responseMessageId = crypto.randomUUID();
|
||||||
const model = endpointOption?.jailbreak ? 'Sydney' : 'BingAI';
|
const model = endpointOption?.jailbreak ? 'Sydney' : 'BingAI';
|
||||||
|
@ -125,6 +126,7 @@ const ask = async ({
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -132,14 +134,14 @@ const ask = async ({
|
||||||
const abortController = new AbortController();
|
const abortController = new AbortController();
|
||||||
let bingConversationId = null;
|
let bingConversationId = null;
|
||||||
if (!isNewConversation) {
|
if (!isNewConversation) {
|
||||||
const convo = await getConvo(req.user.id, conversationId);
|
const convo = await getConvo(user, conversationId);
|
||||||
bingConversationId = convo.bingConversationId;
|
bingConversationId = convo.bingConversationId;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let response = await askBing({
|
let response = await askBing({
|
||||||
text,
|
text,
|
||||||
userId: req.user.id,
|
userId: user,
|
||||||
parentMessageId: userParentMessageId,
|
parentMessageId: userParentMessageId,
|
||||||
conversationId: bingConversationId ?? conversationId,
|
conversationId: bingConversationId ?? conversationId,
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
|
@ -194,7 +196,7 @@ const ask = async ({
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
await saveMessage(responseMessage);
|
await saveMessage({ ...responseMessage, user });
|
||||||
responseMessage.messageId = newResponseMessageId;
|
responseMessage.messageId = newResponseMessageId;
|
||||||
|
|
||||||
let conversationUpdate = {
|
let conversationUpdate = {
|
||||||
|
@ -213,13 +215,14 @@ const ask = async ({
|
||||||
conversationUpdate.invocationId = response.invocationId;
|
conversationUpdate.invocationId = response.invocationId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveConvo(req.user.id, conversationUpdate);
|
await saveConvo(user, conversationUpdate);
|
||||||
userMessage.messageId = newUserMessageId;
|
userMessage.messageId = newUserMessageId;
|
||||||
|
|
||||||
// If response has parentMessageId, the fake userMessage.messageId should be updated to the real one.
|
// If response has parentMessageId, the fake userMessage.messageId should be updated to the real one.
|
||||||
if (!overrideParentMessageId) {
|
if (!overrideParentMessageId) {
|
||||||
await saveMessage({
|
await saveMessage({
|
||||||
...userMessage,
|
...userMessage,
|
||||||
|
user,
|
||||||
messageId: userMessageId,
|
messageId: userMessageId,
|
||||||
newMessageId: newUserMessageId,
|
newMessageId: newUserMessageId,
|
||||||
});
|
});
|
||||||
|
@ -227,9 +230,9 @@ const ask = async ({
|
||||||
userMessageId = newUserMessageId;
|
userMessageId = newUserMessageId;
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: responseMessage,
|
responseMessage: responseMessage,
|
||||||
});
|
});
|
||||||
|
@ -241,7 +244,7 @@ const ask = async ({
|
||||||
response: responseMessage,
|
response: responseMessage,
|
||||||
});
|
});
|
||||||
|
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(user, {
|
||||||
conversationId: conversationId,
|
conversationId: conversationId,
|
||||||
title,
|
title,
|
||||||
});
|
});
|
||||||
|
@ -263,12 +266,12 @@ const ask = async ({
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
saveMessage(responseMessage);
|
saveMessage({ ...responseMessage, user });
|
||||||
|
|
||||||
return {
|
return {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: responseMessage,
|
responseMessage: responseMessage,
|
||||||
};
|
};
|
||||||
|
@ -286,7 +289,7 @@ const ask = async ({
|
||||||
model,
|
model,
|
||||||
isCreatedByUser: false,
|
isCreatedByUser: false,
|
||||||
};
|
};
|
||||||
await saveMessage(errorMessage);
|
await saveMessage({ ...errorMessage, user });
|
||||||
handleError(res, errorMessage);
|
handleError(res, errorMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
|
||||||
let responseMessageId;
|
let responseMessageId;
|
||||||
let lastSavedTimestamp = 0;
|
let lastSavedTimestamp = 0;
|
||||||
const { overrideParentMessageId = null } = req.body;
|
const { overrideParentMessageId = null } = req.body;
|
||||||
|
const user = req.user.id;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const getIds = (data) => {
|
const getIds = (data) => {
|
||||||
|
@ -82,6 +83,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
|
||||||
unfinished: true,
|
unfinished: true,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -97,7 +99,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
|
||||||
endpointOption.key,
|
endpointOption.key,
|
||||||
'Your GOOGLE_TOKEN has expired. Please provide your token again.',
|
'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);
|
key = JSON.parse(key);
|
||||||
delete endpointOption.key;
|
delete endpointOption.key;
|
||||||
console.log('Using service account key provided by User for PaLM models');
|
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, {
|
let response = await client.sendMessage(text, {
|
||||||
getIds,
|
getIds,
|
||||||
user: req.user.id,
|
user,
|
||||||
conversationId,
|
conversationId,
|
||||||
parentMessageId,
|
parentMessageId,
|
||||||
overrideParentMessageId,
|
overrideParentMessageId,
|
||||||
|
@ -136,18 +138,18 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
|
||||||
response.parentMessageId = overrideParentMessageId;
|
response.parentMessageId = overrideParentMessageId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveConvo(req.user.id, {
|
await saveConvo(user, {
|
||||||
...endpointOption,
|
...endpointOption,
|
||||||
...endpointOption.modelOptions,
|
...endpointOption.modelOptions,
|
||||||
conversationId,
|
conversationId,
|
||||||
endpoint: 'google',
|
endpoint: 'google',
|
||||||
});
|
});
|
||||||
|
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
@ -164,7 +166,7 @@ const ask = async ({ text, endpointOption, parentMessageId = null, conversationI
|
||||||
error: true,
|
error: true,
|
||||||
text: error.message,
|
text: error.message,
|
||||||
};
|
};
|
||||||
await saveMessage(errorMessage);
|
await saveMessage({ ...errorMessage, user });
|
||||||
handleError(res, errorMessage);
|
handleError(res, errorMessage);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,6 +76,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
plugins,
|
plugins,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,7 +130,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
};
|
};
|
||||||
|
|
||||||
const onChainEnd = () => {
|
const onChainEnd = () => {
|
||||||
saveMessage(userMessage);
|
saveMessage({ ...userMessage, user });
|
||||||
sendIntermediateMessage(res, { plugins });
|
sendIntermediateMessage(res, { plugins });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -182,12 +183,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
console.log('CLIENT RESPONSE');
|
console.log('CLIENT RESPONSE');
|
||||||
console.dir(response, { depth: null });
|
console.dir(response, { depth: null });
|
||||||
response.plugins = plugins.map((p) => ({ ...p, loading: false }));
|
response.plugins = plugins.map((p) => ({ ...p, loading: false }));
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -61,6 +61,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
unfinished: true,
|
unfinished: true,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,12 +114,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
response.promptTokens,
|
response.promptTokens,
|
||||||
response.completionTokens,
|
response.completionTokens,
|
||||||
);
|
);
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,6 +33,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
let lastSavedTimestamp = 0;
|
let lastSavedTimestamp = 0;
|
||||||
let saveDelay = 100;
|
let saveDelay = 100;
|
||||||
const userMessageId = parentMessageId;
|
const userMessageId = parentMessageId;
|
||||||
|
const user = req.user.id;
|
||||||
|
|
||||||
const addMetadata = (data) => (metadata = data);
|
const addMetadata = (data) => (metadata = data);
|
||||||
const getIds = (data) => {
|
const getIds = (data) => {
|
||||||
|
@ -56,6 +57,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
isEdited: true,
|
isEdited: true,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +81,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
const { client } = await initializeClient(req, endpointOption);
|
const { client } = await initializeClient(req, endpointOption);
|
||||||
|
|
||||||
let response = await client.sendMessage(text, {
|
let response = await client.sendMessage(text, {
|
||||||
user: req.user.id,
|
user,
|
||||||
generation,
|
generation,
|
||||||
isContinued,
|
isContinued,
|
||||||
isEdited: true,
|
isEdited: true,
|
||||||
|
@ -107,11 +109,11 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
response.parentMessageId = overrideParentMessageId;
|
response.parentMessageId = overrideParentMessageId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -75,6 +75,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
isEdited: true,
|
isEdited: true,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +90,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
plugin.inputs.push(formattedAction);
|
plugin.inputs.push(formattedAction);
|
||||||
plugin.latest = formattedAction.plugin;
|
plugin.latest = formattedAction.plugin;
|
||||||
if (!start) {
|
if (!start) {
|
||||||
saveMessage(userMessage);
|
saveMessage({ ...userMessage, user });
|
||||||
}
|
}
|
||||||
sendIntermediateMessage(res, { plugin });
|
sendIntermediateMessage(res, { plugin });
|
||||||
// console.log('PLUGIN ACTION', formattedAction);
|
// console.log('PLUGIN ACTION', formattedAction);
|
||||||
|
@ -99,7 +100,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
let { intermediateSteps: steps } = data;
|
let { intermediateSteps: steps } = data;
|
||||||
plugin.outputs = steps && steps[0].action ? formatSteps(steps) : 'An error occurred.';
|
plugin.outputs = steps && steps[0].action ? formatSteps(steps) : 'An error occurred.';
|
||||||
plugin.loading = false;
|
plugin.loading = false;
|
||||||
saveMessage(userMessage);
|
saveMessage({ ...userMessage, user });
|
||||||
sendIntermediateMessage(res, { plugin });
|
sendIntermediateMessage(res, { plugin });
|
||||||
// console.log('CHAIN END', plugin.outputs);
|
// console.log('CHAIN END', plugin.outputs);
|
||||||
};
|
};
|
||||||
|
@ -154,12 +155,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
console.log('CLIENT RESPONSE');
|
console.log('CLIENT RESPONSE');
|
||||||
console.dir(response, { depth: null });
|
console.dir(response, { depth: null });
|
||||||
response.plugin = { ...plugin, loading: false };
|
response.plugin = { ...plugin, loading: false };
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -33,6 +33,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
let lastSavedTimestamp = 0;
|
let lastSavedTimestamp = 0;
|
||||||
let saveDelay = 100;
|
let saveDelay = 100;
|
||||||
const userMessageId = parentMessageId;
|
const userMessageId = parentMessageId;
|
||||||
|
const user = req.user.id;
|
||||||
|
|
||||||
const addMetadata = (data) => (metadata = data);
|
const addMetadata = (data) => (metadata = data);
|
||||||
const getIds = (data) => {
|
const getIds = (data) => {
|
||||||
|
@ -58,6 +59,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
cancelled: false,
|
cancelled: false,
|
||||||
isEdited: true,
|
isEdited: true,
|
||||||
error: false,
|
error: false,
|
||||||
|
user,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +84,7 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
const { client } = await initializeClient(req, endpointOption);
|
const { client } = await initializeClient(req, endpointOption);
|
||||||
|
|
||||||
let response = await client.sendMessage(text, {
|
let response = await client.sendMessage(text, {
|
||||||
user: req.user.id,
|
user,
|
||||||
generation,
|
generation,
|
||||||
isContinued,
|
isContinued,
|
||||||
isEdited: true,
|
isEdited: true,
|
||||||
|
@ -110,12 +112,12 @@ router.post('/', validateEndpoint, buildEndpointOption, setHeaders, async (req,
|
||||||
response.promptTokens,
|
response.promptTokens,
|
||||||
response.completionTokens,
|
response.completionTokens,
|
||||||
);
|
);
|
||||||
await saveMessage(response);
|
await saveMessage({ ...response, user });
|
||||||
|
|
||||||
sendMessage(res, {
|
sendMessage(res, {
|
||||||
title: await getConvoTitle(req.user.id, conversationId),
|
title: await getConvoTitle(user, conversationId),
|
||||||
final: true,
|
final: true,
|
||||||
conversation: await getConvo(req.user.id, conversationId),
|
conversation: await getConvo(user, conversationId),
|
||||||
requestMessage: userMessage,
|
requestMessage: userMessage,
|
||||||
responseMessage: response,
|
responseMessage: response,
|
||||||
});
|
});
|
||||||
|
|
|
@ -46,7 +46,7 @@ const tAgentOptionsSchema = z.object({
|
||||||
|
|
||||||
const tConversationSchema = z.object({
|
const tConversationSchema = z.object({
|
||||||
conversationId: z.string().nullable(),
|
conversationId: z.string().nullable(),
|
||||||
title: z.string(),
|
title: z.string().nullable().or(z.literal('New Chat')).default('New Chat'),
|
||||||
user: z.string().optional(),
|
user: z.string().optional(),
|
||||||
endpoint: eModelEndpointSchema.nullable(),
|
endpoint: eModelEndpointSchema.nullable(),
|
||||||
suggestions: z.array(z.string()).optional(),
|
suggestions: z.array(z.string()).optional(),
|
||||||
|
|
|
@ -17,7 +17,7 @@ router.get('/:conversationId', requireJwtAuth, validateMessageReq, async (req, r
|
||||||
// CREATE
|
// CREATE
|
||||||
router.post('/:conversationId', requireJwtAuth, validateMessageReq, async (req, res) => {
|
router.post('/:conversationId', requireJwtAuth, validateMessageReq, async (req, res) => {
|
||||||
const message = req.body;
|
const message = req.body;
|
||||||
const savedMessage = await saveMessage(message);
|
const savedMessage = await saveMessage({ ...message, user: req.user.id });
|
||||||
await saveConvo(req.user.id, savedMessage);
|
await saveConvo(req.user.id, savedMessage);
|
||||||
res.status(201).send(savedMessage);
|
res.status(201).send(savedMessage);
|
||||||
});
|
});
|
||||||
|
|
|
@ -32,7 +32,8 @@ const sendMessage = (res, message, event = 'message') => {
|
||||||
* @param {function} callback - [Optional] The callback function to be executed.
|
* @param {function} callback - [Optional] The callback function to be executed.
|
||||||
*/
|
*/
|
||||||
const sendError = async (res, options, callback) => {
|
const sendError = async (res, options, callback) => {
|
||||||
const { sender, conversationId, messageId, parentMessageId, text, shouldSaveMessage } = options;
|
const { user, sender, conversationId, messageId, parentMessageId, text, shouldSaveMessage } =
|
||||||
|
options;
|
||||||
const errorMessage = {
|
const errorMessage = {
|
||||||
sender,
|
sender,
|
||||||
messageId: messageId ?? crypto.randomUUID(),
|
messageId: messageId ?? crypto.randomUUID(),
|
||||||
|
@ -50,7 +51,7 @@ const sendError = async (res, options, callback) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shouldSaveMessage) {
|
if (shouldSaveMessage) {
|
||||||
await saveMessage(errorMessage);
|
await saveMessage({ ...errorMessage, user });
|
||||||
}
|
}
|
||||||
|
|
||||||
handleError(res, errorMessage);
|
handleError(res, errorMessage);
|
||||||
|
|
|
@ -79,11 +79,12 @@ export default function NewConversationMenu() {
|
||||||
lastModelUpdate.secondaryModel = conversation.agentOptions.model;
|
lastModelUpdate.secondaryModel = conversation.agentOptions.model;
|
||||||
}
|
}
|
||||||
setLastModel(lastModelUpdate);
|
setLastModel(lastModelUpdate);
|
||||||
setLastConvo(conversation);
|
|
||||||
} else if (endpoint === 'bingAI') {
|
} else if (endpoint === 'bingAI') {
|
||||||
const { jailbreak, toneStyle } = conversation;
|
const { jailbreak, toneStyle } = conversation;
|
||||||
setLastBingSettings({ ...lastBingSettings, jailbreak, toneStyle });
|
setLastBingSettings({ ...lastBingSettings, jailbreak, toneStyle });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setLastConvo(conversation);
|
||||||
}, [conversation]);
|
}, [conversation]);
|
||||||
|
|
||||||
// set the current model
|
// set the current model
|
||||||
|
|
|
@ -9,11 +9,13 @@ const config: PlaywrightTestConfig = {
|
||||||
...mainConfig,
|
...mainConfig,
|
||||||
retries: 0,
|
retries: 0,
|
||||||
globalSetup: require.resolve('./setup/global-setup.local'),
|
globalSetup: require.resolve('./setup/global-setup.local'),
|
||||||
|
globalTeardown: require.resolve('./setup/global-teardown.local'),
|
||||||
webServer: {
|
webServer: {
|
||||||
...mainConfig.webServer,
|
...mainConfig.webServer,
|
||||||
command: `node ${absolutePath}`,
|
command: `node ${absolutePath}`,
|
||||||
env: {
|
env: {
|
||||||
...process.env,
|
...process.env,
|
||||||
|
SEARCH: 'false',
|
||||||
NODE_ENV: 'development',
|
NODE_ENV: 'development',
|
||||||
SESSION_EXPIRY: '60000',
|
SESSION_EXPIRY: '60000',
|
||||||
REFRESH_TOKEN_EXPIRY: '300000',
|
REFRESH_TOKEN_EXPIRY: '300000',
|
||||||
|
|
|
@ -6,6 +6,7 @@ dotenv.config();
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
globalSetup: require.resolve('./setup/global-setup'),
|
globalSetup: require.resolve('./setup/global-setup'),
|
||||||
|
globalTeardown: require.resolve('./setup/global-teardown'),
|
||||||
testDir: 'specs/',
|
testDir: 'specs/',
|
||||||
outputDir: 'specs/.test-results',
|
outputDir: 'specs/.test-results',
|
||||||
/* Run tests in files in parallel.
|
/* Run tests in files in parallel.
|
||||||
|
@ -61,8 +62,10 @@ export default defineConfig({
|
||||||
reuseExistingServer: true,
|
reuseExistingServer: true,
|
||||||
env: {
|
env: {
|
||||||
...process.env,
|
...process.env,
|
||||||
|
SEARCH: 'false',
|
||||||
NODE_ENV: 'development',
|
NODE_ENV: 'development',
|
||||||
SESSION_EXPIRY: '60000',
|
SESSION_EXPIRY: '60000',
|
||||||
|
ALLOW_REGISTRATION: 'true',
|
||||||
REFRESH_TOKEN_EXPIRY: '300000',
|
REFRESH_TOKEN_EXPIRY: '300000',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -2,10 +2,31 @@ import { Page, FullConfig, chromium } from '@playwright/test';
|
||||||
import dotenv from 'dotenv';
|
import dotenv from 'dotenv';
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
type User = { username: string; password: string };
|
type User = { email: string; name: string; password: string };
|
||||||
|
|
||||||
|
async function register(page: Page, user: User) {
|
||||||
|
await page.getByRole('link', { name: 'Sign up' }).click();
|
||||||
|
await page.getByLabel('Full name').click();
|
||||||
|
await page.getByLabel('Full name').fill('test');
|
||||||
|
await page.getByText('Username (optional)').click();
|
||||||
|
await page.getByLabel('Username (optional)').fill('test');
|
||||||
|
await page.getByLabel('Email').click();
|
||||||
|
await page.getByLabel('Email').fill(user.email);
|
||||||
|
await page.getByLabel('Email').press('Tab');
|
||||||
|
await page.getByTestId('password').click();
|
||||||
|
await page.getByTestId('password').fill(user.password);
|
||||||
|
await page.getByTestId('confirm_password').click();
|
||||||
|
await page.getByTestId('confirm_password').fill(user.password);
|
||||||
|
await page.getByLabel('Submit registration').click();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function logout(page: Page, user: User) {
|
||||||
|
await page.getByRole('button', { name: user.name }).click();
|
||||||
|
await page.getByRole('button', { name: 'Log out' }).click();
|
||||||
|
}
|
||||||
|
|
||||||
async function login(page: Page, user: User) {
|
async function login(page: Page, user: User) {
|
||||||
await page.locator('input[name="email"]').fill(user.username);
|
await page.locator('input[name="email"]').fill(user.email);
|
||||||
await page.locator('input[name="password"]').fill(user.password);
|
await page.locator('input[name="password"]').fill(user.password);
|
||||||
await page.locator('input[name="password"]').press('Enter');
|
await page.locator('input[name="password"]').press('Enter');
|
||||||
}
|
}
|
||||||
|
@ -15,22 +36,36 @@ async function authenticate(config: FullConfig, user: User) {
|
||||||
const { baseURL, storageState } = config.projects[0].use;
|
const { baseURL, storageState } = config.projects[0].use;
|
||||||
console.log('🤖: using baseURL', baseURL);
|
console.log('🤖: using baseURL', baseURL);
|
||||||
console.dir(user, { depth: null });
|
console.dir(user, { depth: null });
|
||||||
const browser = await chromium.launch();
|
const browser = await chromium.launch({
|
||||||
|
// headless: false,
|
||||||
|
});
|
||||||
const page = await browser.newPage();
|
const page = await browser.newPage();
|
||||||
console.log('🤖: 🗝 authenticating user:', user.username);
|
console.log('🤖: 🗝 authenticating user:', user.email);
|
||||||
|
|
||||||
if (!baseURL) {
|
if (!baseURL) {
|
||||||
throw new Error('🤖: baseURL is not defined');
|
throw new Error('🤖: baseURL is not defined');
|
||||||
}
|
}
|
||||||
await page.goto(baseURL, { timeout: 5000 });
|
|
||||||
await login(page, user);
|
|
||||||
await page.waitForURL(`${baseURL}/chat/new`);
|
|
||||||
console.log('🤖: ✔️ user successfully authenticated');
|
|
||||||
// Set localStorage before navigating to the page
|
// Set localStorage before navigating to the page
|
||||||
await page.context().addInitScript(() => {
|
await page.context().addInitScript(() => {
|
||||||
localStorage.setItem('navVisible', 'true');
|
localStorage.setItem('navVisible', 'true');
|
||||||
});
|
});
|
||||||
console.log('🤖: ✔️ localStorage: set Nav as Visible', storageState);
|
console.log('🤖: ✔️ localStorage: set Nav as Visible', storageState);
|
||||||
|
|
||||||
|
await page.goto(baseURL, { timeout: 5000 });
|
||||||
|
await register(page, user);
|
||||||
|
await page.waitForURL(`${baseURL}/chat/new`);
|
||||||
|
console.log('🤖: ✔️ user successfully registered');
|
||||||
|
|
||||||
|
// Logout
|
||||||
|
await logout(page, user);
|
||||||
|
await page.waitForURL(`${baseURL}/login`);
|
||||||
|
console.log('🤖: ✔️ user successfully logged out');
|
||||||
|
|
||||||
|
await login(page, user);
|
||||||
|
await page.waitForURL(`${baseURL}/chat/new`);
|
||||||
|
console.log('🤖: ✔️ user successfully authenticated');
|
||||||
|
|
||||||
await page.context().storageState({ path: storageState as string });
|
await page.context().storageState({ path: storageState as string });
|
||||||
console.log('🤖: ✔️ authentication state successfully saved in', storageState);
|
console.log('🤖: ✔️ authentication state successfully saved in', storageState);
|
||||||
await browser.close();
|
await browser.close();
|
||||||
|
|
43
e2e/setup/cleanupUser.ts
Normal file
43
e2e/setup/cleanupUser.ts
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
import connectDb from '@librechat/backend/lib/db/connectDb';
|
||||||
|
import User from '@librechat/backend/models/User';
|
||||||
|
import Session from '@librechat/backend/models/Session';
|
||||||
|
import { deleteMessages } from '@librechat/backend/models/Message';
|
||||||
|
import { deleteConvos } from '@librechat/backend/models/Conversation';
|
||||||
|
type TUser = { email: string; password: string };
|
||||||
|
|
||||||
|
export default async function cleanupUser(user: TUser) {
|
||||||
|
const { email } = user;
|
||||||
|
try {
|
||||||
|
console.log('🤖: global teardown has been started');
|
||||||
|
const db = await connectDb();
|
||||||
|
console.log('🤖: ✅ Connected to Database');
|
||||||
|
|
||||||
|
const { _id } = await User.findOne({ email }).lean();
|
||||||
|
console.log('🤖: ✅ Found user in Database');
|
||||||
|
|
||||||
|
// Delete all conversations & associated messages
|
||||||
|
const { deletedCount, messages } = await deleteConvos(_id, {});
|
||||||
|
|
||||||
|
if (messages.deletedCount > 0 || deletedCount > 0) {
|
||||||
|
console.log(`🤖: ✅ Deleted ${deletedCount} convos & ${messages.deletedCount} messages`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure all user messages are deleted
|
||||||
|
const { deletedCount: deletedMessages } = await deleteMessages({ user: _id });
|
||||||
|
if (deletedMessages > 0) {
|
||||||
|
console.log(`🤖: ✅ Deleted ${deletedMessages} remaining message(s)`);
|
||||||
|
}
|
||||||
|
|
||||||
|
await Session.deleteAllUserSessions(_id);
|
||||||
|
|
||||||
|
await User.deleteMany({ email });
|
||||||
|
|
||||||
|
console.log('🤖: ✅ Deleted user from Database');
|
||||||
|
|
||||||
|
await db.connection.close();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
process.on('uncaughtException', (err) => console.error('Uncaught Exception:', err));
|
|
@ -3,7 +3,8 @@ import authenticate from './authenticate';
|
||||||
|
|
||||||
async function globalSetup(config: FullConfig) {
|
async function globalSetup(config: FullConfig) {
|
||||||
const user = {
|
const user = {
|
||||||
username: String(process.env.E2E_USER_EMAIL),
|
name: 'test',
|
||||||
|
email: String(process.env.E2E_USER_EMAIL),
|
||||||
password: String(process.env.E2E_USER_PASSWORD),
|
password: String(process.env.E2E_USER_PASSWORD),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
12
e2e/setup/global-teardown.local.ts
Normal file
12
e2e/setup/global-teardown.local.ts
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
import localUser from '../config.local';
|
||||||
|
import cleanupUser from './cleanupUser';
|
||||||
|
|
||||||
|
async function globalTeardown() {
|
||||||
|
try {
|
||||||
|
await cleanupUser(localUser);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default globalTeardown;
|
16
e2e/setup/global-teardown.ts
Normal file
16
e2e/setup/global-teardown.ts
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
import cleanupUser from './cleanupUser';
|
||||||
|
|
||||||
|
async function globalTeardown() {
|
||||||
|
const user = {
|
||||||
|
email: String(process.env.E2E_USER_EMAIL),
|
||||||
|
password: String(process.env.E2E_USER_PASSWORD),
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
await cleanupUser(user);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error:', error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default globalTeardown;
|
|
@ -73,7 +73,7 @@ export const tMessageSchema = z.object({
|
||||||
overrideParentMessageId: z.string().nullable().optional(),
|
overrideParentMessageId: z.string().nullable().optional(),
|
||||||
bg: z.string().nullable().optional(),
|
bg: z.string().nullable().optional(),
|
||||||
model: z.string().nullable().optional(),
|
model: z.string().nullable().optional(),
|
||||||
title: z.string().nullable().optional(),
|
title: z.string().nullable().or(z.literal('New Chat')).default('New Chat'),
|
||||||
sender: z.string(),
|
sender: z.string(),
|
||||||
text: z.string(),
|
text: z.string(),
|
||||||
generation: z.string().nullable().optional(),
|
generation: z.string().nullable().optional(),
|
||||||
|
@ -103,7 +103,7 @@ export type TMessage = z.input<typeof tMessageSchema> & {
|
||||||
|
|
||||||
export const tConversationSchema = z.object({
|
export const tConversationSchema = z.object({
|
||||||
conversationId: z.string().nullable(),
|
conversationId: z.string().nullable(),
|
||||||
title: z.string(),
|
title: z.string().nullable().or(z.literal('New Chat')).default('New Chat'),
|
||||||
user: z.string().optional(),
|
user: z.string().optional(),
|
||||||
endpoint: eModelEndpointSchema.nullable(),
|
endpoint: eModelEndpointSchema.nullable(),
|
||||||
suggestions: z.array(z.string()).optional(),
|
suggestions: z.array(z.string()).optional(),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue