mirror of
https://github.com/willmiao/ComfyUI-Lora-Manager.git
synced 2026-06-23 19:51:15 -03:00
Compare commits
3 Commits
2b361f4f5d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3bf0a164b | ||
|
|
afb6ca1b8d | ||
|
|
94f43426d7 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -19,6 +19,7 @@ model_cache/
|
|||||||
.codex
|
.codex
|
||||||
.omo
|
.omo
|
||||||
reasonix.toml
|
reasonix.toml
|
||||||
|
.reasonix/
|
||||||
.codegraph/
|
.codegraph/
|
||||||
|
|
||||||
# Vue widgets development cache (but keep build output)
|
# Vue widgets development cache (but keep build output)
|
||||||
|
|||||||
@@ -145,6 +145,10 @@
|
|||||||
},
|
},
|
||||||
"usage": {
|
"usage": {
|
||||||
"timesUsed": "Verwendungsanzahl"
|
"timesUsed": "Verwendungsanzahl"
|
||||||
|
},
|
||||||
|
"footer": {
|
||||||
|
"versionCount": "{count} Versionen",
|
||||||
|
"viewAllVersions": "Alle lokalen Versionen anzeigen"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"globalContextMenu": {
|
"globalContextMenu": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "Zusätzliche Ordnerpfade",
|
"extraFolderPaths": "Zusätzliche Ordnerpfade",
|
||||||
"downloadPathTemplates": "Download-Pfad-Vorlagen",
|
"downloadPathTemplates": "Download-Pfad-Vorlagen",
|
||||||
"priorityTags": "Prioritäts-Tags",
|
"priorityTags": "Prioritäts-Tags",
|
||||||
"updateFlags": "Update-Markierungen",
|
"versionScope": "Update-Markierungen",
|
||||||
"exampleImages": "Beispielbilder",
|
"exampleImages": "Beispielbilder",
|
||||||
"autoOrganize": "Auto-Organisierung",
|
"autoOrganize": "Auto-Organisierung",
|
||||||
"metadata": "Metadaten",
|
"metadata": "Metadaten",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "Herunterladen",
|
"download": "Herunterladen",
|
||||||
"restartRequired": "Neustart erforderlich"
|
"restartRequired": "Neustart erforderlich"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "Strategie für Update-Markierungen",
|
"label": "Strategie für Update-Markierungen",
|
||||||
"help": "Entscheide, ob Update-Badges nur dann erscheinen, wenn eine neue Version dasselbe Basismodell wie deine lokalen Dateien verwendet, oder sobald es irgendein neueres Release für dieses Modell gibt.",
|
"help": "Entscheide, ob Update-Badges nur dann erscheinen, wenn eine neue Version dasselbe Basismodell wie deine lokalen Dateien verwendet, oder sobald es irgendein neueres Release für dieses Modell gibt.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "Extra Folder Paths",
|
"extraFolderPaths": "Extra Folder Paths",
|
||||||
"downloadPathTemplates": "Download Path Templates",
|
"downloadPathTemplates": "Download Path Templates",
|
||||||
"priorityTags": "Priority Tags",
|
"priorityTags": "Priority Tags",
|
||||||
"updateFlags": "Update Flags",
|
"versionScope": "Version Scope",
|
||||||
"exampleImages": "Example Images",
|
"exampleImages": "Example Images",
|
||||||
"autoOrganize": "Auto-organize",
|
"autoOrganize": "Auto-organize",
|
||||||
"metadata": "Metadata",
|
"metadata": "Metadata",
|
||||||
@@ -591,12 +595,12 @@
|
|||||||
"download": "Download",
|
"download": "Download",
|
||||||
"restartRequired": "Requires restart"
|
"restartRequired": "Requires restart"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "Update Flag Strategy",
|
"label": "Version Grouping",
|
||||||
"help": "Decide whether update badges should only appear when a new release shares the same base model as your local files or whenever any newer version exists for that model.",
|
"help": "Decide how versions are grouped for display: by base model or all together. Also controls update badge logic and the VLM version list filtering.",
|
||||||
"options": {
|
"options": {
|
||||||
"sameBase": "Match updates by base model",
|
"sameBase": "Group by base model (same_base)",
|
||||||
"any": "Flag any available update"
|
"any": "Show all versions (any)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hideEarlyAccessUpdates": {
|
"hideEarlyAccessUpdates": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "Rutas de carpetas adicionales",
|
"extraFolderPaths": "Rutas de carpetas adicionales",
|
||||||
"downloadPathTemplates": "Plantillas de rutas de descarga",
|
"downloadPathTemplates": "Plantillas de rutas de descarga",
|
||||||
"priorityTags": "Etiquetas prioritarias",
|
"priorityTags": "Etiquetas prioritarias",
|
||||||
"updateFlags": "Indicadores de actualización",
|
"versionScope": "Indicadores de actualización",
|
||||||
"exampleImages": "Imágenes de ejemplo",
|
"exampleImages": "Imágenes de ejemplo",
|
||||||
"autoOrganize": "Organización automática",
|
"autoOrganize": "Organización automática",
|
||||||
"metadata": "Metadatos",
|
"metadata": "Metadatos",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "Descargar",
|
"download": "Descargar",
|
||||||
"restartRequired": "Requiere reinicio"
|
"restartRequired": "Requiere reinicio"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "Estrategia de indicadores de actualización",
|
"label": "Estrategia de indicadores de actualización",
|
||||||
"help": "Decide si las insignias de actualización deben mostrarse solo cuando una nueva versión comparte el mismo modelo base que tus archivos locales o siempre que exista cualquier versión más reciente de ese modelo.",
|
"help": "Decide si las insignias de actualización deben mostrarse solo cuando una nueva versión comparte el mismo modelo base que tus archivos locales o siempre que exista cualquier versión más reciente de ese modelo.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "Chemins de dossiers supplémentaires",
|
"extraFolderPaths": "Chemins de dossiers supplémentaires",
|
||||||
"downloadPathTemplates": "Modèles de chemin de téléchargement",
|
"downloadPathTemplates": "Modèles de chemin de téléchargement",
|
||||||
"priorityTags": "Étiquettes prioritaires",
|
"priorityTags": "Étiquettes prioritaires",
|
||||||
"updateFlags": "Indicateurs de mise à jour",
|
"versionScope": "Indicateurs de mise à jour",
|
||||||
"exampleImages": "Images d'exemple",
|
"exampleImages": "Images d'exemple",
|
||||||
"autoOrganize": "Organisation automatique",
|
"autoOrganize": "Organisation automatique",
|
||||||
"metadata": "Métadonnées",
|
"metadata": "Métadonnées",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "Télécharger",
|
"download": "Télécharger",
|
||||||
"restartRequired": "Redémarrage requis"
|
"restartRequired": "Redémarrage requis"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "Stratégie des indicateurs de mise à jour",
|
"label": "Stratégie des indicateurs de mise à jour",
|
||||||
"help": "Choisissez si les badges de mise à jour doivent apparaître uniquement lorsqu’une nouvelle version partage le même modèle de base que vos fichiers locaux, ou dès qu’il existe une version plus récente pour ce modèle.",
|
"help": "Choisissez si les badges de mise à jour doivent apparaître uniquement lorsqu’une nouvelle version partage le même modèle de base que vos fichiers locaux, ou dès qu’il existe une version plus récente pour ce modèle.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "נתיבי תיקיות נוספים",
|
"extraFolderPaths": "נתיבי תיקיות נוספים",
|
||||||
"downloadPathTemplates": "תבניות נתיב הורדה",
|
"downloadPathTemplates": "תבניות נתיב הורדה",
|
||||||
"priorityTags": "תגיות עדיפות",
|
"priorityTags": "תגיות עדיפות",
|
||||||
"updateFlags": "תגי עדכון",
|
"versionScope": "תגי עדכון",
|
||||||
"exampleImages": "תמונות דוגמה",
|
"exampleImages": "תמונות דוגמה",
|
||||||
"autoOrganize": "ארגון אוטומטי",
|
"autoOrganize": "ארגון אוטומטי",
|
||||||
"metadata": "מטא-נתונים",
|
"metadata": "מטא-נתונים",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "הורד",
|
"download": "הורד",
|
||||||
"restartRequired": "דורש הפעלה מחדש"
|
"restartRequired": "דורש הפעלה מחדש"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "אסטרטגיית תגי עדכון",
|
"label": "אסטרטגיית תגי עדכון",
|
||||||
"help": "בחרו אם תוויות העדכון יוצגו רק כאשר גרסה חדשה חולקת את אותו דגם בסיס כמו הקבצים המקומיים שלכם או בכל מקרה שבו קיימת גרסה חדשה עבור אותו דגם.",
|
"help": "בחרו אם תוויות העדכון יוצגו רק כאשר גרסה חדשה חולקת את אותו דגם בסיס כמו הקבצים המקומיים שלכם או בכל מקרה שבו קיימת גרסה חדשה עבור אותו דגם.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "追加フォルダーパス",
|
"extraFolderPaths": "追加フォルダーパス",
|
||||||
"downloadPathTemplates": "ダウンロードパステンプレート",
|
"downloadPathTemplates": "ダウンロードパステンプレート",
|
||||||
"priorityTags": "優先タグ",
|
"priorityTags": "優先タグ",
|
||||||
"updateFlags": "アップデートフラグ",
|
"versionScope": "アップデートフラグ",
|
||||||
"exampleImages": "例画像",
|
"exampleImages": "例画像",
|
||||||
"autoOrganize": "自動整理",
|
"autoOrganize": "自動整理",
|
||||||
"metadata": "メタデータ",
|
"metadata": "メタデータ",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "ダウンロード",
|
"download": "ダウンロード",
|
||||||
"restartRequired": "再起動が必要"
|
"restartRequired": "再起動が必要"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "アップデートフラグの表示戦略",
|
"label": "アップデートフラグの表示戦略",
|
||||||
"help": "新リリースがローカルファイルと同じベースモデルを共有する場合にのみ更新バッジを表示するか、そのモデルに新しいバージョンがあれば常に表示するかを決めます。",
|
"help": "新リリースがローカルファイルと同じベースモデルを共有する場合にのみ更新バッジを表示するか、そのモデルに新しいバージョンがあれば常に表示するかを決めます。",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "추가 폴다 경로",
|
"extraFolderPaths": "추가 폴다 경로",
|
||||||
"downloadPathTemplates": "다운로드 경로 템플릿",
|
"downloadPathTemplates": "다운로드 경로 템플릿",
|
||||||
"priorityTags": "우선순위 태그",
|
"priorityTags": "우선순위 태그",
|
||||||
"updateFlags": "업데이트 표시",
|
"versionScope": "업데이트 표시",
|
||||||
"exampleImages": "예시 이미지",
|
"exampleImages": "예시 이미지",
|
||||||
"autoOrganize": "자동 정리",
|
"autoOrganize": "자동 정리",
|
||||||
"metadata": "메타데이터",
|
"metadata": "메타데이터",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "다운로드",
|
"download": "다운로드",
|
||||||
"restartRequired": "재시작 필요"
|
"restartRequired": "재시작 필요"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "업데이트 표시 전략",
|
"label": "업데이트 표시 전략",
|
||||||
"help": "새 릴리스가 로컬 파일과 동일한 베이스 모델을 공유할 때만 업데이트 배지를 표시할지, 또는 해당 모델에 사용 가능한 새 버전이 있으면 항상 표시할지 결정합니다.",
|
"help": "새 릴리스가 로컬 파일과 동일한 베이스 모델을 공유할 때만 업데이트 배지를 표시할지, 또는 해당 모델에 사용 가능한 새 버전이 있으면 항상 표시할지 결정합니다.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "Дополнительные пути к папкам",
|
"extraFolderPaths": "Дополнительные пути к папкам",
|
||||||
"downloadPathTemplates": "Шаблоны путей загрузки",
|
"downloadPathTemplates": "Шаблоны путей загрузки",
|
||||||
"priorityTags": "Приоритетные теги",
|
"priorityTags": "Приоритетные теги",
|
||||||
"updateFlags": "Метки обновлений",
|
"versionScope": "Метки обновлений",
|
||||||
"exampleImages": "Примеры изображений",
|
"exampleImages": "Примеры изображений",
|
||||||
"autoOrganize": "Автоорганизация",
|
"autoOrganize": "Автоорганизация",
|
||||||
"metadata": "Метаданные",
|
"metadata": "Метаданные",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "Загрузить",
|
"download": "Загрузить",
|
||||||
"restartRequired": "Требует перезапуска"
|
"restartRequired": "Требует перезапуска"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "Стратегия меток обновлений",
|
"label": "Стратегия меток обновлений",
|
||||||
"help": "Выберите, отображать ли значки обновления только когда новая версия имеет тот же базовый модель, что и локальные файлы, или всегда при наличии любого нового релиза для этой модели.",
|
"help": "Выберите, отображать ли значки обновления только когда новая версия имеет тот же базовый модель, что и локальные файлы, или всегда при наличии любого нового релиза для этой модели.",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "额外文件夹路径",
|
"extraFolderPaths": "额外文件夹路径",
|
||||||
"downloadPathTemplates": "下载路径模板",
|
"downloadPathTemplates": "下载路径模板",
|
||||||
"priorityTags": "优先标签",
|
"priorityTags": "优先标签",
|
||||||
"updateFlags": "更新标记",
|
"versionScope": "版本范围",
|
||||||
"exampleImages": "示例图片",
|
"exampleImages": "示例图片",
|
||||||
"autoOrganize": "自动整理",
|
"autoOrganize": "自动整理",
|
||||||
"metadata": "元数据",
|
"metadata": "元数据",
|
||||||
@@ -591,12 +595,12 @@
|
|||||||
"download": "下载",
|
"download": "下载",
|
||||||
"restartRequired": "需要重启"
|
"restartRequired": "需要重启"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "更新标记策略",
|
"label": "版本分组",
|
||||||
"help": "决定更新徽章是否仅在新版本与本地文件共享相同基础模型时显示,或只要该模型有任何更新版本就显示。",
|
"help": "控制版本在 UI 中的分组方式:按基础模型分组或合并显示。同时影响更新徽章逻辑和版本列表的筛选行为。",
|
||||||
"options": {
|
"options": {
|
||||||
"sameBase": "按基础模型匹配更新",
|
"sameBase": "按基础模型分组",
|
||||||
"any": "显示任何可用更新"
|
"any": "显示所有版本"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hideEarlyAccessUpdates": {
|
"hideEarlyAccessUpdates": {
|
||||||
@@ -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": {
|
||||||
@@ -328,7 +332,7 @@
|
|||||||
"extraFolderPaths": "額外資料夾路徑",
|
"extraFolderPaths": "額外資料夾路徑",
|
||||||
"downloadPathTemplates": "下載路徑範本",
|
"downloadPathTemplates": "下載路徑範本",
|
||||||
"priorityTags": "優先標籤",
|
"priorityTags": "優先標籤",
|
||||||
"updateFlags": "更新標記",
|
"versionScope": "版本範圍",
|
||||||
"exampleImages": "範例圖片",
|
"exampleImages": "範例圖片",
|
||||||
"autoOrganize": "自動整理",
|
"autoOrganize": "自動整理",
|
||||||
"metadata": "中繼資料",
|
"metadata": "中繼資料",
|
||||||
@@ -591,7 +595,7 @@
|
|||||||
"download": "下載",
|
"download": "下載",
|
||||||
"restartRequired": "需要重新啟動"
|
"restartRequired": "需要重新啟動"
|
||||||
},
|
},
|
||||||
"updateFlagStrategy": {
|
"versionGrouping": {
|
||||||
"label": "更新標記策略",
|
"label": "更新標記策略",
|
||||||
"help": "決定更新徽章是否僅在新版本與本地檔案共享相同基礎模型時顯示,或只要該模型有任何更新版本就顯示。",
|
"help": "決定更新徽章是否僅在新版本與本地檔案共享相同基礎模型時顯示,或只要該模型有任何更新版本就顯示。",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -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 version_grouping 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("version_grouping", "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)
|
||||||
@@ -520,7 +551,7 @@ class BaseModelService(ABC):
|
|||||||
if not ordered_ids:
|
if not ordered_ids:
|
||||||
return annotated
|
return annotated
|
||||||
|
|
||||||
strategy_value = self.settings.get("update_flag_strategy")
|
strategy_value = self.settings.get("version_grouping")
|
||||||
if isinstance(strategy_value, str) and strategy_value.strip():
|
if isinstance(strategy_value, str) and strategy_value.strip():
|
||||||
strategy = strategy_value.strip().lower()
|
strategy = strategy_value.strip().lower()
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
|
|||||||
"lora_syntax_format": "legacy",
|
"lora_syntax_format": "legacy",
|
||||||
"model_card_footer_action": "replace_preview",
|
"model_card_footer_action": "replace_preview",
|
||||||
"show_version_on_card": True,
|
"show_version_on_card": True,
|
||||||
"update_flag_strategy": "same_base",
|
"version_grouping": "same_base",
|
||||||
"auto_organize_exclusions": [],
|
"auto_organize_exclusions": [],
|
||||||
"metadata_refresh_skip_paths": [],
|
"metadata_refresh_skip_paths": [],
|
||||||
"skip_previously_downloaded_model_versions": False,
|
"skip_previously_downloaded_model_versions": False,
|
||||||
@@ -745,6 +745,7 @@ class SettingsManager:
|
|||||||
"includeTriggerWords": "include_trigger_words",
|
"includeTriggerWords": "include_trigger_words",
|
||||||
"compactMode": "compact_mode",
|
"compactMode": "compact_mode",
|
||||||
"modelCardFooterAction": "model_card_footer_action",
|
"modelCardFooterAction": "model_card_footer_action",
|
||||||
|
"update_flag_strategy": "version_grouping",
|
||||||
}
|
}
|
||||||
|
|
||||||
updated = False
|
updated = False
|
||||||
|
|||||||
@@ -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 version_grouping: only filter by base model when the strategy says so
|
||||||
|
const strategy = state.global?.settings?.version_grouping;
|
||||||
|
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>` : ''}
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ function getToggleTooltipText(mode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getDefaultDisplayMode() {
|
function getDefaultDisplayMode() {
|
||||||
const strategy = state?.global?.settings?.update_flag_strategy;
|
const strategy = state?.global?.settings?.version_grouping;
|
||||||
return strategy === DISPLAY_FILTER_MODES.SAME_BASE
|
return strategy === DISPLAY_FILTER_MODES.SAME_BASE
|
||||||
? DISPLAY_FILTER_MODES.SAME_BASE
|
? DISPLAY_FILTER_MODES.SAME_BASE
|
||||||
: DISPLAY_FILTER_MODES.ANY;
|
: DISPLAY_FILTER_MODES.ANY;
|
||||||
@@ -339,7 +339,7 @@ function resolveUpdateAvailability(record, baseModel, currentVersionId) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const strategy = state?.global?.settings?.update_flag_strategy;
|
const strategy = state?.global?.settings?.version_grouping;
|
||||||
const sameBaseMode = strategy === DISPLAY_FILTER_MODES.SAME_BASE;
|
const sameBaseMode = strategy === DISPLAY_FILTER_MODES.SAME_BASE;
|
||||||
const hideEarlyAccess = state?.global?.settings?.hide_early_access_updates;
|
const hideEarlyAccess = state?.global?.settings?.hide_early_access_updates;
|
||||||
|
|
||||||
@@ -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) {
|
||||||
|
|||||||
@@ -917,9 +917,9 @@ export class SettingsManager {
|
|||||||
modelNameDisplaySelect.value = state.global.settings.model_name_display || 'model_name';
|
modelNameDisplaySelect.value = state.global.settings.model_name_display || 'model_name';
|
||||||
}
|
}
|
||||||
|
|
||||||
const updateFlagStrategySelect = document.getElementById('updateFlagStrategy');
|
const versionGroupingSelect = document.getElementById('versionGrouping');
|
||||||
if (updateFlagStrategySelect) {
|
if (versionGroupingSelect) {
|
||||||
updateFlagStrategySelect.value = state.global.settings.update_flag_strategy || 'same_base';
|
versionGroupingSelect.value = state.global.settings.version_grouping || 'same_base';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set hide early access updates setting
|
// Set hide early access updates setting
|
||||||
@@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2066,7 +2070,7 @@ export class SettingsManager {
|
|||||||
if (
|
if (
|
||||||
settingKey === 'model_name_display'
|
settingKey === 'model_name_display'
|
||||||
|| settingKey === 'model_card_footer_action'
|
|| settingKey === 'model_card_footer_action'
|
||||||
|| settingKey === 'update_flag_strategy'
|
|| settingKey === 'version_grouping'
|
||||||
|| settingKey === 'mature_blur_level'
|
|| settingKey === 'mature_blur_level'
|
||||||
) {
|
) {
|
||||||
this.reloadContent();
|
this.reloadContent();
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
|
|||||||
include_trigger_words: false,
|
include_trigger_words: false,
|
||||||
compact_mode: false,
|
compact_mode: false,
|
||||||
priority_tags: { ...DEFAULT_PRIORITY_TAG_CONFIG },
|
priority_tags: { ...DEFAULT_PRIORITY_TAG_CONFIG },
|
||||||
update_flag_strategy: 'same_base',
|
version_grouping: 'same_base',
|
||||||
hide_early_access_updates: false,
|
hide_early_access_updates: false,
|
||||||
auto_organize_exclusions: [],
|
auto_organize_exclusions: [],
|
||||||
metadata_refresh_skip_paths: [],
|
metadata_refresh_skip_paths: [],
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -1100,23 +1100,23 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Update Flags -->
|
<!-- Version Scope -->
|
||||||
<div class="settings-subsection">
|
<div class="settings-subsection">
|
||||||
<div class="settings-subsection-header">
|
<div class="settings-subsection-header">
|
||||||
<h4>{{ t('settings.sections.updateFlags') }}</h4>
|
<h4>{{ t('settings.sections.versionScope') }}</h4>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-item">
|
<div class="setting-item">
|
||||||
<div class="setting-row">
|
<div class="setting-row">
|
||||||
<div class="setting-info">
|
<div class="setting-info">
|
||||||
<label for="updateFlagStrategy">
|
<label for="versionGrouping">
|
||||||
{{ t('settings.updateFlagStrategy.label') }}
|
{{ t('settings.versionGrouping.label') }}
|
||||||
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.updateFlagStrategy.help') }}"></i>
|
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.versionGrouping.help') }}"></i>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="setting-control select-control">
|
<div class="setting-control select-control">
|
||||||
<select id="updateFlagStrategy" onchange="settingsManager.saveSelectSetting('updateFlagStrategy', 'update_flag_strategy')">
|
<select id="versionGrouping" onchange="settingsManager.saveSelectSetting('versionGrouping', 'version_grouping')">
|
||||||
<option value="same_base">{{ t('settings.updateFlagStrategy.options.sameBase') }}</option>
|
<option value="same_base">{{ t('settings.versionGrouping.options.sameBase') }}</option>
|
||||||
<option value="any">{{ t('settings.updateFlagStrategy.options.any') }}</option>
|
<option value="any">{{ t('settings.versionGrouping.options.any') }}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ const stateMock = {
|
|||||||
global: {
|
global: {
|
||||||
settings: {
|
settings: {
|
||||||
autoplay_on_hover: false,
|
autoplay_on_hover: false,
|
||||||
update_flag_strategy: 'any',
|
version_grouping: 'any',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -67,7 +67,7 @@ describe('ModelVersionsTab media rendering', () => {
|
|||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
stateMock.global.settings.autoplay_on_hover = false;
|
stateMock.global.settings.autoplay_on_hover = false;
|
||||||
stateMock.global.settings.update_flag_strategy = 'any';
|
stateMock.global.settings.version_grouping = 'any';
|
||||||
({ getModelApiClient } = await import(API_FACTORY_MODULE));
|
({ getModelApiClient } = await import(API_FACTORY_MODULE));
|
||||||
fetchModelUpdateVersions = vi.fn();
|
fetchModelUpdateVersions = vi.fn();
|
||||||
getModelApiClient.mockReturnValue({
|
getModelApiClient.mockReturnValue({
|
||||||
@@ -157,7 +157,7 @@ describe('ModelVersionsTab media rendering', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('shows a stable label with a short state indicator', async () => {
|
it('shows a stable label with a short state indicator', async () => {
|
||||||
stateMock.global.settings.update_flag_strategy = 'any';
|
stateMock.global.settings.version_grouping = 'any';
|
||||||
fetchModelUpdateVersions.mockResolvedValue({
|
fetchModelUpdateVersions.mockResolvedValue({
|
||||||
success: true,
|
success: true,
|
||||||
record: {
|
record: {
|
||||||
@@ -192,7 +192,7 @@ describe('ModelVersionsTab media rendering', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('filters versions to the current base model when strategy is same_base', async () => {
|
it('filters versions to the current base model when strategy is same_base', async () => {
|
||||||
stateMock.global.settings.update_flag_strategy = 'same_base';
|
stateMock.global.settings.version_grouping = 'same_base';
|
||||||
fetchModelUpdateVersions.mockResolvedValue({
|
fetchModelUpdateVersions.mockResolvedValue({
|
||||||
success: true,
|
success: true,
|
||||||
record: {
|
record: {
|
||||||
@@ -235,7 +235,7 @@ describe('ModelVersionsTab media rendering', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('toggle button can switch to display all versions', async () => {
|
it('toggle button can switch to display all versions', async () => {
|
||||||
stateMock.global.settings.update_flag_strategy = 'same_base';
|
stateMock.global.settings.version_grouping = 'same_base';
|
||||||
fetchModelUpdateVersions.mockResolvedValue({
|
fetchModelUpdateVersions.mockResolvedValue({
|
||||||
success: true,
|
success: true,
|
||||||
record: {
|
record: {
|
||||||
@@ -286,7 +286,7 @@ describe('ModelVersionsTab media rendering', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('shows a newer version badge when viewing same-base results', async () => {
|
it('shows a newer version badge when viewing same-base results', async () => {
|
||||||
stateMock.global.settings.update_flag_strategy = 'same_base';
|
stateMock.global.settings.version_grouping = 'same_base';
|
||||||
fetchModelUpdateVersions.mockResolvedValue({
|
fetchModelUpdateVersions.mockResolvedValue({
|
||||||
success: true,
|
success: true,
|
||||||
record: {
|
record: {
|
||||||
|
|||||||
@@ -482,7 +482,7 @@ async def test_get_paginated_data_annotates_update_flags_with_bulk_dedup():
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_update_flag_strategy_same_base_prefers_matching_base():
|
async def test_version_grouping_same_base_prefers_matching_base():
|
||||||
items = [
|
items = [
|
||||||
{
|
{
|
||||||
"model_name": "Pony Version",
|
"model_name": "Pony Version",
|
||||||
@@ -551,7 +551,7 @@ async def test_update_flag_strategy_same_base_prefers_matching_base():
|
|||||||
should_ignore_model=False,
|
should_ignore_model=False,
|
||||||
)
|
)
|
||||||
update_service = StubUpdateServiceWithRecords({1: record})
|
update_service = StubUpdateServiceWithRecords({1: record})
|
||||||
settings = StubSettings({"update_flag_strategy": "same_base"})
|
settings = StubSettings({"version_grouping": "same_base"})
|
||||||
|
|
||||||
service = DummyService(
|
service = DummyService(
|
||||||
model_type="stub",
|
model_type="stub",
|
||||||
@@ -579,7 +579,7 @@ async def test_update_flag_strategy_same_base_prefers_matching_base():
|
|||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_update_flag_strategy_same_base_honors_latest_local_version():
|
async def test_version_grouping_same_base_honors_latest_local_version():
|
||||||
items = [
|
items = [
|
||||||
{
|
{
|
||||||
"model_name": "Pony v0.1",
|
"model_name": "Pony v0.1",
|
||||||
@@ -648,7 +648,7 @@ async def test_update_flag_strategy_same_base_honors_latest_local_version():
|
|||||||
should_ignore_model=False,
|
should_ignore_model=False,
|
||||||
)
|
)
|
||||||
update_service = StubUpdateServiceWithRecords({1: record})
|
update_service = StubUpdateServiceWithRecords({1: record})
|
||||||
settings = StubSettings({"update_flag_strategy": "same_base"})
|
settings = StubSettings({"version_grouping": "same_base"})
|
||||||
|
|
||||||
service = DummyService(
|
service = DummyService(
|
||||||
model_type="stub",
|
model_type="stub",
|
||||||
@@ -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