OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-26 18:26:48 +00:00
Code Issues Actions 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; responseMessage.done = true;
if (responseMessage.content == '') { if (responseMessage.content == '') {
responseMessage.error = true; responseMessage.error = {
responseMessage.errorContent = 'Oops! No text generated from Ollama, Please try again.'; code: 400,
content: `Oops! No text generated from Ollama, Please try again.`
};
} }
responseMessage.context = data.context ?? null; responseMessage.context = data.context ?? null;
@ -753,24 +755,21 @@
console.log(error); console.log(error);
if ('detail' in error) { if ('detail' in error) {
toast.error(error.detail); toast.error(error.detail);
responseMessage.errorContent = error.detail; responseMessage.error = { content: error.detail };
} else { } else {
toast.error(error.error); toast.error(error.error);
responseMessage.errorContent = error.error; responseMessage.error = { content: error.error };
} }
} else { } else {
toast.error( toast.error(
$i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, { provider: 'Ollama' }) $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}}.`, { responseMessage.error = {
provider: 'Ollama' 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; responseMessage.done = true;
messages = messages; messages = messages;
} }
@ -1034,13 +1033,13 @@
errorMessage = innerError.message; errorMessage = innerError.message;
} }
responseMessage.error = true; responseMessage.error = {
responseMessage.errorContent = content: $i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
$i18n.t(`Uh-oh! There was an issue connecting to {{provider}}.`, {
provider: model.name ?? model.id provider: model.name ?? model.id
}) + }) +
'\n' + '\n' +
errorMessage; errorMessage;
};
responseMessage.done = true; responseMessage.done = true;
messages = messages; messages = messages;

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

@ -453,7 +453,7 @@
<div class="w-full"> <div class="w-full">
{#if message.content === '' && !message.error} {#if message.content === '' && !message.error}
<Skeleton /> <Skeleton />
{:else if !message.error || message.errorContent} {:else if !message.error}
{#each tokens as token, tokenIdx} {#each tokens as token, tokenIdx}
{#if token.type === 'code'} {#if token.type === 'code'}
<CodeBlock <CodeBlock
@ -471,7 +471,7 @@
{/if} {/if}
{/each} {/each}
{/if} {/if}
{#if message.error === true} {#if message.error}
<div <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" 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> </svg>
<div class=" self-center"> <div class=" self-center">
{message.errorContent ?? message.content} {message?.error?.content ?? message.content}
</div> </div>
</div> </div>
{/if} {/if}