feat: modelfiles to models

This commit is contained in:
Timothy J. Baek
2024-05-24 00:26:00 -07:00
parent 17e4be49c0
commit 4d57e08b38
18 changed files with 257 additions and 310 deletions

View File

@@ -14,7 +14,7 @@
import { toast } from 'svelte-sonner';
import {
capitalizeFirstLetter,
getModels,
getAllModels,
sanitizeResponseContent,
splitStream
} from '$lib/utils';
@@ -159,7 +159,7 @@
})
);
models.set(await getModels(localStorage.token));
models.set(await getAllModels(localStorage.token));
} else {
toast.error($i18n.t('Download canceled'));
}

View File

@@ -23,7 +23,7 @@
const i18n = getContext('i18n');
export let getModels: Function;
export let getAllModels: Function;
// External
let OLLAMA_BASE_URLS = [''];
@@ -38,7 +38,7 @@
OPENAI_API_BASE_URLS = await updateOpenAIUrls(localStorage.token, OPENAI_API_BASE_URLS);
OPENAI_API_KEYS = await updateOpenAIKeys(localStorage.token, OPENAI_API_KEYS);
await models.set(await getModels());
await models.set(await getAllModels());
};
const updateOllamaUrlsHandler = async () => {
@@ -51,7 +51,7 @@
if (ollamaVersion) {
toast.success($i18n.t('Server connection verified'));
await models.set(await getModels());
await models.set(await getAllModels());
}
};

View File

@@ -11,7 +11,7 @@
import AdvancedParams from './Advanced/AdvancedParams.svelte';
export let saveSettings: Function;
export let getModels: Function;
export let getAllModels: Function;
// General
let themes = ['dark', 'light', 'rose-pine dark', 'rose-pine-dawn light', 'oled-dark'];

View File

@@ -42,7 +42,7 @@
let imageSize = '';
let steps = 50;
const getModels = async () => {
const getAllModels = async () => {
models = await getImageGenerationModels(localStorage.token).catch((error) => {
toast.error(error);
return null;
@@ -66,7 +66,7 @@
if (res) {
COMFYUI_BASE_URL = res.COMFYUI_BASE_URL;
await getModels();
await getAllModels();
if (models) {
toast.success($i18n.t('Server connection verified'));
@@ -85,7 +85,7 @@
if (res) {
AUTOMATIC1111_BASE_URL = res.AUTOMATIC1111_BASE_URL;
await getModels();
await getAllModels();
if (models) {
toast.success($i18n.t('Server connection verified'));
@@ -112,7 +112,7 @@
if (enableImageGeneration) {
config.set(await getBackendConfig(localStorage.token));
getModels();
getAllModels();
}
};
@@ -141,7 +141,7 @@
steps = await getImageSteps(localStorage.token);
if (enableImageGeneration) {
getModels();
getAllModels();
}
}
});

View File

@@ -22,7 +22,7 @@
const i18n = getContext('i18n');
export let getModels: Function;
export let getAllModels: Function;
let showLiteLLM = false;
let showLiteLLMParams = false;
@@ -261,7 +261,7 @@
})
);
models.set(await getModels(localStorage.token));
models.set(await getAllModels(localStorage.token));
} else {
toast.error($i18n.t('Download canceled'));
}
@@ -424,7 +424,7 @@
modelTransferring = false;
uploadProgress = null;
models.set(await getModels());
models.set(await getAllModels());
};
const deleteModelHandler = async () => {
@@ -439,7 +439,7 @@
}
deleteModelTag = '';
models.set(await getModels());
models.set(await getAllModels());
};
const cancelModelPullHandler = async (model: string) => {
@@ -488,7 +488,7 @@
liteLLMMaxTokens = '';
liteLLMModelInfo = await getLiteLLMModelInfo(localStorage.token);
models.set(await getModels());
models.set(await getAllModels());
};
const deleteLiteLLMModelHandler = async () => {
@@ -507,7 +507,7 @@
deleteLiteLLMModelName = '';
liteLLMModelInfo = await getLiteLLMModelInfo(localStorage.token);
models.set(await getModels());
models.set(await getAllModels());
};
const addModelInfoHandler = async () => {
@@ -519,9 +519,7 @@
return;
}
// Remove any existing config
modelConfig = modelConfig.filter(
(m) => !(m.id === selectedModelId)
);
modelConfig = modelConfig.filter((m) => !(m.id === selectedModelId));
// Add new config
modelConfig.push({
id: selectedModelId,
@@ -536,7 +534,7 @@
toast.success(
$i18n.t('Model info for {{modelName}} added successfully', { modelName: selectedModelId })
);
models.set(await getModels());
models.set(await getAllModels());
};
const deleteModelInfoHandler = async () => {
@@ -547,14 +545,12 @@
if (!model) {
return;
}
modelConfig = modelConfig.filter(
(m) => !(m.id === selectedModelId)
);
modelConfig = modelConfig.filter((m) => !(m.id === selectedModelId));
await updateModelConfig(localStorage.token, modelConfig);
toast.success(
$i18n.t('Model info for {{modelName}} deleted successfully', { modelName: selectedModelId })
);
models.set(await getModels());
models.set(await getAllModels());
};
const toggleIsVisionCapable = () => {

View File

@@ -3,7 +3,7 @@
import { toast } from 'svelte-sonner';
import { models, settings, user } from '$lib/stores';
import { getModels as _getModels } from '$lib/utils';
import { getAllModels as _getAllModels } from '$lib/utils';
import Modal from '../common/Modal.svelte';
import Account from './Settings/Account.svelte';
@@ -25,12 +25,12 @@
const saveSettings = async (updated) => {
console.log(updated);
await settings.set({ ...$settings, ...updated });
await models.set(await getModels());
await models.set(await getAllModels());
localStorage.setItem('settings', JSON.stringify($settings));
};
const getModels = async () => {
return await _getModels(localStorage.token);
const getAllModels = async () => {
return await _getAllModels(localStorage.token);
};
let selectedTab = 'general';
@@ -318,17 +318,17 @@
<div class="flex-1 md:min-h-[28rem]">
{#if selectedTab === 'general'}
<General
{getModels}
{getAllModels}
{saveSettings}
on:save={() => {
toast.success($i18n.t('Settings saved successfully!'));
}}
/>
{:else if selectedTab === 'models'}
<Models {getModels} />
<Models {getAllModels} />
{:else if selectedTab === 'connections'}
<Connections
{getModels}
{getAllModels}
on:save={() => {
toast.success($i18n.t('Settings saved successfully!'));
}}

View File

@@ -7,11 +7,7 @@
import { WEBUI_NAME, modelfiles, settings, user } from '$lib/stores';
import { createModel, deleteModel } from '$lib/apis/ollama';
import {
createNewModelfile,
deleteModelfileByTagName,
getModelfiles
} from '$lib/apis/modelfiles';
import { addNewModel, deleteModelById, getModels } from '$lib/apis/models';
import { goto } from '$app/navigation';
const i18n = getContext('i18n');
@@ -36,8 +32,8 @@
const deleteModelfile = async (tagName) => {
await deleteModelHandler(tagName);
await deleteModelfileByTagName(localStorage.token, tagName);
await modelfiles.set(await getModelfiles(localStorage.token));
await deleteModelById(localStorage.token, tagName);
await modelfiles.set(await getModels(localStorage.token));
};
const shareModelfile = async (modelfile) => {
@@ -246,12 +242,12 @@
console.log(savedModelfiles);
for (const modelfile of savedModelfiles) {
await createNewModelfile(localStorage.token, modelfile).catch((error) => {
await addNewModel(localStorage.token, modelfile).catch((error) => {
return null;
});
}
await modelfiles.set(await getModelfiles(localStorage.token));
await modelfiles.set(await getModels(localStorage.token));
};
reader.readAsText(importFiles[0]);
@@ -318,7 +314,7 @@
class="self-center w-fit text-sm px-3 py-1 border dark:border-gray-600 rounded-xl flex"
on:click={async () => {
for (const modelfile of localModelfiles) {
await createNewModelfile(localStorage.token, modelfile).catch((error) => {
await addNewModel(localStorage.token, modelfile).catch((error) => {
return null;
});
}
@@ -326,7 +322,7 @@
saveModelfiles(localModelfiles);
localStorage.removeItem('modelfiles');
localModelfiles = JSON.parse(localStorage.getItem('modelfiles') ?? '[]');
await modelfiles.set(await getModelfiles(localStorage.token));
await modelfiles.set(await getModels(localStorage.token));
}}
>
<div class=" self-center mr-2 font-medium">{$i18n.t('Sync All')}</div>
@@ -354,7 +350,7 @@
localStorage.removeItem('modelfiles');
localModelfiles = JSON.parse(localStorage.getItem('modelfiles') ?? '[]');
await modelfiles.set(await getModelfiles(localStorage.token));
await modelfiles.set(await getModels(localStorage.token));
}}
>
<div class=" self-center">