Browse Source

Merge branch 'dev' of https://github.com/kroonen/open-webui into dev

Robin Kroonen 1 year ago
parent
commit
ec4c6e3918

+ 6 - 0
backend/apps/rag/main.py

@@ -28,6 +28,7 @@ from langchain_community.document_loaders import (
     UnstructuredXMLLoader,
     UnstructuredRSTLoader,
     UnstructuredExcelLoader,
+    UnstructuredPowerPointLoader,
     YoutubeLoader,
 )
 from langchain.text_splitter import RecursiveCharacterTextSplitter
@@ -768,6 +769,11 @@ def get_loader(filename: str, file_content_type: str, file_path: str):
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
     ] or file_ext in ["xls", "xlsx"]:
         loader = UnstructuredExcelLoader(file_path)
+    elif file_content_type in [
+        "application/vnd.ms-powerpoint",
+        "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+    ] or file_ext in ["ppt", "pptx"]:
+        loader = UnstructuredPowerPointLoader(file_path)
     elif file_ext in known_source_ext or (
         file_content_type and file_content_type.find("text/") >= 0
     ):

+ 1 - 0
backend/requirements.txt

@@ -35,6 +35,7 @@ chromadb==0.4.24
 sentence-transformers==2.7.0
 pypdf==4.2.0
 docx2txt==0.8
+python-pptx==0.6.23
 unstructured==0.11.8
 Markdown==3.6
 pypandoc==1.13

+ 3 - 1
src/lib/constants.ts

@@ -86,7 +86,9 @@ export const SUPPORTED_FILE_EXTENSIONS = [
 	'csv',
 	'txt',
 	'xls',
-	'xlsx'
+	'xlsx',
+	'pptx',
+	'ppt'
 ];
 
 // Source: https://kit.svelte.dev/docs/modules#$env-static-public

+ 6 - 4
src/routes/(app)/+page.svelte

@@ -344,10 +344,11 @@
 			$settings.system || (responseMessage?.userContext ?? null)
 				? {
 						role: 'system',
-						content:
-							$settings.system + responseMessage?.userContext ?? null
+						content: `${$settings?.system ?? ''}${
+							responseMessage?.userContext ?? null
 								? `\n\nUser Context:\n${(responseMessage?.userContext ?? []).join('\n')}`
 								: ''
+						}`
 				  }
 				: undefined,
 			...messages
@@ -603,10 +604,11 @@
 						$settings.system || (responseMessage?.userContext ?? null)
 							? {
 									role: 'system',
-									content:
-										$settings.system + (responseMessage?.userContext ?? null)
+									content: `${$settings?.system ?? ''}${
+										responseMessage?.userContext ?? null
 											? `\n\nUser Context:\n${(responseMessage?.userContext ?? []).join('\n')}`
 											: ''
+									}`
 							  }
 							: undefined,
 						...messages

+ 6 - 4
src/routes/(app)/c/[id]/+page.svelte

@@ -350,10 +350,11 @@
 			$settings.system || (responseMessage?.userContext ?? null)
 				? {
 						role: 'system',
-						content:
-							$settings.system + responseMessage?.userContext ?? null
+						content: `${$settings?.system ?? ''}${
+							responseMessage?.userContext ?? null
 								? `\n\nUser Context:\n${(responseMessage?.userContext ?? []).join('\n')}`
 								: ''
+						}`
 				  }
 				: undefined,
 			...messages
@@ -609,10 +610,11 @@
 						$settings.system || (responseMessage?.userContext ?? null)
 							? {
 									role: 'system',
-									content:
-										$settings.system + (responseMessage?.userContext ?? null)
+									content: `${$settings?.system ?? ''}${
+										responseMessage?.userContext ?? null
 											? `\n\nUser Context:\n${(responseMessage?.userContext ?? []).join('\n')}`
 											: ''
+									}`
 							  }
 							: undefined,
 						...messages