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
1d0eaec3
Commit
1d0eaec3
authored
Feb 02, 2024
by
Timothy J. Baek
Browse files
refac: queryVectorDB renamed to queryCollection
parent
50f7b20a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
43 deletions
+39
-43
src/lib/apis/rag/index.ts
src/lib/apis/rag/index.ts
+3
-3
src/routes/(app)/+page.svelte
src/routes/(app)/+page.svelte
+18
-20
src/routes/(app)/c/[id]/+page.svelte
src/routes/(app)/c/[id]/+page.svelte
+18
-20
No files found.
src/lib/apis/rag/index.ts
View file @
1d0eaec3
...
...
@@ -66,13 +66,13 @@ export const uploadWebToVectorDB = async (token: string, collection_name: string
export
const
queryVectorDB
=
async
(
token
:
string
,
collection_name
s
:
string
[]
,
collection_name
:
string
,
query
:
string
,
k
:
number
)
=>
{
let
error
=
null
;
const
res
=
await
fetch
(
`
${
RAG_API_BASE_URL
}
/query/collection
s
`
,
{
const
res
=
await
fetch
(
`
${
RAG_API_BASE_URL
}
/query/collection`
,
{
method
:
'
POST
'
,
headers
:
{
Accept
:
'
application/json
'
,
...
...
@@ -80,7 +80,7 @@ export const queryVectorDB = async (
authorization
:
`Bearer
${
token
}
`
},
body
:
JSON
.
stringify
({
collection_name
s
:
collection_name
s
,
collection_name
:
collection_name
,
query
:
query
,
k
:
k
})
...
...
src/routes/(app)/+page.svelte
View file @
1d0eaec3
...
...
@@ -28,7 +28,7 @@
getTagsById,
updateChatById
} from '$lib/apis/chats';
import { query
VectorDB
} from '$lib/apis/rag';
import { query
Collection
} from '$lib/apis/rag';
import { generateOpenAIChatCompletion } from '$lib/apis/openai';
import MessageInput from '$lib/components/chat/MessageInput.svelte';
...
...
@@ -232,28 +232,26 @@
processing = 'Reading';
const query = history.messages[parentId].content;
let relevantContexts = await queryVectorDB(
localStorage.token,
docs.map((d) => d.collection_name),
query,
4
).catch((error) => {
console.log(error);
return null;
});
if (relevantContexts) {
relevantContexts = relevantContexts.filter((context) => context);
let relevantContexts = await Promise.all(
docs.map(async (doc) => {
return await queryCollection(localStorage.token, doc.collection_name, query, 4).catch(
(error) => {
console.log(error);
return null;
}
);
})
);
relevantContexts = relevantContexts.filter((context) => context);
const contextString = relevantContexts.reduce((a, context, i, arr) => {
return `${a}${context.documents.join(' ')}\n`;
}, '');
const contextString = relevantContexts.reduce((a, context, i, arr) => {
return `${a}${context.documents.join(' ')}\n`;
}, '');
console.log(contextString);
console.log(contextString);
history.messages[parentId].raContent = RAGTemplate(contextString, query);
history.messages[parentId].contexts = relevantContexts;
}
history.messages[parentId].raContent = RAGTemplate(contextString, query);
history.messages[parentId].contexts = relevantContexts;
await tick();
processing = '';
}
...
...
src/routes/(app)/c/[id]/+page.svelte
View file @
1d0eaec3
...
...
@@ -29,7 +29,7 @@
getTagsById,
updateChatById
} from '$lib/apis/chats';
import { query
VectorDB
} from '$lib/apis/rag';
import { query
Collection
} from '$lib/apis/rag';
import { generateOpenAIChatCompletion } from '$lib/apis/openai';
import MessageInput from '$lib/components/chat/MessageInput.svelte';
...
...
@@ -246,28 +246,26 @@
processing = 'Reading';
const query = history.messages[parentId].content;
let relevantContexts = await queryVectorDB(
localStorage.token,
docs.map((d) => d.collection_name),
query,
4
).catch((error) => {
console.log(error);
return null;
});
if (relevantContexts) {
relevantContexts = relevantContexts.filter((context) => context);
let relevantContexts = await Promise.all(
docs.map(async (doc) => {
return await queryCollection(localStorage.token, doc.collection_name, query, 4).catch(
(error) => {
console.log(error);
return null;
}
);
})
);
relevantContexts = relevantContexts.filter((context) => context);
const contextString = relevantContexts.reduce((a, context, i, arr) => {
return `${a}${context.documents.join(' ')}\n`;
}, '');
const contextString = relevantContexts.reduce((a, context, i, arr) => {
return `${a}${context.documents.join(' ')}\n`;
}, '');
console.log(contextString);
console.log(contextString);
history.messages[parentId].raContent = RAGTemplate(contextString, query);
history.messages[parentId].contexts = relevantContexts;
}
history.messages[parentId].raContent = RAGTemplate(contextString, query);
history.messages[parentId].contexts = relevantContexts;
await tick();
processing = '';
}
...
...
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