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

clean code with newConversationId in askbingai

Browse source 
Revert "Merge pull request #167 from danny-avila/fix-sydney"

This reverts commit 15999bda95, reversing
changes made to e1c6517b8f.
This commit is contained in:
Wentao Lyu 2023-04-07 23:13:13 +08:00
parent d79d297441
commit 9623fe2e9f
1 changed files with 46 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

91
api/server/routes/ask/askBingAI.js
View file

@ -35,21 +35,21 @@ router.post('/', async (req, res) => {
let endpointOption = {}; let endpointOption = {};
if (req.body?.jailbreak) if (req.body?.jailbreak)
endpointOption = { endpointOption = {
jailbreak: req.body?.jailbreak || false, jailbreak: req.body?.jailbreak ?? false,
jailbreakConversationId: req.body?.jailbreakConversationId || null, jailbreakConversationId: req.body?.jailbreakConversationId ?? null,
systemMessage: req.body?.systemMessage || null, systemMessage: req.body?.systemMessage ?? null,
context: req.body?.context || null, context: req.body?.context ?? null,
toneStyle: req.body?.toneStyle || 'fast' toneStyle: req.body?.toneStyle ?? 'fast'
}; };
else else
endpointOption = { endpointOption = {
jailbreak: req.body?.jailbreak || false, jailbreak: req.body?.jailbreak ?? false,
systemMessage: req.body?.systemMessage || null, systemMessage: req.body?.systemMessage ?? null,
context: req.body?.context || null, context: req.body?.context ?? null,
conversationSignature: req.body?.conversationSignature || null, conversationSignature: req.body?.conversationSignature ?? null,
clientId: req.body?.clientId || null, clientId: req.body?.clientId ?? null,
invocationId: req.body?.invocationId || null, invocationId: req.body?.invocationId ?? null,
toneStyle: req.body?.toneStyle || 'fast' toneStyle: req.body?.toneStyle ?? 'fast'
}; };
console.log('ask log', { console.log('ask log', {
@ -122,31 +122,23 @@ const ask = async ({
console.log('BING RESPONSE', response); console.log('BING RESPONSE', response);
const newConversationId = endpointOption?.jailbreak
? response.jailbreakConversationId
: response.conversationId || conversationId;
const newUserMassageId = response.parentMessageId || response.details.requestId || userMessageId;
const newResponseMessageId = response.messageId || response.details.messageId;
// STEP1 generate response message // STEP1 generate response message
response.text = response.response || response.details.spokenText || '**Bing refused to answer.**'; response.text = response.response || response.details.spokenText || '**Bing refused to answer.**';
let responseMessage = { let responseMessage = {
conversationId: newConversationId,
messageId: newResponseMessageId,
parentMessageId: overrideParentMessageId || newUserMassageId,
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
text: await handleText(response, true), text: await handleText(response, true),
suggestions: suggestions: response.details.suggestedResponses && response.details.suggestedResponses.map(s => s.text)
response.details.suggestedResponses && response.details.suggestedResponses.map(s => s.text),
jailbreak: endpointOption?.jailbreak
}; };
// // response.text = await handleText(response, true);
// response.suggestions =
// response.details.suggestedResponses && response.details.suggestedResponses.map(s => s.text);
if (endpointOption?.jailbreak) {
responseMessage.conversationId = response.jailbreakConversationId;
responseMessage.messageId = response.messageId || response.details.messageId;
responseMessage.parentMessageId = overrideParentMessageId || response.parentMessageId || userMessageId;
responseMessage.sender = 'Sydney';
} else {
responseMessage.conversationId = response.conversationId;
responseMessage.messageId = response.messageId || response.details.messageId;
responseMessage.parentMessageId =
overrideParentMessageId || response.parentMessageId || response.details.requestId || userMessageId;
responseMessage.sender = 'BingAI';
}
await saveMessage(responseMessage); await saveMessage(responseMessage);
@ -159,14 +151,22 @@ const ask = async ({
// Attition: the api will also create new conversationId while using invalid userMessage.parentMessageId, // Attition: the api will also create new conversationId while using invalid userMessage.parentMessageId,
// but in this situation, don't change the conversationId, but create new convo. // but in this situation, don't change the conversationId, but create new convo.
let conversationUpdate = { conversationId, endpoint: 'bingAI' }; let conversationUpdate = { conversationId: newConversationId, endpoint: 'bingAI' };
if (conversationId != responseMessage.conversationId && isNewConversation) if (conversationId != newConversationId)
conversationUpdate = { if (isNewConversation) {
...conversationUpdate, // change the conversationId to new one
conversationId: conversationId, conversationUpdate = {
newConversationId: responseMessage.conversationId || conversationId ...conversationUpdate,
}; conversationId: conversationId,
conversationId = responseMessage.conversationId || conversationId; newConversationId: newConversationId
};
} else {
// create new conversation
conversationUpdate = {
...conversationUpdate,
...endpointOption
};
}
if (endpointOption?.jailbreak) { if (endpointOption?.jailbreak) {
conversationUpdate.jailbreak = true; conversationUpdate.jailbreak = true;
@ -179,17 +179,16 @@ const ask = async ({
} }
await saveConvo(req?.session?.user?.username, conversationUpdate); await saveConvo(req?.session?.user?.username, conversationUpdate);
conversationId = newConversationId;
// STEP3 update the user message // STEP3 update the user message
userMessage.conversationId = conversationId; userMessage.conversationId = newConversationId;
userMessage.messageId = responseMessage.parentMessageId; userMessage.messageId = newUserMassageId;
// 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)
const oldUserMessageId = userMessageId; await saveMessage({ ...userMessage, messageId: userMessageId, newMessageId: newUserMassageId });
await saveMessage({ ...userMessage, messageId: oldUserMessageId, newMessageId: userMessage.messageId }); userMessageId = newUserMassageId;
}
userMessageId = userMessage.messageId;
sendMessage(res, { sendMessage(res, {
title: await getConvoTitle(req?.session?.user?.username, conversationId), title: await getConvoTitle(req?.session?.user?.username, conversationId),