Merge pull request #2427 from open-webui/dev

fix
This commit is contained in:
Timothy Jaeryang Baek 2024-05-20 07:12:19 -10:00 committed by GitHub
commit aea81fc988
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 8 deletions

View File

@ -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

View File

@ -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