Skip to content

GitLab

Commit 5262156c authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

feat: error handling for when ollama is not running

parent 93cffa89
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 18 deletions
src/routes/(app)/+page.svelte
View file @ 5262156c
...@@ -189,17 +189,12 @@ ...@@ -189,17 +189,12 @@
}, },
format: $settings.requestFormat ?? undefined format: $settings.requestFormat ?? undefined
}) })
}).catch((err) => {
console.log(err);
return null;
}); });
if (!res.ok) { if (res && res.ok) {
const error = await res.json();
console.log(error);
if ('detail' in error) {
toast.error(error.detail);
} else {
toast.error(error.error);
}
} else {
const reader = res.body const reader = res.body
.pipeThrough(new TextDecoderStream()) .pipeThrough(new TextDecoderStream())
.pipeThrough(splitStream('\n')) .pipeThrough(splitStream('\n'))
...@@ -275,6 +270,18 @@ ...@@ -275,6 +270,18 @@
history: history 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; stopResponseFlag = false;
......
src/routes/(app)/c/[id]/+page.svelte
View file @ 5262156c
...@@ -216,17 +216,12 @@ ...@@ -216,17 +216,12 @@
}, },
format: $settings.requestFormat ?? undefined format: $settings.requestFormat ?? undefined
}) })
}).catch((err) => {
console.log(err);
return null;
}); });
if (!res.ok) { if (res && res.ok) {
const error = await res.json();
console.log(error);
if ('detail' in error) {
toast.error(error.detail);
} else {
toast.error(error.error);
}
} else {
const reader = res.body const reader = res.body
.pipeThrough(new TextDecoderStream()) .pipeThrough(new TextDecoderStream())
.pipeThrough(splitStream('\n')) .pipeThrough(splitStream('\n'))
...@@ -302,6 +297,18 @@ ...@@ -302,6 +297,18 @@
history: history 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; stopResponseFlag = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment