Skip to content

Commit edb8971

Browse files
committed
refac
1 parent 64da99a commit edb8971

3 files changed

Lines changed: 177 additions & 5 deletions

File tree

src/lib/components/chat/MessageInput/InputMenu.svelte

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import ChevronLeft from '$lib/components/icons/ChevronLeft.svelte';
2323
import PageEdit from '$lib/components/icons/PageEdit.svelte';
2424
import Chats from './InputMenu/Chats.svelte';
25+
import Files from './InputMenu/Files.svelte';
2526
import Notes from './InputMenu/Notes.svelte';
2627
import Knowledge from './InputMenu/Knowledge.svelte';
2728
import AttachWebpageModal from './AttachWebpageModal.svelte';
@@ -204,6 +205,38 @@
204205
</button>
205206
</Tooltip>
206207

208+
<Tooltip
209+
content={fileUploadCapableModels.length !== selectedModels.length
210+
? $i18n.t('Model(s) do not support file upload')
211+
: !fileUploadEnabled
212+
? $i18n.t('You do not have permission to upload files.')
213+
: ''}
214+
className="w-full"
215+
>
216+
<button
217+
class="flex gap-2 w-full items-center px-3 py-1.5 text-sm select-none cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-800/50 rounded-xl {!fileUploadEnabled
218+
? 'opacity-50'
219+
: ''}"
220+
on:click={() => {
221+
if (fileUploadEnabled) {
222+
tab = 'files';
223+
}
224+
}}
225+
>
226+
<DocumentArrowUp />
227+
228+
<div class="flex items-center w-full justify-between">
229+
<div class="line-clamp-1">
230+
{$i18n.t('Attach Files')}
231+
</div>
232+
233+
<div class="text-gray-500">
234+
<ChevronRight />
235+
</div>
236+
</div>
237+
</button>
238+
</Tooltip>
239+
207240
{#if $config?.features?.enable_notes ?? false}
208241
<Tooltip
209242
content={fileUploadCapableModels.length !== selectedModels.length
@@ -481,6 +514,25 @@
481514

482515
<Notes {onSelect} />
483516
</div>
517+
{:else if tab === 'files'}
518+
<div in:fly={{ x: 20, duration: 150 }}>
519+
<button
520+
class="flex w-full justify-between gap-2 items-center px-3 py-1.5 text-sm select-none cursor-pointer rounded-xl hover:bg-gray-50 dark:hover:bg-gray-800/50"
521+
on:click={() => {
522+
tab = '';
523+
}}
524+
>
525+
<ChevronLeft />
526+
527+
<div class="flex items-center w-full justify-between">
528+
<div>
529+
{$i18n.t('Files')}
530+
</div>
531+
</div>
532+
</button>
533+
534+
<Files {onSelect} />
535+
</div>
484536
{:else if tab === 'chats'}
485537
<div in:fly={{ x: 20, duration: 150 }}>
486538
<button
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<script lang="ts">
2+
import { onMount, tick, getContext } from 'svelte';
3+
4+
import { searchFiles } from '$lib/apis/files';
5+
6+
import Tooltip from '$lib/components/common/Tooltip.svelte';
7+
import DocumentPage from '$lib/components/icons/DocumentPage.svelte';
8+
import Spinner from '$lib/components/common/Spinner.svelte';
9+
import Loader from '$lib/components/common/Loader.svelte';
10+
11+
const i18n = getContext('i18n');
12+
13+
export let onSelect = (e) => {};
14+
15+
let loaded = false;
16+
let items = [];
17+
let selectedIdx = 0;
18+
19+
let page = 0;
20+
let limit = 50;
21+
let itemsLoading = false;
22+
let allItemsLoaded = false;
23+
24+
const loadMoreItems = async () => {
25+
if (allItemsLoaded) return;
26+
page += 1;
27+
await getItemsPage();
28+
};
29+
30+
const getItemsPage = async () => {
31+
itemsLoading = true;
32+
let res = await searchFiles(localStorage.token, '*', page * limit, limit).catch(() => []);
33+
34+
if ((res ?? []).length < limit) {
35+
allItemsLoaded = true;
36+
}
37+
38+
items = [
39+
...items,
40+
...(res ?? []).map((file) => ({
41+
...file,
42+
type: file?.meta?.content_type?.startsWith('image/') ? 'image' : 'file',
43+
name: file.filename,
44+
url: file.id,
45+
content_type: file?.meta?.content_type,
46+
size: file?.meta?.size
47+
}))
48+
];
49+
50+
itemsLoading = false;
51+
return res;
52+
};
53+
54+
onMount(async () => {
55+
await getItemsPage();
56+
await tick();
57+
loaded = true;
58+
});
59+
</script>
60+
61+
{#if loaded}
62+
{#if items.length === 0}
63+
<div class="text-center text-xs text-gray-500 py-3">{$i18n.t('No files found')}</div>
64+
{:else}
65+
<div class="flex flex-col gap-0.5">
66+
{#each items as item, idx}
67+
<button
68+
class=" px-2.5 py-1 rounded-xl w-full text-left flex justify-between items-center text-sm {idx ===
69+
selectedIdx
70+
? ' bg-gray-50 dark:bg-gray-800 dark:text-gray-100 selected-command-option-button'
71+
: ''}"
72+
type="button"
73+
on:click={() => {
74+
onSelect(item);
75+
}}
76+
on:mousemove={() => {
77+
selectedIdx = idx;
78+
}}
79+
on:mouseleave={() => {
80+
if (idx === 0) {
81+
selectedIdx = -1;
82+
}
83+
}}
84+
data-selected={idx === selectedIdx}
85+
>
86+
<div class="text-black dark:text-gray-100 flex items-center gap-1.5 overflow-hidden">
87+
<Tooltip content={$i18n.t('File')} placement="top">
88+
<DocumentPage className="size-4 shrink-0" />
89+
</Tooltip>
90+
91+
<Tooltip content={item?.name} placement="top-start">
92+
<div class="line-clamp-1 flex-1">
93+
{item?.name}
94+
</div>
95+
</Tooltip>
96+
</div>
97+
</button>
98+
{/each}
99+
100+
{#if !allItemsLoaded}
101+
<Loader
102+
on:visible={(e) => {
103+
if (!itemsLoading) {
104+
loadMoreItems();
105+
}
106+
}}
107+
>
108+
<div class="w-full flex justify-center py-4 text-xs animate-pulse items-center gap-2">
109+
<Spinner className=" size-4" />
110+
<div class=" ">{$i18n.t('Loading...')}</div>
111+
</div>
112+
</Loader>
113+
{/if}
114+
</div>
115+
{/if}
116+
{:else}
117+
<div class="py-4.5">
118+
<Spinner />
119+
</div>
120+
{/if}

src/lib/components/chat/Messages/CodeBlock.svelte

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@
469469
{/if}
470470
{:else}
471471
<div
472-
class="sticky {stickyButtonsClassName} left-0 right-0 py-1.5 px-3 gap-2 flex items-center justify-end w-full z-10 text-xs text-black dark:text-white bg-white dark:bg-black rounded-t-2xl"
472+
class="sticky {stickyButtonsClassName} left-0 right-0 py-1.5 px-3.5 gap-2 flex items-center justify-end w-full z-10 text-xs text-black dark:text-white bg-white dark:bg-black rounded-t-2xl"
473473
>
474474
<div class="flex-1 truncate">
475475
<Tooltip content={lang} placement="top-start">
@@ -599,17 +599,17 @@
599599

600600
{#if executing || stdout || stderr || result || files}
601601
<div
602-
class="bg-gray-50 dark:bg-black dark:text-white rounded-b-2xl! py-4 px-4 flex flex-col gap-2"
602+
class="bg-gray-50 dark:bg-black dark:text-white rounded-b-2xl! pt-2 pb-3 px-3.5 flex flex-col gap-2"
603603
>
604604
{#if executing}
605605
<div class=" ">
606-
<div class=" text-gray-500 text-sm mb-1">{$i18n.t('STDOUT/STDERR')}</div>
606+
<div class=" text-gray-500 text-xs mb-1">{$i18n.t('STDOUT/STDERR')}</div>
607607
<div class="text-sm">{$i18n.t('Running...')}</div>
608608
</div>
609609
{:else}
610610
{#if stdout || stderr}
611611
<div class=" ">
612-
<div class=" text-gray-500 text-sm mb-1">{$i18n.t('STDOUT/STDERR')}</div>
612+
<div class=" text-gray-500 text-xs mb-1">{$i18n.t('STDOUT/STDERR')}</div>
613613
<div
614614
class="text-sm font-mono whitespace-pre-wrap {stdout?.split('\n')?.length > 100
615615
? `max-h-96`
@@ -621,7 +621,7 @@
621621
{/if}
622622
{#if result || files}
623623
<div class=" ">
624-
<div class=" text-gray-500 text-sm mb-1">{$i18n.t('RESULT')}</div>
624+
<div class=" text-gray-500 text-xs mb-1">{$i18n.t('RESULT')}</div>
625625
{#if result}
626626
<div class="text-sm">{`${JSON.stringify(result)}`}</div>
627627
{/if}

0 commit comments

Comments
 (0)