Skip to content

GitLab

Commit f49e1afa authored by Jun Siang Cheah's avatar Jun Siang Cheah
Browse files

feat: inject search result doc in the response, not the query 

this is to handle when we have multiple models selected or regenerate a
response, it'll only add it to the model's response and not add dupes on
the user message
parent 44c8b0bb
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 54 deletions
src/lib/components/chat/Messages/ResponseMessage.svelte
View file @ f49e1afa
...@@ -369,59 +369,102 @@ ...@@ -369,59 +369,102 @@
class="prose chat-{message.role} w-full max-w-full dark:prose-invert prose-headings:my-0 prose-p:m-0 prose-p:-mb-6 prose-pre:my-0 prose-table:my-0 prose-blockquote:my-0 prose-img:my-0 prose-ul:-my-4 prose-ol:-my-4 prose-li:-my-3 prose-ul:-mb-6 prose-ol:-mb-8 prose-ol:p-0 prose-li:-mb-4 whitespace-pre-line" class="prose chat-{message.role} w-full max-w-full dark:prose-invert prose-headings:my-0 prose-p:m-0 prose-p:-mb-6 prose-pre:my-0 prose-table:my-0 prose-blockquote:my-0 prose-img:my-0 prose-ul:-my-4 prose-ol:-my-4 prose-li:-my-3 prose-ul:-mb-6 prose-ol:-mb-8 prose-ol:p-0 prose-li:-mb-4 whitespace-pre-line"
> >
<div> <div>
{#if message.progress} {#if message.progress || message.files}
<div class="my-2.5 w-full flex overflow-x-auto gap-2 flex-wrap"> <div class="my-2.5 w-full flex overflow-x-auto gap-2 flex-wrap">
<div> {#if message.progress}
<button <div>
class="h-16 flex items-center space-x-3 px-2.5 dark:bg-gray-600 rounded-xl border border-gray-200 dark:border-none text-left" <button
type="button" class="h-16 flex items-center space-x-3 px-2.5 dark:bg-gray-600 rounded-xl border border-gray-200 dark:border-none text-left"
> type="button"
<div class="p-2.5 bg-red-400 text-white rounded-lg"> >
<svg <div class="p-2.5 bg-red-400 text-white rounded-lg">
class=" w-6 h-6 translate-y-[0.5px]" <svg
fill="currentColor" class=" w-6 h-6 translate-y-[0.5px]"
viewBox="0 0 24 24" fill="currentColor"
xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
><style> xmlns="http://www.w3.org/2000/svg"
.spinner_qM83 { ><style>
animation: spinner_8HQG 1.05s infinite; .spinner_qM83 {
} animation: spinner_8HQG 1.05s infinite;
.spinner_oXPr {
animation-delay: 0.1s;
}
.spinner_ZTLf {
animation-delay: 0.2s;
}
@keyframes spinner_8HQG {
0%,
57.14% {
animation-timing-function: cubic-bezier(0.33, 0.66, 0.66, 1);
transform: translate(0);
} }
28.57% { .spinner_oXPr {
animation-timing-function: cubic-bezier(0.33, 0, 0.66, 0.33); animation-delay: 0.1s;
transform: translateY(-6px);
} }
100% { .spinner_ZTLf {
transform: translate(0); animation-delay: 0.2s;
} }
} @keyframes spinner_8HQG {
</style><circle class="spinner_qM83" cx="4" cy="12" r="2.5" /><circle 0%,
class="spinner_qM83 spinner_oXPr" 57.14% {
cx="12" animation-timing-function: cubic-bezier(0.33, 0.66, 0.66, 1);
cy="12" transform: translate(0);
r="2.5" }
/><circle class="spinner_qM83 spinner_ZTLf" cx="20" cy="12" r="2.5" /></svg 28.57% {
> animation-timing-function: cubic-bezier(0.33, 0, 0.66, 0.33);
</div> transform: translateY(-6px);
}
100% {
transform: translate(0);
}
}
</style><circle class="spinner_qM83" cx="4" cy="12" r="2.5" /><circle
class="spinner_qM83 spinner_oXPr"
cx="12"
cy="12"
r="2.5"
/><circle class="spinner_qM83 spinner_ZTLf" cx="20" cy="12" r="2.5" /></svg
>
</div>
<div class="flex flex-col justify-center -space-y-0.5"> <div class="flex flex-col justify-center -space-y-0.5">
<div class=" dark:text-gray-100 text-sm font-medium line-clamp-2 text-wrap"> <div class=" dark:text-gray-100 text-sm font-medium line-clamp-2 text-wrap">
{message.progress} {message.progress}
</div>
</div> </div>
</button>
</div>
{/if}
{#if message.files}
{#each message.files as file}
<div>
{#if file.type === 'websearch'}
<button
class="h-16 w-[15rem] flex items-center space-x-3 px-2.5 dark:bg-gray-600 rounded-xl border border-gray-200 dark:border-none text-left"
type="button"
>
<div class="p-2.5 bg-red-400 text-white rounded-lg">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
fill="currentColor"
class="w-6 h-6"
>
<path
d="M11.625 16.5a1.875 1.875 0 1 0 0-3.75 1.875 1.875 0 0 0 0 3.75Z"
/>
<path
fill-rule="evenodd"
d="M5.625 1.5H9a3.75 3.75 0 0 1 3.75 3.75v1.875c0 1.036.84 1.875 1.875 1.875H16.5a3.75 3.75 0 0 1 3.75 3.75v7.875c0 1.035-.84 1.875-1.875 1.875H5.625a1.875 1.875 0 0 1-1.875-1.875V3.375c0-1.036.84-1.875 1.875-1.875Zm6 16.5c.66 0 1.277-.19 1.797-.518l1.048 1.048a.75.75 0 0 0 1.06-1.06l-1.047-1.048A3.375 3.375 0 1 0 11.625 18Z"
clip-rule="evenodd"
/>
<path
d="M14.25 5.25a5.23 5.23 0 0 0-1.279-3.434 9.768 9.768 0 0 1 6.963 6.963A5.23 5.23 0 0 0 16.5 7.5h-1.875a.375.375 0 0 1-.375-.375V5.25Z"
/>
</svg>
</div>
<div class="flex flex-col justify-center -space-y-0.5">
<div class=" dark:text-gray-100 text-sm font-medium line-clamp-1">
{file.name}
</div>
<div class=" text-gray-500 text-sm">{$i18n.t('Search Results')}</div>
</div>
</button>
{/if}
</div> </div>
</button> {/each}
</div> {/if}
</div> </div>
{/if} {/if}
......
src/routes/(app)/+page.svelte
View file @ f49e1afa
...@@ -327,11 +327,10 @@ ...@@ -327,11 +327,10 @@
messages = messages; messages = messages;
return; return;
} }
const parentMessage = history.messages[parentId]; if (!responseMessage.files) {
if (!parentMessage.files) { responseMessage.files = [];
parentMessage.files = [];
} }
parentMessage.files.push({ responseMessage.files.push({
collection_name: searchDocument!.collection_name, collection_name: searchDocument!.collection_name,
name: searchQuery, name: searchQuery,
type: 'websearch', type: 'websearch',
......
src/routes/(app)/c/[id]/+page.svelte
View file @ f49e1afa
...@@ -332,11 +332,10 @@ ...@@ -332,11 +332,10 @@
messages = messages; messages = messages;
return; return;
} }
const parentMessage = history.messages[parentId]; if (!responseMessage.files) {
if (!parentMessage.files) { responseMessage.files = [];
parentMessage.files = [];
} }
parentMessage.files.push({ responseMessage.files.push({
collection_name: searchDocument!.collection_name, collection_name: searchDocument!.collection_name,
name: searchQuery, name: searchQuery,
type: 'websearch', type: 'websearch',
......
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