From 7ffc3e9e2ae41e79ca6c2d992441dc24ab24613c Mon Sep 17 00:00:00 2001
From: Nuked88 <nuked8@gmail.com>
Date: Mon, 26 May 2025 20:59:48 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9F=A2=20assets=5Fdownloader.html=20for?=
 =?UTF-8?q?=20added=20base=20model=20filter=20dropdowns=20=F0=9F=9B=A0?=
 =?UTF-8?q?=EF=B8=8F=20assets=5Fdownloader.jsb=20->=20integrated=20base=20?=
 =?UTF-8?q?model=20filter=20into=20search=20logic=20=F0=9F=9B=A0=EF=B8=8F?=
 =?UTF-8?q?=20assets=5Fdownloader.jsb=20->=20updated=20event=20handling=20?=
 =?UTF-8?q?for=20new=20filters=20=F0=9F=9B=A0=EF=B8=8F=20assets=5Fdownload?=
 =?UTF-8?q?er.css=20->=20adjusted=20width=20for=20base=20model=20filter=20?=
 =?UTF-8?q?element=20=F0=9F=94=B4=20pyproject.toml=20for=20version=20bump?=
 =?UTF-8?q?=20to=201.6.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets_downloader/assets_downloader.html  | 68 +++++++++++++++++++
 .../assets_downloader/assets_downloader.jsb   | 34 +++++++---
 app/panels/assets_downloader/style.css        |  4 +-
 pyproject.toml                                |  2 +-
 4 files changed, 98 insertions(+), 10 deletions(-)

diff --git a/app/panels/assets_downloader/assets_downloader.html b/app/panels/assets_downloader/assets_downloader.html
index 0bb3e62..1f75662 100644
--- a/app/panels/assets_downloader/assets_downloader.html
+++ b/app/panels/assets_downloader/assets_downloader.html
@@ -37,6 +37,60 @@
                     <option value="Other">Other</option>
                 </select>
 
+                <!-- Base Model Filter -->
+                <select id="baseModelFilter" data-placeholder="Base Model(s)" multiple data-multi-select>
+                    <option value="Aura Flow">Aura Flow</option>
+                    <option value="CogVideoX">CogVideoX</option>
+                    <option value="Flux .1 D">Flux .1 D</option>
+                    <option value="Flux .1 S">Flux .1 S</option>
+                    <option value="HiDream">HiDream</option>
+                    <option value="Hunyuan 1">Hunyuan 1</option>
+                    <option value="Hunyuan Video">Hunyuan Video</option>
+                    <option value="Illustrious">Illustrious</option>
+                    <option value="Kolors">Kolors</option>
+                    <option value="LTXV">LTXV</option>
+                    <option value="Lumina">Lumina</option>
+                    <option value="Mochi">Mochi</option>
+                    <option value="NoobAI">NoobAI</option>
+                    <option value="ODOR">ODOR</option>
+                    <option value="Open AI">Open AI</option>
+                    <option value="Other">Other</option>
+                    <option value="PixArt Σ">PixArt Σ</option>
+                    <option value="PixArt α">PixArt α</option>
+                    <option value="Playground v2">Playground v2</option>
+                    <option value="Pony">Pony</option>
+                    <option value="SD 1.4">SD 1.4</option>
+                    <option value="SD 1.5">SD 1.5</option>
+                    <option value="SD 1.5 Hyper">SD 1.5 Hyper</option>
+                    <option value="SD 1.5 LCM">SD 1.5 LCM</option>
+                    <option value="SD 2.0">SD 2.0</option>
+                    <option value="SD 2.0 768">SD 2.0 768</option>
+                    <option value="SD 2.1">SD 2.1</option>
+                    <option value="SD 2.1 768">SD 2.1 768</option>
+                    <option value="SD 2.1 Unclip">SD 2.1 Unclip</option>
+                    <option value="SD 3">SD 3</option>
+                    <option value="SD 3.5">SD 3.5</option>
+                    <option value="SD 3.5 Large">SD 3.5 Large</option>
+                    <option value="SD 3.5 Large Turbo">SD 3.5 Large Turbo</option>
+                    <option value="SD 3.5 Medium">SD 3.5 Medium</option>
+                    <option value="SDXL 0.9">SDXL 0.9</option>
+                    <option value="SDXL 1.0">SDXL 1.0</option>
+                    <option value="SDXL 1.0 LCM">SDXL 1.0 LCM</option>
+                    <option value="SDXL Distilled">SDXL Distilled</option>
+                    <option value="SDXL Hyper">SDXL Hyper</option>
+                    <option value="SDXL Lightning">SDXL Lightning</option>
+                    <option value="SDXL Turbo">SDXL Turbo</option>
+                    <option value="SVD">SVD</option>
+                    <option value="SVD XT">SVD XT</option>
+                    <option value="Stable Cascade">Stable Cascade</option>
+                    <option value="WAN Video">WAN Video</option>
+                    <option value="Wan Video 1.3B t2v">Wan Video 1.3B t2v</option>
+                    <option value="Wan Video 14B i2v 480p">Wan Video 14B i2v 480p</option>
+                    <option value="Wan Video 14B i2v 720p">Wan Video 14B i2v 720p</option>
+                    <option value="Wan Video 14B t2v">Wan Video 14B t2v</option>
+                    <option value="Other">Other</option>
+                </select>
+
                 <!-- Sort Option -->
                 <select id="sortOption" onchange="assets_downloader.searchT()">
                     <option value="">Sort By</option>
@@ -113,6 +167,20 @@
                         <option value="Other">Other</option>
                     </select>
 
+                    <!-- Base Model Filter -->
+                    <select id="baseModelFilterLibrary" data-placeholder="Base Model(s)" multiple data-library-multi-select>
+                        <option value="SD 1.4">SD 1.4</option>
+                        <option value="SD 1.5">SD 1.5</option>
+                        <option value="SD 2.0">SD 2.0</option>
+                        <option value="SD 2.0 768">SD 2.0 768</option>
+                        <option value="SD 2.1">SD 2.1</option>
+                        <option value="SD 2.1 768">SD 2.1 768</option>
+                        <option value="SD 2.1 Unclip">SD 2.1 Unclip</option>
+                        <option value="SDXL 0.9">SDXL 0.9</option>
+                        <option value="SDXL 1.0">SDXL 1.0</option>
+                        <option value="Other">Other</option>
+                    </select>
+
                     <!-- Sort Option -->
                     <select id="sortOptionLibrary" onchange="assets_downloader.searchInLibrary()">
                         <option value="">Sort By</option>
diff --git a/app/panels/assets_downloader/assets_downloader.jsb b/app/panels/assets_downloader/assets_downloader.jsb
index 1536240..43a1b14 100644
--- a/app/panels/assets_downloader/assets_downloader.jsb
+++ b/app/panels/assets_downloader/assets_downloader.jsb
@@ -622,9 +622,13 @@ setupWebSocket();
         // Get search query and filters
         const query = document.getElementById('searchTemplateInput').value;
         const nsfwFilter = Array.from(document.getElementById('nsfwFilter').selectedOptions).map(option => option.value);
-        const multiSelectElement = document.getElementById('typeFilter');
-        const hiddenInputs = multiSelectElement.querySelectorAll('input[type="hidden"]');
-        const typeFilter = Array.from(hiddenInputs).map(input => input.value);
+        const typeMultiSelectElement = document.getElementById('typeFilter');
+        const typeHiddenInputs = typeMultiSelectElement.querySelectorAll('input[type="hidden"]');
+        const typeFilter = Array.from(typeHiddenInputs).map(input => input.value);
+
+        const baseModelMultiSelectElement = document.getElementById('baseModelFilter');
+        const baseModelHiddenInputs = baseModelMultiSelectElement.querySelectorAll('input[type="hidden"]');
+        const baseModelFilter = Array.from(baseModelHiddenInputs).map(input => input.value);
 
         const sortOption = document.getElementById('sortOption').value;
         const periodOption = document.getElementById('periodOption').value;
@@ -648,6 +652,11 @@ setupWebSocket();
             typeFilter.forEach(type => params.append("types", type));
         }
 
+        // Add base model filter
+        if (baseModelFilter.length > 0) {
+            baseModelFilter.forEach(model => params.append("baseModels", model));
+        }
+
         // Add sort option
         if (sortOption) {
             params.append("sort", sortOption);
@@ -842,9 +851,14 @@ setupWebSocket();
         const nsfwFilter = document.getElementById('nsfwFilterLibrary').value;
 
         // Filtro tipo (multi-select)
-        const multiSelectElement = document.getElementById('typeFilterLibrary');
-        const hiddenInputs = multiSelectElement.querySelectorAll('input[type="hidden"]');
-        const selectedTypes = Array.from(hiddenInputs).map(option => option.value.toLowerCase());
+        const typeMultiSelectElement = document.getElementById('typeFilterLibrary');
+        const typeHiddenInputs = typeMultiSelectElement.querySelectorAll('input[type="hidden"]');
+        const selectedTypes = Array.from(typeHiddenInputs).map(option => option.value.toLowerCase());
+
+        // Filtro baseModels (multi-select)
+        const baseModelMultiSelectElement = document.getElementById('baseModelFilterLibrary');
+        const baseModelHiddenInputs = baseModelMultiSelectElement.querySelectorAll('input[type="hidden"]');
+        const selectedBaseModels = Array.from(baseModelHiddenInputs).map(option => option.value.toLowerCase());
 
         // Opzione di ordinamento
         const sortOption = document.getElementById('sortOptionLibrary').value;
@@ -859,6 +873,7 @@ setupWebSocket();
             const cardNSFW = card.querySelector('input[name="nsfw"]').value;
 
             const cardTypes = Array.from(card.querySelectorAll('.main-stripe .sub-stripe div')).map(el => el.innerText.toLowerCase());
+            const cardBaseModel = card.querySelector('.main-stripe .sub-stripe div:nth-child(3)').innerText.toLowerCase();
 
             // Filtra per testo (searchQuery)
             let matchesSearch = searchQuery === "" || cardTitle.includes(searchQuery);
@@ -869,8 +884,11 @@ setupWebSocket();
             // Filtra per tipo (se selezionati)
             let matchesType = selectedTypes.length === 0 || selectedTypes.some(type => cardTypes.includes(type));
 
+            // Filtra per baseModel (se selezionati)
+            let matchesBaseModel = selectedBaseModels.length === 0 || selectedBaseModels.includes(cardBaseModel);
+
             // Mostra o nascondi la card in base ai filtri
-            if (matchesSearch && matchesNSFW && matchesType) {
+            if (matchesSearch && matchesNSFW && matchesType && matchesBaseModel) {
                 card.style.display = "block";
             } else {
                 card.style.display = "none";
@@ -1169,7 +1187,7 @@ setupWebSocket();
         }
 
     }
-    document.querySelectorAll('[data-multi-select]').forEach(select => new MultiSelect(select, { onChange: debouncedSearchType }));
+    document.querySelectorAll('[data-multi-select]').forEach(select => new MultiSelect(select, { onChange: debouncedSearchT }));
     document.querySelectorAll('[data-library-multi-select]').forEach(select => new MultiSelect(select, { onChange: debouncedSearchInLibrary }));
 
     return {
diff --git a/app/panels/assets_downloader/style.css b/app/panels/assets_downloader/style.css
index dd548e7..f305f30 100644
--- a/app/panels/assets_downloader/style.css
+++ b/app/panels/assets_downloader/style.css
@@ -305,7 +305,9 @@ padding-bottom: 150px;
   }
 
 
-
+  #baseModelFilter{
+    width: 157px !important;
+  }
   #t1, #t2{
     display: none;
   }
diff --git a/pyproject.toml b/pyproject.toml
index 5d90a9e..f1fc885 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-n-sidebar"
 description = "A simple sidebar for ComfyUI."
-version = "1.6.1"
+version = "1.6.2"
 license = { file = "LICENSE" }
 
 [project.urls]