refac
This commit is contained in:
1 parent
6fd8c599c1
commit
c89fd237b8
3 files changed
+65
-36
No files matched your search
@@ -22,11 +22,12 @@
|
|||||||
export let selectedModelIdx: number = -1;
|
export let selectedModelIdx: number = -1;
|
||||||
export let item: any = {};
|
export let item: any = {};
|
||||||
export let index: number = -1;
|
export let index: number = -1;
|
||||||
export let value: string = '';
|
export let value: string | null = '';
|
||||||
|
|
||||||
export let unloadModelHandler: (modelValue: string) => void = () => {};
|
export let unloadModelHandler: (modelValue: string) => void = () => {};
|
||||||
export let pinModelHandler: (modelId: string) => void = () => {};
|
export let pinModelHandler: (modelId: string) => void = () => {};
|
||||||
export let deleteModelHandler: (model: any) => void = () => {};
|
export let deleteModelHandler: (model: any) => void = () => {};
|
||||||
|
export let selectionOnly = false;
|
||||||
|
|
||||||
export let onClick: () => void = () => {};
|
export let onClick: () => void = () => {};
|
||||||
|
|
||||||
@@ -237,7 +238,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="ml-auto pl-2 pr-1 flex items-center gap-1.5 shrink-0">
|
<div class="ml-auto pl-2 pr-1 flex items-center gap-1.5 shrink-0">
|
||||||
{#if $user?.role === 'admin' && item.model.loaded}
|
{#if !selectionOnly && $user?.role === 'admin' && item.model.loaded}
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={`${$i18n.t('Eject')}`}
|
content={`${$i18n.t('Eject')}`}
|
||||||
className="flex-shrink-0 group-hover/item:opacity-100 opacity-0 "
|
className="flex-shrink-0 group-hover/item:opacity-100 opacity-0 "
|
||||||
@@ -256,27 +257,29 @@
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<ModelItemMenu
|
{#if !selectionOnly}
|
||||||
bind:show={showMenu}
|
<ModelItemMenu
|
||||||
model={item.model}
|
bind:show={showMenu}
|
||||||
{pinModelHandler}
|
model={item.model}
|
||||||
{deleteModelHandler}
|
{pinModelHandler}
|
||||||
copyLinkHandler={() => {
|
{deleteModelHandler}
|
||||||
copyLinkHandler(item.model);
|
copyLinkHandler={() => {
|
||||||
}}
|
copyLinkHandler(item.model);
|
||||||
>
|
|
||||||
<button
|
|
||||||
aria-label={`${$i18n.t('More Options')}`}
|
|
||||||
class="flex"
|
|
||||||
on:click={(e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopPropagation();
|
|
||||||
showMenu = !showMenu;
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<EllipsisHorizontal />
|
<button
|
||||||
</button>
|
aria-label={`${$i18n.t('More Options')}`}
|
||||||
</ModelItemMenu>
|
class="flex"
|
||||||
|
on:click={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
showMenu = !showMenu;
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<EllipsisHorizontal />
|
||||||
|
</button>
|
||||||
|
</ModelItemMenu>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{#if value === item.value}
|
{#if value === item.value}
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -42,10 +42,11 @@
|
|||||||
const dispatch = createEventDispatcher();
|
const dispatch = createEventDispatcher();
|
||||||
|
|
||||||
export let id = '';
|
export let id = '';
|
||||||
export let value = '';
|
export let value: string | null = '';
|
||||||
export let placeholder = $i18n.t('Select a model');
|
export let placeholder = $i18n.t('Select a model');
|
||||||
export let searchEnabled = true;
|
export let searchEnabled = true;
|
||||||
export let searchPlaceholder = $i18n.t('Search a model');
|
export let searchPlaceholder = $i18n.t('Search a model');
|
||||||
|
export let selectionOnly = false;
|
||||||
|
|
||||||
export let items: {
|
export let items: {
|
||||||
label: string;
|
label: string;
|
||||||
@@ -398,7 +399,7 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$: if (show) {
|
$: if (show && !selectionOnly) {
|
||||||
setOllamaVersion();
|
setOllamaVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -742,6 +743,7 @@
|
|||||||
{pinModelHandler}
|
{pinModelHandler}
|
||||||
{unloadModelHandler}
|
{unloadModelHandler}
|
||||||
{deleteModelHandler}
|
{deleteModelHandler}
|
||||||
|
{selectionOnly}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
value = item.value;
|
value = item.value;
|
||||||
selectedModelIdx = index;
|
selectedModelIdx = index;
|
||||||
@@ -754,7 +756,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if !(searchValue.trim() in $MODEL_DOWNLOAD_POOL) && searchValue && ollamaVersion && $user?.role === 'admin'}
|
{#if !selectionOnly && !(searchValue.trim() in $MODEL_DOWNLOAD_POOL) && searchValue && ollamaVersion && $user?.role === 'admin'}
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={$i18n.t(`Pull "{{searchValue}}" from Ollama.com`, {
|
content={$i18n.t(`Pull "{{searchValue}}" from Ollama.com`, {
|
||||||
searchValue: searchValue
|
searchValue: searchValue
|
||||||
@@ -776,7 +778,7 @@
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#each Object.keys($MODEL_DOWNLOAD_POOL) as model}
|
{#each selectionOnly ? [] : Object.keys($MODEL_DOWNLOAD_POOL) as model}
|
||||||
<div
|
<div
|
||||||
class="flex w-full justify-between font-medium select-none rounded-button py-2 pl-3 pr-1.5 text-sm text-gray-700 dark:text-gray-100 outline-hidden transition-all duration-75 rounded-xl cursor-pointer data-highlighted:bg-muted"
|
class="flex w-full justify-between font-medium select-none rounded-button py-2 pl-3 pr-1.5 text-sm text-gray-700 dark:text-gray-100 outline-hidden transition-all duration-75 rounded-xl cursor-pointer data-highlighted:bg-muted"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
import { getVoices } from '$lib/apis/audio';
|
import { getVoices } from '$lib/apis/audio';
|
||||||
|
|
||||||
import AdvancedParams from '$lib/components/chat/Settings/Advanced/AdvancedParams.svelte';
|
import AdvancedParams from '$lib/components/chat/Settings/Advanced/AdvancedParams.svelte';
|
||||||
|
import ModelSelector from '$lib/components/chat/ModelSelector/Selector.svelte';
|
||||||
import Tags from '$lib/components/common/Tags.svelte';
|
import Tags from '$lib/components/common/Tags.svelte';
|
||||||
import Knowledge from '$lib/components/workspace/Models/Knowledge.svelte';
|
import Knowledge from '$lib/components/workspace/Models/Knowledge.svelte';
|
||||||
import ToolsSelector from '$lib/components/workspace/Models/ToolsSelector.svelte';
|
import ToolsSelector from '$lib/components/workspace/Models/ToolsSelector.svelte';
|
||||||
@@ -112,6 +113,25 @@
|
|||||||
export let suggestionTags: { name: string }[] = [];
|
export let suggestionTags: { name: string }[] = [];
|
||||||
let voices: { id: string; name?: string }[] = [];
|
let voices: { id: string; name?: string }[] = [];
|
||||||
|
|
||||||
|
const getBaseModelItems = (models: any[] = []) => {
|
||||||
|
const currentModelId = (model as any)?.id;
|
||||||
|
|
||||||
|
return models
|
||||||
|
.filter(
|
||||||
|
(baseModel) =>
|
||||||
|
(!currentModelId || baseModel.id !== currentModelId) &&
|
||||||
|
!baseModel?.preset &&
|
||||||
|
baseModel?.owned_by !== 'arena' &&
|
||||||
|
!(baseModel?.direct ?? false) &&
|
||||||
|
(!(baseModel?.info?.meta?.hidden ?? false) || baseModel.id === info.base_model_id)
|
||||||
|
)
|
||||||
|
.map((baseModel) => ({
|
||||||
|
value: baseModel.id,
|
||||||
|
label: baseModel.name,
|
||||||
|
model: baseModel
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
const loadSuggestionTags = async () => {
|
const loadSuggestionTags = async () => {
|
||||||
const res: string[] = await (preset ? getModelTags : getBaseModelTags)(
|
const res: string[] = await (preset ? getModelTags : getBaseModelTags)(
|
||||||
localStorage.token
|
localStorage.token
|
||||||
@@ -144,6 +164,13 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (preset && !info.base_model_id) {
|
||||||
|
toast.error($i18n.t('Base Model is required.'));
|
||||||
|
loading = false;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (knowledge.some((item) => item.status === 'uploading')) {
|
if (knowledge.some((item) => item.status === 'uploading')) {
|
||||||
toast.error($i18n.t('Please wait until all files are uploaded.'));
|
toast.error($i18n.t('Please wait until all files are uploaded.'));
|
||||||
loading = false;
|
loading = false;
|
||||||
@@ -619,19 +646,16 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<select
|
<ModelSelector
|
||||||
class="text-sm w-full bg-transparent outline-hidden"
|
id="workspace-base-model"
|
||||||
placeholder={$i18n.t('Select a base model (e.g. llama3, gpt-4o)')}
|
placeholder={$i18n.t('Select a base model (e.g. llama3, gpt-4o)')}
|
||||||
|
searchPlaceholder={$i18n.t('Search a model')}
|
||||||
|
items={getBaseModelItems($models)}
|
||||||
|
className="w-[32rem]"
|
||||||
|
triggerClassName="text-sm"
|
||||||
|
selectionOnly
|
||||||
bind:value={info.base_model_id}
|
bind:value={info.base_model_id}
|
||||||
required
|
/>
|
||||||
>
|
|
||||||
<option value={null} class=" text-gray-900"
|
|
||||||
>{$i18n.t('Select a base model')}</option
|
|
||||||
>
|
|
||||||
{#each $models.filter((m) => (model ? m.id !== model.id : true) && !m?.preset && m?.owned_by !== 'arena' && !(m?.direct ?? false) && (!(m?.info?.meta?.hidden ?? false) || m.id === info.base_model_id)) as model}
|
|
||||||
<option value={model.id} class=" text-gray-900">{model.name}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
Reference in new issue
Block a user