diff --git a/src/lib/components/chat/ModelSelector/Selector.svelte b/src/lib/components/chat/ModelSelector/Selector.svelte index 6ada254635..8df105c62c 100644 --- a/src/lib/components/chat/ModelSelector/Selector.svelte +++ b/src/lib/components/chat/ModelSelector/Selector.svelte @@ -14,7 +14,7 @@ import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; import { flyAndScale } from '$lib/utils/transitions'; - import { onMount, getContext, tick } from 'svelte'; + import { getContext, tick } from 'svelte'; import { deleteModel, getOllamaVersion, pullModel } from '$lib/apis/ollama'; import { deleteModelById } from '$lib/apis/models'; @@ -206,7 +206,14 @@ } }; - let tags = []; + $: tags = Array.from( + new Set( + (items ?? []) + .filter((item) => includeHidden || !(item.model?.info?.meta?.hidden ?? false)) + .flatMap((item) => item.model?.tags ?? []) + .map((tag) => tag.name.toLowerCase()) + ) + ).sort((a, b) => a.localeCompare(b)); let selectedModel = ''; $: selectedValues = values ?? (value ? [value] : []); @@ -372,6 +379,17 @@ ? `tag:${selectedTag}` : ''; + $: if (selectedTag && !modelFilterItems.some((item) => item.value === `tag:${selectedTag}`)) { + selectedTag = ''; + } + + $: if ( + selectedConnectionType && + !modelFilterItems.some((item) => item.value === `connection:${selectedConnectionType}`) + ) { + selectedConnectionType = ''; + } + const setModelFilter = (filterValue: string) => { if (!filterValue) { selectedConnectionType = ''; @@ -740,17 +758,6 @@ : []; }; - onMount(() => { - if (items) { - tags = items - .filter((item) => includeHidden || !(item.model?.info?.meta?.hidden ?? false)) - .flatMap((item) => item.model?.tags ?? []) - .map((tag) => tag.name.toLowerCase()); - // Remove duplicates and sort - tags = Array.from(new Set(tags)).sort((a, b) => a.localeCompare(b)); - } - }); - const cancelModelPullHandler = async (model: string) => { const { reader, abortController, providerLabel } = $MODEL_DOWNLOAD_POOL[model]; if (abortController) {