UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-03-14 16:28:30 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy J. Baek 2024-06-01 10:19:27 -07:00
parent fd31b5f8d6
commit 78b279cabc
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/components/chat/Chat.svelte
View File

@ -680,8 +680,10 @@
responseMessage.done = true;
if (responseMessage.content == '') {
responseMessage.error = true;
responseMessage.errorContent = 'Oops! No text generated from Ollama, Please try again.';
responseMessage.error = {
code: 400,
content: `Oops! No text generated from Ollama, Please try again.`
};
}
responseMessage.context = data.context ?? null;
@ -753,24 +755,21 @@
console.log(error);
if ('detail' in error) {
toast.error(error.detail);
responseMessage.errorContent = error.detail;
responseMessage.error = { content: error.detail };
} else {
toast.error(error.error);
responseMessage.errorContent = error.error;
responseMessage.error = { content: error.error };
}
} else {
toast.error(
$i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, { provider: 'Ollama' })
);
responseMessage.errorContent = $i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
provider: 'Ollama'
});
responseMessage.error = {
content: $i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
provider: 'Ollama'
})
};
}
responseMessage.error = true;
responseMessage.errorContent = $i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
provider: 'Ollama'
});
responseMessage.done = true;
messages = messages;
}
@ -1034,13 +1033,13 @@
errorMessage = innerError.message;
}
responseMessage.error = true;
responseMessage.errorContent =
$i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
responseMessage.error = {
content: $i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
provider: model.name ?? model.id
}) +
'\n' +
errorMessage;
};
responseMessage.done = true;
messages = messages;

6
src/lib/components/chat/Messages/ResponseMessage.svelte
View File

@ -453,7 +453,7 @@
<div class="w-full">
{#if message.content === '' && !message.error}
<Skeleton />
{:else if !message.error || message.errorContent}
{:else if !message.error}
{#each tokens as token, tokenIdx}
{#if token.type === 'code'}
<CodeBlock
@ -471,7 +471,7 @@
{/if}
{/each}
{/if}
{#if message.error === true}
{#if message.error}
<div
class="flex mt-2 mb-4 space-x-2 border px-4 py-3 border-red-800 bg-red-800/30 font-medium rounded-lg"
>
@ -491,7 +491,7 @@
</svg>
<div class=" self-center">
{message.errorContent ?? message.content}
{message?.error?.content ?? message.content}
</div>
</div>
{/if}