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: re-orginazed three ask api. To provide ability to reproduce message.

Browse source 
feat: bing and sydney come to work again, [need more test]
This commit is contained in:
Wentao Lyu 2023-03-15 00:54:50 +08:00
parent 8b00805d24
commit 644f3f716f
5 changed files with 209 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

137
api/server/routes/ask.js
View file

@ -12,12 +12,13 @@ const {
} = require('../../app/');
const { getConvo, saveMessage, getConvoTitle, saveConvo } = require('../../models');
const { handleError, sendMessage } = require('./handlers');
const { getMessages } = require('../../models/Message');
router.use('/bing', askBing);
router.use('/sydney', askSydney);
router.post('/', async (req, res) => {
let { model, text, parentMessageId, conversationId: oldConversationId , chatGptLabel, promptPrefix } = req.body;
let { model, text, parentMessageId, conversationId: oldConversationId , ...convo } = req.body;
if (text.length === 0) {
return handleError(res, { text: 'Prompt empty or too short' });
}
@ -27,21 +28,94 @@ router.post('/', async (req, res) => {
const userMessageId = crypto.randomUUID();
const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000'
let userMessage = {
messageId: userMessageId,
sender: 'User',
text,
parentMessageId: userParentMessageId,
conversationId,
isCreatedByUser: true
messageId: userMessageId,
sender: 'User',
text,
parentMessageId: userParentMessageId,
conversationId,
isCreatedByUser: true
};
console.log('ask log', {
model,
...userMessage,
chatGptLabel,
promptPrefix
...convo
});
// if (model === 'chatgptCustom' && !chatGptLabel && conversationId) {
// const convo = await getConvo({ conversationId });
// if (convo) {
// console.log('found convo for custom gpt', { convo })
// chatGptLabel = convo.chatGptLabel;
// promptPrefix = convo.promptPrefix;
// }
// }
await saveMessage(userMessage);
await saveConvo({ ...userMessage, model, ...convo });
return await ask({
userMessage,
model,
convo,
preSendRequest: true,
req, res
});
})
router.post('/regenerate', async (req, res) => {
const { parentMessageId, model, chatGptLabel, promptPrefix } = req.body;
const oldUserMessage = await getMessages({ messageId: req.body })
if (oldUserMessage) {
const convo = await getConvo(userMessage?.conversationId)
const userMessageId = crypto.randomUUID();
let userMessage = {
...userMessage,
messageId: userMessageId,
};
console.log('ask log for regeneration', {
model,
...userMessage,
...convo
});
return await ask({
userMessage,
model,
convo,
preSendRequest: false,
req, res
});
} else
return handleError(res, { text: 'Parent message not found' });
// if (model === 'chatgptCustom' && !chatGptLabel && conversationId) {
// const convo = await getConvo({ conversationId });
// if (convo) {
// console.log('found convo for custom gpt', { convo })
// chatGptLabel = convo.chatGptLabel;
// promptPrefix = convo.promptPrefix;
// }
// }
// await saveConvo({ ...userMessage, model, chatGptLabel, promptPrefix });
});
const ask = async ({
userMessage,
overrideParentMessageId = null,
model,
convo,
preSendRequest = true,
req, res
}) => {
let { sender, text, parentMessageId: userParentMessageId, conversationId, messageId: userMessageId } = userMessage;
let client;
if (model === 'chatgpt') {
@ -52,15 +126,6 @@ router.post('/', async (req, res) => {
client = browserClient;
}
if (model === 'chatgptCustom' && !chatGptLabel && conversationId) {
const convo = await getConvo({ conversationId });
if (convo) {
console.log('found convo for custom gpt', { convo })
chatGptLabel = convo.chatGptLabel;
promptPrefix = convo.promptPrefix;
}
}
res.writeHead(200, {
Connection: 'keep-alive',
'Content-Type': 'text/event-stream',
@ -69,9 +134,8 @@ router.post('/', async (req, res) => {
'X-Accel-Buffering': 'no'
});
await saveMessage(userMessage);
await saveConvo({ ...userMessage, model, chatGptLabel, promptPrefix });
sendMessage(res, { message: userMessage, created: true });
if (preSendRequest)
sendMessage(res, { message: userMessage, created: true });
try {
let i = 0;
@ -80,12 +144,12 @@ router.post('/', async (req, res) => {
if (i === 0 && typeof partial === 'object') {
userMessage.conversationId = conversationId ? conversationId : partial.conversationId;
await saveMessage(userMessage);
sendMessage(res, { ...partial, initial: true });
sendMessage(res, { ...partial, parentMessageId: overrideParentMessageId || userMessageId, initial: true });
i++;
}
if (typeof partial === 'object') {
sendMessage(res, { ...partial, message: true });
sendMessage(res, { ...partial, parentMessageId: overrideParentMessageId || userMessageId, message: true });
} else {
tokens += partial === text ? '' : partial;
if (tokens.match(/^\n/)) {
@ -107,10 +171,10 @@ router.post('/', async (req, res) => {
progressCallback,
convo: {
parentMessageId: userParentMessageId,
conversationId
conversationId,
...convo
},
chatGptLabel,
promptPrefix
...convo
});
console.log('CLIENT RESPONSE', gptResponse);
@ -118,7 +182,7 @@ router.post('/', async (req, res) => {
if (!gptResponse.parentMessageId) {
gptResponse.text = gptResponse.response;
// gptResponse.id = gptResponse.messageId;
gptResponse.parentMessageId = userMessage.messageId;
gptResponse.parentMessageId = overrideParentMessageId || userMessageId;
userMessage.conversationId = conversationId
? conversationId
: gptResponse.conversationId;
@ -133,23 +197,26 @@ router.post('/', async (req, res) => {
) {
await saveMessage({
messageId: crypto.randomUUID(), sender: model,
conversationId, parentMessageId: userMessageId,
conversationId, parentMessageId: overrideParentMessageId || userMessageId,
error: true, text: 'Prompt empty or too short'});
return handleError(res, { text: 'Prompt empty or too short' });
}
gptResponse.sender = model === 'chatgptCustom' ? chatGptLabel : model;
gptResponse.sender = model === 'chatgptCustom' ? convo.chatGptLabel : model;
// gptResponse.final = true;
gptResponse.text = await detectCode(gptResponse.text);
if (chatGptLabel?.length > 0 && model === 'chatgptCustom') {
gptResponse.chatGptLabel = chatGptLabel;
if (convo.chatGptLabel?.length > 0 && model === 'chatgptCustom') {
gptResponse.chatGptLabel = convo.chatGptLabel;
}
if (promptPrefix?.length > 0 && model === 'chatgptCustom') {
gptResponse.promptPrefix = promptPrefix;
if (convo.promptPrefix?.length > 0 && model === 'chatgptCustom') {
gptResponse.promptPrefix = convo.promptPrefix;
}
// override the parentMessageId, for the regeneration.
gptResponse.parentMessageId = overrideParentMessageId || userMessageId
await saveMessage(gptResponse);
await saveConvo(gptResponse);
sendMessage(res, {
@ -160,7 +227,7 @@ router.post('/', async (req, res) => {
});
res.end();
if (parentMessageId == '00000000-0000-0000-0000-000000000000') {
if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
const title = await titleConvo({
model,
message: text,
@ -184,6 +251,6 @@ router.post('/', async (req, res) => {
await saveMessage(errorMessage);
handleError(res, errorMessage);
}
});
};
module.exports = router;