morgan
/
chatgpt-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly parse errors

This commit is contained in:
Niek van der Maas 2023-03-06 20:46:05 +01:00
parent 117f6f2a39
commit ce931c609a
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/Chat.svelte
View File

@ -81,16 +81,7 @@
`Bearer ${$apiKeyStorage}`, `Bearer ${$apiKeyStorage}`,
"Content-Type": "text/event-stream", "Content-Type": "text/event-stream",
}, },
body: JSON.stringify({ body: JSON.stringify(request),
model: "gpt-3.5-turbo",
messages, // Provide the previous messages as well for context
// temperature: 1
// top_p: 1
// n: 1
stream: false,
// stop: null
max_tokens: 4096,
}),
onmessage(ev) { onmessage(ev) {
console.log(ev); console.log(ev);
}, },
@ -119,7 +110,7 @@
...settingsMap.reduce((acc, setting) => { ...settingsMap.reduce((acc, setting) => {
const value = (settings.querySelector(`#settings-${setting.key}`) as HTMLInputElement).value; const value = (settings.querySelector(`#settings-${setting.key}`) as HTMLInputElement).value;
if (value) { if (value) {
acc[setting.key] = parseFloat(value); acc[setting.key] = setting.type === "number" ? parseFloat(value) : value;
} }
return acc; return acc;
}, {}), }, {}),
@ -135,7 +126,7 @@
}) })
).json(); ).json();
} catch (e) { } catch (e) {
response = { status: "error", error: { message: e.message } }; response = { error: { message: e.message } } as Response;
} }
// Hide updating bar // Hide updating bar
@ -157,7 +148,7 @@
const response = await sendRequest(chat.messages); const response = await sendRequest(chat.messages);
if (response.status === "error") { if (response.error) {
addMessage(chatId, { addMessage(chatId, {
role: "error", role: "error",
content: `Error: ${response.error.message}`, content: `Error: ${response.error.message}`,
@ -179,7 +170,7 @@
const response = await sendRequest(chat.messages); const response = await sendRequest(chat.messages);
if (response.status === "error") { if (response.error) {
addMessage(chatId, { addMessage(chatId, {
role: "error", role: "error",
content: `Error: ${response.error.message}`, content: `Error: ${response.error.message}`,

4
src/lib/Types.svelte
View File

@ -40,7 +40,6 @@
}; };
type ResponseOK = { type ResponseOK = {
status: "ok";
id: string; id: string;
object: string; object: string;
created: number; created: number;
@ -53,7 +52,6 @@
}; };
type ResponseError = { type ResponseError = {
status: "error";
error: { error: {
message: string; message: string;
type?: string; type?: string;
@ -62,5 +60,5 @@
}; };
}; };
export type Response = ResponseOK | ResponseError; export type Response = ResponseOK & ResponseError;
</script> </script>