Merge pull request #3305 from Eradev/staging Fixed featherless.ai models display and filters

e7bcac017176518e90a5455a7c1e1b81205cc406

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/scripts/textgen-models.js+11 -11 Viewed

         return;
+    }
-    // Sort the data by model id (default A-Z)
-    data.sort((a, b) => a.id.localeCompare(b.id));
     originalModels = data;  // Store the original data for search
     featherlessModels = data;

     // Retrieve the stored number of items per page or default to 10
     const perPage = Number(localStorage.getItem(storageKey)) || 10;
-    // Initialize pagination with the full set of models
+    // Initialize pagination
-    const currentModelIndex = data.findIndex(x => x.id === textgen_settings.featherless_model);
+    applyFiltersAndSort();
-    featherlessCurrentPage = currentModelIndex >= 0 ? (currentModelIndex / perPage) + 1 : 1;
-    setupPagination(originalModels, perPage);
     // Function to set up pagination (also used for filtered results)
     function setupPagination(models, perPage, pageNumber = featherlessCurrentPage) {

                     const dateAddedDiv = document.createElement('div');
                     dateAddedDiv.classList.add('model-date-added');
-                    dateAddedDiv.textContent = `Added On: ${new Date(model.updated_at).toLocaleDateString()}`;
+                    dateAddedDiv.textContent = `Added On: ${new Date(model.created * 1000).toLocaleDateString()}`;
                     detailsContainer.appendChild(modelClassDiv);
                     detailsContainer.appendChild(contextLengthDiv);

@@ -472,6 +468,7 @@ export async function loadFeatherlessModels(data) {
472	featherlessTop = await fetchFeatherlessStats();	468	featherlessTop = await fetchFeatherlessStats();
473	}	469	}
474	const featherlessIds = featherlessTop.map(stat => stat.id);	470	const featherlessIds = featherlessTop.map(stat => stat.id);
		471
475	if (selectedCategory === 'New') {	472	if (selectedCategory === 'New') {
476	featherlessNew = await fetchFeatherlessNew();	473	featherlessNew = await fetchFeatherlessNew();
477	}	474	}

@@ -493,7 +490,7 @@ export async function loadFeatherlessModels(data) {
493	return matchesSearch && matchesClass && matchesNew;	490	return matchesSearch && matchesClass && matchesNew;
494	}	491	}
495	else {	492	else {
496	return matchesSearch;	493	return matchesSearch && matchesClass;
497	}	494	}
498	});	495	});
499		496

         } else if (selectedSortOrder === 'desc') {
             filteredModels.sort((a, b) => b.id.localeCompare(a.id));
         } else if (selectedSortOrder === 'date_asc') {
-            filteredModels.sort((a, b) => a.updated_at.localeCompare(b.updated_at));
+            filteredModels.sort((a, b) => a.created - b.created);
         } else if (selectedSortOrder === 'date_desc') {
-            filteredModels.sort((a, b) => b.updated_at.localeCompare(a.updated_at));
+            filteredModels.sort((a, b) => b.created - a.created);
+        }
+        const currentModelIndex = filteredModels.findIndex(x => x.id === textgen_settings.featherless_model);
+        featherlessCurrentPage = currentModelIndex >= 0 ? (currentModelIndex / perPage) + 1 : 1;
         setupPagination(filteredModels, Number(localStorage.getItem(storageKey)) || perPage, featherlessCurrentPage);
+    }

@@ -528,7 +528,7 @@ async function fetchFeatherlessStats() {
528	}	528	}
529		529
530	async function fetchFeatherlessNew() {	530	async function fetchFeatherlessNew() {
531	const response = await fetch('https://api.featherless.ai/feather/models?sort=-created_at&perPage=10');	531	const response = await fetch('https://api.featherless.ai/feather/models?sort=-created_at&perPage=20');
532	const data = await response.json();	532	const data = await response.json();
533	return data.items;	533	return data.items;
534	}	534	}