Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
chenpangpang
open-webui
Commits
78b279ca
Commit
78b279ca
authored
Jun 01, 2024
by
Timothy J. Baek
Browse files
refac
parent
fd31b5f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
src/lib/components/chat/Chat.svelte
src/lib/components/chat/Chat.svelte
+14
-15
src/lib/components/chat/Messages/ResponseMessage.svelte
src/lib/components/chat/Messages/ResponseMessage.svelte
+3
-3
No files found.
src/lib/components/chat/Chat.svelte
View file @
78b279ca
...
...
@@ -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.error
C
ontent
=
error.detail;
responseMessage.error
= { c
ontent
:
error.detail
}
;
} else {
toast.error(error.error);
responseMessage.error
C
ontent
=
error.error;
responseMessage.error
= { c
ontent
:
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;
...
...
src/lib/components/chat/Messages/ResponseMessage.svelte
View file @
78b279ca
...
...
@@ -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.error
C
ontent ?? message.content}
{message
?
.error
?.c
ontent ?? message.content}
</div>
</div>
{/if}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment