Skip to content

Commit d38e463

Browse files
authored
fix(bingAI): markdown and error formatting for final stream response (danny-avila#829)
* fix(bingAI): markdown formatting for final stream response due to new strict payload validation on the frontend * fix: add missing prop to bing Error response
1 parent 7dc27b1 commit d38e463

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

api/server/routes/ask/bingAI.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ const ask = async ({
102102
let { text, parentMessageId: userParentMessageId, messageId: userMessageId } = userMessage;
103103

104104
let responseMessageId = crypto.randomUUID();
105+
const model = endpointOption?.jailbreak ? 'Sydney' : 'BingAI';
105106

106107
if (preSendRequest) {
107108
sendMessage(res, { message: userMessage, created: true });
@@ -115,13 +116,15 @@ const ask = async ({
115116
lastSavedTimestamp = currentTimestamp;
116117
saveMessage({
117118
messageId: responseMessageId,
118-
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
119+
sender: model,
119120
conversationId,
120121
parentMessageId: overrideParentMessageId || userMessageId,
122+
model,
121123
text: text,
122124
unfinished: true,
123125
cancelled: false,
124126
error: false,
127+
isCreatedByUser: false,
125128
});
126129
}
127130
},
@@ -178,14 +181,16 @@ const ask = async ({
178181
messageId: responseMessageId,
179182
newMessageId: newResponseMessageId,
180183
parentMessageId: overrideParentMessageId || newUserMessageId,
181-
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
184+
sender: model,
182185
text: await handleText(response, true),
186+
model,
183187
suggestions:
184188
response.details.suggestedResponses &&
185189
response.details.suggestedResponses.map((s) => s.text),
186190
unfinished,
187191
cancelled: false,
188192
error: false,
193+
isCreatedByUser: false,
189194
};
190195

191196
await saveMessage(responseMessage);
@@ -246,14 +251,15 @@ const ask = async ({
246251
if (partialText?.length > 2) {
247252
const responseMessage = {
248253
messageId: responseMessageId,
249-
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
254+
sender: model,
250255
conversationId,
251256
parentMessageId: overrideParentMessageId || userMessageId,
252257
text: partialText,
253-
model: endpointOption.modelOptions.model,
258+
model,
254259
unfinished: true,
255260
cancelled: false,
256261
error: false,
262+
isCreatedByUser: false,
257263
};
258264

259265
saveMessage(responseMessage);
@@ -269,13 +275,15 @@ const ask = async ({
269275
console.log(error);
270276
const errorMessage = {
271277
messageId: responseMessageId,
272-
sender: endpointOption?.jailbreak ? 'Sydney' : 'BingAI',
278+
sender: model,
273279
conversationId,
274280
parentMessageId: overrideParentMessageId || userMessageId,
275281
unfinished: false,
276282
cancelled: false,
277283
error: true,
278284
text: error.message,
285+
model,
286+
isCreatedByUser: false,
279287
};
280288
await saveMessage(errorMessage);
281289
handleError(res, errorMessage);

client/src/components/Messages/Content/MessageContent.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ const EditMessage = ({
6161

6262
const resubmitMessage = () => {
6363
const text = textEditor?.current?.innerText ?? '';
64-
console.log('siblingIdx:', siblingIdx);
6564
if (message.isCreatedByUser) {
6665
ask({
6766
text,

0 commit comments

Comments
 (0)