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

bing hotfix, latest api, uses sydney

Browse source
This commit is contained in:
Daniel Avila 2023-03-20 17:02:37 -04:00
parent d13315c45b
commit 7d796f2c3e
8 changed files with 59 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
api/server/routes/askSydney.js
View file

@ -2,7 +2,7 @@ const express = require('express');
const crypto = require('crypto');
const router = express.Router();
const { titleConvo, askSydney } = require('../../app/');
const { saveMessage, saveConvo, getConvoTitle } = require('../../models');
const { saveBingMessage, saveConvo, getConvoTitle } = require('../../models');
const { handleError, sendMessage, createOnProgress, handleText } = require('./handlers');
router.post('/', async (req, res) => {
@ -21,7 +21,7 @@ router.post('/', async (req, res) => {
const conversationId = oldConversationId || crypto.randomUUID();
const isNewConversation = !oldConversationId;
const userMessageId = crypto.randomUUID();
const userMessageId = convo.messageId;
const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000';
let userMessage = {
messageId: userMessageId,
@ -34,13 +34,13 @@ router.post('/', async (req, res) => {
console.log('ask log', {
model,
...userMessage,
...convo
...convo,
...userMessage
});
if (!overrideParentMessageId) {
await saveMessage(userMessage);
await saveConvo(req?.session?.user?.username, { ...userMessage, model, ...convo });
await saveBingMessage(userMessage);
await saveConvo(req?.session?.user?.username, { model, ...convo, ...userMessage });
}
return await ask({
@ -100,9 +100,9 @@ const ask = async ({
parentMessageId: overrideParentMessageId || userMessageId
}),
convo: {
...convo,
parentMessageId: userParentMessageId,
conversationId,
...convo
conversationId
},
abortController
});
@ -114,9 +114,10 @@ const ask = async ({
convo.conversationSignature || response.conversationSignature;
userMessage.conversationId = response.conversationId || conversationId;
userMessage.invocationId = response.invocationId;
userMessage.messageId = response.parentMessageId || userMessageId;
// Unlike gpt and bing, Sydney will never accept our given userMessage.messageId, it will generate its own one.
if (!overrideParentMessageId)
await saveMessage(userMessage);
await saveBingMessage({ oldMessageId: userMessageId, ...userMessage });
// Save sydney response
// response.id = response.messageId;
@ -140,7 +141,7 @@ const ask = async ({
// Save user message
userMessage.conversationId = response.conversationId || conversationId;
if (!overrideParentMessageId)
await saveMessage(userMessage);
await saveBingMessage(userMessage);
// Bing API will not use our conversationId at the first time,
// so change the placeholder conversationId to the real one.
@ -158,8 +159,8 @@ const ask = async ({
response.text = await handleText(response, true);
// Save sydney response & convo, then send
await saveMessage(response);
await saveConvo(req?.session?.user?.username, { ...response, model, chatGptLabel: null, promptPrefix: null, ...convo });
await saveBingMessage(response);
await saveConvo(req?.session?.user?.username, { model, chatGptLabel: null, promptPrefix: null, ...convo, ...response });
sendMessage(res, {
title: await getConvoTitle(req?.session?.user?.username, conversationId),
@ -191,9 +192,9 @@ const ask = async ({
error: true,
text: error.message
};
await saveMessage(errorMessage);
await saveBingMessage(errorMessage);
handleError(res, errorMessage);
}
};
module.exports = router;
module.exports = router;