Merge pull request #70 from yfguo/improve-error-handling

allow error message to be cleared

Author: bcote-anl

backend/open_webui/routers/openai.py

@@ -1015,10 +1015,11 @@ async def generate_chat_completion(
             )
         else:
             try:
+                log.debug(f"response: {r}")
                 response = await r.json()
             except Exception as e:
                 log.debug(f"response: {r}")
-                r.raise_for_status()
+            r.raise_for_status()
             return response
     except Exception as e:
         log.exception(e)

src/lib/components/chat/MessageInput.svelte

@@ -107,6 +107,13 @@
 	let inputVariables = {};
 	let inputVariableValues = {};
 
+	let currentMessage = null;
+	let showStopButton = false;
+	$: currentMessage = history?.messages?.[history?.currentId ?? ''] ?? null;
+	$: showStopButton =
+		(Array.isArray(taskIds) && taskIds.length > 0) ||
+		(currentMessage?.role === 'assistant' && currentMessage?.done !== true);
+
 	$: onChange({
 		prompt,
 		files: files
@@ -1819,7 +1826,7 @@
 											</Tooltip>
 										{/if}
 
-										{#if (taskIds && taskIds.length > 0) || (history.currentId && history.messages[history.currentId]?.done != true)}
+										{#if showStopButton}
 											<div class=" flex items-center">
 												<Tooltip content={$i18n.t('Stop')}>
 													<button

src/lib/components/chat/Messages/Error.svelte

@@ -1,15 +1,33 @@
 <script lang="ts">
+	import { createEventDispatcher, getContext } from 'svelte';
+	import type { Writable } from 'svelte/store';
+	import type { i18n as i18nType } from 'i18next';
+
 	import Info from '$lib/components/icons/Info.svelte';
 
+	const i18n = getContext<Writable<i18nType>>('i18n');
+	const dispatch = createEventDispatcher();
+
 	export let content = '';
+
+	const handleClear = () => {
+		dispatch('clear');
+	};
 </script>
 
 <div class="flex my-2 gap-2.5 border px-4 py-3 border-red-600/10 bg-red-600/10 rounded-lg">
-	<div class=" self-start mt-0.5">
+	<div class="self-start mt-0.5">
 		<Info className="size-5 text-red-700 dark:text-red-400" />
 	</div>
 
-	<div class=" self-center text-sm">
-		{typeof content === 'string' ? content : JSON.stringify(content)}
+	<div class="flex flex-col gap-2 text-sm text-left">
+		<div>{typeof content === 'string' ? content : JSON.stringify(content)}</div>
+		<button
+			type="button"
+			class="self-start rounded-md border border-red-500/40 bg-transparent px-3 py-1 text-xs font-medium text-red-700 transition hover:bg-red-500/10 dark:text-red-300"
+			on:click={handleClear}
+		>
+			{$i18n.t('Clear')}
+		</button>
 	</div>
 </div>

src/lib/components/chat/Messages/ResponseMessage.svelte

@@ -150,6 +150,9 @@
 
 	let messageIndexEdit = false;
 
+	let hideMessage = false;
+	$: hideMessage = message?.hidden ?? false;
+
 	let audioParts: Record<number, HTMLAudioElement | null> = {};
 	let speaking = false;
 	let speakingIdx: number | undefined;
@@ -194,6 +197,30 @@
 		});
 	};
 
+	const clearResponseError = () => {
+		const target = history?.messages?.[message.id];
+		if (!target) {
+			return;
+		}
+
+		const updatedMessage = {
+			...target,
+			done: true,
+			content: '',
+			hidden: true
+		};
+		delete updatedMessage.error;
+
+		history.messages = {
+			...history.messages,
+			[message.id]: updatedMessage
+		};
+		message = JSON.parse(JSON.stringify(updatedMessage));
+		history.currentId = message.id;
+
+		updateChat?.();
+	};
+
 	const toggleSpeakMessage = async () => {
 		if (speaking) {
 			try {
@@ -599,7 +626,7 @@
 
 {#key message.id}
 	<div
-		class=" flex w-full message-{message.id}"
+		class={`flex w-full message-${message.id} ${hideMessage ? 'hidden' : ''}`}
 		id="message-{message.id}"
 		dir={$settings.chatDirection}
 	>
@@ -853,7 +880,7 @@
 								{/if}
 
 								{#if message?.error}
-									<Error content={message?.error?.content ?? message.content} />
+									<Error content={message?.error?.content ?? message.content} on:clear={clearResponseError} />
 								{/if}
 
 								{#if (message?.sources || message?.citations) && (model?.info?.meta?.capabilities?.citations ?? true)}