mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-06-24 12:01:16 -03:00
feat(ui): show version count in group-by-model cards, add versions_count sort, no-reload VLM
- group_by_model dedup now counts versions per group and attaches version_count; respects update_flag_strategy (same_base) by sub-grouping on base_model - Card footer shows clickable 'x versions' link instead of version name when grouped (hides HIGH/LOW badges); clicking triggers View Local Versions without page reload - Added 'Local Versions' sort option (versions_count), auto-hidden when group_by_model is off - Sort preference is saved/restored separately for normal and grouped modes - VLM flow (triggerVlmView, clearCustomFilter) uses resetAndReload() via API instead of window.location.reload() - Fixed cache mutation bug: version_count is now set on a shallow copy, not the cached dict, preventing stale version_count leaking into VLM responses - i18n: all 9 locale files translated
This commit is contained in:
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Verwendungsanzahl"
|
"timesUsed": "Verwendungsanzahl"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} Versionen",
|
||||||
|
"viewAllVersions": "Alle lokalen Versionen anzeigen"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "Kleinste",
|
"sizeAsc": "Kleinste",
|
||||||
"usage": "Anzahl Nutzung",
|
"usage": "Anzahl Nutzung",
|
||||||
"usageDesc": "Meiste",
|
"usageDesc": "Meiste",
|
||||||
"usageAsc": "Wenigste"
|
"usageAsc": "Wenigste",
|
||||||
|
"versionsCount": "Lokale Versionen",
|
||||||
|
"versionsCountDesc": "Meiste Versionen zuerst",
|
||||||
|
"versionsCountAsc": "Wenigste Versionen zuerst"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "Modelliste aktualisieren",
|
"title": "Modelliste aktualisieren",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Times used"
|
"timesUsed": "Times used"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} versions",
|
||||||
|
"viewAllVersions": "View all local versions"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "Smallest",
|
"sizeAsc": "Smallest",
|
||||||
"usage": "Use Count",
|
"usage": "Use Count",
|
||||||
"usageDesc": "Most",
|
"usageDesc": "Most",
|
||||||
"usageAsc": "Least"
|
"usageAsc": "Least",
|
||||||
|
"versionsCount": "Local Versions",
|
||||||
|
"versionsCountDesc": "Most versions first",
|
||||||
|
"versionsCountAsc": "Fewest versions first"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "Refresh model list",
|
"title": "Refresh model list",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Veces usado"
|
"timesUsed": "Veces usado"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} versiones",
|
||||||
|
"viewAllVersions": "Ver todas las versiones locales"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "Menor",
|
"sizeAsc": "Menor",
|
||||||
"usage": "Número de usos",
|
"usage": "Número de usos",
|
||||||
"usageDesc": "Más",
|
"usageDesc": "Más",
|
||||||
"usageAsc": "Menos"
|
"usageAsc": "Menos",
|
||||||
|
"versionsCount": "Versiones locales",
|
||||||
|
"versionsCountDesc": "Más versiones primero",
|
||||||
|
"versionsCountAsc": "Menos versiones primero"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "Actualizar lista de modelos",
|
"title": "Actualizar lista de modelos",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Nombre d'utilisations"
|
"timesUsed": "Nombre d'utilisations"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} versions",
|
||||||
|
"viewAllVersions": "Voir toutes les versions locales"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "Plus petit",
|
"sizeAsc": "Plus petit",
|
||||||
"usage": "Nombre d'utilisations",
|
"usage": "Nombre d'utilisations",
|
||||||
"usageDesc": "Plus",
|
"usageDesc": "Plus",
|
||||||
"usageAsc": "Moins"
|
"usageAsc": "Moins",
|
||||||
|
"versionsCount": "Versions locales",
|
||||||
|
"versionsCountDesc": "Plus de versions d'abord",
|
||||||
|
"versionsCountAsc": "Moins de versions d'abord"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "Actualiser la liste des modèles",
|
"title": "Actualiser la liste des modèles",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "מספר שימושים"
|
"timesUsed": "מספר שימושים"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} גרסאות",
|
||||||
|
"viewAllVersions": "הצג את כל הגרסאות המקומיות"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "הקטן ביותר",
|
"sizeAsc": "הקטן ביותר",
|
||||||
"usage": "מספר שימושים",
|
"usage": "מספר שימושים",
|
||||||
"usageDesc": "הכי הרבה",
|
"usageDesc": "הכי הרבה",
|
||||||
"usageAsc": "הכי פחות"
|
"usageAsc": "הכי פחות",
|
||||||
|
"versionsCount": "גרסאות מקומיות",
|
||||||
|
"versionsCountDesc": "הכי הרבה גרסאות ראשונות",
|
||||||
|
"versionsCountAsc": "הכי מעט גרסאות ראשונות"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "רענן רשימת מודלים",
|
"title": "רענן רשימת מודלים",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "使用回数"
|
"timesUsed": "使用回数"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} バージョン",
|
||||||
|
"viewAllVersions": "ローカルの全バージョンを表示"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "小さい順",
|
"sizeAsc": "小さい順",
|
||||||
"usage": "使用回数",
|
"usage": "使用回数",
|
||||||
"usageDesc": "多い",
|
"usageDesc": "多い",
|
||||||
"usageAsc": "少ない"
|
"usageAsc": "少ない",
|
||||||
|
"versionsCount": "ローカルバージョン数",
|
||||||
|
"versionsCountDesc": "バージョン数の多い順",
|
||||||
|
"versionsCountAsc": "バージョン数の少ない順"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "モデルリストを更新",
|
"title": "モデルリストを更新",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "사용 횟수"
|
"timesUsed": "사용 횟수"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count}개 버전",
|
||||||
|
"viewAllVersions": "모든 로컬 버전 보기"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "작은 순서",
|
"sizeAsc": "작은 순서",
|
||||||
"usage": "사용 횟수",
|
"usage": "사용 횟수",
|
||||||
"usageDesc": "많은 순",
|
"usageDesc": "많은 순",
|
||||||
"usageAsc": "적은 순"
|
"usageAsc": "적은 순",
|
||||||
|
"versionsCount": "로컬 버전 수",
|
||||||
|
"versionsCountDesc": "버전 수 많은 순",
|
||||||
|
"versionsCountAsc": "버전 수 적은 순"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "모델 목록 새로고침",
|
"title": "모델 목록 새로고침",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Количество использований"
|
"timesUsed": "Количество использований"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} версий",
|
||||||
|
"viewAllVersions": "Показать все локальные версии"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "Наименьшим",
|
"sizeAsc": "Наименьшим",
|
||||||
"usage": "Число использований",
|
"usage": "Число использований",
|
||||||
"usageDesc": "Больше",
|
"usageDesc": "Больше",
|
||||||
"usageAsc": "Меньше"
|
"usageAsc": "Меньше",
|
||||||
|
"versionsCount": "Локальные версии",
|
||||||
|
"versionsCountDesc": "Сначала больше версий",
|
||||||
|
"versionsCountAsc": "Сначала меньше версий"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "Обновить список моделей",
|
"title": "Обновить список моделей",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "使用次数"
|
"timesUsed": "使用次数"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} 个版本",
|
||||||
|
"viewAllVersions": "查看所有本地版本"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "最小",
|
"sizeAsc": "最小",
|
||||||
"usage": "使用次数",
|
"usage": "使用次数",
|
||||||
"usageDesc": "最多",
|
"usageDesc": "最多",
|
||||||
"usageAsc": "最少"
|
"usageAsc": "最少",
|
||||||
|
"versionsCount": "本地版本数",
|
||||||
|
"versionsCountDesc": "版本数从多到少",
|
||||||
|
"versionsCountAsc": "版本数从少到多"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "刷新模型列表",
|
"title": "刷新模型列表",
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "使用次數"
|
"timesUsed": "使用次數"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} 個版本",
|
||||||
|
"viewAllVersions": "檢視所有本地版本"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -675,7 +679,10 @@
|
|||||||
"sizeAsc": "最小",
|
"sizeAsc": "最小",
|
||||||
"usage": "使用次數",
|
"usage": "使用次數",
|
||||||
"usageDesc": "最多",
|
"usageDesc": "最多",
|
||||||
"usageAsc": "最少"
|
"usageAsc": "最少",
|
||||||
|
"versionsCount": "本地版本數",
|
||||||
|
"versionsCountDesc": "版本數從多到少",
|
||||||
|
"versionsCountAsc": "版本數從少到多"
|
||||||
},
|
},
|
||||||
"refresh": {
|
"refresh": {
|
||||||
"title": "重新整理模型列表",
|
"title": "重新整理模型列表",
|
||||||
|
|||||||
@@ -115,19 +115,50 @@ class BaseModelService(ABC):
|
|||||||
# Optionally group by civitai modelId, showing only the latest version per model
|
# Optionally group by civitai modelId, showing only the latest version per model
|
||||||
dedup_lost = 0
|
dedup_lost = 0
|
||||||
if kwargs.get("group_by_model") and civitai_model_id is None:
|
if kwargs.get("group_by_model") and civitai_model_id is None:
|
||||||
dedup_map = {} # modelId -> (item, version_id)
|
# Determine whether to further sub-group by base model
|
||||||
|
# When update_flag_strategy is "same_base", versions with different
|
||||||
|
# base models are effectively different groups — the dedup key
|
||||||
|
# needs to include base_model so the version count and VLM flow
|
||||||
|
# stay consistent (card shows correct count for its base model).
|
||||||
|
ufs = self.settings.get("update_flag_strategy", "same_base")
|
||||||
|
group_by_base = ufs == "same_base"
|
||||||
|
|
||||||
|
dedup_map = {} # (modelId [,base_model]) -> (item, version_id)
|
||||||
|
version_counter = {} # same-key -> count
|
||||||
standalone = []
|
standalone = []
|
||||||
for item in sorted_data:
|
for item in sorted_data:
|
||||||
mid = self._extract_model_id(item)
|
mid = self._extract_model_id(item)
|
||||||
if mid is None:
|
if mid is None:
|
||||||
standalone.append(item)
|
standalone.append(item)
|
||||||
continue
|
continue
|
||||||
|
key = (mid, item.get("base_model") or "") if group_by_base else mid
|
||||||
|
# Count all versions per key
|
||||||
|
version_counter[key] = version_counter.get(key, 0) + 1
|
||||||
vid = self._extract_version_id(item) or 0
|
vid = self._extract_version_id(item) or 0
|
||||||
if mid not in dedup_map or vid > dedup_map[mid][1]:
|
if key not in dedup_map or vid > dedup_map[key][1]:
|
||||||
dedup_map[mid] = (item, vid)
|
dedup_map[key] = (item, vid)
|
||||||
|
# Attach version_count to each surviving grouped item (shallow copy
|
||||||
|
# to avoid mutating cached dicts — the cache is shared across requests)
|
||||||
|
for key, (item, vid) in dedup_map.items():
|
||||||
|
item = dict(item)
|
||||||
|
item["version_count"] = version_counter[key]
|
||||||
|
dedup_map[key] = (item, vid)
|
||||||
dedup_lost = len(sorted_data) - (len(dedup_map) + len(standalone))
|
dedup_lost = len(sorted_data) - (len(dedup_map) + len(standalone))
|
||||||
sorted_data = [entry[0] for entry in dedup_map.values()] + standalone
|
sorted_data = [entry[0] for entry in dedup_map.values()] + standalone
|
||||||
|
|
||||||
|
# Re-sort by version_count after dedup (only makes sense in group_by_model mode)
|
||||||
|
is_group_by_active = kwargs.get("group_by_model") and civitai_model_id is None
|
||||||
|
if sort_params.key == "versions_count" and is_group_by_active:
|
||||||
|
reverse = sort_params.order == "desc"
|
||||||
|
sorted_data.sort(
|
||||||
|
key=lambda x: (
|
||||||
|
x.get("version_count", 0),
|
||||||
|
(x.get("model_name") or x.get("file_name") or "").lower(),
|
||||||
|
x.get("file_path", "").lower(),
|
||||||
|
),
|
||||||
|
reverse=reverse,
|
||||||
|
)
|
||||||
|
|
||||||
t1 = time.perf_counter()
|
t1 = time.perf_counter()
|
||||||
if hash_filters:
|
if hash_filters:
|
||||||
filtered_data = await self._apply_hash_filters(sorted_data, hash_filters)
|
filtered_data = await self._apply_hash_filters(sorted_data, hash_filters)
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class CheckpointService(BaseModelService):
|
|||||||
"skip_metadata_refresh": bool(checkpoint_data.get("skip_metadata_refresh", False)),
|
"skip_metadata_refresh": bool(checkpoint_data.get("skip_metadata_refresh", False)),
|
||||||
"civitai": self.filter_civitai_data(checkpoint_data.get("civitai", {}), minimal=True),
|
"civitai": self.filter_civitai_data(checkpoint_data.get("civitai", {}), minimal=True),
|
||||||
"auto_tags": checkpoint_data.get("auto_tags") or extract_auto_tags(checkpoint_data),
|
"auto_tags": checkpoint_data.get("auto_tags") or extract_auto_tags(checkpoint_data),
|
||||||
|
"version_count": checkpoint_data.get("version_count"),
|
||||||
}
|
}
|
||||||
|
|
||||||
def find_duplicate_hashes(self) -> Dict:
|
def find_duplicate_hashes(self) -> Dict:
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class EmbeddingService(BaseModelService):
|
|||||||
"skip_metadata_refresh": bool(embedding_data.get("skip_metadata_refresh", False)),
|
"skip_metadata_refresh": bool(embedding_data.get("skip_metadata_refresh", False)),
|
||||||
"civitai": self.filter_civitai_data(embedding_data.get("civitai", {}), minimal=True),
|
"civitai": self.filter_civitai_data(embedding_data.get("civitai", {}), minimal=True),
|
||||||
"auto_tags": embedding_data.get("auto_tags") or extract_auto_tags(embedding_data),
|
"auto_tags": embedding_data.get("auto_tags") or extract_auto_tags(embedding_data),
|
||||||
|
"version_count": embedding_data.get("version_count"),
|
||||||
}
|
}
|
||||||
|
|
||||||
def find_duplicate_hashes(self) -> Dict:
|
def find_duplicate_hashes(self) -> Dict:
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ class LoraService(BaseModelService):
|
|||||||
lora_data.get("civitai", {}), minimal=True
|
lora_data.get("civitai", {}), minimal=True
|
||||||
),
|
),
|
||||||
"auto_tags": lora_data.get("auto_tags") or extract_auto_tags(lora_data),
|
"auto_tags": lora_data.get("auto_tags") or extract_auto_tags(lora_data),
|
||||||
|
"version_count": lora_data.get("version_count"),
|
||||||
}
|
}
|
||||||
|
|
||||||
async def _apply_specific_filters(self, data: List[Dict], **kwargs) -> List[Dict]:
|
async def _apply_specific_filters(self, data: List[Dict], **kwargs) -> List[Dict]:
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ SUPPORTED_SORT_MODES = [
|
|||||||
('size', 'desc'),
|
('size', 'desc'),
|
||||||
('usage', 'asc'),
|
('usage', 'asc'),
|
||||||
('usage', 'desc'),
|
('usage', 'desc'),
|
||||||
|
('versions_count', 'asc'),
|
||||||
|
('versions_count', 'desc'),
|
||||||
]
|
]
|
||||||
# Is this in use?
|
# Is this in use?
|
||||||
|
|
||||||
@@ -263,6 +265,17 @@ class ModelCache:
|
|||||||
),
|
),
|
||||||
reverse=reverse
|
reverse=reverse
|
||||||
)
|
)
|
||||||
|
elif sort_key == 'versions_count':
|
||||||
|
# Pre-dedup sort: fall back to name sort.
|
||||||
|
# Actual re-sort by version_count happens in get_paginated_data after dedup.
|
||||||
|
result = natsorted(
|
||||||
|
data,
|
||||||
|
key=lambda x: (
|
||||||
|
self._get_display_name(x).lower(),
|
||||||
|
x.get('file_path', '').lower()
|
||||||
|
),
|
||||||
|
reverse=reverse
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
# Fallback: no sort
|
# Fallback: no sort
|
||||||
result = list(data)
|
result = list(data)
|
||||||
|
|||||||
@@ -509,6 +509,50 @@
|
|||||||
background: rgba(0,0,0,0.18); /* Optional: subtle background for contrast */
|
background: rgba(0,0,0,0.18); /* Optional: subtle background for contrast */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Clickable version count link (shown in group-by-model mode) */
|
||||||
|
.version-count-link {
|
||||||
|
display: inline-block;
|
||||||
|
color: var(--color-accent);
|
||||||
|
text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
|
||||||
|
font-size: 0.85em;
|
||||||
|
line-height: 1.4;
|
||||||
|
margin-top: 2px;
|
||||||
|
border: 1px solid var(--color-accent-border);
|
||||||
|
border-radius: var(--border-radius-xs);
|
||||||
|
padding: 1px 6px;
|
||||||
|
background: var(--color-accent-subtle);
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.15s ease, border-color 0.15s ease;
|
||||||
|
}
|
||||||
|
.version-count-link:hover {
|
||||||
|
background: var(--color-accent-border);
|
||||||
|
border-color: var(--color-accent-transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Medium density adjustments for version count link */
|
||||||
|
.medium-density .version-count-link {
|
||||||
|
font-size: 0.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.medium-density .badge-version-unit .version-count-link {
|
||||||
|
max-width: 90px;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Compact density adjustments for version count link */
|
||||||
|
.compact-density .version-count-link {
|
||||||
|
font-size: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.compact-density .badge-version-unit .version-count-link {
|
||||||
|
max-width: 70px;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
/* Version row — flex container for badges + version names */
|
/* Version row — flex container for badges + version names */
|
||||||
.version-row {
|
.version-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@@ -59,3 +59,8 @@
|
|||||||
.initialization-notice .loading-spinner {
|
.initialization-notice .loading-spinner {
|
||||||
margin-bottom: var(--space-2);
|
margin-bottom: var(--space-2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Hide versions_count sort option when group-by-model is off */
|
||||||
|
body:not(.group-by-model) .sort-option-versions-count {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|||||||
@@ -108,6 +108,11 @@ export class GlobalContextMenu extends BaseContextMenu {
|
|||||||
const newValue = !state.global.settings.group_by_model;
|
const newValue = !state.global.settings.group_by_model;
|
||||||
state.global.settings.group_by_model = newValue;
|
state.global.settings.group_by_model = newValue;
|
||||||
|
|
||||||
|
// Save/restore sort preference when toggling group_by_model
|
||||||
|
if (window.pageControls?.onGroupByModelToggled) {
|
||||||
|
window.pageControls.onGroupByModelToggled(newValue);
|
||||||
|
}
|
||||||
|
|
||||||
sm.saveSetting('group_by_model', newValue).catch((error) => {
|
sm.saveSetting('group_by_model', newValue).catch((error) => {
|
||||||
console.error('Failed to save group_by_model setting:', error);
|
console.error('Failed to save group_by_model setting:', error);
|
||||||
// Revert state on failure
|
// Revert state on failure
|
||||||
|
|||||||
@@ -102,7 +102,12 @@ export class CheckpointsControls extends PageControls {
|
|||||||
removeSessionItem('vlm_model_name');
|
removeSessionItem('vlm_model_name');
|
||||||
removeSessionItem('vlm_base_model');
|
removeSessionItem('vlm_base_model');
|
||||||
removeSessionItem('vlm_page_type');
|
removeSessionItem('vlm_page_type');
|
||||||
window.location.reload();
|
// Hide the indicator
|
||||||
|
const indicator = document.getElementById('customFilterIndicator');
|
||||||
|
if (indicator) {
|
||||||
|
indicator.classList.add('hidden');
|
||||||
|
}
|
||||||
|
await resetAndReload();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,11 @@ export class LorasControls extends PageControls {
|
|||||||
removeSessionItem('vlm_model_name');
|
removeSessionItem('vlm_model_name');
|
||||||
removeSessionItem('vlm_base_model');
|
removeSessionItem('vlm_base_model');
|
||||||
removeSessionItem('vlm_page_type');
|
removeSessionItem('vlm_page_type');
|
||||||
window.location.reload();
|
const indicator = document.getElementById('customFilterIndicator');
|
||||||
|
if (indicator) {
|
||||||
|
indicator.classList.add('hidden');
|
||||||
|
}
|
||||||
|
await resetAndReload();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// PageControls.js - Manages controls for both LoRAs and Checkpoints pages
|
// PageControls.js - Manages controls for both LoRAs and Checkpoints pages
|
||||||
import { state, getCurrentPageState, setCurrentPageType } from '../../state/index.js';
|
import { state, getCurrentPageState, setCurrentPageType } from '../../state/index.js';
|
||||||
import { getStorageItem, setStorageItem, getSessionItem, setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';
|
import { getStorageItem, setStorageItem, removeStorageItem, getSessionItem, setSessionItem, removeSessionItem } from '../../utils/storageHelpers.js';
|
||||||
import { showToast, openCivitaiByMetadata } from '../../utils/uiHelpers.js';
|
import { showToast, openCivitaiByMetadata } from '../../utils/uiHelpers.js';
|
||||||
import { performModelUpdateCheck } from '../../utils/updateCheckHelpers.js';
|
import { performModelUpdateCheck } from '../../utils/updateCheckHelpers.js';
|
||||||
import { sidebarManager } from '../SidebarManager.js';
|
import { sidebarManager } from '../SidebarManager.js';
|
||||||
@@ -465,6 +465,68 @@ export class PageControls {
|
|||||||
/**
|
/**
|
||||||
* Clear custom filter
|
* Clear custom filter
|
||||||
*/
|
*/
|
||||||
|
/**
|
||||||
|
* Trigger View Local Versions without page reload
|
||||||
|
* Sets sessionStorage and reloads data via the API.
|
||||||
|
*/
|
||||||
|
triggerVlmView(modelId, modelName, baseModel, pageType) {
|
||||||
|
const targetPageType = pageType || this.pageType;
|
||||||
|
setSessionItem('vlm_model_id', String(modelId));
|
||||||
|
setSessionItem('vlm_model_name', modelName || String(modelId));
|
||||||
|
setSessionItem('vlm_page_type', targetPageType);
|
||||||
|
if (baseModel) {
|
||||||
|
setSessionItem('vlm_base_model', baseModel);
|
||||||
|
} else {
|
||||||
|
removeSessionItem('vlm_base_model');
|
||||||
|
}
|
||||||
|
// Reload data via API (no page reload)
|
||||||
|
this.resetAndReload(true).then(() => {
|
||||||
|
// Show the VLM indicator after data loads
|
||||||
|
this.checkVlmFilter();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Called when group_by_model is toggled.
|
||||||
|
* Saves current sort when entering grouped mode, restores normal sort
|
||||||
|
* when leaving — prevents "Most versions first" persisting after exit.
|
||||||
|
*/
|
||||||
|
onGroupByModelToggled(isEnabled) {
|
||||||
|
const normalKey = `${this.pageType}_sort_normal`;
|
||||||
|
const groupedKey = `${this.pageType}_sort_grouped`;
|
||||||
|
|
||||||
|
if (isEnabled) {
|
||||||
|
// Entering group mode: save current sort for later restoration
|
||||||
|
setStorageItem(normalKey, this.pageState.sortBy);
|
||||||
|
// Restore previously saved grouped sort, if any
|
||||||
|
const savedGroupedSort = getStorageItem(groupedKey);
|
||||||
|
if (savedGroupedSort) {
|
||||||
|
this.pageState.sortBy = savedGroupedSort;
|
||||||
|
this.saveSortPreference(savedGroupedSort);
|
||||||
|
const sortSelect = document.getElementById('sortSelect');
|
||||||
|
if (sortSelect) {
|
||||||
|
sortSelect.value = savedGroupedSort;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Leaving group mode: save current grouped sort aside, restore normal
|
||||||
|
const currentSort = this.pageState.sortBy;
|
||||||
|
if (currentSort && currentSort.startsWith('versions_count')) {
|
||||||
|
setStorageItem(groupedKey, currentSort);
|
||||||
|
}
|
||||||
|
const savedNormalSort = getStorageItem(normalKey);
|
||||||
|
if (savedNormalSort) {
|
||||||
|
removeStorageItem(normalKey);
|
||||||
|
this.pageState.sortBy = savedNormalSort;
|
||||||
|
this.saveSortPreference(savedNormalSort);
|
||||||
|
const sortSelect = document.getElementById('sortSelect');
|
||||||
|
if (sortSelect) {
|
||||||
|
sortSelect.value = savedNormalSort;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check for View Local Versions filter in sessionStorage (page-type-scoped)
|
* Check for View Local Versions filter in sessionStorage (page-type-scoped)
|
||||||
*/
|
*/
|
||||||
@@ -515,8 +577,14 @@ export class PageControls {
|
|||||||
removeSessionItem('vlm_base_model');
|
removeSessionItem('vlm_base_model');
|
||||||
removeSessionItem('vlm_page_type');
|
removeSessionItem('vlm_page_type');
|
||||||
|
|
||||||
// Full page reload to restore initial state (mirrors the "set" action)
|
// Hide the indicator
|
||||||
window.location.reload();
|
const indicator = document.getElementById('customFilterIndicator');
|
||||||
|
if (indicator) {
|
||||||
|
indicator.classList.add('hidden');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload data via API (no page reload)
|
||||||
|
await this.resetAndReload(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -100,6 +100,12 @@ function handleModelCardEvent_internal(event, modelType) {
|
|||||||
return true; // Stop propagation
|
return true; // Stop propagation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (event.target.closest('.version-count-link')) {
|
||||||
|
event.stopPropagation();
|
||||||
|
handleViewLocalVersionsFromCard(card, modelType);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// If no specific element was clicked, handle the card click (show modal or toggle selection)
|
// If no specific element was clicked, handle the card click (show modal or toggle selection)
|
||||||
handleCardClick(card, modelType);
|
handleCardClick(card, modelType);
|
||||||
return false; // Continue with other handlers (e.g., bulk selection)
|
return false; // Continue with other handlers (e.g., bulk selection)
|
||||||
@@ -265,6 +271,22 @@ async function handleExampleImagesAccess(card, modelType) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleViewLocalVersionsFromCard(card, modelType) {
|
||||||
|
const modelId = card.dataset.modelId;
|
||||||
|
const modelName = card.dataset.name;
|
||||||
|
if (!modelId) return;
|
||||||
|
// Respect update_flag_strategy: only filter by base model when the strategy says so
|
||||||
|
const strategy = state.global?.settings?.update_flag_strategy;
|
||||||
|
const shouldFilterByBase = strategy === 'same_base';
|
||||||
|
const baseModel = shouldFilterByBase && card.dataset.base_model !== 'Unknown'
|
||||||
|
? card.dataset.base_model
|
||||||
|
: undefined;
|
||||||
|
// Use the no-reload VLM flow via PageControls
|
||||||
|
if (window.pageControls && typeof window.pageControls.triggerVlmView === 'function') {
|
||||||
|
window.pageControls.triggerVlmView(modelId, modelName, baseModel, modelType);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function handleCardClick(card, modelType) {
|
function handleCardClick(card, modelType) {
|
||||||
const pageState = getCurrentPageState();
|
const pageState = getCurrentPageState();
|
||||||
|
|
||||||
@@ -448,6 +470,10 @@ export function createModelCard(model, modelType) {
|
|||||||
const hasUpdateAvailable = Boolean(model.update_available);
|
const hasUpdateAvailable = Boolean(model.update_available);
|
||||||
card.dataset.update_available = hasUpdateAvailable ? 'true' : 'false';
|
card.dataset.update_available = hasUpdateAvailable ? 'true' : 'false';
|
||||||
card.dataset.skip_metadata_refresh = model.skip_metadata_refresh ? 'true' : 'false';
|
card.dataset.skip_metadata_refresh = model.skip_metadata_refresh ? 'true' : 'false';
|
||||||
|
// Store version_count for group-by-model display
|
||||||
|
if (model.version_count !== undefined) {
|
||||||
|
card.dataset.version_count = model.version_count;
|
||||||
|
}
|
||||||
|
|
||||||
// To only show usage_count when sorting by usage.
|
// To only show usage_count when sorting by usage.
|
||||||
const pageState = getCurrentPageState();
|
const pageState = getCurrentPageState();
|
||||||
@@ -659,16 +685,28 @@ export function createModelCard(model, modelType) {
|
|||||||
const autoTags = model.auto_tags || [];
|
const autoTags = model.auto_tags || [];
|
||||||
const hlTags = autoTags.filter(t => t === 'HIGH' || t === 'LOW');
|
const hlTags = autoTags.filter(t => t === 'HIGH' || t === 'LOW');
|
||||||
const hasVersionName = model.civitai?.name;
|
const hasVersionName = model.civitai?.name;
|
||||||
if (!hlTags.length && !hasVersionName) return '';
|
// When group_by_model is active and model has multiple versions,
|
||||||
|
// show clickable version count instead of version name (and hide badges)
|
||||||
|
const isGroupByModel = state.global.settings.group_by_model;
|
||||||
|
const versionCount = model.version_count;
|
||||||
|
const showVersionCount = isGroupByModel && versionCount > 1;
|
||||||
|
if (!hlTags.length && !hasVersionName && !showVersionCount) return '';
|
||||||
const density = state.global.settings.display_density || 'default';
|
const density = state.global.settings.display_density || 'default';
|
||||||
const shortLabels = density === 'medium' || density === 'compact';
|
const shortLabels = density === 'medium' || density === 'compact';
|
||||||
const badges = hlTags.map(t => {
|
// Don't show HIGH/LOW badges when showing version count (confusing in grouped mode)
|
||||||
|
const badges = !showVersionCount ? hlTags.map(t => {
|
||||||
const cls = t === 'HIGH' ? 'hl-badge hl-badge--high' : 'hl-badge hl-badge--low';
|
const cls = t === 'HIGH' ? 'hl-badge hl-badge--high' : 'hl-badge hl-badge--low';
|
||||||
const label = shortLabels ? (t === 'HIGH' ? 'H' : 'L') : t;
|
const label = shortLabels ? (t === 'HIGH' ? 'H' : 'L') : t;
|
||||||
const titleAttr = shortLabels ? ` title="${t}"` : '';
|
const titleAttr = shortLabels ? ` title="${t}"` : '';
|
||||||
return `<span class="${cls}"${titleAttr}>${label}</span>`;
|
return `<span class="${cls}"${titleAttr}>${label}</span>`;
|
||||||
}).join('');
|
}).join('') : '';
|
||||||
const versionHtml = hasVersionName ? `<span class="version-name civitai-version">${model.civitai.name}</span>` : '';
|
let versionHtml = '';
|
||||||
|
if (showVersionCount) {
|
||||||
|
const countLabel = translate('modelCard.footer.versionCount', { count: versionCount }, `${versionCount} versions`);
|
||||||
|
versionHtml = `<span class="version-count-link" title="${translate('modelCard.footer.viewAllVersions', {}, 'View all local versions')}">${countLabel}</span>`;
|
||||||
|
} else if (hasVersionName) {
|
||||||
|
versionHtml = `<span class="version-name civitai-version">${model.civitai.name}</span>`;
|
||||||
|
}
|
||||||
return `<span class="badge-version-unit">${badges}${versionHtml}</span>`;
|
return `<span class="badge-version-unit">${badges}${versionHtml}</span>`;
|
||||||
})()}
|
})()}
|
||||||
${hasUsageCount ? `<span class="version-name" title="${translate('modelCard.usage.timesUsed', {}, 'Times used')}">${model.usage_count}×</span>` : ''}
|
${hasUsageCount ? `<span class="version-name" title="${translate('modelCard.usage.timesUsed', {}, 'Times used')}">${model.usage_count}×</span>` : ''}
|
||||||
|
|||||||
@@ -1042,9 +1042,16 @@ export function initVersionsTab({
|
|||||||
removeSessionItem('vlm_base_model');
|
removeSessionItem('vlm_base_model');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close the modal and reload the page to show filtered cards
|
// Close the modal and navigate via no-reload VLM flow
|
||||||
modalManager.closeModal(modalId);
|
modalManager.closeModal(modalId);
|
||||||
window.location.reload();
|
if (window.pageControls && typeof window.pageControls.triggerVlmView === 'function') {
|
||||||
|
window.pageControls.triggerVlmView(
|
||||||
|
modelId,
|
||||||
|
modelName || String(modelId),
|
||||||
|
isFilteringActive ? baseModelInfo.raw : undefined,
|
||||||
|
modelType
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleToggleVersionIgnore(button, versionId) {
|
async function handleToggleVersionIgnore(button, versionId) {
|
||||||
|
|||||||
@@ -2018,6 +2018,10 @@ export class SettingsManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (settingKey === 'show_only_sfw' || settingKey === 'blur_mature_content' || settingKey === 'group_by_model') {
|
if (settingKey === 'show_only_sfw' || settingKey === 'blur_mature_content' || settingKey === 'group_by_model') {
|
||||||
|
// Save/restore sort preference when toggling group_by_model
|
||||||
|
if (settingKey === 'group_by_model' && window.pageControls?.onGroupByModelToggled) {
|
||||||
|
window.pageControls.onGroupByModelToggled(value);
|
||||||
|
}
|
||||||
this.reloadContent();
|
this.reloadContent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,12 @@
|
|||||||
<option value="usage:asc">{{ t('loras.controls.sort.usageAsc', default='Times used (low to high)') }}</option>
|
<option value="usage:asc">{{ t('loras.controls.sort.usageAsc', default='Times used (low to high)') }}</option>
|
||||||
</optgroup>
|
</optgroup>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% if page_id != 'recipes' %}
|
||||||
|
<optgroup class="sort-option-versions-count" label="{{ t('loras.controls.sort.versionsCount', default='Local Versions') }}">
|
||||||
|
<option value="versions_count:desc">{{ t('loras.controls.sort.versionsCountDesc', default='Most versions first') }}</option>
|
||||||
|
<option value="versions_count:asc">{{ t('loras.controls.sort.versionsCountAsc', default='Fewest versions first') }}</option>
|
||||||
|
</optgroup>
|
||||||
|
{% endif %}
|
||||||
{% if page_id == 'recipes' %}
|
{% if page_id == 'recipes' %}
|
||||||
<optgroup label="{{ t('recipes.controls.sort.lorasCount') }}">
|
<optgroup label="{{ t('recipes.controls.sort.lorasCount') }}">
|
||||||
<option value="loras_count:desc">{{ t('recipes.controls.sort.lorasCountDesc') }}</option>
|
<option value="loras_count:desc">{{ t('recipes.controls.sort.lorasCountDesc') }}</option>
|
||||||
|
|||||||
@@ -790,8 +790,14 @@ async def test_get_paginated_data_group_by_model_dedup():
|
|||||||
for item in response["items"]:
|
for item in response["items"]:
|
||||||
if item.get("civitai", {}).get("modelId") == 1:
|
if item.get("civitai", {}).get("modelId") == 1:
|
||||||
assert item["civitai"]["id"] == 200
|
assert item["civitai"]["id"] == 200
|
||||||
|
# version_count should reflect total versions for this model
|
||||||
|
assert item.get("version_count") == 2, f"Expected version_count=2, got {item.get('version_count')}"
|
||||||
elif item.get("civitai", {}).get("modelId") == 2:
|
elif item.get("civitai", {}).get("modelId") == 2:
|
||||||
assert item["civitai"]["id"] == 99
|
assert item["civitai"]["id"] == 99
|
||||||
|
assert item.get("version_count") == 2, f"Expected version_count=2, got {item.get('version_count')}"
|
||||||
|
else:
|
||||||
|
# Standalone item should NOT have version_count
|
||||||
|
assert "version_count" not in item, f"Standalone should not have version_count"
|
||||||
|
|
||||||
# With group_by_model=False (default) — all 5 items pass through
|
# With group_by_model=False (default) — all 5 items pass through
|
||||||
response_all = await service.get_paginated_data(
|
response_all = await service.get_paginated_data(
|
||||||
|
|||||||
Reference in New Issue
Block a user