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
ec4c6e39
Commit
ec4c6e39
authored
May 20, 2024
by
Robin Kroonen
Browse files
Merge branch 'dev' of
https://github.com/kroonen/open-webui
into dev
parents
985ee1c2
54677a33
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
9 deletions
+22
-9
backend/apps/rag/main.py
backend/apps/rag/main.py
+6
-0
backend/requirements.txt
backend/requirements.txt
+1
-0
src/lib/constants.ts
src/lib/constants.ts
+3
-1
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+6
-4
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+6
-4
No files found.
backend/apps/rag/main.py
View file @
ec4c6e39
...
@@ -28,6 +28,7 @@ from langchain_community.document_loaders import (
...
@@ -28,6 +28,7 @@ from langchain_community.document_loaders import (
UnstructuredXMLLoader
,
UnstructuredXMLLoader
,
UnstructuredRSTLoader
,
UnstructuredRSTLoader
,
UnstructuredExcelLoader
,
UnstructuredExcelLoader
,
UnstructuredPowerPointLoader
,
YoutubeLoader
,
YoutubeLoader
,
)
)
from
langchain.text_splitter
import
RecursiveCharacterTextSplitter
from
langchain.text_splitter
import
RecursiveCharacterTextSplitter
...
@@ -768,6 +769,11 @@ def get_loader(filename: str, file_content_type: str, file_path: str):
...
@@ -768,6 +769,11 @@ def get_loader(filename: str, file_content_type: str, file_path: str):
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
,
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
,
]
or
file_ext
in
[
"xls"
,
"xlsx"
]:
]
or
file_ext
in
[
"xls"
,
"xlsx"
]:
loader
=
UnstructuredExcelLoader
(
file_path
)
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
(
elif
file_ext
in
known_source_ext
or
(
file_content_type
and
file_content_type
.
find
(
"text/"
)
>=
0
file_content_type
and
file_content_type
.
find
(
"text/"
)
>=
0
):
):
...
...
backend/requirements.txt
View file @
ec4c6e39
...
@@ -35,6 +35,7 @@ chromadb==0.4.24
...
@@ -35,6 +35,7 @@ chromadb==0.4.24
sentence-transformers==2.7.0
sentence-transformers==2.7.0
pypdf==4.2.0
pypdf==4.2.0
docx2txt==0.8
docx2txt==0.8
python-pptx==0.6.23
unstructured==0.11.8
unstructured==0.11.8
Markdown==3.6
Markdown==3.6
pypandoc==1.13
pypandoc==1.13
...
...
src/lib/constants.ts
View file @
ec4c6e39
...
@@ -86,7 +86,9 @@ export const SUPPORTED_FILE_EXTENSIONS = [
...
@@ -86,7 +86,9 @@ export const SUPPORTED_FILE_EXTENSIONS = [
'
csv
'
,
'
csv
'
,
'
txt
'
,
'
txt
'
,
'
xls
'
,
'
xls
'
,
'
xlsx
'
'
xlsx
'
,
'
pptx
'
,
'
ppt
'
];
];
// Source: https://kit.svelte.dev/docs/modules#$env-static-public
// Source: https://kit.svelte.dev/docs/modules#$env-static-public
...
...
src/routes/(app)/+page.svelte
View file @
ec4c6e39
...
@@ -344,10 +344,11 @@
...
@@ -344,10 +344,11 @@
$
settings
.
system
||
(
responseMessage
?.
userContext
??
null
)
$
settings
.
system
||
(
responseMessage
?.
userContext
??
null
)
?
{
?
{
role
:
'system'
,
role
:
'system'
,
content
:
content
:
`${$
settings
?.
system
??
''
}${
$
settings
.
system
+
responseMessage
?.
userContext
??
null
responseMessage
?.
userContext
??
null
?
`\
n
\
nUser
Context
:\
n
${(
responseMessage
?.
userContext
??
[]).
join
(
'\n'
)}`
?
`\
n
\
nUser
Context
:\
n
${(
responseMessage
?.
userContext
??
[]).
join
(
'\n'
)}`
:
''
:
''
}`
}
}
:
undefined
,
:
undefined
,
...
messages
...
messages
...
@@ -603,10 +604,11 @@
...
@@ -603,10 +604,11 @@
$settings.system || (responseMessage?.userContext ?? null)
$settings.system || (responseMessage?.userContext ?? null)
? {
? {
role: 'system',
role: 'system',
content:
content:
`${$settings?.system ?? ''}${
$settings.system + (
responseMessage?.userContext ?? null
)
responseMessage?.userContext ?? null
? `
\n\n
User Context:
\n
${(responseMessage?.userContext ?? []).join('
\n
')}`
? `
\n\n
User Context:
\n
${(responseMessage?.userContext ?? []).join('
\n
')}`
: ''
: ''
}`
}
}
: undefined,
: undefined,
...messages
...messages
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
ec4c6e39
...
@@ -350,10 +350,11 @@
...
@@ -350,10 +350,11 @@
$
settings
.
system
||
(
responseMessage
?.
userContext
??
null
)
$
settings
.
system
||
(
responseMessage
?.
userContext
??
null
)
?
{
?
{
role
:
'system'
,
role
:
'system'
,
content
:
content
:
`${$
settings
?.
system
??
''
}${
$
settings
.
system
+
responseMessage
?.
userContext
??
null
responseMessage
?.
userContext
??
null
?
`\
n
\
nUser
Context
:\
n
${(
responseMessage
?.
userContext
??
[]).
join
(
'\n'
)}`
?
`\
n
\
nUser
Context
:\
n
${(
responseMessage
?.
userContext
??
[]).
join
(
'\n'
)}`
:
''
:
''
}`
}
}
:
undefined
,
:
undefined
,
...
messages
...
messages
...
@@ -609,10 +610,11 @@
...
@@ -609,10 +610,11 @@
$settings.system || (responseMessage?.userContext ?? null)
$settings.system || (responseMessage?.userContext ?? null)
? {
? {
role: 'system',
role: 'system',
content:
content:
`${$settings?.system ?? ''}${
$settings.system + (
responseMessage?.userContext ?? null
)
responseMessage?.userContext ?? null
? `
\n\n
User Context:
\n
${(responseMessage?.userContext ?? []).join('
\n
')}`
? `
\n\n
User Context:
\n
${(responseMessage?.userContext ?? []).join('
\n
')}`
: ''
: ''
}`
}
}
: undefined,
: undefined,
...messages
...messages
...
...
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