Skip to content

GitLab

"...resnet50_tensorflow.git" did not exist on "1e2ceffd5a029f192b274e6b48430f948c5f5f55"
Unverified Commit 358f79f5 authored by Timothy Jaeryang Baek's avatar Timothy Jaeryang Baek Committed by GitHub
Browse files

Merge pull request #439 from ollama-webui/rag-context-management 

feat: better rag context management
parents 51eb2645 bf1c0266
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 10 deletions
src/routes/(app)/+page.svelte
View file @ 358f79f5
......@@ -288,9 +288,9 @@
...messages
]
.filter((message) => message)
.map((message) => ({
.map((message, idx, arr) => ({
role: message.role,
content: message?.raContent ?? message.content,
content: arr.length - 2 !== idx ? message.content : message?.raContent ?? message.content,
...(message.files && {
images: message.files
.filter((file) => file.type === 'image')
......@@ -472,14 +472,17 @@
...messages
]
.filter((message) => message)
.map((message) => ({
.map((message, idx, arr) => ({
role: message.role,
...(message.files
? {
content: [
{
type: 'text',
text: message?.raContent ?? message.content
text:
arr.length - 1 !== idx
? message.content
: message?.raContent ?? message.content
},
...message.files
.filter((file) => file.type === 'image')
......@@ -491,7 +494,10 @@
}))
]
}
: { content: message?.raContent ?? message.content })
: {
content:
arr.length - 1 !== idx ? message.content : message?.raContent ?? message.content
})
})),
seed: $settings?.options?.seed ?? undefined,
stop: $settings?.options?.stop ?? undefined,
......
src/routes/(app)/c/[id]/+page.svelte
View file @ 358f79f5
......@@ -299,9 +299,9 @@
...messages
]
.filter((message) => message)
.map((message) => ({
.map((message, idx, arr) => ({
role: message.role,
content: message?.raContent ?? message.content,
content: arr.length - 2 !== idx ? message.content : message?.raContent ?? message.content,
...(message.files && {
images: message.files
.filter((file) => file.type === 'image')
......@@ -483,14 +483,17 @@
...messages
]
.filter((message) => message)
.map((message) => ({
.map((message, idx, arr) => ({
role: message.role,
...(message.files
? {
content: [
{
type: 'text',
text: message?.raContent ?? message.content
text:
arr.length - 1 !== idx
? message.content
: message?.raContent ?? message.content
},
...message.files
.filter((file) => file.type === 'image')
......@@ -502,7 +505,10 @@
}))
]
}
: { content: message?.raContent ?? message.content })
: {
content:
arr.length - 1 !== idx ? message.content : message?.raContent ?? message.content
})
})),
seed: $settings?.options?.seed ?? undefined,
stop: $settings?.options?.stop ?? undefined,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment