Merge pull request #3948 from open-webui/dev

0.3.10

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.10] - 2024-07-17
+
+### Fixed
+
+- **🔄 Improved File Upload**: Addressed the issue where file uploads lacked animation.
+- **💬 Chat Continuity**: Fixed a problem where existing chats were not functioning properly in some instances.
+- **🗂️ Chat File Reset**: Resolved the issue of chat files not resetting for new conversations, now ensuring a clean slate for each chat session.
+- **📁 Document Workspace Uploads**: Corrected the handling of document uploads in the workspace using the Files API.
+
 ## [0.3.9] - 2024-07-17
 
 ### Added
@@ -27,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- **⬆️ Dependency Updates** 
+- **⬆️ Dependency Updates**
   - Upgraded 'pydantic' from version 2.7.1 to 2.8.2.
   - Upgraded 'sqlalchemy' from version 2.0.30 to 2.0.31.
   - Upgraded 'unstructured' from version 0.14.9 to 0.14.10.

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "open-webui",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "open-webui",
-			"version": "0.3.9",
+			"version": "0.3.10",
 			"dependencies": {
 				"@codemirror/lang-javascript": "^6.2.2",
 				"@codemirror/lang-python": "^6.1.6",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "open-webui",
-	"version": "0.3.9",
+	"version": "0.3.10",
 	"private": true,
 	"scripts": {
 		"dev": "npm run pyodide:fetch && vite dev --host",

src/lib/components/chat/Chat.svelte

@@ -264,6 +264,8 @@
 			messages: {},
 			currentId: null
 		};
+
+		chatFiles = [];
 		params = {};
 
 		if ($page.url.searchParams.get('models')) {
@@ -335,7 +337,7 @@
 				}
 
 				params = chatContent?.params ?? {};
-				chatFiles = chatContent?.files ?? {};
+				chatFiles = chatContent?.files ?? [];
 
 				autoScroll = true;
 				await tick();
@@ -770,6 +772,11 @@
 		if (model?.info?.meta?.knowledge ?? false) {
 			files.push(...model.info.meta.knowledge);
 		}
+		if (responseMessage?.files) {
+			files.push(
+				...responseMessage?.files.filter((item) => ['web_search_results'].includes(item.type))
+			);
+		}
 
 		eventTarget.dispatchEvent(
 			new CustomEvent('chat:start', {
@@ -1005,6 +1012,11 @@
 		if (model?.info?.meta?.knowledge ?? false) {
 			files.push(...model.info.meta.knowledge);
 		}
+		if (responseMessage?.files) {
+			files.push(
+				...responseMessage?.files.filter((item) => ['web_search_results'].includes(item.type))
+			);
+		}
 
 		scrollToBottom();
 

src/lib/components/chat/MessageInput.svelte

@@ -545,6 +545,7 @@
 											<FileItem
 												name={file.name}
 												type={file.type}
+												status={file.status}
 												dismissible={true}
 												on:dismiss={() => {
 													files.splice(fileIdx, 1);

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

@@ -566,6 +566,11 @@
 											const metadata = citation.metadata?.[index];
 											const id = metadata?.source ?? 'N/A';
 											let source = citation?.source;
+
+											if (metadata?.name) {
+												source = { ...source, name: metadata.name };
+											}
+
 											// Check if ID looks like a URL
 											if (id.startsWith('http://') || id.startsWith('https://')) {
 												source = { name: id };

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

@@ -99,12 +99,8 @@
 						<div class={$settings?.chatBubble ?? true ? 'self-end' : ''}>
 							{#if file.type === 'image'}
 								<img src={file.url} alt="input" class=" max-h-96 rounded-lg" draggable="false" />
-							{:else if file.type === 'file'}
-								<FileItem url={`${file?.url}/content`} name={file.name} type={$i18n.t('File')} />
-							{:else if file.type === 'doc'}
-								<FileItem url={`${file?.url}`} name={file.name} type={$i18n.t('Document')} />
-							{:else if file.type === 'collection'}
-								<FileItem name={file?.title ?? `#${file.name}`} type={$i18n.t('Collection')} />
+							{:else}
+								<FileItem url={file.url} name={file.name} type={file.type} />
 							{/if}
 						</div>
 					{/each}

src/lib/components/documents/AddDocModal.svelte

@@ -16,6 +16,7 @@
 	const i18n = getContext('i18n');
 
 	export let show = false;
+	export let uploadDoc: Function;
 	let uploadDocInputElement: HTMLInputElement;
 	let inputFiles;
 	let tags = [];
@@ -26,32 +27,6 @@
 		content: null
 	};
 
-	const uploadDoc = async (file) => {
-		const res = await uploadDocToVectorDB(localStorage.token, '', file).catch((error) => {
-			toast.error(error);
-			return null;
-		});
-
-		if (res) {
-			await createNewDoc(
-				localStorage.token,
-				res.collection_name,
-				res.filename,
-				transformFileName(res.filename),
-				res.filename,
-				tags.length > 0
-					? {
-							tags: tags
-					  }
-					: null
-			).catch((error) => {
-				toast.error(error);
-				return null;
-			});
-			await documents.set(await getDocs(localStorage.token));
-		}
-	};
-
 	const submitHandler = async () => {
 		if (inputFiles && inputFiles.length > 0) {
 			for (const file of inputFiles) {

src/lib/components/workspace/Documents.svelte

@@ -205,7 +205,7 @@
 	<EditDocModal bind:show={showEditDocModal} {selectedDoc} />
 {/key}
 
-<AddDocModal bind:show={showAddDocModal} />
+<AddDocModal bind:show={showAddDocModal} {uploadDoc} />
 
 <div class="mb-3">
 	<div class="flex justify-between items-center">