diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte index e7d522b1..f6bf0e35 100644 --- a/src/routes/(app)/+page.svelte +++ b/src/routes/(app)/+page.svelte @@ -189,17 +189,12 @@ }, format: $settings.requestFormat ?? undefined }) + }).catch((err) => { + console.log(err); + return null; }); - if (!res.ok) { - const error = await res.json(); - console.log(error); - if ('detail' in error) { - toast.error(error.detail); - } else { - toast.error(error.error); - } - } else { + if (res && res.ok) { const reader = res.body .pipeThrough(new TextDecoderStream()) .pipeThrough(splitStream('\n')) @@ -275,6 +270,18 @@ history: history }); } + } else { + if (res !== null) { + const error = await res.json(); + console.log(error); + if ('detail' in error) { + toast.error(error.detail); + } else { + toast.error(error.error); + } + } else { + toast.error(`Uh-oh! There was an issue connecting to Ollama.`); + } } stopResponseFlag = false; diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte index ff2a9b17..3eec7a5e 100644 --- a/src/routes/(app)/c/[id]/+page.svelte +++ b/src/routes/(app)/c/[id]/+page.svelte @@ -216,17 +216,12 @@ }, format: $settings.requestFormat ?? undefined }) + }).catch((err) => { + console.log(err); + return null; }); - if (!res.ok) { - const error = await res.json(); - console.log(error); - if ('detail' in error) { - toast.error(error.detail); - } else { - toast.error(error.error); - } - } else { + if (res && res.ok) { const reader = res.body .pipeThrough(new TextDecoderStream()) .pipeThrough(splitStream('\n')) @@ -302,6 +297,18 @@ history: history }); } + } else { + if (res !== null) { + const error = await res.json(); + console.log(error); + if ('detail' in error) { + toast.error(error.detail); + } else { + toast.error(error.error); + } + } else { + toast.error(`Uh-oh! There was an issue connecting to Ollama.`); + } } stopResponseFlag = false;