Skip to content

Commit

Permalink
feat: allow disabling streaming for all clients
Browse files Browse the repository at this point in the history
  • Loading branch information
@waylaidwanderer
waylaidwanderer committed Mar 18, 2023
1 parent 5c6eefd commit 56f9818
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 51 deletions.
132 changes: 84 additions & 48 deletions components/Chat.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,15 @@ const sendMessage = async (input) => {
};
}
let stream = true;
if (typeof activePresetToUse.value?.options?.stream !== 'undefined') {
stream = activePresetToUse.value?.options?.stream;
}
const data = {
...conversationData.value,
message: input,
stream: true,
stream,
clientOptions,
};
Expand All @@ -183,6 +188,81 @@ const sendMessage = async (input) => {
body: JSON.stringify(data),
};
const handleMessageResult = (result) => {
console.debug(result);
messages.value[userMessageIndex].id = result.parentMessageId;
messages.value[botMessageIndex].id = result.messageId;
messages.value[botMessageIndex].parentMessageId = result.parentMessageId;
let conversationId;
if (result.jailbreakConversationId) {
// Bing jailbreak mode
conversationId = result.jailbreakConversationId;
conversationData.value = {
jailbreakConversationId: result.jailbreakConversationId,
parentMessageId: result.messageId,
};
} else if (result.conversationSignature) {
// Bing
conversationId = result.conversationId;
conversationData.value = {
conversationId: result.conversationId,
conversationSignature: result.conversationSignature,
clientId: result.clientId,
invocationId: result.invocationId,
};
} else {
// other clients
conversationId = result.conversationId;
conversationData.value = {
conversationId: result.conversationId,
parentMessageId: result.messageId,
title: result.title,
};
}
const adaptiveText = result.details.adaptiveCards?.[0]?.body?.[0]?.text?.trim();
if (adaptiveText) {
console.debug('adaptiveText', adaptiveText);
messages.value[botMessageIndex].text = adaptiveText;
} else {
messages.value[botMessageIndex].text = result.response;
}
messages.value[botMessageIndex].raw = result;
if (result.details.suggestedResponses) {
suggestedResponses.value = result.details.suggestedResponses.map(response => response.text);
}
updateConversation(conversationId, conversationData.value, messages.value, activePresetNameToUse.value, activePresetToUse.value);
nextTick().then(() => {
setChatContainerHeight();
inputTextElement.value.focus();
});
};
if (!stream) {
const result = await fetch(`${config.apiBaseUrl}/conversation`, {
...opts,
signal: processingController.value.signal,
});
processingController.value = null;
if (result.status === 200) {
const json = await result.json();
handleMessageResult(json);
} else {
let errorData = await result.text();
messages.value[botMessageIndex].error = true;
messages.value[botMessageIndex].raw = errorData;
try {
errorData = JSON.parse(errorData);
messages.value[botMessageIndex].text = errorData.error || 'An error occurred. Please try again.';
} catch {
messages.value[botMessageIndex].text = `\`\`\`\n${errorData.toString().trim()}\n\`\`\``;
}
}
return;
}
try {
await fetchEventSource(`${config.apiBaseUrl}/conversation`, {
...opts,
Expand All @@ -207,59 +287,15 @@ const sendMessage = async (input) => {
}
if (eventMessage.event === 'result') {
const result = JSON.parse(eventMessage.data);
console.debug(result);
messages.value[userMessageIndex].id = result.parentMessageId;
messages.value[botMessageIndex].id = result.messageId;
messages.value[botMessageIndex].parentMessageId = result.parentMessageId;
let conversationId;
if (result.jailbreakConversationId) {
// Bing jailbreak mode
conversationId = result.jailbreakConversationId;
conversationData.value = {
jailbreakConversationId: result.jailbreakConversationId,
parentMessageId: result.messageId,
};
} else if (result.conversationSignature) {
// Bing
conversationId = result.conversationId;
conversationData.value = {
conversationId: result.conversationId,
conversationSignature: result.conversationSignature,
clientId: result.clientId,
invocationId: result.invocationId,
};
} else {
// other clients
conversationId = result.conversationId;
conversationData.value = {
conversationId: result.conversationId,
parentMessageId: result.messageId,
title: result.title,
};
}
const adaptiveText = result.details.adaptiveCards?.[0]?.body?.[0]?.text?.trim();
if (adaptiveText) {
console.debug('adaptiveText', adaptiveText);
messages.value[botMessageIndex].text = adaptiveText;
} else {
messages.value[botMessageIndex].text = result.response;
}
messages.value[botMessageIndex].raw = result;
if (result.details.suggestedResponses) {
suggestedResponses.value = result.details.suggestedResponses.map(response => response.text);
}
updateConversation(conversationId, conversationData.value, messages.value, activePresetNameToUse.value, activePresetToUse.value);
nextTick(() => {
setChatContainerHeight();
});
handleMessageResult(result);
return;
}
if (eventMessage.event === 'error') {
const eventMessageData = JSON.parse(eventMessage.data);
messages.value[botMessageIndex].text = eventMessageData.error || 'An error occurred. Please try again.';
messages.value[botMessageIndex].text = eventMessageData.error ? `\`\`\`\n${eventMessageData.error.toString().trim()}\n\`\`\`` : 'An error occurred. Please try again.';
messages.value[botMessageIndex].error = true;
messages.value[botMessageIndex].raw = eventMessageData;
nextTick().then(() => scrollToBottom());
nextTick().then(() => setChatContainerHeight());
return;
}
messages.value[botMessageIndex].text += JSON.parse(eventMessage.data);
Expand Down
20 changes: 17 additions & 3 deletions components/Chat/ClientSettings.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ const props = defineProps({
const availableOptions = {
chatgpt: {
stream: {
type: 'checkbox',
label: 'Stream',
default: true,
},
clientOptions: {
type: 'nested',
label: 'Client Options',
Expand Down Expand Up @@ -114,6 +119,11 @@ const availableOptions = {
},
},
'chatgpt-browser': {
stream: {
type: 'checkbox',
label: 'Stream',
default: true,
},
clientOptions: {
type: 'nested',
label: 'Client Options',
Expand All @@ -134,6 +144,11 @@ const availableOptions = {
},
},
bing: {
stream: {
type: 'checkbox',
label: 'Stream',
default: true,
},
jailbreakMode: {
type: 'checkbox',
label: 'Jailbreak Mode',
Expand Down Expand Up @@ -230,7 +245,7 @@ const generateForm = (options, parentKey, levels = 0) => Object.entries(options)
classList = `${classList} shadow-inner bg-white/5 px-3`;
break;
}
const inputValue = get(formClientOptions.value, optionKey);
const inputValue = get(formClientOptions.value, optionKey, option.default);
let inputElement;
switch (option.type) {
case 'textarea':
Expand Down Expand Up @@ -267,7 +282,6 @@ const generateForm = (options, parentKey, levels = 0) => Object.entries(options)
value: inputValue,
onChange: (e) => {
const targetValue = e.target.value;
console.log(targetValue);
if (!targetValue) {
unset(formClientOptions.value, optionKey);
} else {
Expand All @@ -277,7 +291,7 @@ const generateForm = (options, parentKey, levels = 0) => Object.entries(options)
class: classList,
}, [
h('option', { value: '' }, 'default server value'),
...option.options.map((option) => h('option', { value: option.value }, option.label)),
...option.options.map(_option => h('option', { value: _option.value }, _option.label)),
]);
break;
default:
Expand Down

0 comments on commit 56f9818

Please sign in to comment.