Initialize page on load

This commit is contained in:
Cohee
2024-10-09 21:51:31 +03:00
parent 64ff555425
commit 151a77cd36
2 changed files with 29 additions and 37 deletions

View File

@ -266,8 +266,8 @@ export async function loadAphroditeModels(data) {
} }
} }
let selectedModelId = null; // Page -1 will be initialized from a selected model.
let currentPage = 1; let currentPage = -1;
export async function loadFeatherlessModels(data) { export async function loadFeatherlessModels(data) {
const searchBar = document.getElementById('model_search_bar'); const searchBar = document.getElementById('model_search_bar');
const modelCardBlock = document.getElementById('model_card_block'); const modelCardBlock = document.getElementById('model_card_block');
@ -297,6 +297,8 @@ export async function loadFeatherlessModels(data) {
const perPage = Number(localStorage.getItem(storageKey)) || 10; const perPage = Number(localStorage.getItem(storageKey)) || 10;
// Initialize pagination with the full set of models // Initialize pagination with the full set of models
const selectedModelPage = (data.findIndex(x => x.id === textgen_settings.featherless_model) / perPage) + 1;
currentPage = currentPage === -1 && selectedModelPage > 0 ? selectedModelPage : 1;
setupPagination(originalModels, perPage); setupPagination(originalModels, perPage);
// Function to set up pagination (also used for filtered results) // Function to set up pagination (also used for filtered results)
@ -354,7 +356,7 @@ export async function loadFeatherlessModels(data) {
modelCardBlock.appendChild(card); modelCardBlock.appendChild(card);
if (model.id === selectedModelId) { if (model.id === textgen_settings.featherless_model) {
card.classList.add('selected'); card.classList.add('selected');
} }
@ -376,8 +378,6 @@ export async function loadFeatherlessModels(data) {
}); });
} }
// Add event listener for input on the search bar // Add event listener for input on the search bar
searchBar.addEventListener('input', function () { searchBar.addEventListener('input', function () {
applyFiltersAndSort(); applyFiltersAndSort();
@ -411,6 +411,12 @@ export async function loadFeatherlessModels(data) {
// Function to apply sorting and filtering based on user input // Function to apply sorting and filtering based on user input
async function applyFiltersAndSort() { async function applyFiltersAndSort() {
if (!(searchBar instanceof HTMLInputElement) ||
!(sortOrderSelect instanceof HTMLSelectElement) ||
!(classSelect instanceof HTMLSelectElement) ||
!(categoriesSelect instanceof HTMLSelectElement)) {
return;
}
const searchQuery = searchBar.value.toLowerCase(); const searchQuery = searchBar.value.toLowerCase();
const selectedSortOrder = sortOrderSelect.value; const selectedSortOrder = sortOrderSelect.value;
const selectedClass = classSelect.value; const selectedClass = classSelect.value;
@ -460,7 +466,15 @@ export async function loadFeatherlessModels(data) {
setupPagination(filteredModels, Number(localStorage.getItem(storageKey)) || perPage, currentPage); setupPagination(filteredModels, Number(localStorage.getItem(storageKey)) || perPage, currentPage);
} }
// Required to keep the /model command function
$('#featherless_model').empty();
for (const model of data) {
const option = document.createElement('option');
option.value = model.id;
option.text = model.id;
option.selected = model.id === textgen_settings.featherless_model;
$('#featherless_model').append(option);
}
} }
async function fetchFeatherlessStats() { async function fetchFeatherlessStats() {
@ -476,10 +490,9 @@ async function fetchFeatherlessNew() {
} }
function onFeatherlessModelSelect(modelId) { function onFeatherlessModelSelect(modelId) {
const model = featherlessModels.find(x => x.id === modelId); const model = featherlessModels.find(x => x.id === modelId);
selectedModelId = modelId;
textgen_settings.featherless_model = modelId; textgen_settings.featherless_model = modelId;
$('#featherless_model').val(modelId);
$('#api_button_textgenerationwebui').trigger('click'); $('#api_button_textgenerationwebui').trigger('click');
setGenerationParamsFromPreset({ max_length: model.context_length }); setGenerationParamsFromPreset({ max_length: model.context_length });
} }
@ -679,20 +692,6 @@ function getAphroditeModelTemplate(option) {
`)); `));
} }
function getFeatherlessModelTemplate(option) {
const model = featherlessModels.find(x => x.id === option?.element?.value);
if (!option.id || !model) {
return option.text;
}
return $((`
<div class="flex-container flexFlowColumn">
<div><strong>${DOMPurify.sanitize(model.name)}</strong> | <span>${model.context_length || '???'} tokens</span></div>
</div>
`));
}
async function downloadOllamaModel() { async function downloadOllamaModel() {
try { try {
const serverUrl = textgen_settings.server_urls[textgen_types.OLLAMA]; const serverUrl = textgen_settings.server_urls[textgen_types.OLLAMA];
@ -880,7 +879,6 @@ export function initTextGenModels() {
$('#ollama_download_model').on('click', downloadOllamaModel); $('#ollama_download_model').on('click', downloadOllamaModel);
$('#vllm_model').on('change', onVllmModelSelect); $('#vllm_model').on('change', onVllmModelSelect);
$('#aphrodite_model').on('change', onAphroditeModelSelect); $('#aphrodite_model').on('change', onAphroditeModelSelect);
$('#featherless_model').on('change', onFeatherlessModelSelect);
$('#tabby_download_model').on('click', downloadTabbyModel); $('#tabby_download_model').on('click', downloadTabbyModel);
$('#tabby_model').on('change', onTabbyModelSelect); $('#tabby_model').on('change', onTabbyModelSelect);
@ -955,13 +953,6 @@ export function initTextGenModels() {
width: '100%', width: '100%',
templateResult: getAphroditeModelTemplate, templateResult: getAphroditeModelTemplate,
}); });
$('#featherless_model').select2({
placeholder: 'Select a model',
searchInputPlaceholder: 'Search models...',
searchInputCssClass: 'text_pole',
width: '100%',
templateResult: getFeatherlessModelTemplate,
});
providersSelect.select2({ providersSelect.select2({
sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)), sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)),
placeholder: 'Select providers. No selection = all providers.', placeholder: 'Select providers. No selection = all providers.',

View File

@ -186,6 +186,7 @@ const settings = {
openrouter_allow_fallbacks: true, openrouter_allow_fallbacks: true,
xtc_threshold: 0.1, xtc_threshold: 0.1,
xtc_probability: 0, xtc_probability: 0,
featherless_model: '',
}; };
export let textgenerationwebui_banned_in_macros = []; export let textgenerationwebui_banned_in_macros = [];