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

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);
}
};