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
77928ae1
Commit
77928ae1
authored
May 11, 2024
by
Jun Siang Cheah
Browse files
Merge branch 'dev' of
https://github.com/open-webui/open-webui
into feat/web-search-toggle
parents
2660a6e5
9a957670
Changes
85
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
568 additions
and
908 deletions
+568
-908
kubernetes/helm/templates/ollama-statefulset.yaml
kubernetes/helm/templates/ollama-statefulset.yaml
+0
-98
kubernetes/helm/templates/webui-deployment.yaml
kubernetes/helm/templates/webui-deployment.yaml
+0
-62
kubernetes/helm/templates/webui-ingress.yaml
kubernetes/helm/templates/webui-ingress.yaml
+0
-33
kubernetes/helm/templates/webui-pvc.yaml
kubernetes/helm/templates/webui-pvc.yaml
+0
-27
kubernetes/helm/templates/webui-service.yaml
kubernetes/helm/templates/webui-service.yaml
+0
-29
kubernetes/helm/values-minikube.yaml
kubernetes/helm/values-minikube.yaml
+0
-27
kubernetes/helm/values.yaml
kubernetes/helm/values.yaml
+0
-75
package-lock.json
package-lock.json
+2
-2
package.json
package.json
+1
-1
src/app.html
src/app.html
+6
-0
src/lib/apis/audio/index.ts
src/lib/apis/audio/index.ts
+5
-2
src/lib/apis/ollama/index.ts
src/lib/apis/ollama/index.ts
+1
-1
src/lib/apis/openai/index.ts
src/lib/apis/openai/index.ts
+4
-3
src/lib/apis/rag/index.ts
src/lib/apis/rag/index.ts
+6
-0
src/lib/components/ChangelogModal.svelte
src/lib/components/ChangelogModal.svelte
+2
-4
src/lib/components/admin/AddUserModal.svelte
src/lib/components/admin/AddUserModal.svelte
+1
-1
src/lib/components/chat/MessageInput/Documents.svelte
src/lib/components/chat/MessageInput/Documents.svelte
+6
-2
src/lib/components/chat/MessageInput/Suggestions.svelte
src/lib/components/chat/MessageInput/Suggestions.svelte
+5
-3
src/lib/components/chat/Messages/RateComment.svelte
src/lib/components/chat/Messages/RateComment.svelte
+1
-1
src/lib/components/chat/Messages/ResponseMessage.svelte
src/lib/components/chat/Messages/ResponseMessage.svelte
+528
-537
No files found.
kubernetes/helm/templates/ollama-statefulset.yaml
deleted
100644 → 0
View file @
2660a6e5
{{
- if not .Values.ollama.externalHost
}}
apiVersion
:
apps/v1
kind
:
StatefulSet
metadata
:
name
:
{{
include "ollama.name" .
}}
labels
:
{{
- include "ollama.labels" . | nindent 4
}}
{{
- with .Values.ollama.annotations
}}
annotations
:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
serviceName
:
{{
include "ollama.name" .
}}
replicas
:
{{
.Values.ollama.replicaCount
}}
selector
:
matchLabels
:
{{
- include "ollama.selectorLabels" . | nindent 6
}}
template
:
metadata
:
labels
:
{{
- include "ollama.labels" . | nindent 8
}}
{{
- with .Values.ollama.podAnnotations
}}
annotations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
spec
:
enableServiceLinks
:
false
automountServiceAccountToken
:
false
{{
- with .Values.ollama.runtimeClassName
}}
runtimeClassName
:
{{
.
}}
{{
- end
}}
containers
:
-
name
:
{{
include "ollama.name" .
}}
{{
- with .Values.ollama.image
}}
image
:
{{
.repository
}}
:{{ .tag }}
imagePullPolicy
:
{{
.pullPolicy
}}
{{
- end
}}
tty
:
true
ports
:
-
name
:
http
containerPort
:
{{
.Values.ollama.service.containerPort
}}
env
:
{{
- if .Values.ollama.gpu.enabled
}}
-
name
:
PATH
value
:
/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
name
:
LD_LIBRARY_PATH
value
:
/usr/local/nvidia/lib:/usr/local/nvidia/lib64
-
name
:
NVIDIA_DRIVER_CAPABILITIES
value
:
compute,utility
{{
- end
}}
{{
- with .Values.ollama.resources
}}
resources
:
{{
- toYaml . | nindent 10
}}
{{
- end
}}
volumeMounts
:
-
name
:
data
mountPath
:
/root/.ollama
{{
- with .Values.ollama.nodeSelector
}}
nodeSelector
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- with .Values.ollama.tolerations
}}
tolerations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
volumes
:
{{
- if and .Values.ollama.persistence.enabled .Values.ollama.persistence.existingClaim
}}
-
name
:
data
persistentVolumeClaim
:
claimName
:
{{
.Values.ollama.persistence.existingClaim
}}
{{
- else if not .Values.ollama.persistence.enabled
}}
-
name
:
data
emptyDir
:
{}
{{
- else if and .Values.ollama.persistence.enabled (not .Values.ollama.persistence.existingClaim)
}}
[]
volumeClaimTemplates
:
-
metadata
:
name
:
data
labels
:
{{
- include "ollama.selectorLabels" . | nindent 8
}}
{{
- with .Values.ollama.persistence.annotations
}}
annotations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
spec
:
accessModes
:
{{
- range .Values.ollama.persistence.accessModes
}}
-
{{
. | quote
}}
{{
- end
}}
resources
:
requests
:
storage
:
{{
.Values.ollama.persistence.size | quote
}}
storageClassName
:
{{
.Values.ollama.persistence.storageClass
}}
{{
- with .Values.ollama.persistence.selector
}}
selector
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
kubernetes/helm/templates/webui-deployment.yaml
deleted
100644 → 0
View file @
2660a6e5
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
name
:
{{
include "open-webui.name" .
}}
labels
:
{{
- include "open-webui.labels" . | nindent 4
}}
{{
- with .Values.webui.annotations
}}
annotations
:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
replicas
:
{{
.Values.webui.replicaCount
}}
selector
:
matchLabels
:
{{
- include "open-webui.selectorLabels" . | nindent 6
}}
template
:
metadata
:
labels
:
{{
- include "open-webui.labels" . | nindent 8
}}
{{
- with .Values.webui.podAnnotations
}}
annotations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
spec
:
enableServiceLinks
:
false
automountServiceAccountToken
:
false
containers
:
-
name
:
{{
.Chart.Name
}}
{{
- with .Values.webui.image
}}
image
:
{{
.repository
}}
:{{ .tag | default $.Chart.AppVersion }}
imagePullPolicy
:
{{
.pullPolicy
}}
{{
- end
}}
ports
:
-
name
:
http
containerPort
:
{{
.Values.webui.service.containerPort
}}
{{
- with .Values.webui.resources
}}
resources
:
{{
- toYaml . | nindent 10
}}
{{
- end
}}
volumeMounts
:
-
name
:
data
mountPath
:
/app/backend/data
env
:
-
name
:
OLLAMA_BASE_URL
value
:
{{
include "ollama.url" . | quote
}}
tty
:
true
{{
- with .Values.webui.nodeSelector
}}
nodeSelector
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
volumes
:
{{
- if and .Values.webui.persistence.enabled .Values.webui.persistence.existingClaim
}}
-
name
:
data
persistentVolumeClaim
:
claimName
:
{{
.Values.webui.persistence.existingClaim
}}
{{
- else if not .Values.webui.persistence.enabled
}}
-
name
:
data
emptyDir
:
{}
{{
- else if and .Values.webui.persistence.enabled (not .Values.webui.persistence.existingClaim)
}}
-
name
:
data
persistentVolumeClaim
:
claimName
:
{{
include "open-webui.name" .
}}
{{
- end
}}
kubernetes/helm/templates/webui-ingress.yaml
deleted
100644 → 0
View file @
2660a6e5
{{
- if .Values.webui.ingress.enabled
}}
apiVersion
:
networking.k8s.io/v1
kind
:
Ingress
metadata
:
name
:
{{
include "open-webui.name" .
}}
labels
:
{{
- include "open-webui.labels" . | nindent 4
}}
{{
- with .Values.webui.ingress.annotations
}}
annotations
:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
{{
- with .Values.webui.ingress.class
}}
ingressClassName
:
{{
.
}}
{{
- end
}}
{{
- if .Values.webui.ingress.tls
}}
tls
:
-
hosts
:
-
{{
.Values.webui.ingress.host | quote
}}
secretName
:
{{
default (printf "%s-tls" .Release.Name) .Values.webui.ingress.existingSecret
}}
{{
- end
}}
rules
:
-
host
:
{{
.Values.webui.ingress.host
}}
http
:
paths
:
-
path
:
/
pathType
:
Prefix
backend
:
service
:
name
:
{{
include "open-webui.name" .
}}
port
:
name
:
http
{{
- end
}}
kubernetes/helm/templates/webui-pvc.yaml
deleted
100644 → 0
View file @
2660a6e5
{{
- if and .Values.webui.persistence.enabled (not .Values.webui.persistence.existingClaim)
}}
apiVersion
:
v1
kind
:
PersistentVolumeClaim
metadata
:
name
:
{{
include "open-webui.name" .
}}
labels
:
{{
- include "open-webui.selectorLabels" . | nindent 4
}}
{{
- with .Values.webui.persistence.annotations
}}
annotations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
spec
:
accessModes
:
{{
- range .Values.webui.persistence.accessModes
}}
-
{{
. | quote
}}
{{
- end
}}
resources
:
requests
:
storage
:
{{
.Values.webui.persistence.size
}}
{{
- if .Values.webui.persistence.storageClass
}}
storageClassName
:
{{
.Values.webui.persistence.storageClass
}}
{{
- end
}}
{{
- with .Values.webui.persistence.selector
}}
selector
:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
{{
- end
}}
kubernetes/helm/templates/webui-service.yaml
deleted
100644 → 0
View file @
2660a6e5
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
{{
include "open-webui.name" .
}}
labels
:
{{
- include "open-webui.labels" . | nindent 4
}}
{{
- with .Values.webui.service.labels
}}
{{
- toYaml . | nindent 4
}}
{{
- end
}}
{{
- with .Values.webui.service.annotations
}}
annotations
:
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
selector
:
{{
- include "open-webui.selectorLabels" . | nindent 4
}}
type
:
{{
.Values.webui.service.type | default "ClusterIP"
}}
ports
:
-
protocol
:
TCP
name
:
http
port
:
{{
.Values.webui.service.port
}}
targetPort
:
http
{{
- if .Values.webui.service.nodePort
}}
nodePort
:
{{
.Values.webui.service.nodePort | int
}}
{{
- end
}}
{{
- if .Values.webui.service.loadBalancerClass
}}
loadBalancerClass
:
{{
.Values.webui.service.loadBalancerClass | quote
}}
{{
- end
}}
kubernetes/helm/values-minikube.yaml
deleted
100644 → 0
View file @
2660a6e5
ollama
:
resources
:
requests
:
cpu
:
"
2000m"
memory
:
"
2Gi"
limits
:
cpu
:
"
4000m"
memory
:
"
4Gi"
nvidia.com/gpu
:
"
0"
service
:
type
:
ClusterIP
gpu
:
enabled
:
false
webui
:
resources
:
requests
:
cpu
:
"
500m"
memory
:
"
500Mi"
limits
:
cpu
:
"
1000m"
memory
:
"
1Gi"
ingress
:
enabled
:
true
host
:
open-webui.minikube.local
service
:
type
:
NodePort
kubernetes/helm/values.yaml
deleted
100644 → 0
View file @
2660a6e5
nameOverride
:
"
"
ollama
:
externalHost
:
"
"
annotations
:
{}
podAnnotations
:
{}
replicaCount
:
1
image
:
repository
:
ollama/ollama
tag
:
latest
pullPolicy
:
Always
resources
:
{}
persistence
:
enabled
:
true
size
:
30Gi
existingClaim
:
"
"
accessModes
:
-
ReadWriteOnce
storageClass
:
"
"
selector
:
{}
annotations
:
{}
nodeSelector
:
{}
# -- If using a special runtime container such as nvidia, set it here.
runtimeClassName
:
"
"
tolerations
:
-
key
:
nvidia.com/gpu
operator
:
Exists
effect
:
NoSchedule
service
:
type
:
ClusterIP
annotations
:
{}
port
:
80
containerPort
:
11434
gpu
:
# -- Enable additional ENV values to help Ollama discover GPU usage
enabled
:
false
webui
:
annotations
:
{}
podAnnotations
:
{}
replicaCount
:
1
image
:
repository
:
ghcr.io/open-webui/open-webui
tag
:
"
"
pullPolicy
:
Always
resources
:
{}
ingress
:
enabled
:
false
class
:
"
"
# -- Use appropriate annotations for your Ingress controller, e.g., for NGINX:
# nginx.ingress.kubernetes.io/rewrite-target: /
annotations
:
{}
host
:
"
"
tls
:
false
existingSecret
:
"
"
persistence
:
enabled
:
true
size
:
2Gi
existingClaim
:
"
"
# -- If using multiple replicas, you must update accessModes to ReadWriteMany
accessModes
:
-
ReadWriteOnce
storageClass
:
"
"
selector
:
{}
annotations
:
{}
nodeSelector
:
{}
tolerations
:
[]
service
:
type
:
ClusterIP
annotations
:
{}
port
:
80
containerPort
:
8080
nodePort
:
"
"
labels
:
{}
loadBalancerClass
:
"
"
package-lock.json
View file @
77928ae1
{
"name"
:
"open-webui"
,
"version"
:
"0.1.12
3
"
,
"version"
:
"0.1.12
4
"
,
"lockfileVersion"
:
3
,
"requires"
:
true
,
"packages"
:
{
""
:
{
"name"
:
"open-webui"
,
"version"
:
"0.1.12
3
"
,
"version"
:
"0.1.12
4
"
,
"dependencies"
:
{
"@sveltejs/adapter-node"
:
"^1.3.1"
,
"async"
:
"^3.2.5"
,
...
...
package.json
View file @
77928ae1
{
"name"
:
"open-webui"
,
"version"
:
"0.1.12
3
"
,
"version"
:
"0.1.12
4
"
,
"private"
:
true
,
"scripts"
:
{
"dev"
:
"vite dev --host"
,
...
...
src/app.html
View file @
77928ae1
...
...
@@ -6,6 +6,12 @@
<link
rel=
"manifest"
href=
"%sveltekit.assets%/manifest.json"
crossorigin=
"use-credentials"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, maximum-scale=1"
/>
<meta
name=
"robots"
content=
"noindex,nofollow"
/>
<link
rel=
"search"
type=
"application/opensearchdescription+xml"
title=
"Open WebUI"
href=
"/opensearch.xml"
/>
<script>
// On page load or when changing themes, best to add inline in `head` to avoid FOUC
(()
=>
{
...
...
src/lib/apis/audio/index.ts
View file @
77928ae1
...
...
@@ -30,6 +30,8 @@ export const getAudioConfig = async (token: string) => {
type
OpenAIConfigForm
=
{
url
:
string
;
key
:
string
;
model
:
string
;
speaker
:
string
;
};
export
const
updateAudioConfig
=
async
(
token
:
string
,
payload
:
OpenAIConfigForm
)
=>
{
...
...
@@ -95,7 +97,8 @@ export const transcribeAudio = async (token: string, file: File) => {
export
const
synthesizeOpenAISpeech
=
async
(
token
:
string
=
''
,
speaker
:
string
=
'
alloy
'
,
text
:
string
=
''
text
:
string
=
''
,
model
:
string
=
'
tts-1
'
)
=>
{
let
error
=
null
;
...
...
@@ -106,7 +109,7 @@ export const synthesizeOpenAISpeech = async (
'
Content-Type
'
:
'
application/json
'
},
body
:
JSON
.
stringify
({
model
:
'
tts-1
'
,
model
:
model
,
input
:
text
,
voice
:
speaker
})
...
...
src/lib/apis/ollama/index.ts
View file @
77928ae1
...
...
@@ -182,7 +182,7 @@ export const generateTitle = async (
throw
error
;
}
return
res
?.
response
??
'
New Chat
'
;
return
res
?.
response
.
replace
(
/
[
"'
]
/g
,
''
)
??
'
New Chat
'
;
};
export
const
generatePrompt
=
async
(
token
:
string
=
''
,
model
:
string
,
conversation
:
string
)
=>
{
...
...
src/lib/apis/openai/index.ts
View file @
77928ae1
...
...
@@ -239,7 +239,8 @@ export const generateOpenAIChatCompletion = async (
export
const
synthesizeOpenAISpeech
=
async
(
token
:
string
=
''
,
speaker
:
string
=
'
alloy
'
,
text
:
string
=
''
text
:
string
=
''
,
model
:
string
=
'
tts-1
'
)
=>
{
let
error
=
null
;
...
...
@@ -250,7 +251,7 @@ export const synthesizeOpenAISpeech = async (
'
Content-Type
'
:
'
application/json
'
},
body
:
JSON
.
stringify
({
model
:
'
tts-1
'
,
model
:
model
,
input
:
text
,
voice
:
speaker
})
...
...
@@ -316,7 +317,7 @@ export const generateTitle = async (
throw
error
;
}
return
res
?.
choices
[
0
]?.
message
?.
content
??
'
New Chat
'
;
return
res
?.
choices
[
0
]?.
message
?.
content
.
replace
(
/
[
"'
]
/g
,
''
)
??
'
New Chat
'
;
};
export
const
generateSearchQuery
=
async
(
...
...
src/lib/apis/rag/index.ts
View file @
77928ae1
...
...
@@ -32,10 +32,16 @@ type ChunkConfigForm = {
chunk_overlap
:
number
;
};
type
YoutubeConfigForm
=
{
language
:
string
[];
translation
?:
string
|
null
;
};
type
RAGConfigForm
=
{
pdf_extract_images
?:
boolean
;
chunk
?:
ChunkConfigForm
;
web_loader_ssl_verification
?:
boolean
;
youtube
?:
YoutubeConfigForm
;
};
export
const
updateRAGConfig
=
async
(
token
:
string
,
payload
:
RAGConfigForm
)
=>
{
...
...
src/lib/components/ChangelogModal.svelte
View file @
77928ae1
...
...
@@ -22,7 +22,7 @@
</script>
<Modal bind:show>
<div class="px-5 p
y
-4 dark:text-gray-300 text-gray-700">
<div class="px-5 p
t
-4 dark:text-gray-300 text-gray-700">
<div class="flex justify-between items-start">
<div class="text-xl font-bold">
{$i18n.t('What’s New in')}
...
...
@@ -57,10 +57,8 @@
</div>
</div>
<hr class=" dark:border-gray-800" />
<div class=" w-full p-4 px-5 text-gray-700 dark:text-gray-100">
<div class=" overflow-y-scroll max-h-80">
<div class=" overflow-y-scroll max-h-80
scrollbar-none
">
<div class="mb-3">
{#if changelog}
{#each Object.keys(changelog) as version}
...
...
src/lib/components/admin/AddUserModal.svelte
View file @
77928ae1
...
...
@@ -107,7 +107,7 @@
reader.readAsText(file);
} else {
toast.error(
`
File not found.
`
);
toast.error(
$i18n.t('
File not found.
')
);
}
}
};
...
...
src/lib/components/chat/MessageInput/Documents.svelte
View file @
77928ae1
...
...
@@ -24,7 +24,7 @@
{
name: 'All Documents',
type: 'collection',
title: 'All Documents',
title:
$i18n.t(
'All Documents'
)
,
collection_names: $documents.map((doc) => doc.collection_name)
}
]
...
...
@@ -143,7 +143,11 @@
</button>
{/each}
{#if prompt.split(' ')?.at(0)?.substring(1).startsWith('https://www.youtube.com')}
{#if prompt
.split(' ')
.some((s) => s.substring(1).startsWith('https://www.youtube.com') || s
.substring(1)
.startsWith('https://youtu.be'))}
<button
class="px-3 py-1.5 rounded-xl w-full text-left bg-gray-100 selected-command-option-button"
type="button"
...
...
src/lib/components/chat/MessageInput/Suggestions.svelte
View file @
77928ae1
<script lang="ts">
import Bolt from '$lib/components/icons/Bolt.svelte';
import { onMount } from 'svelte';
import { onMount, getContext } from 'svelte';
const i18n = getContext('i18n');
export let submitPrompt: Function;
export let suggestionPrompts = [];
...
...
@@ -33,7 +35,7 @@
{#if prompts.length > 0}
<div class="mb-2 flex gap-1 text-sm font-medium items-center text-gray-400 dark:text-gray-600">
<Bolt />
Suggested
{$i18n.t('
Suggested
')}
</div>
{/if}
...
...
@@ -71,7 +73,7 @@
<div
class="text-xs text-gray-400 group-hover:text-gray-500 dark:text-gray-600 dark:group-hover:text-gray-500 transition self-center"
>
Prompt
{$i18n.t('
Prompt
')}
</div>
<div
...
...
src/lib/components/chat/Messages/RateComment.svelte
View file @
77928ae1
...
...
@@ -123,7 +123,7 @@
submitHandler();
}}
>
Submit
{$i18n.t('
Submit
')}
</button>
</div>
</div>
src/lib/components/chat/Messages/ResponseMessage.svelte
View file @
77928ae1
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
Next
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