{$i18n.t('Minimum Score')}
diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 7f3c435a44..78a22010e5 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -80,6 +80,7 @@
let eventConfirmationMessage = '';
let eventConfirmationInput = false;
let eventConfirmationInputPlaceholder = '';
+ let eventConfirmationInputValue = '';
let eventCallback = null;
let showModelSelector = true;
@@ -108,7 +109,6 @@
};
let params = {};
- let valves = {};
$: if (history.currentId !== null) {
let _messages = [];
@@ -182,6 +182,7 @@
eventConfirmationTitle = data.title;
eventConfirmationMessage = data.message;
eventConfirmationInputPlaceholder = data.placeholder;
+ eventConfirmationInputValue = data?.value ?? '';
} else {
console.log('Unknown message type', data);
}
@@ -281,6 +282,10 @@
if ($page.url.searchParams.get('q')) {
prompt = $page.url.searchParams.get('q') ?? '';
+ selectedToolIds = ($page.url.searchParams.get('tool_ids') ?? '')
+ .split(',')
+ .map((id) => id.trim())
+ .filter((id) => id);
if (prompt) {
await tick();
@@ -706,6 +711,7 @@
let _response = null;
const responseMessage = history.messages[responseMessageId];
+ const userMessage = history.messages[responseMessage.parentId];
// Wait until history/message have been updated
await tick();
@@ -772,11 +778,12 @@
if (model?.info?.meta?.knowledge ?? false) {
files.push(...model.info.meta.knowledge);
}
- if (responseMessage?.files) {
- files.push(
- ...responseMessage?.files.filter((item) => ['web_search_results'].includes(item.type))
- );
- }
+ files.push(
+ ...(userMessage?.files ?? []).filter((item) =>
+ ['doc', 'file', 'collection'].includes(item.type)
+ ),
+ ...(responseMessage?.files ?? []).filter((item) => ['web_search_results'].includes(item.type))
+ );
eventTarget.dispatchEvent(
new CustomEvent('chat:start', {
@@ -808,7 +815,6 @@
keep_alive: $settings.keepAlive ?? undefined,
tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined,
files: files.length > 0 ? files : undefined,
- ...(Object.keys(valves).length ? { valves } : {}),
session_id: $socket?.id,
chat_id: $chatId,
id: responseMessageId
@@ -1006,17 +1012,20 @@
const sendPromptOpenAI = async (model, userPrompt, responseMessageId, _chatId) => {
let _response = null;
+
const responseMessage = history.messages[responseMessageId];
+ const userMessage = history.messages[responseMessage.parentId];
let files = JSON.parse(JSON.stringify(chatFiles));
if (model?.info?.meta?.knowledge ?? false) {
files.push(...model.info.meta.knowledge);
}
- if (responseMessage?.files) {
- files.push(
- ...responseMessage?.files.filter((item) => ['web_search_results'].includes(item.type))
- );
- }
+ files.push(
+ ...(userMessage?.files ?? []).filter((item) =>
+ ['doc', 'file', 'collection'].includes(item.type)
+ ),
+ ...(responseMessage?.files ?? []).filter((item) => ['web_search_results'].includes(item.type))
+ );
scrollToBottom();
@@ -1105,7 +1114,6 @@
max_tokens: params?.max_tokens ?? $settings?.params?.max_tokens ?? undefined,
tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined,
files: files.length > 0 ? files : undefined,
- ...(Object.keys(valves).length ? { valves } : {}),
session_id: $socket?.id,
chat_id: $chatId,
id: responseMessageId
@@ -1484,6 +1492,7 @@
message={eventConfirmationMessage}
input={eventConfirmationInput}
inputPlaceholder={eventConfirmationInputPlaceholder}
+ inputValue={eventConfirmationInputValue}
on:confirm={(e) => {
if (e.detail) {
eventCallback(e.detail);
@@ -1631,7 +1640,6 @@
bind:show={showControls}
bind:chatFiles
bind:params
- bind:valves
/>
{/if}
diff --git a/src/lib/components/chat/ChatControls.svelte b/src/lib/components/chat/ChatControls.svelte
index f67e6d6efd..3de095b0d9 100644
--- a/src/lib/components/chat/ChatControls.svelte
+++ b/src/lib/components/chat/ChatControls.svelte
@@ -9,9 +9,7 @@
export let models = [];
export let chatId = null;
-
export let chatFiles = [];
- export let valves = {};
export let params = {};
let largeScreen = false;
@@ -50,7 +48,6 @@
}}
{models}
bind:chatFiles
- bind:valves
bind:params
/>