Compare commits

...

41 Commits

Author SHA1 Message Date
Will Miao
68bf8442eb chore(release): bump version to v1.0.4 and add release notes 2026-04-16 14:26:28 +08:00
Will Miao
605fbf4117 feat(civitai): add host preference for view links 2026-04-16 13:28:51 +08:00
Will Miao
406d5fea6a fix(civitai): use red-only api host (#897) 2026-04-16 12:08:07 +08:00
Will Miao
af2146f96c fix(civitai): fallback image info hosts on request failure 2026-04-16 09:29:03 +08:00
Will Miao
bdc8dec860 fix(civitai): support civitai.red URLs (#897) 2026-04-16 08:54:12 +08:00
Will Miao
c4fa1631ee chore: bump version to v1.0.3 2026-04-15 23:10:43 +08:00
Will Miao
506d763dc2 chore: add pyyaml dependency 2026-04-15 23:07:36 +08:00
Will Miao
a2cd09b619 docs: add v1.0.3 release notes 2026-04-15 22:52:04 +08:00
Will Miao
cdd77029b6 fix(autocomplete): improve wildcard onboarding UX 2026-04-15 22:25:25 +08:00
Will Miao
439679e15f fix(autocomplete): preserve manual accept-key selection 2026-04-15 21:19:00 +08:00
Will Miao
2640258902 fix(prompt): invalidate dynamic wildcard cache without seed (#895) 2026-04-15 20:43:21 +08:00
Will Miao
b910388d54 fix(autocomplete): remove short prompt command aliases (#895) 2026-04-15 20:43:03 +08:00
Will Miao
083de395b1 chore(logging): remove autocomplete debug logs (#895) 2026-04-15 20:42:55 +08:00
Will Miao
4514ca94b7 fix(autocomplete): reduce tag search overhead (#895) 2026-04-15 20:42:33 +08:00
Will Miao
62247bdd87 feat(prompt): expand wildcards at runtime (#895) 2026-04-15 20:42:27 +08:00
Will Miao
6d0d9600a7 fix(versions): clarify tab hover states and copy 2026-04-13 21:12:13 +08:00
Will Miao
70cd3f4e1b fix(download-history): use title for downloaded tooltip 2026-04-13 20:26:40 +08:00
Will Miao
a95c518b30 feat(download-history): add downloaded status UX 2026-04-13 19:51:04 +08:00
Will Miao
ba1800095e fix(recipes): preserve scroll on in-place reloads 2026-04-13 10:30:50 +08:00
Will Miao
39c083db79 fix(recipes): preserve legacy gen params in modal flows 2026-04-12 21:25:54 +08:00
Will Miao
55e9e4bb6f fix(recipes): sanitize remote import gen params 2026-04-12 20:29:01 +08:00
Will Miao
0253d001e6 fix(recipe): hydrate stale modal data from recipe json 2026-04-12 19:22:58 +08:00
Will Miao
9998da3241 fix(ui): refresh stale model page versions 2026-04-11 20:11:21 +08:00
Will Miao
6666a72775 fix(doctor): center status badge 2026-04-11 16:28:14 +08:00
Will Miao
5f1bd894b9 fix(settings): prevent library modal focus jump 2026-04-11 16:20:37 +08:00
Will Miao
1817142a7b feat(doctor): add system diagnostics feature 2026-04-11 16:03:38 +08:00
Will Miao
25fa175aa2 fix(usage): resolve checkpoint hashes from disk 2026-04-10 22:28:04 +08:00
Will Miao
39643eb2bc fix(metadata): recover prompts through scheduled guidance 2026-04-10 21:36:42 +08:00
Will Miao
4ac78f8aa8 fix(settings): reserve scrollbar space in settings content 2026-04-10 21:13:48 +08:00
Will Miao
0bcca0ba68 fix(settings): clarify backup scope in UI 2026-04-10 21:04:11 +08:00
Will Miao
72f8e0d1be fix(backup): add user-state backup UI and storage 2026-04-10 20:49:30 +08:00
Will Miao
85b6c91192 fix(download): add ZImageBase to diffusion model routing (#892) 2026-04-10 08:55:28 +08:00
Will Miao
908016cbd6 fix(recipe modal): compact layout on short viewports (#891) 2026-04-09 22:46:25 +08:00
Will Miao
a5ac9cf81b Revert "fix(recipes): make recipe modal viewport-safe (#891)"
This reverts commit 51fe7aa07e.
2026-04-09 22:28:29 +08:00
Will Miao
32875042bd feat(metadata): support PromptAttention CLIP encoder 2026-04-09 19:21:25 +08:00
Will Miao
51fe7aa07e fix(recipes): make recipe modal viewport-safe (#891) 2026-04-09 19:14:12 +08:00
Will Miao
db4726a961 feat(recipes): add configurable storage path migration 2026-04-09 15:57:37 +08:00
Will Miao
e13d70248a fix(usage-stats): resolve pending checkpoint hashes 2026-04-08 09:40:20 +08:00
pixelpaws
1c4919a3e8 Merge pull request #887 from NubeBuster/feat/usage-extractors
feat(usage-stats): add extractors for rgthree Power LoRA Loader and TensorRT loaders
2026-04-08 09:32:08 +08:00
Will Miao
18ddadc9ec feat(autocomplete): auto-format textarea on blur (#884) 2026-04-08 07:57:28 +08:00
NubeBuster
b711ac468a feat(usage-stats): add extractors for rgthree Power LoRA Loader and TensorRT Loader
Fixes #394 — LoRAs loaded via rgthree Power Lora Loader were not
tracked in usage statistics because no extractor existed for that node.

New extractors:
- RgthreePowerLoraLoaderExtractor: parses LORA_* kwargs, respects
  the per-LoRA 'on' toggle
- TensorRTLoaderExtractor: parses engine filename (strips _$profile
  suffix) as best-effort for vanilla TRT. If the output MODEL has
  attachments["source_model"] (set by NubeBuster fork), overrides
  with the real checkpoint name.

TensorRTRefitLoader and TensorRTLoaderAuto take a MODEL input whose
upstream checkpoint loader is already tracked — no extractor needed.

Also adds a name:<filename> fallback and warning log in both
_process_checkpoints and _process_loras when hash lookup fails.
2026-04-05 16:45:21 +02:00
125 changed files with 12557 additions and 777 deletions

View File

@@ -56,6 +56,22 @@ Insomnia Art Designs, megakirbs, Brennok, 2018cfh, W+K+White, wackop, Takkan, Ca
## Release Notes ## Release Notes
### v1.0.4
* **Civitai Domain Split Support** - Added support for `civitai.com` and `civitai.red` model URLs and recipe/image URLs across import, analysis, and download flows.
* **Civitai API Host Migration** - Updated core Civitai API requests to use `civitai.red` for compatibility with Civitai's current API host.
* **Configurable Civitai View Host** - Added a setting to choose which Civitai site opens by default for model, search, and view links.
* **401 Unauthorized Reminder** - Some users have reported `401 Unauthorized` errors. If you run into this, try generating a new API key on `civitai.red` and updating it in LoRA Manager settings.
### v1.0.3
* **Custom Recipe Storage Path** - Added support for configuring a custom storage path for recipes, with migration support to move existing recipe data when changing locations.
* **Wildcard Support for LM Text/Prompt Nodes** - The LM `Text` node and `Prompt` node now support the new `/wildcard` command, with runtime wildcard expansion and support for dynamic prompt syntax for more flexible prompt construction.
* **System Diagnostics ("Doctor")** - Added a new diagnostics feature to help surface environment and setup issues more clearly.
* **User-State Backup Support** - Added backup support for user state, with accompanying UI and clearer backup scope messaging in Settings.
* **Downloaded Status Visibility** - Added clearer downloaded-status UX so previously downloaded model versions are easier to recognize.
* **Autocomplete Performance Improvements** - Fixed autocomplete performance issues to reduce tag-search overhead and improve responsiveness.
### v1.0.2 ### v1.0.2
* **Model Download History Tracking** - LoRA Manager now keeps a history of downloaded model versions, allowing it to recognize whether a version has been downloaded before, even if it is no longer currently present in your library. * **Model Download History Tracking** - LoRA Manager now keeps a history of downloaded model versions, allowing it to recognize whether a version has been downloaded before, even if it is no longer currently present in your library.
@@ -101,7 +117,7 @@ Insomnia Art Designs, megakirbs, Brennok, 2018cfh, W+K+White, wackop, Takkan, Ca
### v0.9.14 ### v0.9.14
* **LoRA Cycler Node** - Introduced a new LoRA Cycler node that enables iteration through specified LoRAs with support for repeat count and pause iteration functionality. Refer to the new "Lora Cycler" template workflow for concrete example. * **LoRA Cycler Node** - Introduced a new LoRA Cycler node that enables iteration through specified LoRAs with support for repeat count and pause iteration functionality. Refer to the new "Lora Cycler" template workflow for concrete example.
* **Enhanced Prompt Node with Tag Autocomplete** - Enhanced the Prompt node with comprehensive tag autocomplete based on merged Danbooru + e621 tags. Supports tag search and autocomplete functionality. Implemented a command system with shortcuts like `/char` or `/artist` for category-specific tag searching. Added `/ac` or `/noac` commands to quickly enable or disable autocomplete. Refer to the "Lora Manager Basic" template workflow in ComfyUI -> Templates -> ComfyUI-Lora-Manager for detailed tips. * **Enhanced Prompt Node with Tag Autocomplete** - Enhanced the Prompt node with comprehensive tag autocomplete based on merged Danbooru + e621 tags. Supports tag search and autocomplete functionality. Implemented a command system with shortcuts like `/character` or `/artist` for category-specific tag searching. Added `/ac` or `/noac` commands to quickly enable or disable autocomplete. Refer to the "Lora Manager Basic" template workflow in ComfyUI -> Templates -> ComfyUI-Lora-Manager for detailed tips.
* **Bug Fixes & Stability** - Addressed multiple bugs and improved overall stability. * **Bug Fixes & Stability** - Addressed multiple bugs and improved overall stability.
### v0.9.12 ### v0.9.12
@@ -253,6 +269,41 @@ pip install -r requirements.txt
- Paste into the Lora Loader node's text input - Paste into the Lora Loader node's text input
- The node will automatically apply preset strength and trigger words - The node will automatically apply preset strength and trigger words
### Wildcards for TextLM / PromptLM
`Text (LoraManager)` and `Prompt (LoraManager)` support `/wildcard` autocomplete plus runtime wildcard expansion.
- Wildcard files live in `{settings folder}/wildcards/`
- When you type `/wildcard` and no wildcard files exist yet, the autocomplete dropdown shows the exact folder path and lets you open it
- Supported formats: `.txt`, `.yaml`, `.yml`, `.json`
Format rules:
- `wildcards/animals/cat.txt` becomes `__animals/cat__`
- `.txt` files use one option per line
- YAML / JSON files use nested keys that end in string arrays
Examples:
```txt
# wildcards/color.txt
red
blue
green
```
Use it as `__color__`.
```yaml
# wildcards/colors.yaml
palette:
warm:
- red
- orange
```
Use it as `__palette/warm__`.
### Filename Format Patterns for Save Image Node ### Filename Format Patterns for Save Image Node
The Save Image Node supports dynamic filename generation using pattern codes. You can customize how your images are named using the following format patterns: The Save Image Node supports dynamic filename generation using pattern codes. You can customize how your images are named using the following format patterns:

File diff suppressed because one or more lines are too long

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai API Key", "civitaiApiKey": "Civitai API Key",
"civitaiApiKeyPlaceholder": "Geben Sie Ihren Civitai API Key ein", "civitaiApiKeyPlaceholder": "Geben Sie Ihren Civitai API Key ein",
"civitaiApiKeyHelp": "Wird für die Authentifizierung beim Herunterladen von Modellen von Civitai verwendet", "civitaiApiKeyHelp": "Wird für die Authentifizierung beim Herunterladen von Modellen von Civitai verwendet",
"civitaiHost": {
"label": "Civitai-Host",
"help": "Wählen Sie aus, welche Civitai-Seite geöffnet wird, wenn Sie „View on Civitai“-Links verwenden.",
"options": {
"com": "civitai.com (nur SFW)",
"red": "civitai.red (uneingeschränkt)"
}
},
"civitaiHostBanner": {
"title": "Civitai-Host-Einstellung verfügbar",
"content": "Civitai verwendet jetzt civitai.com für SFW-Inhalte und civitai.red für uneingeschränkte Inhalte. In den Einstellungen können Sie ändern, welche Seite standardmäßig geöffnet wird.",
"openSettings": "Einstellungen öffnen"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "Einstellungsordner öffnen", "label": "Einstellungsordner öffnen",
"tooltip": "Den Ordner mit der settings.json öffnen", "tooltip": "Den Ordner mit der settings.json öffnen",
@@ -263,7 +276,9 @@
"videoSettings": "Video-Einstellungen", "videoSettings": "Video-Einstellungen",
"layoutSettings": "Layout-Einstellungen", "layoutSettings": "Layout-Einstellungen",
"misc": "Verschiedenes", "misc": "Verschiedenes",
"backup": "Backups",
"folderSettings": "Standard-Roots", "folderSettings": "Standard-Roots",
"recipeSettings": "Rezepte",
"extraFolderPaths": "Zusätzliche Ordnerpfade", "extraFolderPaths": "Zusätzliche Ordnerpfade",
"downloadPathTemplates": "Download-Pfad-Vorlagen", "downloadPathTemplates": "Download-Pfad-Vorlagen",
"priorityTags": "Prioritäts-Tags", "priorityTags": "Prioritäts-Tags",
@@ -323,6 +338,32 @@
"saveFailed": "Übersprungene Pfade konnten nicht gespeichert werden: {message}" "saveFailed": "Übersprungene Pfade konnten nicht gespeichert werden: {message}"
} }
}, },
"backup": {
"autoEnabled": "Automatische Backups",
"autoEnabledHelp": "Erstellt einmal täglich einen lokalen Schnappschuss und behält die neuesten Schnappschüsse gemäß der Aufbewahrungsrichtlinie.",
"retention": "Aufbewahrungsanzahl",
"retentionHelp": "Wie viele automatische Schnappschüsse behalten werden, bevor ältere entfernt werden.",
"management": "Backup-Verwaltung",
"managementHelp": "Exportiere deinen aktuellen Benutzerstatus oder stelle ihn aus einem Backup-Archiv wieder her.",
"scopeHelp": "Sichert deine Einstellungen, den Downloadverlauf und den Status der Modellaktualisierung. Modelldateien und neu erzeugbare Caches sind nicht enthalten.",
"locationSummary": "Aktueller Backup-Speicherort",
"openFolderButton": "Backup-Ordner öffnen",
"openFolderSuccess": "Backup-Ordner geöffnet",
"openFolderFailed": "Backup-Ordner konnte nicht geöffnet werden",
"locationCopied": "Backup-Pfad in die Zwischenablage kopiert: {{path}}",
"locationClipboardFallback": "Backup-Pfad: {{path}}",
"exportButton": "Backup exportieren",
"exportSuccess": "Backup erfolgreich exportiert.",
"exportFailed": "Backup konnte nicht exportiert werden: {message}",
"importButton": "Backup importieren",
"importConfirm": "Dieses Backup importieren und den lokalen Benutzerstatus überschreiben?",
"importSuccess": "Backup erfolgreich importiert.",
"importFailed": "Backup konnte nicht importiert werden: {message}",
"latestSnapshot": "Neuester Schnappschuss",
"latestAutoSnapshot": "Neuester automatischer Schnappschuss",
"snapshotCount": "Gespeicherte Schnappschüsse",
"noneAvailable": "Noch keine Schnappschüsse vorhanden"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "Downloads für Basismodelle überspringen", "label": "Downloads für Basismodelle überspringen",
"help": "Gilt für alle Download-Abläufe. Hier können nur unterstützte Basismodelle ausgewählt werden.", "help": "Gilt für alle Download-Abläufe. Hier können nur unterstützte Basismodelle ausgewählt werden.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "Legen Sie den Standard-Diffusion-Modell-(UNET)-Stammordner für Downloads, Importe und Verschiebungen fest", "defaultUnetRootHelp": "Legen Sie den Standard-Diffusion-Modell-(UNET)-Stammordner für Downloads, Importe und Verschiebungen fest",
"defaultEmbeddingRoot": "Embedding-Stammordner", "defaultEmbeddingRoot": "Embedding-Stammordner",
"defaultEmbeddingRootHelp": "Legen Sie den Standard-Embedding-Stammordner für Downloads, Importe und Verschiebungen fest", "defaultEmbeddingRootHelp": "Legen Sie den Standard-Embedding-Stammordner für Downloads, Importe und Verschiebungen fest",
"recipesPath": "Rezepte-Speicherpfad",
"recipesPathHelp": "Optionales benutzerdefiniertes Verzeichnis für gespeicherte Rezepte. Leer lassen, um den recipes-Ordner im ersten LoRA-Stammverzeichnis zu verwenden.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "Rezepte-Speicher wird verschoben...",
"noDefault": "Kein Standard" "noDefault": "Kein Standard"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "Early Access", "earlyAccess": "Early Access",
"earlyAccessTooltip": "Early Access erforderlich", "earlyAccessTooltip": "Early Access erforderlich",
"inLibrary": "In Bibliothek", "inLibrary": "In Bibliothek",
"downloaded": "Heruntergeladen",
"downloadedTooltip": "Zuvor heruntergeladen, aber derzeit nicht in Ihrer Bibliothek.",
"alreadyInLibrary": "Bereits in Bibliothek", "alreadyInLibrary": "Bereits in Bibliothek",
"autoOrganizedPath": "[Automatisch organisiert durch Pfadvorlage]", "autoOrganizedPath": "[Automatisch organisiert durch Pfadvorlage]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "in {count}d" "days": "in {count}d"
}, },
"badges": { "badges": {
"current": "Aktuelle Version", "current": "Geöffnete Version",
"currentTooltip": "Das ist die Version, mit der dieses Modal geöffnet wurde",
"inLibrary": "In der Bibliothek", "inLibrary": "In der Bibliothek",
"inLibraryTooltip": "Diese Version befindet sich in Ihrer lokalen Bibliothek",
"downloaded": "Heruntergeladen",
"downloadedTooltip": "Diese Version wurde bereits heruntergeladen, befindet sich aber derzeit nicht in Ihrer Bibliothek",
"newer": "Neuere Version", "newer": "Neuere Version",
"newerTooltip": "Diese Version ist neuer als Ihre neueste lokale Version",
"earlyAccess": "Früher Zugriff", "earlyAccess": "Früher Zugriff",
"ignored": "Ignoriert" "earlyAccessTooltip": "Für diese Version ist derzeit Civitai Early Access erforderlich",
"ignored": "Ignoriert",
"ignoredTooltip": "Für diese Version sind Update-Benachrichtigungen deaktiviert"
}, },
"actions": { "actions": {
"download": "Herunterladen", "download": "Herunterladen",
"downloadTooltip": "Diese Version herunterladen",
"downloadEarlyAccessTooltip": "Diese Early-Access-Version von Civitai herunterladen",
"delete": "Löschen", "delete": "Löschen",
"deleteTooltip": "Diese lokale Version löschen",
"ignore": "Ignorieren", "ignore": "Ignorieren",
"unignore": "Ignorierung aufheben", "unignore": "Ignorierung aufheben",
"ignoreTooltip": "Update-Benachrichtigungen für diese Version ignorieren",
"unignoreTooltip": "Update-Benachrichtigungen für diese Version fortsetzen",
"viewVersionOnCivitai": "Version auf Civitai anzeigen",
"earlyAccessTooltip": "Erfordert Early-Access-Kauf", "earlyAccessTooltip": "Erfordert Early-Access-Kauf",
"resumeModelUpdates": "Aktualisierungen für dieses Modell fortsetzen", "resumeModelUpdates": "Aktualisierungen für dieses Modell fortsetzen",
"ignoreModelUpdates": "Aktualisierungen für dieses Modell ignorieren", "ignoreModelUpdates": "Aktualisierungen für dieses Modell ignorieren",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "Fehler beim Speichern der Basis-Modell-Zuordnungen: {message}", "mappingSaveFailed": "Fehler beim Speichern der Basis-Modell-Zuordnungen: {message}",
"downloadTemplatesUpdated": "Download-Pfad-Vorlagen aktualisiert", "downloadTemplatesUpdated": "Download-Pfad-Vorlagen aktualisiert",
"downloadTemplatesFailed": "Fehler beim Speichern der Download-Pfad-Vorlagen: {message}", "downloadTemplatesFailed": "Fehler beim Speichern der Download-Pfad-Vorlagen: {message}",
"recipesPathUpdated": "Rezepte-Speicherpfad aktualisiert",
"recipesPathSaveFailed": "Fehler beim Aktualisieren des Rezepte-Speicherpfads: {message}",
"settingsUpdated": "Einstellungen aktualisiert: {setting}", "settingsUpdated": "Einstellungen aktualisiert: {setting}",
"compactModeToggled": "Kompakt-Modus {state}", "compactModeToggled": "Kompakt-Modus {state}",
"settingSaveFailed": "Fehler beim Speichern der Einstellung: {message}", "settingSaveFailed": "Fehler beim Speichern der Einstellung: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "Systemdiagnose",
"title": "Doktor",
"buttonTitle": "Diagnose und häufige Fehlerbehebungen ausführen",
"loading": "Umgebung wird geprüft...",
"footer": "Exportiere ein Diagnosepaket, falls das Problem nach der Reparatur weiterhin besteht.",
"summary": {
"idle": "Führe eine Überprüfung von Einstellungen, Cache-Integrität und UI-Konsistenz durch.",
"ok": "Keine aktiven Probleme wurden in der aktuellen Umgebung gefunden.",
"warning": "{count} Problem(e) wurden gefunden. Die meisten lassen sich direkt über dieses Panel beheben.",
"error": "Bevor die App vollständig fehlerfrei ist, müssen {count} Problem(e) behoben werden."
},
"status": {
"ok": "Gesund",
"warning": "Handlungsbedarf",
"error": "Aktion erforderlich"
},
"actions": {
"runAgain": "Erneut ausführen",
"exportBundle": "Paket exportieren"
},
"toast": {
"loadFailed": "Diagnose konnte nicht geladen werden: {message}",
"repairSuccess": "Cache-Neuaufbau abgeschlossen.",
"repairFailed": "Cache-Neuaufbau fehlgeschlagen: {message}",
"exportSuccess": "Diagnosepaket exportiert.",
"exportFailed": "Export des Diagnosepakets fehlgeschlagen: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "Anwendungs-Update erkannt", "title": "Anwendungs-Update erkannt",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai API Key", "civitaiApiKey": "Civitai API Key",
"civitaiApiKeyPlaceholder": "Enter your Civitai API key", "civitaiApiKeyPlaceholder": "Enter your Civitai API key",
"civitaiApiKeyHelp": "Used for authentication when downloading models from Civitai", "civitaiApiKeyHelp": "Used for authentication when downloading models from Civitai",
"civitaiHost": {
"label": "Civitai host",
"help": "Choose which Civitai site opens when using View on Civitai links.",
"options": {
"com": "civitai.com (SFW)",
"red": "civitai.red (unrestricted)"
}
},
"civitaiHostBanner": {
"title": "Civitai host preference available",
"content": "Civitai now uses civitai.com for SFW content and civitai.red for unrestricted content. You can change which site opens by default in Settings.",
"openSettings": "Open Settings"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "Open settings folder", "label": "Open settings folder",
"tooltip": "Open folder containing settings.json", "tooltip": "Open folder containing settings.json",
@@ -263,7 +276,9 @@
"videoSettings": "Video Settings", "videoSettings": "Video Settings",
"layoutSettings": "Layout Settings", "layoutSettings": "Layout Settings",
"misc": "Miscellaneous", "misc": "Miscellaneous",
"backup": "Backups",
"folderSettings": "Default Roots", "folderSettings": "Default Roots",
"recipeSettings": "Recipes",
"extraFolderPaths": "Extra Folder Paths", "extraFolderPaths": "Extra Folder Paths",
"downloadPathTemplates": "Download Path Templates", "downloadPathTemplates": "Download Path Templates",
"priorityTags": "Priority Tags", "priorityTags": "Priority Tags",
@@ -323,6 +338,32 @@
"saveFailed": "Unable to save skip paths: {message}" "saveFailed": "Unable to save skip paths: {message}"
} }
}, },
"backup": {
"autoEnabled": "Automatic backups",
"autoEnabledHelp": "Create a local snapshot once per day and keep the latest snapshots according to the retention policy.",
"retention": "Retention count",
"retentionHelp": "How many automatic snapshots to keep before older ones are pruned.",
"management": "Backup management",
"managementHelp": "Export your current user state or restore it from a backup archive.",
"scopeHelp": "Backs up your settings, download history, and model update state. It does not include model files or rebuildable caches.",
"locationSummary": "Current backup location",
"openFolderButton": "Open backup folder",
"openFolderSuccess": "Opened backup folder",
"openFolderFailed": "Failed to open backup folder",
"locationCopied": "Backup path copied to clipboard: {{path}}",
"locationClipboardFallback": "Backup path: {{path}}",
"exportButton": "Export backup",
"exportSuccess": "Backup exported successfully.",
"exportFailed": "Failed to export backup: {message}",
"importButton": "Import backup",
"importConfirm": "Import this backup and overwrite local user state?",
"importSuccess": "Backup imported successfully.",
"importFailed": "Failed to import backup: {message}",
"latestSnapshot": "Latest snapshot",
"latestAutoSnapshot": "Latest automatic snapshot",
"snapshotCount": "Saved snapshots",
"noneAvailable": "No snapshots yet"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "Skip downloads for base models", "label": "Skip downloads for base models",
"help": "When enabled, versions using the selected base models will be skipped.", "help": "When enabled, versions using the selected base models will be skipped.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "Set default diffusion model (UNET) root directory for downloads, imports and moves", "defaultUnetRootHelp": "Set default diffusion model (UNET) root directory for downloads, imports and moves",
"defaultEmbeddingRoot": "Embedding Root", "defaultEmbeddingRoot": "Embedding Root",
"defaultEmbeddingRootHelp": "Set default embedding root directory for downloads, imports and moves", "defaultEmbeddingRootHelp": "Set default embedding root directory for downloads, imports and moves",
"recipesPath": "Recipes Storage Path",
"recipesPathHelp": "Optional custom directory for stored recipes. Leave empty to use the first LoRA root's recipes folder.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "Migrating recipes storage...",
"noDefault": "No Default" "noDefault": "No Default"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -653,9 +698,9 @@
"title": "Import a recipe from image or URL", "title": "Import a recipe from image or URL",
"urlLocalPath": "URL / Local Path", "urlLocalPath": "URL / Local Path",
"uploadImage": "Upload Image", "uploadImage": "Upload Image",
"urlSectionDescription": "Input a Civitai image URL or local file path to import as a recipe.", "urlSectionDescription": "Input a Civitai image URL from civitai.com or civitai.red, or a local file path, to import as a recipe.",
"imageUrlOrPath": "Image URL or File Path:", "imageUrlOrPath": "Image URL or File Path:",
"urlPlaceholder": "https://civitai.com/images/... or C:/path/to/image.png", "urlPlaceholder": "https://civitai.com/images/... or https://civitai.red/images/... or C:/path/to/image.png",
"fetchImage": "Fetch Image", "fetchImage": "Fetch Image",
"uploadSectionDescription": "Upload an image with LoRA metadata to import as a recipe.", "uploadSectionDescription": "Upload an image with LoRA metadata to import as a recipe.",
"selectImage": "Select Image", "selectImage": "Select Image",
@@ -925,6 +970,8 @@
"earlyAccess": "Early Access", "earlyAccess": "Early Access",
"earlyAccessTooltip": "Early access required", "earlyAccessTooltip": "Early access required",
"inLibrary": "In Library", "inLibrary": "In Library",
"downloaded": "Downloaded",
"downloadedTooltip": "Previously downloaded, but it is not currently in your library.",
"alreadyInLibrary": "Already in Library", "alreadyInLibrary": "Already in Library",
"autoOrganizedPath": "[Auto-organized by path template]", "autoOrganizedPath": "[Auto-organized by path template]",
"errors": { "errors": {
@@ -1056,9 +1103,9 @@
}, },
"proceedText": "Only proceed if you're sure this is what you want.", "proceedText": "Only proceed if you're sure this is what you want.",
"urlLabel": "Civitai Model URL:", "urlLabel": "Civitai Model URL:",
"urlPlaceholder": "https://civitai.com/models/649516/model-name?modelVersionId=726676", "urlPlaceholder": "https://civitai.com/models/649516/model-name?modelVersionId=726676 or https://civitai.red/models/649516/model-name?modelVersionId=726676",
"helpText": { "helpText": {
"title": "Paste any Civitai model URL. Supported formats:", "title": "Paste any Civitai model URL from civitai.com or civitai.red. Supported formats:",
"format1": "https://civitai.com/models/649516", "format1": "https://civitai.com/models/649516",
"format2": "https://civitai.com/models/649516?modelVersionId=726676", "format2": "https://civitai.com/models/649516?modelVersionId=726676",
"format3": "https://civitai.com/models/649516/model-name?modelVersionId=726676", "format3": "https://civitai.com/models/649516/model-name?modelVersionId=726676",
@@ -1194,17 +1241,30 @@
"days": "in {count}d" "days": "in {count}d"
}, },
"badges": { "badges": {
"current": "Current Version", "current": "Opened Version",
"currentTooltip": "This is the version you opened this modal from",
"inLibrary": "In Library", "inLibrary": "In Library",
"inLibraryTooltip": "This version exists in your local library",
"downloaded": "Downloaded",
"downloadedTooltip": "This version was downloaded before, but is not currently in your library",
"newer": "Newer Version", "newer": "Newer Version",
"newerTooltip": "This version is newer than your latest local version",
"earlyAccess": "Early Access", "earlyAccess": "Early Access",
"ignored": "Ignored" "earlyAccessTooltip": "This version currently requires Civitai early access",
"ignored": "Ignored",
"ignoredTooltip": "Update notifications are disabled for this version"
}, },
"actions": { "actions": {
"download": "Download", "download": "Download",
"downloadTooltip": "Download this version",
"downloadEarlyAccessTooltip": "Download this early access version from Civitai",
"delete": "Delete", "delete": "Delete",
"deleteTooltip": "Delete this local version",
"ignore": "Ignore", "ignore": "Ignore",
"unignore": "Unignore", "unignore": "Unignore",
"ignoreTooltip": "Ignore update notifications for this version",
"unignoreTooltip": "Resume update notifications for this version",
"viewVersionOnCivitai": "View version on Civitai",
"earlyAccessTooltip": "Requires early access purchase", "earlyAccessTooltip": "Requires early access purchase",
"resumeModelUpdates": "Resume updates for this model", "resumeModelUpdates": "Resume updates for this model",
"ignoreModelUpdates": "Ignore updates for this model", "ignoreModelUpdates": "Ignore updates for this model",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "Failed to save base model mappings: {message}", "mappingSaveFailed": "Failed to save base model mappings: {message}",
"downloadTemplatesUpdated": "Download path templates updated", "downloadTemplatesUpdated": "Download path templates updated",
"downloadTemplatesFailed": "Failed to save download path templates: {message}", "downloadTemplatesFailed": "Failed to save download path templates: {message}",
"recipesPathUpdated": "Recipes storage path updated",
"recipesPathSaveFailed": "Failed to update recipes storage path: {message}",
"settingsUpdated": "Settings updated: {setting}", "settingsUpdated": "Settings updated: {setting}",
"compactModeToggled": "Compact Mode {state}", "compactModeToggled": "Compact Mode {state}",
"settingSaveFailed": "Failed to save setting: {message}", "settingSaveFailed": "Failed to save setting: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "System diagnostics",
"title": "Doctor",
"buttonTitle": "Run diagnostics and common fixes",
"loading": "Checking environment...",
"footer": "Export a diagnostics bundle if the issue still persists after repair.",
"summary": {
"idle": "Run a health check for settings, cache integrity, and UI consistency.",
"ok": "No active issues were found in the current environment.",
"warning": "{count} issue(s) were found. Most can be fixed directly from this panel.",
"error": "{count} issue(s) need attention before the app is fully healthy."
},
"status": {
"ok": "Healthy",
"warning": "Needs Attention",
"error": "Action Required"
},
"actions": {
"runAgain": "Run Again",
"exportBundle": "Export Bundle"
},
"toast": {
"loadFailed": "Failed to load diagnostics: {message}",
"repairSuccess": "Cache rebuild completed.",
"repairFailed": "Cache rebuild failed: {message}",
"exportSuccess": "Diagnostics bundle exported.",
"exportFailed": "Failed to export diagnostics bundle: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "Application Update Detected", "title": "Application Update Detected",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Clave API de Civitai", "civitaiApiKey": "Clave API de Civitai",
"civitaiApiKeyPlaceholder": "Introduce tu clave API de Civitai", "civitaiApiKeyPlaceholder": "Introduce tu clave API de Civitai",
"civitaiApiKeyHelp": "Utilizada para autenticación al descargar modelos de Civitai", "civitaiApiKeyHelp": "Utilizada para autenticación al descargar modelos de Civitai",
"civitaiHost": {
"label": "Host de Civitai",
"help": "Elige qué sitio de Civitai se abre al usar los enlaces de \"View on Civitai\".",
"options": {
"com": "civitai.com (solo SFW)",
"red": "civitai.red (sin restricciones)"
}
},
"civitaiHostBanner": {
"title": "Preferencia de host de Civitai disponible",
"content": "Civitai ahora usa civitai.com para contenido SFW y civitai.red para contenido sin restricciones. Puedes cambiar en Ajustes qué sitio se abre por defecto.",
"openSettings": "Abrir ajustes"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "Abrir carpeta de ajustes", "label": "Abrir carpeta de ajustes",
"tooltip": "Abrir la carpeta que contiene settings.json", "tooltip": "Abrir la carpeta que contiene settings.json",
@@ -263,7 +276,9 @@
"videoSettings": "Configuración de video", "videoSettings": "Configuración de video",
"layoutSettings": "Configuración de diseño", "layoutSettings": "Configuración de diseño",
"misc": "Varios", "misc": "Varios",
"backup": "Copias de seguridad",
"folderSettings": "Raíces predeterminadas", "folderSettings": "Raíces predeterminadas",
"recipeSettings": "Recetas",
"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",
@@ -323,6 +338,32 @@
"saveFailed": "No se pudieron guardar las rutas a omitir: {message}" "saveFailed": "No se pudieron guardar las rutas a omitir: {message}"
} }
}, },
"backup": {
"autoEnabled": "Copias de seguridad automáticas",
"autoEnabledHelp": "Crea una instantánea local una vez al día y conserva las más recientes según la política de retención.",
"retention": "Cantidad de retención",
"retentionHelp": "Cuántas instantáneas automáticas conservar antes de eliminar las antiguas.",
"management": "Gestión de copias",
"managementHelp": "Exporta tu estado de usuario actual o restáuralo desde un archivo de copia de seguridad.",
"scopeHelp": "Incluye tu configuración, el historial de descargas y el estado de actualización de los modelos. No incluye los archivos de modelo ni las cachés que se pueden regenerar.",
"locationSummary": "Ubicación actual de la copia",
"openFolderButton": "Abrir carpeta de copias",
"openFolderSuccess": "Carpeta de copias abierta",
"openFolderFailed": "No se pudo abrir la carpeta de copias",
"locationCopied": "Ruta de la copia copiada al portapapeles: {{path}}",
"locationClipboardFallback": "Ruta de la copia: {{path}}",
"exportButton": "Exportar copia",
"exportSuccess": "Copia exportada correctamente.",
"exportFailed": "No se pudo exportar la copia: {message}",
"importButton": "Importar copia",
"importConfirm": "¿Importar esta copia y sobrescribir el estado local del usuario?",
"importSuccess": "Copia importada correctamente.",
"importFailed": "No se pudo importar la copia: {message}",
"latestSnapshot": "Última instantánea",
"latestAutoSnapshot": "Última instantánea automática",
"snapshotCount": "Instantáneas guardadas",
"noneAvailable": "Aún no hay instantáneas"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "Omitir descargas para modelos base", "label": "Omitir descargas para modelos base",
"help": "Se aplica a todos los flujos de descarga. Aquí solo se pueden seleccionar modelos base compatibles.", "help": "Se aplica a todos los flujos de descarga. Aquí solo se pueden seleccionar modelos base compatibles.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "Establecer el directorio raíz predeterminado de Diffusion Model (UNET) para descargas, importaciones y movimientos", "defaultUnetRootHelp": "Establecer el directorio raíz predeterminado de Diffusion Model (UNET) para descargas, importaciones y movimientos",
"defaultEmbeddingRoot": "Raíz de embedding", "defaultEmbeddingRoot": "Raíz de embedding",
"defaultEmbeddingRootHelp": "Establecer el directorio raíz predeterminado de embedding para descargas, importaciones y movimientos", "defaultEmbeddingRootHelp": "Establecer el directorio raíz predeterminado de embedding para descargas, importaciones y movimientos",
"recipesPath": "Ruta de almacenamiento de recetas",
"recipesPathHelp": "Directorio personalizado opcional para las recetas guardadas. Déjalo vacío para usar la carpeta recipes del primer directorio raíz de LoRA.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "Migrando el almacenamiento de recetas...",
"noDefault": "Sin predeterminado" "noDefault": "Sin predeterminado"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "Acceso temprano", "earlyAccess": "Acceso temprano",
"earlyAccessTooltip": "Acceso temprano requerido", "earlyAccessTooltip": "Acceso temprano requerido",
"inLibrary": "En la biblioteca", "inLibrary": "En la biblioteca",
"downloaded": "Descargado",
"downloadedTooltip": "Descargado anteriormente, pero actualmente no está en tu biblioteca.",
"alreadyInLibrary": "Ya en la biblioteca", "alreadyInLibrary": "Ya en la biblioteca",
"autoOrganizedPath": "[Auto-organizado por plantilla de ruta]", "autoOrganizedPath": "[Auto-organizado por plantilla de ruta]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "en {count}d" "days": "en {count}d"
}, },
"badges": { "badges": {
"current": "Versión actual", "current": "Versión abierta",
"currentTooltip": "Es la versión con la que abriste este modal",
"inLibrary": "En la biblioteca", "inLibrary": "En la biblioteca",
"inLibraryTooltip": "Esta versión existe en tu biblioteca local",
"downloaded": "Descargado",
"downloadedTooltip": "Esta versión se descargó antes, pero ahora no está en tu biblioteca",
"newer": "Versión más reciente", "newer": "Versión más reciente",
"newerTooltip": "Esta versión es más reciente que tu última versión local",
"earlyAccess": "Acceso temprano", "earlyAccess": "Acceso temprano",
"ignored": "Ignorada" "earlyAccessTooltip": "Esta versión requiere actualmente acceso temprano de Civitai",
"ignored": "Ignorada",
"ignoredTooltip": "Las notificaciones de actualización están desactivadas para esta versión"
}, },
"actions": { "actions": {
"download": "Descargar", "download": "Descargar",
"downloadTooltip": "Descargar esta versión",
"downloadEarlyAccessTooltip": "Descargar esta versión de acceso temprano desde Civitai",
"delete": "Eliminar", "delete": "Eliminar",
"deleteTooltip": "Eliminar esta versión local",
"ignore": "Ignorar", "ignore": "Ignorar",
"unignore": "Dejar de ignorar", "unignore": "Dejar de ignorar",
"ignoreTooltip": "Ignorar las notificaciones de actualización de esta versión",
"unignoreTooltip": "Reanudar las notificaciones de actualización de esta versión",
"viewVersionOnCivitai": "Ver versión en Civitai",
"earlyAccessTooltip": "Requiere compra de acceso temprano", "earlyAccessTooltip": "Requiere compra de acceso temprano",
"resumeModelUpdates": "Reanudar actualizaciones para este modelo", "resumeModelUpdates": "Reanudar actualizaciones para este modelo",
"ignoreModelUpdates": "Ignorar actualizaciones para este modelo", "ignoreModelUpdates": "Ignorar actualizaciones para este modelo",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "Error al guardar mapeos de modelo base: {message}", "mappingSaveFailed": "Error al guardar mapeos de modelo base: {message}",
"downloadTemplatesUpdated": "Plantillas de rutas de descarga actualizadas", "downloadTemplatesUpdated": "Plantillas de rutas de descarga actualizadas",
"downloadTemplatesFailed": "Error al guardar plantillas de rutas de descarga: {message}", "downloadTemplatesFailed": "Error al guardar plantillas de rutas de descarga: {message}",
"recipesPathUpdated": "Ruta de almacenamiento de recetas actualizada",
"recipesPathSaveFailed": "Error al actualizar la ruta de almacenamiento de recetas: {message}",
"settingsUpdated": "Configuración actualizada: {setting}", "settingsUpdated": "Configuración actualizada: {setting}",
"compactModeToggled": "Modo compacto {state}", "compactModeToggled": "Modo compacto {state}",
"settingSaveFailed": "Error al guardar configuración: {message}", "settingSaveFailed": "Error al guardar configuración: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "Diagnósticos del sistema",
"title": "Doctor",
"buttonTitle": "Ejecutar diagnósticos y correcciones comunes",
"loading": "Comprobando el entorno...",
"footer": "Exporta un paquete de diagnóstico si el problema persiste después de la reparación.",
"summary": {
"idle": "Ejecuta una comprobación del estado de la configuración, la integridad de la caché y la coherencia de la interfaz.",
"ok": "No se encontraron problemas activos en el entorno actual.",
"warning": "Se encontraron {count} problema(s). La mayoría se puede solucionar directamente desde este panel.",
"error": "Se encontraron {count} problema(s). Deben atenderse antes de que la aplicación esté completamente saludable."
},
"status": {
"ok": "Saludable",
"warning": "Requiere atención",
"error": "Se requiere acción"
},
"actions": {
"runAgain": "Ejecutar de nuevo",
"exportBundle": "Exportar paquete"
},
"toast": {
"loadFailed": "Error al cargar los diagnósticos: {message}",
"repairSuccess": "Reconstrucción de caché completada.",
"repairFailed": "Error al reconstruir la caché: {message}",
"exportSuccess": "Paquete de diagnósticos exportado.",
"exportFailed": "Error al exportar el paquete de diagnósticos: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "Actualización de la aplicación detectada", "title": "Actualización de la aplicación detectada",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Clé API Civitai", "civitaiApiKey": "Clé API Civitai",
"civitaiApiKeyPlaceholder": "Entrez votre clé API Civitai", "civitaiApiKeyPlaceholder": "Entrez votre clé API Civitai",
"civitaiApiKeyHelp": "Utilisée pour l'authentification lors du téléchargement de modèles depuis Civitai", "civitaiApiKeyHelp": "Utilisée pour l'authentification lors du téléchargement de modèles depuis Civitai",
"civitaiHost": {
"label": "Hôte Civitai",
"help": "Choisissez quel site Civitai s'ouvre lorsque vous utilisez les liens « View on Civitai ».",
"options": {
"com": "civitai.com (SFW uniquement)",
"red": "civitai.red (sans restriction)"
}
},
"civitaiHostBanner": {
"title": "Préférence dhôte Civitai disponible",
"content": "Civitai utilise désormais civitai.com pour le contenu SFW et civitai.red pour le contenu sans restriction. Vous pouvez modifier dans les paramètres le site ouvert par défaut.",
"openSettings": "Ouvrir les paramètres"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "Ouvrir le dossier des paramètres", "label": "Ouvrir le dossier des paramètres",
"tooltip": "Ouvrir le dossier contenant settings.json", "tooltip": "Ouvrir le dossier contenant settings.json",
@@ -263,7 +276,9 @@
"videoSettings": "Paramètres vidéo", "videoSettings": "Paramètres vidéo",
"layoutSettings": "Paramètres d'affichage", "layoutSettings": "Paramètres d'affichage",
"misc": "Divers", "misc": "Divers",
"backup": "Sauvegardes",
"folderSettings": "Racines par défaut", "folderSettings": "Racines par défaut",
"recipeSettings": "Recipes",
"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",
@@ -323,6 +338,32 @@
"saveFailed": "Impossible d'enregistrer les chemins à ignorer : {message}" "saveFailed": "Impossible d'enregistrer les chemins à ignorer : {message}"
} }
}, },
"backup": {
"autoEnabled": "Sauvegardes automatiques",
"autoEnabledHelp": "Crée un instantané local une fois par jour et conserve les plus récents selon la politique de rétention.",
"retention": "Nombre de rétention",
"retentionHelp": "Combien d'instantanés automatiques conserver avant de supprimer les plus anciens.",
"management": "Gestion des sauvegardes",
"managementHelp": "Exporte l'état actuel de l'utilisateur ou restaure-le depuis une archive de sauvegarde.",
"scopeHelp": "Inclut vos paramètres, l'historique des téléchargements et l'état des mises à jour des modèles. Les fichiers de modèle et les caches régénérables ne sont pas inclus.",
"locationSummary": "Emplacement actuel des sauvegardes",
"openFolderButton": "Ouvrir le dossier de sauvegarde",
"openFolderSuccess": "Dossier de sauvegarde ouvert",
"openFolderFailed": "Impossible d'ouvrir le dossier de sauvegarde",
"locationCopied": "Chemin de sauvegarde copié dans le presse-papiers : {{path}}",
"locationClipboardFallback": "Chemin de sauvegarde : {{path}}",
"exportButton": "Exporter la sauvegarde",
"exportSuccess": "Sauvegarde exportée avec succès.",
"exportFailed": "Échec de l'export de la sauvegarde : {message}",
"importButton": "Importer la sauvegarde",
"importConfirm": "Importer cette sauvegarde et écraser l'état local de l'utilisateur ?",
"importSuccess": "Sauvegarde importée avec succès.",
"importFailed": "Échec de l'import de la sauvegarde : {message}",
"latestSnapshot": "Dernier instantané",
"latestAutoSnapshot": "Dernier instantané automatique",
"snapshotCount": "Instantanés enregistrés",
"noneAvailable": "Aucun instantané pour le moment"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "Ignorer les téléchargements pour certains modèles de base", "label": "Ignorer les téléchargements pour certains modèles de base",
"help": "Sapplique à tous les flux de téléchargement. Seuls les modèles de base pris en charge peuvent être sélectionnés ici.", "help": "Sapplique à tous les flux de téléchargement. Seuls les modèles de base pris en charge peuvent être sélectionnés ici.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "Définir le répertoire racine Diffusion Model (UNET) par défaut pour les téléchargements, imports et déplacements", "defaultUnetRootHelp": "Définir le répertoire racine Diffusion Model (UNET) par défaut pour les téléchargements, imports et déplacements",
"defaultEmbeddingRoot": "Racine Embedding", "defaultEmbeddingRoot": "Racine Embedding",
"defaultEmbeddingRootHelp": "Définir le répertoire racine embedding par défaut pour les téléchargements, imports et déplacements", "defaultEmbeddingRootHelp": "Définir le répertoire racine embedding par défaut pour les téléchargements, imports et déplacements",
"recipesPath": "Recipes Storage Path",
"recipesPathHelp": "Optional custom directory for stored recipes. Leave empty to use the first LoRA root's recipes folder.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "Migrating recipes storage...",
"noDefault": "Aucun par défaut" "noDefault": "Aucun par défaut"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "Accès anticipé", "earlyAccess": "Accès anticipé",
"earlyAccessTooltip": "Accès anticipé requis", "earlyAccessTooltip": "Accès anticipé requis",
"inLibrary": "Dans la bibliothèque", "inLibrary": "Dans la bibliothèque",
"downloaded": "Téléchargé",
"downloadedTooltip": "Déjà téléchargé, mais il n'est actuellement pas dans votre bibliothèque.",
"alreadyInLibrary": "Déjà dans la bibliothèque", "alreadyInLibrary": "Déjà dans la bibliothèque",
"autoOrganizedPath": "[Auto-organisé par modèle de chemin]", "autoOrganizedPath": "[Auto-organisé par modèle de chemin]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "dans {count}j" "days": "dans {count}j"
}, },
"badges": { "badges": {
"current": "Version actuelle", "current": "Version ouverte",
"currentTooltip": "C'est la version à partir de laquelle cette fenêtre a été ouverte",
"inLibrary": "Dans la bibliothèque", "inLibrary": "Dans la bibliothèque",
"inLibraryTooltip": "Cette version existe dans votre bibliothèque locale",
"downloaded": "Téléchargé",
"downloadedTooltip": "Cette version a déjà été téléchargée, mais n'est pas actuellement dans votre bibliothèque",
"newer": "Version plus récente", "newer": "Version plus récente",
"newerTooltip": "Cette version est plus récente que votre dernière version locale",
"earlyAccess": "Accès anticipé", "earlyAccess": "Accès anticipé",
"ignored": "Ignorée" "earlyAccessTooltip": "Cette version nécessite actuellement l'accès anticipé Civitai",
"ignored": "Ignorée",
"ignoredTooltip": "Les notifications de mise à jour sont désactivées pour cette version"
}, },
"actions": { "actions": {
"download": "Télécharger", "download": "Télécharger",
"downloadTooltip": "Télécharger cette version",
"downloadEarlyAccessTooltip": "Télécharger cette version en accès anticipé depuis Civitai",
"delete": "Supprimer", "delete": "Supprimer",
"deleteTooltip": "Supprimer cette version locale",
"ignore": "Ignorer", "ignore": "Ignorer",
"unignore": "Ne plus ignorer", "unignore": "Ne plus ignorer",
"ignoreTooltip": "Ignorer les notifications de mise à jour pour cette version",
"unignoreTooltip": "Reprendre les notifications de mise à jour pour cette version",
"viewVersionOnCivitai": "Voir la version sur Civitai",
"earlyAccessTooltip": "Nécessite l'achat de l'accès anticipé", "earlyAccessTooltip": "Nécessite l'achat de l'accès anticipé",
"resumeModelUpdates": "Reprendre les mises à jour pour ce modèle", "resumeModelUpdates": "Reprendre les mises à jour pour ce modèle",
"ignoreModelUpdates": "Ignorer les mises à jour pour ce modèle", "ignoreModelUpdates": "Ignorer les mises à jour pour ce modèle",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "Échec de la sauvegarde des mappages de modèle de base : {message}", "mappingSaveFailed": "Échec de la sauvegarde des mappages de modèle de base : {message}",
"downloadTemplatesUpdated": "Modèles de chemin de téléchargement mis à jour", "downloadTemplatesUpdated": "Modèles de chemin de téléchargement mis à jour",
"downloadTemplatesFailed": "Échec de la sauvegarde des modèles de chemin de téléchargement : {message}", "downloadTemplatesFailed": "Échec de la sauvegarde des modèles de chemin de téléchargement : {message}",
"recipesPathUpdated": "Recipes storage path updated",
"recipesPathSaveFailed": "Failed to update recipes storage path: {message}",
"settingsUpdated": "Paramètres mis à jour : {setting}", "settingsUpdated": "Paramètres mis à jour : {setting}",
"compactModeToggled": "Mode compact {state}", "compactModeToggled": "Mode compact {state}",
"settingSaveFailed": "Échec de la sauvegarde du paramètre : {message}", "settingSaveFailed": "Échec de la sauvegarde du paramètre : {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "Diagnostics système",
"title": "Docteur",
"buttonTitle": "Lancer les diagnostics et les corrections courantes",
"loading": "Vérification de l'environnement...",
"footer": "Exportez un lot de diagnostic si le problème persiste après la réparation.",
"summary": {
"idle": "Lancez une vérification de l'état des paramètres, de l'intégrité du cache et de la cohérence de l'interface.",
"ok": "Aucun problème actif n'a été trouvé dans l'environnement actuel.",
"warning": "{count} problème(s) ont été trouvés. La plupart peuvent être corrigés directement depuis ce panneau.",
"error": "{count} problème(s) nécessitent une attention avant que l'application soit entièrement saine."
},
"status": {
"ok": "Sain",
"warning": "Nécessite une attention",
"error": "Action requise"
},
"actions": {
"runAgain": "Relancer",
"exportBundle": "Exporter le lot"
},
"toast": {
"loadFailed": "Échec du chargement des diagnostics : {message}",
"repairSuccess": "Reconstruction du cache terminée.",
"repairFailed": "Échec de la reconstruction du cache : {message}",
"exportSuccess": "Lot de diagnostics exporté.",
"exportFailed": "Échec de l'export du lot de diagnostics : {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "Mise à jour de l'application détectée", "title": "Mise à jour de l'application détectée",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "מפתח API של Civitai", "civitaiApiKey": "מפתח API של Civitai",
"civitaiApiKeyPlaceholder": "הזן את מפתח ה-API שלך מ-Civitai", "civitaiApiKeyPlaceholder": "הזן את מפתח ה-API שלך מ-Civitai",
"civitaiApiKeyHelp": "משמש לאימות בעת הורדת מודלים מ-Civitai", "civitaiApiKeyHelp": "משמש לאימות בעת הורדת מודלים מ-Civitai",
"civitaiHost": {
"label": "מארח Civitai",
"help": "בחר איזה אתר של Civitai ייפתח בעת שימוש בקישורי \"View on Civitai\".",
"options": {
"com": "civitai.com (SFW בלבד)",
"red": "civitai.red (ללא הגבלות)"
}
},
"civitaiHostBanner": {
"title": "העדפת מארח Civitai זמינה",
"content": "Civitai משתמש כעת ב-civitai.com עבור תוכן SFW וב-civitai.red עבור תוכן ללא הגבלות. ניתן לשנות בהגדרות איזה אתר ייפתח כברירת מחדל.",
"openSettings": "פתח הגדרות"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "פתח תיקיית הגדרות", "label": "פתח תיקיית הגדרות",
"tooltip": "פתח את התיקייה שמכילה את settings.json", "tooltip": "פתח את התיקייה שמכילה את settings.json",
@@ -263,7 +276,9 @@
"videoSettings": "הגדרות וידאו", "videoSettings": "הגדרות וידאו",
"layoutSettings": "הגדרות פריסה", "layoutSettings": "הגדרות פריסה",
"misc": "שונות", "misc": "שונות",
"backup": "גיבויים",
"folderSettings": "תיקיות ברירת מחדל", "folderSettings": "תיקיות ברירת מחדל",
"recipeSettings": "מתכונים",
"extraFolderPaths": "נתיבי תיקיות נוספים", "extraFolderPaths": "נתיבי תיקיות נוספים",
"downloadPathTemplates": "תבניות נתיב הורדה", "downloadPathTemplates": "תבניות נתיב הורדה",
"priorityTags": "תגיות עדיפות", "priorityTags": "תגיות עדיפות",
@@ -323,6 +338,32 @@
"saveFailed": "לא ניתן לשמור נתיבי דילוג: {message}" "saveFailed": "לא ניתן לשמור נתיבי דילוג: {message}"
} }
}, },
"backup": {
"autoEnabled": "גיבויים אוטומטיים",
"autoEnabledHelp": "יוצר צילום מצב מקומי פעם ביום ושומר את הצילומים האחרונים לפי מדיניות השמירה.",
"retention": "כמות שמירה",
"retentionHelp": "כמה צילומי מצב אוטומטיים לשמור לפני שמסירים ישנים.",
"management": "ניהול גיבויים",
"managementHelp": "ייצא את מצב המשתמש הנוכחי או שחזר אותו מארכיון גיבוי.",
"scopeHelp": "כולל את ההגדרות שלך, היסטוריית ההורדות ומצב עדכוני המודלים. אינו כולל קובצי מודל או מטמונים שניתן לשחזר.",
"locationSummary": "מיקום הגיבוי הנוכחי",
"openFolderButton": "פתח את תיקיית הגיבויים",
"openFolderSuccess": "תיקיית הגיבויים נפתחה",
"openFolderFailed": "לא ניתן היה לפתוח את תיקיית הגיבויים",
"locationCopied": "נתיב הגיבוי הועתק ללוח: {{path}}",
"locationClipboardFallback": "נתיב הגיבוי: {{path}}",
"exportButton": "ייצא גיבוי",
"exportSuccess": "הגיבוי יוצא בהצלחה.",
"exportFailed": "נכשל ייצוא הגיבוי: {message}",
"importButton": "ייבא גיבוי",
"importConfirm": "לייבא את הגיבוי הזה ולדרוס את מצב המשתמש המקומי?",
"importSuccess": "הגיבוי יובא בהצלחה.",
"importFailed": "נכשל ייבוא הגיבוי: {message}",
"latestSnapshot": "צילום המצב האחרון",
"latestAutoSnapshot": "צילום המצב האוטומטי האחרון",
"snapshotCount": "צילומי מצב שמורים",
"noneAvailable": "עדיין אין צילומי מצב"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "דלג על הורדות עבור מודלי בסיס", "label": "דלג על הורדות עבור מודלי בסיס",
"help": "חל על כל תהליכי ההורדה. ניתן לבחור כאן רק מודלי בסיס נתמכים.", "help": "חל על כל תהליכי ההורדה. ניתן לבחור כאן רק מודלי בסיס נתמכים.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "הגדר את ספריית השורש המוגדרת כברירת מחדל של Diffusion Model (UNET) להורדות, ייבוא והעברות", "defaultUnetRootHelp": "הגדר את ספריית השורש המוגדרת כברירת מחדל של Diffusion Model (UNET) להורדות, ייבוא והעברות",
"defaultEmbeddingRoot": "תיקיית שורש Embedding", "defaultEmbeddingRoot": "תיקיית שורש Embedding",
"defaultEmbeddingRootHelp": "הגדר את ספריית השורש המוגדרת כברירת מחדל של embedding להורדות, ייבוא והעברות", "defaultEmbeddingRootHelp": "הגדר את ספריית השורש המוגדרת כברירת מחדל של embedding להורדות, ייבוא והעברות",
"recipesPath": "נתיב אחסון מתכונים",
"recipesPathHelp": "ספרייה מותאמת אישית אופציונלית למתכונים שנשמרו. השאר ריק כדי להשתמש בתיקיית recipes של שורש LoRA הראשון.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "מעביר את אחסון המתכונים...",
"noDefault": "אין ברירת מחדל" "noDefault": "אין ברירת מחדל"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "גישה מוקדמת", "earlyAccess": "גישה מוקדמת",
"earlyAccessTooltip": "נדרשת גישה מוקדמת", "earlyAccessTooltip": "נדרשת גישה מוקדמת",
"inLibrary": "בספרייה", "inLibrary": "בספרייה",
"downloaded": "הורד",
"downloadedTooltip": "הורד בעבר, אך הוא אינו נמצא כרגע בספרייה שלך.",
"alreadyInLibrary": "כבר בספרייה", "alreadyInLibrary": "כבר בספרייה",
"autoOrganizedPath": "[מאורגן אוטומטית לפי תבנית נתיב]", "autoOrganizedPath": "[מאורגן אוטומטית לפי תבנית נתיב]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "בעוד {count} ימים" "days": "בעוד {count} ימים"
}, },
"badges": { "badges": {
"current": "גרסה נוכחית", "current": "גרסה שנפתחה",
"currentTooltip": "זוהי הגרסה שממנה נפתח החלון הזה",
"inLibrary": "בספרייה", "inLibrary": "בספרייה",
"inLibraryTooltip": "גרסה זו קיימת בספרייה המקומית שלך",
"downloaded": "הורד",
"downloadedTooltip": "גרסה זו הורדה בעבר, אך אינה נמצאת כרגע בספרייה שלך",
"newer": "גרסה חדשה יותר", "newer": "גרסה חדשה יותר",
"newerTooltip": "גרסה זו חדשה יותר מהגרסה המקומית האחרונה שלך",
"earlyAccess": "גישה מוקדמת", "earlyAccess": "גישה מוקדמת",
"ignored": "התעלם" "earlyAccessTooltip": "גרסה זו דורשת כרגע גישת Early Access של Civitai",
"ignored": "התעלם",
"ignoredTooltip": "התראות העדכון מושבתות עבור גרסה זו"
}, },
"actions": { "actions": {
"download": "הורדה", "download": "הורדה",
"downloadTooltip": "הורד את הגרסה הזו",
"downloadEarlyAccessTooltip": "הורד את גרסת ה-Early Access הזו מ-Civitai",
"delete": "מחיקה", "delete": "מחיקה",
"deleteTooltip": "מחק את הגרסה המקומית הזו",
"ignore": "התעלם", "ignore": "התעלם",
"unignore": "בטל התעלמות", "unignore": "בטל התעלמות",
"ignoreTooltip": "התעלם מהתראות העדכון עבור גרסה זו",
"unignoreTooltip": "חזור לקבל התראות עדכון עבור גרסה זו",
"viewVersionOnCivitai": "הצג את הגרסה ב-Civitai",
"earlyAccessTooltip": "נדרש רכישת גישה מוקדמת", "earlyAccessTooltip": "נדרש רכישת גישה מוקדמת",
"resumeModelUpdates": "המשך עדכונים עבור מודל זה", "resumeModelUpdates": "המשך עדכונים עבור מודל זה",
"ignoreModelUpdates": "התעלם מעדכונים עבור מודל זה", "ignoreModelUpdates": "התעלם מעדכונים עבור מודל זה",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "שמירת מיפויי מודל בסיס נכשלה: {message}", "mappingSaveFailed": "שמירת מיפויי מודל בסיס נכשלה: {message}",
"downloadTemplatesUpdated": "תבניות נתיב הורדה עודכנו", "downloadTemplatesUpdated": "תבניות נתיב הורדה עודכנו",
"downloadTemplatesFailed": "שמירת תבניות נתיב הורדה נכשלה: {message}", "downloadTemplatesFailed": "שמירת תבניות נתיב הורדה נכשלה: {message}",
"recipesPathUpdated": "נתיב אחסון המתכונים עודכן",
"recipesPathSaveFailed": "עדכון נתיב אחסון המתכונים נכשל: {message}",
"settingsUpdated": "הגדרות עודכנו: {setting}", "settingsUpdated": "הגדרות עודכנו: {setting}",
"compactModeToggled": "מצב קומפקטי {state}", "compactModeToggled": "מצב קומפקטי {state}",
"settingSaveFailed": "שמירת ההגדרה נכשלה: {message}", "settingSaveFailed": "שמירת ההגדרה נכשלה: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "אבחון מערכת",
"title": "דוקטור",
"buttonTitle": "הפעלת אבחון ותיקונים נפוצים",
"loading": "בודק את הסביבה...",
"footer": "ייצא חבילת אבחון אם הבעיה עדיין נמשכת לאחר התיקון.",
"summary": {
"idle": "הרץ בדיקת תקינות עבור הגדרות, שלמות המטמון ועקביות הממשק.",
"ok": "לא נמצאו בעיות פעילות בסביבה הנוכחית.",
"warning": "נמצאה/נמצאו {count} בעיה/בעיות. את רובן אפשר לתקן ישירות מלוח זה.",
"error": "יש לטפל ב-{count} בעיה/בעיות לפני שהאפליקציה תהיה תקינה לחלוטין."
},
"status": {
"ok": "תקין",
"warning": "דורש תשומת לב",
"error": "נדרשת פעולה"
},
"actions": {
"runAgain": "הפעל שוב",
"exportBundle": "ייצוא חבילה"
},
"toast": {
"loadFailed": "טעינת האבחון נכשלה: {message}",
"repairSuccess": "בניית המטמון מחדש הושלמה.",
"repairFailed": "בניית המטמון מחדש נכשלה: {message}",
"exportSuccess": "חבילת האבחון יוצאה.",
"exportFailed": "ייצוא חבילת האבחון נכשל: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "זוהה עדכון יישום", "title": "זוהה עדכון יישום",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai APIキー", "civitaiApiKey": "Civitai APIキー",
"civitaiApiKeyPlaceholder": "Civitai APIキーを入力してください", "civitaiApiKeyPlaceholder": "Civitai APIキーを入力してください",
"civitaiApiKeyHelp": "Civitaiからモデルをダウンロードするときの認証に使用されます", "civitaiApiKeyHelp": "Civitaiからモデルをダウンロードするときの認証に使用されます",
"civitaiHost": {
"label": "Civitai ホスト",
"help": "「View on Civitai」リンクを使うときに開く Civitai サイトを選択します。",
"options": {
"com": "civitai.comSFW のみ)",
"red": "civitai.red制限なし"
}
},
"civitaiHostBanner": {
"title": "Civitai ホスト設定を利用できます",
"content": "Civitai は現在、SFW コンテンツには civitai.com、制限なしコンテンツには civitai.red を使用しています。設定で既定で開くサイトを変更できます。",
"openSettings": "設定を開く"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "設定フォルダーを開く", "label": "設定フォルダーを開く",
"tooltip": "settings.json を含むフォルダーを開きます", "tooltip": "settings.json を含むフォルダーを開きます",
@@ -263,7 +276,9 @@
"videoSettings": "動画設定", "videoSettings": "動画設定",
"layoutSettings": "レイアウト設定", "layoutSettings": "レイアウト設定",
"misc": "その他", "misc": "その他",
"backup": "バックアップ",
"folderSettings": "デフォルトルート", "folderSettings": "デフォルトルート",
"recipeSettings": "レシピ",
"extraFolderPaths": "追加フォルダーパス", "extraFolderPaths": "追加フォルダーパス",
"downloadPathTemplates": "ダウンロードパステンプレート", "downloadPathTemplates": "ダウンロードパステンプレート",
"priorityTags": "優先タグ", "priorityTags": "優先タグ",
@@ -323,6 +338,32 @@
"saveFailed": "スキップパスの保存に失敗しました:{message}" "saveFailed": "スキップパスの保存に失敗しました:{message}"
} }
}, },
"backup": {
"autoEnabled": "自動バックアップ",
"autoEnabledHelp": "1日1回ローカルのスナップショットを作成し、保持ポリシーに従って最新のものを残します。",
"retention": "保持数",
"retentionHelp": "古いものを削除する前に、何件の自動スナップショットを保持するかを指定します。",
"management": "バックアップ管理",
"managementHelp": "現在のユーザー状態をエクスポートするか、バックアップアーカイブから復元します。",
"scopeHelp": "設定、ダウンロード履歴、モデル更新の状態をバックアップします。モデルファイルや再生成できるキャッシュは含まれません。",
"locationSummary": "現在のバックアップ場所",
"openFolderButton": "バックアップフォルダを開く",
"openFolderSuccess": "バックアップフォルダを開きました",
"openFolderFailed": "バックアップフォルダを開けませんでした",
"locationCopied": "バックアップパスをクリップボードにコピーしました: {{path}}",
"locationClipboardFallback": "バックアップパス: {{path}}",
"exportButton": "バックアップをエクスポート",
"exportSuccess": "バックアップを正常にエクスポートしました。",
"exportFailed": "バックアップのエクスポートに失敗しました: {message}",
"importButton": "バックアップをインポート",
"importConfirm": "このバックアップをインポートして、ローカルのユーザー状態を上書きしますか?",
"importSuccess": "バックアップを正常にインポートしました。",
"importFailed": "バックアップのインポートに失敗しました: {message}",
"latestSnapshot": "最新のスナップショット",
"latestAutoSnapshot": "最新の自動スナップショット",
"snapshotCount": "保存済みスナップショット",
"noneAvailable": "まだスナップショットはありません"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "ベースモデルのダウンロードをスキップ", "label": "ベースモデルのダウンロードをスキップ",
"help": "すべてのダウンロードフローに適用されます。ここでは対応しているベースモデルのみ選択できます。", "help": "すべてのダウンロードフローに適用されます。ここでは対応しているベースモデルのみ選択できます。",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "ダウンロード、インポート、移動用のデフォルトDiffusion Model (UNET)ルートディレクトリを設定", "defaultUnetRootHelp": "ダウンロード、インポート、移動用のデフォルトDiffusion Model (UNET)ルートディレクトリを設定",
"defaultEmbeddingRoot": "Embeddingルート", "defaultEmbeddingRoot": "Embeddingルート",
"defaultEmbeddingRootHelp": "ダウンロード、インポート、移動用のデフォルトembeddingルートディレクトリを設定", "defaultEmbeddingRootHelp": "ダウンロード、インポート、移動用のデフォルトembeddingルートディレクトリを設定",
"recipesPath": "レシピ保存先",
"recipesPathHelp": "保存済みレシピ用の任意のカスタムディレクトリです。空欄にすると最初のLoRAルートのrecipesフォルダーを使用します。",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "レシピ保存先を移動中...",
"noDefault": "デフォルトなし" "noDefault": "デフォルトなし"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "アーリーアクセス", "earlyAccess": "アーリーアクセス",
"earlyAccessTooltip": "アーリーアクセスが必要", "earlyAccessTooltip": "アーリーアクセスが必要",
"inLibrary": "ライブラリ内", "inLibrary": "ライブラリ内",
"downloaded": "ダウンロード済み",
"downloadedTooltip": "以前にダウンロード済みですが、現在はライブラリにありません。",
"alreadyInLibrary": "既にライブラリ内", "alreadyInLibrary": "既にライブラリ内",
"autoOrganizedPath": "[パステンプレートによる自動整理]", "autoOrganizedPath": "[パステンプレートによる自動整理]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "{count}日後" "days": "{count}日後"
}, },
"badges": { "badges": {
"current": "現在のバージョン", "current": "開いたバージョン",
"currentTooltip": "このモーダルを開くために選択したバージョンです",
"inLibrary": "ライブラリにあります", "inLibrary": "ライブラリにあります",
"inLibraryTooltip": "このバージョンはローカルライブラリに存在します",
"downloaded": "ダウンロード済み",
"downloadedTooltip": "このバージョンは以前ダウンロードされましたが、現在はライブラリにありません",
"newer": "新しいバージョン", "newer": "新しいバージョン",
"newerTooltip": "このバージョンはローカルの最新バージョンより新しいです",
"earlyAccess": "早期アクセス", "earlyAccess": "早期アクセス",
"ignored": "無視中" "earlyAccessTooltip": "このバージョンは現在 Civitai の早期アクセスが必要です",
"ignored": "無視中",
"ignoredTooltip": "このバージョンの更新通知は無効です"
}, },
"actions": { "actions": {
"download": "ダウンロード", "download": "ダウンロード",
"downloadTooltip": "このバージョンをダウンロード",
"downloadEarlyAccessTooltip": "Civitai からこの早期アクセス版をダウンロード",
"delete": "削除", "delete": "削除",
"deleteTooltip": "このローカルバージョンを削除",
"ignore": "無視", "ignore": "無視",
"unignore": "無視を解除", "unignore": "無視を解除",
"ignoreTooltip": "このバージョンの更新通知を無視",
"unignoreTooltip": "このバージョンの更新通知を再開",
"viewVersionOnCivitai": "Civitai でバージョンを表示",
"earlyAccessTooltip": "早期アクセス購入が必要", "earlyAccessTooltip": "早期アクセス購入が必要",
"resumeModelUpdates": "このモデルの更新を再開", "resumeModelUpdates": "このモデルの更新を再開",
"ignoreModelUpdates": "このモデルの更新を無視", "ignoreModelUpdates": "このモデルの更新を無視",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "ベースモデルマッピングの保存に失敗しました:{message}", "mappingSaveFailed": "ベースモデルマッピングの保存に失敗しました:{message}",
"downloadTemplatesUpdated": "ダウンロードパステンプレートが更新されました", "downloadTemplatesUpdated": "ダウンロードパステンプレートが更新されました",
"downloadTemplatesFailed": "ダウンロードパステンプレートの保存に失敗しました:{message}", "downloadTemplatesFailed": "ダウンロードパステンプレートの保存に失敗しました:{message}",
"recipesPathUpdated": "レシピ保存先を更新しました",
"recipesPathSaveFailed": "レシピ保存先の更新に失敗しました: {message}",
"settingsUpdated": "設定が更新されました:{setting}", "settingsUpdated": "設定が更新されました:{setting}",
"compactModeToggled": "コンパクトモード {state}", "compactModeToggled": "コンパクトモード {state}",
"settingSaveFailed": "設定の保存に失敗しました:{message}", "settingSaveFailed": "設定の保存に失敗しました:{message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "システム診断",
"title": "ドクター",
"buttonTitle": "診断と一般的な修復を実行",
"loading": "環境を確認中...",
"footer": "修復後も問題が続く場合は、診断パッケージをエクスポートしてください。",
"summary": {
"idle": "設定、キャッシュ整合性、UI の一貫性をヘルスチェックします。",
"ok": "現在の環境でアクティブな問題は見つかりませんでした。",
"warning": "{count} 件の問題が見つかりました。ほとんどはこのパネルから直接修復できます。",
"error": "アプリが完全に正常になる前に、{count} 件の問題に対処する必要があります。"
},
"status": {
"ok": "正常",
"warning": "要注意",
"error": "対応が必要"
},
"actions": {
"runAgain": "再実行",
"exportBundle": "パッケージをエクスポート"
},
"toast": {
"loadFailed": "診断の読み込みに失敗しました: {message}",
"repairSuccess": "キャッシュの再構築が完了しました。",
"repairFailed": "キャッシュの再構築に失敗しました: {message}",
"exportSuccess": "診断パッケージをエクスポートしました。",
"exportFailed": "診断パッケージのエクスポートに失敗しました: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "アプリケーション更新が検出されました", "title": "アプリケーション更新が検出されました",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai API 키", "civitaiApiKey": "Civitai API 키",
"civitaiApiKeyPlaceholder": "Civitai API 키를 입력하세요", "civitaiApiKeyPlaceholder": "Civitai API 키를 입력하세요",
"civitaiApiKeyHelp": "Civitai에서 모델을 다운로드할 때 인증에 사용됩니다", "civitaiApiKeyHelp": "Civitai에서 모델을 다운로드할 때 인증에 사용됩니다",
"civitaiHost": {
"label": "Civitai 호스트",
"help": "\"View on Civitai\" 링크를 사용할 때 어떤 Civitai 사이트를 열지 선택합니다.",
"options": {
"com": "civitai.com(SFW 전용)",
"red": "civitai.red(무제한)"
}
},
"civitaiHostBanner": {
"title": "Civitai 호스트 기본 설정 사용 가능",
"content": "이제 Civitai는 SFW 콘텐츠에 civitai.com을, 무제한 콘텐츠에 civitai.red를 사용합니다. 설정에서 기본으로 열 사이트를 변경할 수 있습니다.",
"openSettings": "설정 열기"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "설정 폴더 열기", "label": "설정 폴더 열기",
"tooltip": "settings.json이 있는 폴더를 엽니다", "tooltip": "settings.json이 있는 폴더를 엽니다",
@@ -263,7 +276,9 @@
"videoSettings": "비디오 설정", "videoSettings": "비디오 설정",
"layoutSettings": "레이아웃 설정", "layoutSettings": "레이아웃 설정",
"misc": "기타", "misc": "기타",
"backup": "백업",
"folderSettings": "기본 루트", "folderSettings": "기본 루트",
"recipeSettings": "레시피",
"extraFolderPaths": "추가 폴다 경로", "extraFolderPaths": "추가 폴다 경로",
"downloadPathTemplates": "다운로드 경로 템플릿", "downloadPathTemplates": "다운로드 경로 템플릿",
"priorityTags": "우선순위 태그", "priorityTags": "우선순위 태그",
@@ -323,6 +338,32 @@
"saveFailed": "건너뛰기 경로를 저장할 수 없습니다: {message}" "saveFailed": "건너뛰기 경로를 저장할 수 없습니다: {message}"
} }
}, },
"backup": {
"autoEnabled": "자동 백업",
"autoEnabledHelp": "하루에 한 번 로컬 스냅샷을 만들고 보존 정책에 따라 최신 스냅샷을 유지합니다.",
"retention": "보존 개수",
"retentionHelp": "오래된 자동 스냅샷을 삭제하기 전에 몇 개를 유지할지 지정합니다.",
"management": "백업 관리",
"managementHelp": "현재 사용자 상태를 내보내거나 백업 아카이브에서 복원합니다.",
"scopeHelp": "설정, 다운로드 기록, 모델 업데이트 상태를 백업합니다. 모델 파일과 다시 생성할 수 있는 캐시는 포함되지 않습니다.",
"locationSummary": "현재 백업 위치",
"openFolderButton": "백업 폴더 열기",
"openFolderSuccess": "백업 폴더를 열었습니다",
"openFolderFailed": "백업 폴더를 열지 못했습니다",
"locationCopied": "백업 경로를 클립보드에 복사했습니다: {{path}}",
"locationClipboardFallback": "백업 경로: {{path}}",
"exportButton": "백업 내보내기",
"exportSuccess": "백업을 성공적으로 내보냈습니다.",
"exportFailed": "백업 내보내기에 실패했습니다: {message}",
"importButton": "백업 가져오기",
"importConfirm": "이 백업을 가져와서 로컬 사용자 상태를 덮어쓰시겠습니까?",
"importSuccess": "백업을 성공적으로 가져왔습니다.",
"importFailed": "백업 가져오기에 실패했습니다: {message}",
"latestSnapshot": "최근 스냅샷",
"latestAutoSnapshot": "최근 자동 스냅샷",
"snapshotCount": "저장된 스냅샷",
"noneAvailable": "아직 스냅샷이 없습니다"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "기본 모델 다운로드 건너뛰기", "label": "기본 모델 다운로드 건너뛰기",
"help": "모든 다운로드 흐름에 적용됩니다. 여기서는 지원되는 기본 모델만 선택할 수 있습니다.", "help": "모든 다운로드 흐름에 적용됩니다. 여기서는 지원되는 기본 모델만 선택할 수 있습니다.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "다운로드, 가져오기 및 이동을 위한 기본 Diffusion Model (UNET) 루트 디렉토리를 설정합니다", "defaultUnetRootHelp": "다운로드, 가져오기 및 이동을 위한 기본 Diffusion Model (UNET) 루트 디렉토리를 설정합니다",
"defaultEmbeddingRoot": "Embedding 루트", "defaultEmbeddingRoot": "Embedding 루트",
"defaultEmbeddingRootHelp": "다운로드, 가져오기 및 이동을 위한 기본 Embedding 루트 디렉토리를 설정합니다", "defaultEmbeddingRootHelp": "다운로드, 가져오기 및 이동을 위한 기본 Embedding 루트 디렉토리를 설정합니다",
"recipesPath": "레시피 저장 경로",
"recipesPathHelp": "저장된 레시피를 위한 선택적 사용자 지정 디렉터리입니다. 비워 두면 첫 번째 LoRA 루트의 recipes 폴더를 사용합니다.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "레시피 저장 경로를 이동 중...",
"noDefault": "기본값 없음" "noDefault": "기본값 없음"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "얼리 액세스", "earlyAccess": "얼리 액세스",
"earlyAccessTooltip": "얼리 액세스 필요", "earlyAccessTooltip": "얼리 액세스 필요",
"inLibrary": "라이브러리에 있음", "inLibrary": "라이브러리에 있음",
"downloaded": "다운로드됨",
"downloadedTooltip": "이전에 다운로드했지만 현재 라이브러리에 없습니다.",
"alreadyInLibrary": "이미 라이브러리에 있음", "alreadyInLibrary": "이미 라이브러리에 있음",
"autoOrganizedPath": "[경로 템플릿으로 자동 정리됨]", "autoOrganizedPath": "[경로 템플릿으로 자동 정리됨]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "{count}일 후" "days": "{count}일 후"
}, },
"badges": { "badges": {
"current": "현재 버전", "current": "열린 버전",
"currentTooltip": "이 모달을 열 때 사용한 버전입니다",
"inLibrary": "라이브러리에 있음", "inLibrary": "라이브러리에 있음",
"inLibraryTooltip": "이 버전은 로컬 라이브러리에 있습니다",
"downloaded": "다운로드됨",
"downloadedTooltip": "이 버전은 이전에 다운로드되었지만 현재는 라이브러리에 없습니다",
"newer": "최신 버전", "newer": "최신 버전",
"newerTooltip": "이 버전은 로컬의 최신 버전보다 더 새롭습니다",
"earlyAccess": "얼리 액세스", "earlyAccess": "얼리 액세스",
"ignored": "무시됨" "earlyAccessTooltip": "이 버전은 현재 Civitai 얼리 액세스가 필요합니다",
"ignored": "무시됨",
"ignoredTooltip": "이 버전은 업데이트 알림이 비활성화되어 있습니다"
}, },
"actions": { "actions": {
"download": "다운로드", "download": "다운로드",
"downloadTooltip": "이 버전 다운로드",
"downloadEarlyAccessTooltip": "Civitai에서 이 얼리 액세스 버전 다운로드",
"delete": "삭제", "delete": "삭제",
"deleteTooltip": "이 로컬 버전 삭제",
"ignore": "무시", "ignore": "무시",
"unignore": "무시 해제", "unignore": "무시 해제",
"ignoreTooltip": "이 버전의 업데이트 알림 무시",
"unignoreTooltip": "이 버전의 업데이트 알림 다시 받기",
"viewVersionOnCivitai": "Civitai에서 버전 보기",
"earlyAccessTooltip": "얼리 액세스 구매 필요", "earlyAccessTooltip": "얼리 액세스 구매 필요",
"resumeModelUpdates": "이 모델 업데이트 재개", "resumeModelUpdates": "이 모델 업데이트 재개",
"ignoreModelUpdates": "이 모델 업데이트 무시", "ignoreModelUpdates": "이 모델 업데이트 무시",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "베이스 모델 매핑 저장 실패: {message}", "mappingSaveFailed": "베이스 모델 매핑 저장 실패: {message}",
"downloadTemplatesUpdated": "다운로드 경로 템플릿이 업데이트되었습니다", "downloadTemplatesUpdated": "다운로드 경로 템플릿이 업데이트되었습니다",
"downloadTemplatesFailed": "다운로드 경로 템플릿 저장 실패: {message}", "downloadTemplatesFailed": "다운로드 경로 템플릿 저장 실패: {message}",
"recipesPathUpdated": "레시피 저장 경로가 업데이트되었습니다",
"recipesPathSaveFailed": "레시피 저장 경로 업데이트 실패: {message}",
"settingsUpdated": "설정 업데이트됨: {setting}", "settingsUpdated": "설정 업데이트됨: {setting}",
"compactModeToggled": "컴팩트 모드 {state}", "compactModeToggled": "컴팩트 모드 {state}",
"settingSaveFailed": "설정 저장 실패: {message}", "settingSaveFailed": "설정 저장 실패: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "시스템 진단",
"title": "닥터",
"buttonTitle": "진단 및 일반적인 수정 실행",
"loading": "환경을 확인하는 중...",
"footer": "수리 후에도 문제가 계속되면 진단 번들을 내보내세요.",
"summary": {
"idle": "설정, 캐시 무결성, UI 일관성에 대한 상태 검사를 실행합니다.",
"ok": "현재 환경에서 활성 문제를 찾지 못했습니다.",
"warning": "{count}개의 문제가 발견되었습니다. 대부분은 이 패널에서 바로 해결할 수 있습니다.",
"error": "앱이 완전히 정상 상태가 되기 전에 {count}개의 문제를 처리해야 합니다."
},
"status": {
"ok": "정상",
"warning": "주의 필요",
"error": "조치 필요"
},
"actions": {
"runAgain": "다시 실행",
"exportBundle": "번들 내보내기"
},
"toast": {
"loadFailed": "진단 로드 실패: {message}",
"repairSuccess": "캐시 재구성이 완료되었습니다.",
"repairFailed": "캐시 재구성 실패: {message}",
"exportSuccess": "진단 번들이 내보내졌습니다.",
"exportFailed": "진단 번들 내보내기 실패: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "애플리케이션 업데이트 감지", "title": "애플리케이션 업데이트 감지",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Ключ API Civitai", "civitaiApiKey": "Ключ API Civitai",
"civitaiApiKeyPlaceholder": "Введите ваш ключ API Civitai", "civitaiApiKeyPlaceholder": "Введите ваш ключ API Civitai",
"civitaiApiKeyHelp": "Используется для аутентификации при загрузке моделей с Civitai", "civitaiApiKeyHelp": "Используется для аутентификации при загрузке моделей с Civitai",
"civitaiHost": {
"label": "Хост Civitai",
"help": "Выберите, какой сайт Civitai будет открываться при использовании ссылок «View on Civitai».",
"options": {
"com": "civitai.com (только SFW)",
"red": "civitai.red (без ограничений)"
}
},
"civitaiHostBanner": {
"title": "Доступна настройка хоста Civitai",
"content": "Теперь Civitai использует civitai.com для контента SFW и civitai.red для контента без ограничений. В настройках можно изменить, какой сайт открывать по умолчанию.",
"openSettings": "Открыть настройки"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "Открыть папку настроек", "label": "Открыть папку настроек",
"tooltip": "Открыть папку, содержащую settings.json", "tooltip": "Открыть папку, содержащую settings.json",
@@ -263,7 +276,9 @@
"videoSettings": "Настройки видео", "videoSettings": "Настройки видео",
"layoutSettings": "Настройки макета", "layoutSettings": "Настройки макета",
"misc": "Разное", "misc": "Разное",
"backup": "Резервные копии",
"folderSettings": "Корневые папки", "folderSettings": "Корневые папки",
"recipeSettings": "Рецепты",
"extraFolderPaths": "Дополнительные пути к папкам", "extraFolderPaths": "Дополнительные пути к папкам",
"downloadPathTemplates": "Шаблоны путей загрузки", "downloadPathTemplates": "Шаблоны путей загрузки",
"priorityTags": "Приоритетные теги", "priorityTags": "Приоритетные теги",
@@ -323,6 +338,32 @@
"saveFailed": "Не удалось сохранить пути для пропуска: {message}" "saveFailed": "Не удалось сохранить пути для пропуска: {message}"
} }
}, },
"backup": {
"autoEnabled": "Автоматические резервные копии",
"autoEnabledHelp": "Создаёт локальный снимок раз в день и хранит последние снимки согласно политике хранения.",
"retention": "Количество хранения",
"retentionHelp": "Сколько автоматических снимков сохранять перед удалением старых.",
"management": "Управление резервными копиями",
"managementHelp": "Экспортируйте текущее состояние пользователя или восстановите его из архива резервной копии.",
"scopeHelp": "Резервная копия включает ваши настройки, историю загрузок и состояние обновлений моделей. Файлы моделей и пересоздаваемые кэши не входят.",
"locationSummary": "Текущее расположение резервных копий",
"openFolderButton": "Открыть папку резервных копий",
"openFolderSuccess": "Папка резервных копий открыта",
"openFolderFailed": "Не удалось открыть папку резервных копий",
"locationCopied": "Путь к резервной копии скопирован в буфер обмена: {{path}}",
"locationClipboardFallback": "Путь к резервной копии: {{path}}",
"exportButton": "Экспортировать резервную копию",
"exportSuccess": "Резервная копия успешно экспортирована.",
"exportFailed": "Не удалось экспортировать резервную копию: {message}",
"importButton": "Импортировать резервную копию",
"importConfirm": "Импортировать эту резервную копию и перезаписать локальное состояние пользователя?",
"importSuccess": "Резервная копия успешно импортирована.",
"importFailed": "Не удалось импортировать резервную копию: {message}",
"latestSnapshot": "Последний снимок",
"latestAutoSnapshot": "Последний автоматический снимок",
"snapshotCount": "Сохранённые снимки",
"noneAvailable": "Снимков пока нет"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "Пропускать загрузки для базовых моделей", "label": "Пропускать загрузки для базовых моделей",
"help": "Применяется ко всем сценариям загрузки. Здесь можно выбрать только поддерживаемые базовые модели.", "help": "Применяется ко всем сценариям загрузки. Здесь можно выбрать только поддерживаемые базовые модели.",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "Установить корневую папку Diffusion Model (UNET) по умолчанию для загрузок, импорта и перемещений", "defaultUnetRootHelp": "Установить корневую папку Diffusion Model (UNET) по умолчанию для загрузок, импорта и перемещений",
"defaultEmbeddingRoot": "Корневая папка Embedding", "defaultEmbeddingRoot": "Корневая папка Embedding",
"defaultEmbeddingRootHelp": "Установить корневую папку embedding по умолчанию для загрузок, импорта и перемещений", "defaultEmbeddingRootHelp": "Установить корневую папку embedding по умолчанию для загрузок, импорта и перемещений",
"recipesPath": "Путь хранения рецептов",
"recipesPathHelp": "Дополнительный пользовательский каталог для сохранённых рецептов. Оставьте пустым, чтобы использовать папку recipes в первом корне LoRA.",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "Перенос хранилища рецептов...",
"noDefault": "Не задано" "noDefault": "Не задано"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "Ранний доступ", "earlyAccess": "Ранний доступ",
"earlyAccessTooltip": "Требуется ранний доступ", "earlyAccessTooltip": "Требуется ранний доступ",
"inLibrary": "В библиотеке", "inLibrary": "В библиотеке",
"downloaded": "Загружено",
"downloadedTooltip": "Ранее загружено, но сейчас этого нет в вашей библиотеке.",
"alreadyInLibrary": "Уже в библиотеке", "alreadyInLibrary": "Уже в библиотеке",
"autoOrganizedPath": "[Автоматически организовано по шаблону пути]", "autoOrganizedPath": "[Автоматически организовано по шаблону пути]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "через {count}д" "days": "через {count}д"
}, },
"badges": { "badges": {
"current": "Текущая версия", "current": "Открытая версия",
"currentTooltip": "Это версия, с которой было открыто это окно",
"inLibrary": "В библиотеке", "inLibrary": "В библиотеке",
"inLibraryTooltip": "Эта версия есть в вашей локальной библиотеке",
"downloaded": "Загружено",
"downloadedTooltip": "Эта версия уже загружалась, но сейчас отсутствует в вашей библиотеке",
"newer": "Более новая версия", "newer": "Более новая версия",
"newerTooltip": "Эта версия новее вашей последней локальной версии",
"earlyAccess": "Ранний доступ", "earlyAccess": "Ранний доступ",
"ignored": "Игнорируется" "earlyAccessTooltip": "Для этой версии сейчас требуется ранний доступ Civitai",
"ignored": "Игнорируется",
"ignoredTooltip": "Уведомления об обновлениях для этой версии отключены"
}, },
"actions": { "actions": {
"download": "Скачать", "download": "Скачать",
"downloadTooltip": "Скачать эту версию",
"downloadEarlyAccessTooltip": "Скачать эту версию раннего доступа с Civitai",
"delete": "Удалить", "delete": "Удалить",
"deleteTooltip": "Удалить эту локальную версию",
"ignore": "Игнорировать", "ignore": "Игнорировать",
"unignore": "Перестать игнорировать", "unignore": "Перестать игнорировать",
"ignoreTooltip": "Игнорировать уведомления об обновлениях для этой версии",
"unignoreTooltip": "Возобновить уведомления об обновлениях для этой версии",
"viewVersionOnCivitai": "Посмотреть версию на Civitai",
"earlyAccessTooltip": "Требуется покупка раннего доступа", "earlyAccessTooltip": "Требуется покупка раннего доступа",
"resumeModelUpdates": "Возобновить обновления для этой модели", "resumeModelUpdates": "Возобновить обновления для этой модели",
"ignoreModelUpdates": "Игнорировать обновления для этой модели", "ignoreModelUpdates": "Игнорировать обновления для этой модели",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "Не удалось сохранить сопоставления базовых моделей: {message}", "mappingSaveFailed": "Не удалось сохранить сопоставления базовых моделей: {message}",
"downloadTemplatesUpdated": "Шаблоны путей загрузки обновлены", "downloadTemplatesUpdated": "Шаблоны путей загрузки обновлены",
"downloadTemplatesFailed": "Не удалось сохранить шаблоны путей загрузки: {message}", "downloadTemplatesFailed": "Не удалось сохранить шаблоны путей загрузки: {message}",
"recipesPathUpdated": "Путь хранения рецептов обновлён",
"recipesPathSaveFailed": "Не удалось обновить путь хранения рецептов: {message}",
"settingsUpdated": "Настройки обновлены: {setting}", "settingsUpdated": "Настройки обновлены: {setting}",
"compactModeToggled": "Компактный режим {state}", "compactModeToggled": "Компактный режим {state}",
"settingSaveFailed": "Не удалось сохранить настройку: {message}", "settingSaveFailed": "Не удалось сохранить настройку: {message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "Системная диагностика",
"title": "Доктор",
"buttonTitle": "Запустить диагностику и обычные исправления",
"loading": "Проверка окружения...",
"footer": "Экспортируйте диагностический пакет, если проблема сохраняется после исправления.",
"summary": {
"idle": "Выполнить проверку настроек, целостности кэша и согласованности интерфейса.",
"ok": "В текущем окружении активных проблем не обнаружено.",
"warning": "Обнаружено {count} проблем(ы). Большинство можно исправить прямо из этой панели.",
"error": "Перед тем как приложение станет полностью исправным, нужно устранить {count} проблем(ы)."
},
"status": {
"ok": "Исправно",
"warning": "Требует внимания",
"error": "Требуется действие"
},
"actions": {
"runAgain": "Запустить снова",
"exportBundle": "Экспортировать пакет"
},
"toast": {
"loadFailed": "Не удалось загрузить диагностику: {message}",
"repairSuccess": "Перестройка кэша завершена.",
"repairFailed": "Не удалось перестроить кэш: {message}",
"exportSuccess": "Диагностический пакет экспортирован.",
"exportFailed": "Не удалось экспортировать диагностический пакет: {message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "Обнаружено обновление приложения", "title": "Обнаружено обновление приложения",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai API 密钥", "civitaiApiKey": "Civitai API 密钥",
"civitaiApiKeyPlaceholder": "请输入你的 Civitai API 密钥", "civitaiApiKeyPlaceholder": "请输入你的 Civitai API 密钥",
"civitaiApiKeyHelp": "用于从 Civitai 下载模型时的身份验证", "civitaiApiKeyHelp": "用于从 Civitai 下载模型时的身份验证",
"civitaiHost": {
"label": "Civitai 站点",
"help": "选择使用“在 Civitai 中查看”时默认打开的 Civitai 站点。",
"options": {
"com": "civitai.com仅 SFW",
"red": "civitai.red无限制"
}
},
"civitaiHostBanner": {
"title": "已提供 Civitai 站点偏好设置",
"content": "Civitai 现在使用 civitai.com 提供 SFW 内容,使用 civitai.red 提供无限制内容。你可以在设置中更改默认打开的站点。",
"openSettings": "打开设置"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "打开设置文件夹", "label": "打开设置文件夹",
"tooltip": "打开包含 settings.json 的文件夹", "tooltip": "打开包含 settings.json 的文件夹",
@@ -263,7 +276,9 @@
"videoSettings": "视频设置", "videoSettings": "视频设置",
"layoutSettings": "布局设置", "layoutSettings": "布局设置",
"misc": "其他", "misc": "其他",
"backup": "备份",
"folderSettings": "默认根目录", "folderSettings": "默认根目录",
"recipeSettings": "配方",
"extraFolderPaths": "额外文件夹路径", "extraFolderPaths": "额外文件夹路径",
"downloadPathTemplates": "下载路径模板", "downloadPathTemplates": "下载路径模板",
"priorityTags": "优先标签", "priorityTags": "优先标签",
@@ -323,6 +338,32 @@
"saveFailed": "无法保存跳过路径:{message}" "saveFailed": "无法保存跳过路径:{message}"
} }
}, },
"backup": {
"autoEnabled": "自动备份",
"autoEnabledHelp": "每天创建一次本地快照,并按保留策略保留最新快照。",
"retention": "保留数量",
"retentionHelp": "在删除旧快照之前,要保留多少个自动快照。",
"management": "备份管理",
"managementHelp": "导出当前用户状态,或从备份归档中恢复。",
"scopeHelp": "备份你的设置、下载历史和模型更新状态。不包含模型文件或可重建的缓存。",
"locationSummary": "当前备份位置",
"openFolderButton": "打开备份文件夹",
"openFolderSuccess": "已打开备份文件夹",
"openFolderFailed": "无法打开备份文件夹",
"locationCopied": "备份路径已复制到剪贴板:{{path}}",
"locationClipboardFallback": "备份路径:{{path}}",
"exportButton": "导出备份",
"exportSuccess": "备份导出成功。",
"exportFailed": "备份导出失败:{message}",
"importButton": "导入备份",
"importConfirm": "导入此备份并覆盖本地用户状态吗?",
"importSuccess": "备份导入成功。",
"importFailed": "备份导入失败:{message}",
"latestSnapshot": "最近快照",
"latestAutoSnapshot": "最近自动快照",
"snapshotCount": "已保存快照",
"noneAvailable": "还没有快照"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "跳过这些基础模型的下载", "label": "跳过这些基础模型的下载",
"help": "适用于所有下载流程。这里只能选择受支持的基础模型。", "help": "适用于所有下载流程。这里只能选择受支持的基础模型。",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "设置下载、导入和移动时的默认 Diffusion Model (UNET) 根目录", "defaultUnetRootHelp": "设置下载、导入和移动时的默认 Diffusion Model (UNET) 根目录",
"defaultEmbeddingRoot": "Embedding 根目录", "defaultEmbeddingRoot": "Embedding 根目录",
"defaultEmbeddingRootHelp": "设置下载、导入和移动时的默认 Embedding 根目录", "defaultEmbeddingRootHelp": "设置下载、导入和移动时的默认 Embedding 根目录",
"recipesPath": "配方存储路径",
"recipesPathHelp": "已保存配方的可选自定义目录。留空则使用第一个 LoRA 根目录下的 recipes 文件夹。",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "正在迁移配方存储...",
"noDefault": "无默认" "noDefault": "无默认"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -653,9 +698,9 @@
"title": "从图片或 URL 导入配方", "title": "从图片或 URL 导入配方",
"urlLocalPath": "URL / 本地路径", "urlLocalPath": "URL / 本地路径",
"uploadImage": "上传图片", "uploadImage": "上传图片",
"urlSectionDescription": "输入 Civitai 图片 URL 或本地文件路径以导入为配方。", "urlSectionDescription": "输入来自 civitai.com 或 civitai.red 的 Civitai 图片 URL或本地文件路径以导入为配方。",
"imageUrlOrPath": "图片 URL 或文件路径:", "imageUrlOrPath": "图片 URL 或文件路径:",
"urlPlaceholder": "https://civitai.com/images/... 或 C:/path/to/image.png", "urlPlaceholder": "https://civitai.com/images/... 或 https://civitai.red/images/... 或 C:/path/to/image.png",
"fetchImage": "获取图片", "fetchImage": "获取图片",
"uploadSectionDescription": "上传带有 LoRA 元数据的图片以导入为配方。", "uploadSectionDescription": "上传带有 LoRA 元数据的图片以导入为配方。",
"selectImage": "选择图片", "selectImage": "选择图片",
@@ -925,6 +970,8 @@
"earlyAccess": "早期访问", "earlyAccess": "早期访问",
"earlyAccessTooltip": "需要早期访问权限", "earlyAccessTooltip": "需要早期访问权限",
"inLibrary": "已在库中", "inLibrary": "已在库中",
"downloaded": "已下载",
"downloadedTooltip": "之前已下载,但当前不在你的库中。",
"alreadyInLibrary": "已存在于库中", "alreadyInLibrary": "已存在于库中",
"autoOrganizedPath": "【已按路径模板自动整理】", "autoOrganizedPath": "【已按路径模板自动整理】",
"errors": { "errors": {
@@ -1056,9 +1103,9 @@
}, },
"proceedText": "仅在你确定需要此操作时继续。", "proceedText": "仅在你确定需要此操作时继续。",
"urlLabel": "Civitai 模型 URL", "urlLabel": "Civitai 模型 URL",
"urlPlaceholder": "https://civitai.com/models/649516/model-name?modelVersionId=726676", "urlPlaceholder": "https://civitai.com/models/649516/model-name?modelVersionId=726676 或 https://civitai.red/models/649516/model-name?modelVersionId=726676",
"helpText": { "helpText": {
"title": "粘贴任意 Civitai 模型 URL。支持格式", "title": "粘贴任意来自 civitai.com 或 civitai.red 的 Civitai 模型 URL。支持格式",
"format1": "https://civitai.com/models/649516", "format1": "https://civitai.com/models/649516",
"format2": "https://civitai.com/models/649516?modelVersionId=726676", "format2": "https://civitai.com/models/649516?modelVersionId=726676",
"format3": "https://civitai.com/models/649516/model-name?modelVersionId=726676", "format3": "https://civitai.com/models/649516/model-name?modelVersionId=726676",
@@ -1194,17 +1241,30 @@
"days": "{count}天后" "days": "{count}天后"
}, },
"badges": { "badges": {
"current": "当前版本", "current": "已打开版本",
"currentTooltip": "这是你用来打开此弹窗的版本",
"inLibrary": "已在库中", "inLibrary": "已在库中",
"inLibraryTooltip": "此版本已存在于你的本地库中",
"downloaded": "已下载",
"downloadedTooltip": "此版本之前下载过,但当前不在你的本地库中",
"newer": "较新的版本", "newer": "较新的版本",
"newerTooltip": "此版本比你本地的最新版本更新",
"earlyAccess": "抢先体验", "earlyAccess": "抢先体验",
"ignored": "已忽略" "earlyAccessTooltip": "此版本当前需要 Civitai 抢先体验权限",
"ignored": "已忽略",
"ignoredTooltip": "此版本已关闭更新通知"
}, },
"actions": { "actions": {
"download": "下载", "download": "下载",
"downloadTooltip": "下载此版本",
"downloadEarlyAccessTooltip": "从 Civitai 下载此抢先体验版本",
"delete": "删除", "delete": "删除",
"deleteTooltip": "删除此本地版本",
"ignore": "忽略", "ignore": "忽略",
"unignore": "取消忽略", "unignore": "取消忽略",
"ignoreTooltip": "忽略此版本的更新通知",
"unignoreTooltip": "恢复此版本的更新通知",
"viewVersionOnCivitai": "在 Civitai 上查看版本",
"earlyAccessTooltip": "需要购买抢先体验", "earlyAccessTooltip": "需要购买抢先体验",
"resumeModelUpdates": "继续跟踪该模型的更新", "resumeModelUpdates": "继续跟踪该模型的更新",
"ignoreModelUpdates": "忽略该模型的更新", "ignoreModelUpdates": "忽略该模型的更新",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "保存基础模型映射失败:{message}", "mappingSaveFailed": "保存基础模型映射失败:{message}",
"downloadTemplatesUpdated": "下载路径模板已更新", "downloadTemplatesUpdated": "下载路径模板已更新",
"downloadTemplatesFailed": "保存下载路径模板失败:{message}", "downloadTemplatesFailed": "保存下载路径模板失败:{message}",
"recipesPathUpdated": "配方存储路径已更新",
"recipesPathSaveFailed": "更新配方存储路径失败:{message}",
"settingsUpdated": "设置已更新:{setting}", "settingsUpdated": "设置已更新:{setting}",
"compactModeToggled": "紧凑模式 {state}", "compactModeToggled": "紧凑模式 {state}",
"settingSaveFailed": "保存设置失败:{message}", "settingSaveFailed": "保存设置失败:{message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "系统诊断",
"title": "医生",
"buttonTitle": "运行诊断并尝试修复常见问题",
"loading": "正在检查当前环境...",
"footer": "如果修复后问题仍然存在,可以导出诊断包进一步排查。",
"summary": {
"idle": "检查设置、缓存健康状况和前后端 UI 版本是否一致。",
"ok": "当前环境未发现活动问题。",
"warning": "发现 {count} 个问题,大多数可以直接在这里处理。",
"error": "发现 {count} 个需要尽快处理的问题。"
},
"status": {
"ok": "健康",
"warning": "需要关注",
"error": "需要处理"
},
"actions": {
"runAgain": "重新检查",
"exportBundle": "导出诊断包"
},
"toast": {
"loadFailed": "加载诊断结果失败:{message}",
"repairSuccess": "缓存重建完成。",
"repairFailed": "缓存重建失败:{message}",
"exportSuccess": "诊断包已导出。",
"exportFailed": "导出诊断包失败:{message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "检测到应用更新", "title": "检测到应用更新",

View File

@@ -250,6 +250,19 @@
"civitaiApiKey": "Civitai API 金鑰", "civitaiApiKey": "Civitai API 金鑰",
"civitaiApiKeyPlaceholder": "請輸入您的 Civitai API 金鑰", "civitaiApiKeyPlaceholder": "請輸入您的 Civitai API 金鑰",
"civitaiApiKeyHelp": "用於從 Civitai 下載模型時的身份驗證", "civitaiApiKeyHelp": "用於從 Civitai 下載模型時的身份驗證",
"civitaiHost": {
"label": "Civitai 站點",
"help": "選擇使用「在 Civitai 中查看」時預設開啟的 Civitai 站點。",
"options": {
"com": "civitai.com僅 SFW",
"red": "civitai.red無限制"
}
},
"civitaiHostBanner": {
"title": "已提供 Civitai 站點偏好設定",
"content": "Civitai 現在使用 civitai.com 提供 SFW 內容,使用 civitai.red 提供無限制內容。你可以在設定中變更預設開啟的站點。",
"openSettings": "開啟設定"
},
"openSettingsFileLocation": { "openSettingsFileLocation": {
"label": "開啟設定資料夾", "label": "開啟設定資料夾",
"tooltip": "開啟包含 settings.json 的資料夾", "tooltip": "開啟包含 settings.json 的資料夾",
@@ -263,7 +276,9 @@
"videoSettings": "影片設定", "videoSettings": "影片設定",
"layoutSettings": "版面設定", "layoutSettings": "版面設定",
"misc": "其他", "misc": "其他",
"backup": "備份",
"folderSettings": "預設根目錄", "folderSettings": "預設根目錄",
"recipeSettings": "配方",
"extraFolderPaths": "額外資料夾路徑", "extraFolderPaths": "額外資料夾路徑",
"downloadPathTemplates": "下載路徑範本", "downloadPathTemplates": "下載路徑範本",
"priorityTags": "優先標籤", "priorityTags": "優先標籤",
@@ -323,6 +338,32 @@
"saveFailed": "無法儲存跳過路徑:{message}" "saveFailed": "無法儲存跳過路徑:{message}"
} }
}, },
"backup": {
"autoEnabled": "自動備份",
"autoEnabledHelp": "每天建立一次本地快照,並依保留政策保留最新快照。",
"retention": "保留數量",
"retentionHelp": "在刪除舊快照之前,要保留多少自動快照。",
"management": "備份管理",
"managementHelp": "匯出目前的使用者狀態,或從備份封存中還原。",
"scopeHelp": "備份你的設定、下載歷史與模型更新狀態。不包含模型檔案或可重建的快取。",
"locationSummary": "目前備份位置",
"openFolderButton": "開啟備份資料夾",
"openFolderSuccess": "已開啟備份資料夾",
"openFolderFailed": "無法開啟備份資料夾",
"locationCopied": "備份路徑已複製到剪貼簿:{{path}}",
"locationClipboardFallback": "備份路徑:{{path}}",
"exportButton": "匯出備份",
"exportSuccess": "備份匯出成功。",
"exportFailed": "備份匯出失敗:{message}",
"importButton": "匯入備份",
"importConfirm": "要匯入此備份並覆寫本機使用者狀態嗎?",
"importSuccess": "備份匯入成功。",
"importFailed": "備份匯入失敗:{message}",
"latestSnapshot": "最近快照",
"latestAutoSnapshot": "最近自動快照",
"snapshotCount": "已儲存快照",
"noneAvailable": "目前還沒有快照"
},
"downloadSkipBaseModels": { "downloadSkipBaseModels": {
"label": "跳過這些基礎模型的下載", "label": "跳過這些基礎模型的下載",
"help": "適用於所有下載流程。這裡只能選擇受支援的基礎模型。", "help": "適用於所有下載流程。這裡只能選擇受支援的基礎模型。",
@@ -393,6 +434,10 @@
"defaultUnetRootHelp": "設定下載、匯入和移動時的預設 Diffusion Model (UNET) 根目錄", "defaultUnetRootHelp": "設定下載、匯入和移動時的預設 Diffusion Model (UNET) 根目錄",
"defaultEmbeddingRoot": "Embedding 根目錄", "defaultEmbeddingRoot": "Embedding 根目錄",
"defaultEmbeddingRootHelp": "設定下載、匯入和移動時的預設 Embedding 根目錄", "defaultEmbeddingRootHelp": "設定下載、匯入和移動時的預設 Embedding 根目錄",
"recipesPath": "配方儲存路徑",
"recipesPathHelp": "已儲存配方的可選自訂目錄。留空則使用第一個 LoRA 根目錄下的 recipes 資料夾。",
"recipesPathPlaceholder": "/path/to/recipes",
"recipesPathMigrating": "正在遷移配方儲存...",
"noDefault": "未設定預設" "noDefault": "未設定預設"
}, },
"extraFolderPaths": { "extraFolderPaths": {
@@ -925,6 +970,8 @@
"earlyAccess": "早期存取", "earlyAccess": "早期存取",
"earlyAccessTooltip": "需要早期存取", "earlyAccessTooltip": "需要早期存取",
"inLibrary": "已在庫存", "inLibrary": "已在庫存",
"downloaded": "已下載",
"downloadedTooltip": "先前已下載,但目前不在你的庫中。",
"alreadyInLibrary": "已在庫存", "alreadyInLibrary": "已在庫存",
"autoOrganizedPath": "[依路徑範本自動整理]", "autoOrganizedPath": "[依路徑範本自動整理]",
"errors": { "errors": {
@@ -1194,17 +1241,30 @@
"days": "{count}天後" "days": "{count}天後"
}, },
"badges": { "badges": {
"current": "目前版本", "current": "已開啟版本",
"currentTooltip": "這是你用來開啟此彈窗的版本",
"inLibrary": "已在庫中", "inLibrary": "已在庫中",
"inLibraryTooltip": "此版本已存在於你的本地庫中",
"downloaded": "已下載",
"downloadedTooltip": "此版本之前下載過,但目前不在你的本地庫中",
"newer": "較新版本", "newer": "較新版本",
"newerTooltip": "此版本比你本地的最新版本更新",
"earlyAccess": "搶先體驗", "earlyAccess": "搶先體驗",
"ignored": "已忽略" "earlyAccessTooltip": "此版本目前需要 Civitai 搶先體驗權限",
"ignored": "已忽略",
"ignoredTooltip": "此版本已關閉更新通知"
}, },
"actions": { "actions": {
"download": "下載", "download": "下載",
"downloadTooltip": "下載此版本",
"downloadEarlyAccessTooltip": "從 Civitai 下載此搶先體驗版本",
"delete": "刪除", "delete": "刪除",
"deleteTooltip": "刪除此本地版本",
"ignore": "忽略", "ignore": "忽略",
"unignore": "取消忽略", "unignore": "取消忽略",
"ignoreTooltip": "忽略此版本的更新通知",
"unignoreTooltip": "恢復此版本的更新通知",
"viewVersionOnCivitai": "在 Civitai 上查看版本",
"earlyAccessTooltip": "需要購買搶先體驗", "earlyAccessTooltip": "需要購買搶先體驗",
"resumeModelUpdates": "恢復追蹤此模型的更新", "resumeModelUpdates": "恢復追蹤此模型的更新",
"ignoreModelUpdates": "忽略此模型的更新", "ignoreModelUpdates": "忽略此模型的更新",
@@ -1629,6 +1689,8 @@
"mappingSaveFailed": "儲存基礎模型對應失敗:{message}", "mappingSaveFailed": "儲存基礎模型對應失敗:{message}",
"downloadTemplatesUpdated": "下載路徑範本已更新", "downloadTemplatesUpdated": "下載路徑範本已更新",
"downloadTemplatesFailed": "儲存下載路徑範本失敗:{message}", "downloadTemplatesFailed": "儲存下載路徑範本失敗:{message}",
"recipesPathUpdated": "配方儲存路徑已更新",
"recipesPathSaveFailed": "更新配方儲存路徑失敗:{message}",
"settingsUpdated": "設定已更新:{setting}", "settingsUpdated": "設定已更新:{setting}",
"compactModeToggled": "緊湊模式已{state}", "compactModeToggled": "緊湊模式已{state}",
"settingSaveFailed": "儲存設定失敗:{message}", "settingSaveFailed": "儲存設定失敗:{message}",
@@ -1772,6 +1834,35 @@
"moveFailed": "Failed to move item: {message}" "moveFailed": "Failed to move item: {message}"
} }
}, },
"doctor": {
"kicker": "系統診斷",
"title": "醫生",
"buttonTitle": "執行診斷與常見修復",
"loading": "正在檢查環境...",
"footer": "如果修復後問題仍然存在,請匯出診斷套件。",
"summary": {
"idle": "針對設定、快取完整性與 UI 一致性執行健康檢查。",
"ok": "目前環境中未發現任何活動中的問題。",
"warning": "找到 {count} 個問題。大多可以直接在此面板修復。",
"error": "應先處理 {count} 個問題,應用程式才能完全正常。"
},
"status": {
"ok": "健康",
"warning": "需要注意",
"error": "需要處理"
},
"actions": {
"runAgain": "重新執行",
"exportBundle": "匯出套件"
},
"toast": {
"loadFailed": "載入診斷失敗:{message}",
"repairSuccess": "快取重建完成。",
"repairFailed": "快取重建失敗:{message}",
"exportSuccess": "診斷套件已匯出。",
"exportFailed": "匯出診斷套件失敗:{message}"
}
},
"banners": { "banners": {
"versionMismatch": { "versionMismatch": {
"title": "偵測到應用程式更新", "title": "偵測到應用程式更新",

View File

@@ -134,6 +134,7 @@ class Config:
self.extra_checkpoints_roots: List[str] = [] self.extra_checkpoints_roots: List[str] = []
self.extra_unet_roots: List[str] = [] self.extra_unet_roots: List[str] = []
self.extra_embeddings_roots: List[str] = [] self.extra_embeddings_roots: List[str] = []
self.recipes_path: str = ""
# Scan symbolic links during initialization # Scan symbolic links during initialization
self._initialize_symlink_mappings() self._initialize_symlink_mappings()
@@ -652,6 +653,8 @@ class Config:
preview_roots.update(self._expand_preview_root(root)) preview_roots.update(self._expand_preview_root(root))
for root in self.extra_embeddings_roots or []: for root in self.extra_embeddings_roots or []:
preview_roots.update(self._expand_preview_root(root)) preview_roots.update(self._expand_preview_root(root))
if self.recipes_path:
preview_roots.update(self._expand_preview_root(self.recipes_path))
for target, link in self._path_mappings.items(): for target, link in self._path_mappings.items():
preview_roots.update(self._expand_preview_root(target)) preview_roots.update(self._expand_preview_root(target))
@@ -911,9 +914,11 @@ class Config:
self, self,
folder_paths: Mapping[str, Iterable[str]], folder_paths: Mapping[str, Iterable[str]],
extra_folder_paths: Optional[Mapping[str, Iterable[str]]] = None, extra_folder_paths: Optional[Mapping[str, Iterable[str]]] = None,
recipes_path: str = "",
) -> None: ) -> None:
self._path_mappings.clear() self._path_mappings.clear()
self._preview_root_paths = set() self._preview_root_paths = set()
self.recipes_path = recipes_path if isinstance(recipes_path, str) else ""
lora_paths = folder_paths.get("loras", []) or [] lora_paths = folder_paths.get("loras", []) or []
checkpoint_paths = folder_paths.get("checkpoints", []) or [] checkpoint_paths = folder_paths.get("checkpoints", []) or []
@@ -1169,7 +1174,12 @@ class Config:
if not isinstance(extra_folder_paths, Mapping): if not isinstance(extra_folder_paths, Mapping):
extra_folder_paths = None extra_folder_paths = None
self._apply_library_paths(folder_paths, extra_folder_paths) recipes_path = (
str(library_config.get("recipes_path", ""))
if isinstance(library_config, Mapping)
else ""
)
self._apply_library_paths(folder_paths, extra_folder_paths, recipes_path)
logger.info( logger.info(
"Applied library settings with %d lora roots (%d extra), %d checkpoint roots (%d extra), and %d embedding roots (%d extra)", "Applied library settings with %d lora roots (%d extra), %d checkpoint roots (%d extra), and %d embedding roots (%d extra)",

View File

@@ -222,6 +222,7 @@ class LoraManager:
# Register DownloadManager with ServiceRegistry # Register DownloadManager with ServiceRegistry
await ServiceRegistry.get_download_manager() await ServiceRegistry.get_download_manager()
await ServiceRegistry.get_backup_service()
from .services.metadata_service import initialize_metadata_providers from .services.metadata_service import initialize_metadata_providers

View File

@@ -595,6 +595,15 @@ class MetadataProcessor:
if negative_node_id and negative_node_id in metadata.get(PROMPTS, {}): if negative_node_id and negative_node_id in metadata.get(PROMPTS, {}):
params["negative_prompt"] = metadata[PROMPTS][negative_node_id].get("text", "") params["negative_prompt"] = metadata[PROMPTS][negative_node_id].get("text", "")
else: else:
positive_node_id = MetadataProcessor.trace_node_input(prompt, guider_node_id, "conditioning", max_depth=10) # Generic guider nodes often expose separate positive/negative inputs.
positive_node_id = MetadataProcessor.trace_node_input(prompt, guider_node_id, "positive", max_depth=10)
if not positive_node_id:
positive_node_id = MetadataProcessor.trace_node_input(prompt, guider_node_id, "conditioning", max_depth=10)
if positive_node_id and positive_node_id in metadata.get(PROMPTS, {}): if positive_node_id and positive_node_id in metadata.get(PROMPTS, {}):
params["prompt"] = metadata[PROMPTS][positive_node_id].get("text", "") params["prompt"] = metadata[PROMPTS][positive_node_id].get("text", "")
negative_node_id = MetadataProcessor.trace_node_input(prompt, guider_node_id, "negative", max_depth=10)
if not negative_node_id:
negative_node_id = MetadataProcessor.trace_node_input(prompt, guider_node_id, "conditioning", max_depth=10)
if negative_node_id and negative_node_id in metadata.get(PROMPTS, {}):
params["negative_prompt"] = metadata[PROMPTS][negative_node_id].get("text", "")

View File

@@ -1,4 +1,6 @@
import json
import os import os
import re
from .constants import MODELS, PROMPTS, SAMPLING, LORAS, SIZE, IMAGES, IS_SAMPLER from .constants import MODELS, PROMPTS, SAMPLING, LORAS, SIZE, IMAGES, IS_SAMPLER
@@ -427,6 +429,75 @@ class ImageSizeExtractor(NodeMetadataExtractor):
"node_id": node_id "node_id": node_id
} }
class RgthreePowerLoraLoaderExtractor(NodeMetadataExtractor):
"""Extract LoRA metadata from rgthree Power Lora Loader.
The node passes LoRAs as dynamic kwargs: LORA_1, LORA_2, ... each containing
{'on': bool, 'lora': filename, 'strength': float, 'strengthTwo': float}.
"""
@staticmethod
def extract(node_id, inputs, outputs, metadata):
if not inputs:
return
active_loras = []
for key, value in inputs.items():
if not key.upper().startswith('LORA_'):
continue
if not isinstance(value, dict):
continue
if not value.get('on') or not value.get('lora'):
continue
lora_name = os.path.splitext(os.path.basename(value['lora']))[0]
active_loras.append({
"name": lora_name,
"strength": round(float(value.get('strength', 1.0)), 2)
})
if active_loras:
metadata[LORAS][node_id] = {
"lora_list": active_loras,
"node_id": node_id
}
class TensorRTLoaderExtractor(NodeMetadataExtractor):
"""Extract checkpoint metadata from TensorRT Loader.
extract() parses the engine filename from 'unet_name' as a best-effort
fallback (strips profile suffix after '_$' and counter suffix).
update() checks if the output MODEL has attachments["source_model"]
set by the node (NubeBuster fork) and overrides with the real name.
Vanilla TRT doesn't set this — the filename parse stands.
"""
@staticmethod
def extract(node_id, inputs, outputs, metadata):
if not inputs or "unet_name" not in inputs:
return
unet_name = inputs.get("unet_name")
# Strip path and extension, then drop the $_profile suffix
model_name = os.path.splitext(os.path.basename(unet_name))[0]
if "_$" in model_name:
model_name = model_name[:model_name.index("_$")]
# Strip counter suffix (e.g. _00001_) left by ComfyUI's save path
model_name = re.sub(r'_\d+_?$', '', model_name)
_store_checkpoint_metadata(metadata, node_id, model_name)
@staticmethod
def update(node_id, outputs, metadata):
if not outputs or not isinstance(outputs, list) or len(outputs) == 0:
return
first_output = outputs[0]
if not isinstance(first_output, tuple) or len(first_output) < 1:
return
model = first_output[0]
# NubeBuster fork sets attachments["source_model"] on the ModelPatcher
source_model = getattr(model, 'attachments', {}).get("source_model")
if source_model:
_store_checkpoint_metadata(metadata, node_id, source_model)
class LoraLoaderManagerExtractor(NodeMetadataExtractor): class LoraLoaderManagerExtractor(NodeMetadataExtractor):
@staticmethod @staticmethod
def extract(node_id, inputs, outputs, metadata): def extract(node_id, inputs, outputs, metadata):
@@ -577,8 +648,6 @@ class SamplerCustomAdvancedExtractor(BaseSamplerExtractor):
# Extract latent dimensions # Extract latent dimensions
BaseSamplerExtractor.extract_latent_dimensions(node_id, inputs, metadata) BaseSamplerExtractor.extract_latent_dimensions(node_id, inputs, metadata)
import json
class CLIPTextEncodeFluxExtractor(NodeMetadataExtractor): class CLIPTextEncodeFluxExtractor(NodeMetadataExtractor):
@staticmethod @staticmethod
def extract(node_id, inputs, outputs, metadata): def extract(node_id, inputs, outputs, metadata):
@@ -715,8 +784,11 @@ NODE_EXTRACTORS = {
"UnetLoaderGGUF": UNETLoaderExtractor, # Updated to use dedicated extractor "UnetLoaderGGUF": UNETLoaderExtractor, # Updated to use dedicated extractor
"LoraLoader": LoraLoaderExtractor, "LoraLoader": LoraLoaderExtractor,
"LoraLoaderLM": LoraLoaderManagerExtractor, "LoraLoaderLM": LoraLoaderManagerExtractor,
"RgthreePowerLoraLoader": RgthreePowerLoraLoaderExtractor,
"TensorRTLoader": TensorRTLoaderExtractor,
# Conditioning # Conditioning
"CLIPTextEncode": CLIPTextEncodeExtractor, "CLIPTextEncode": CLIPTextEncodeExtractor,
"CLIPTextEncodeAttentionBias": CLIPTextEncodeExtractor, # From https://github.com/silveroxides/ComfyUI_PromptAttention
"PromptLM": CLIPTextEncodeExtractor, "PromptLM": CLIPTextEncodeExtractor,
"CLIPTextEncodeFlux": CLIPTextEncodeFluxExtractor, # Add CLIPTextEncodeFlux "CLIPTextEncodeFlux": CLIPTextEncodeFluxExtractor, # Add CLIPTextEncodeFlux
"WAS_Text_to_Conditioning": CLIPTextEncodeExtractor, "WAS_Text_to_Conditioning": CLIPTextEncodeExtractor,

View File

@@ -1,15 +1,38 @@
from __future__ import annotations
from typing import Any from typing import Any
import inspect import inspect
from ..services.wildcard_service import (
contains_dynamic_syntax,
get_wildcard_service,
is_trigger_words_input,
)
class _AllContainer:
"""Container that accepts any key for dynamic input validation."""
def __contains__(self, item): class _PromptOptionalInputs:
return True """Lookup that preserves explicit optional inputs and dynamic trigger slots."""
def __getitem__(self, key): def __init__(self, explicit_inputs: dict[str, tuple[str, dict[str, Any]]]) -> None:
return ("STRING", {"forceInput": True}) self._explicit_inputs = explicit_inputs
def __contains__(self, item: object) -> bool:
if not isinstance(item, str):
return False
return item in self._explicit_inputs or is_trigger_words_input(item)
def __getitem__(self, key: str) -> tuple[str, dict[str, Any]]:
if key in self._explicit_inputs:
return self._explicit_inputs[key]
if is_trigger_words_input(key):
return (
"STRING",
{
"forceInput": True,
"tooltip": "Trigger words to prepend. Connect to add more inputs.",
},
)
raise KeyError(key)
class PromptLM: class PromptLM:
@@ -20,12 +43,19 @@ class PromptLM:
DESCRIPTION = ( DESCRIPTION = (
"Encodes a text prompt using a CLIP model into an embedding that can be used " "Encodes a text prompt using a CLIP model into an embedding that can be used "
"to guide the diffusion model towards generating specific images. " "to guide the diffusion model towards generating specific images. "
"Supports dynamic trigger words inputs." "Supports dynamic trigger words inputs and runtime wildcard expansion."
) )
@classmethod @classmethod
def INPUT_TYPES(cls): def INPUT_TYPES(cls):
dyn_inputs = { optional_inputs: dict[str, tuple[str, dict[str, Any]]] = {
"seed": (
"INT",
{
"forceInput": True,
"tooltip": "Optional seed for wildcard generation. Leave unconnected for non-deterministic wildcard expansion.",
},
),
"trigger_words1": ( "trigger_words1": (
"STRING", "STRING",
{ {
@@ -35,10 +65,9 @@ class PromptLM:
), ),
} }
# Bypass validation for dynamic inputs during graph execution
stack = inspect.stack() stack = inspect.stack()
if len(stack) > 2 and stack[2].function == "get_input_info": if len(stack) > 2 and stack[2].function == "get_input_info":
dyn_inputs = _AllContainer() optional_inputs = _PromptOptionalInputs(optional_inputs) # type: ignore[assignment]
return { return {
"required": { "required": {
@@ -46,8 +75,8 @@ class PromptLM:
"AUTOCOMPLETE_TEXT_PROMPT,STRING", "AUTOCOMPLETE_TEXT_PROMPT,STRING",
{ {
"widgetType": "AUTOCOMPLETE_TEXT_PROMPT", "widgetType": "AUTOCOMPLETE_TEXT_PROMPT",
"placeholder": "Enter prompt... /char, /artist for quick tag search", "placeholder": "Enter prompt... /character, /artist, /wildcard for quick search",
"tooltip": "The text to be encoded.", "tooltip": "The text to be encoded. Wildcard references inserted with /wildcard are expanded at runtime.",
}, },
), ),
"clip": ( "clip": (
@@ -55,7 +84,7 @@ class PromptLM:
{"tooltip": "The CLIP model used for encoding the text."}, {"tooltip": "The CLIP model used for encoding the text."},
), ),
}, },
"optional": dyn_inputs, "optional": optional_inputs,
} }
RETURN_TYPES = ("CONDITIONING", "STRING") RETURN_TYPES = ("CONDITIONING", "STRING")
@@ -65,18 +94,37 @@ class PromptLM:
) )
FUNCTION = "encode" FUNCTION = "encode"
def encode(self, text: str, clip: Any, **kwargs): @classmethod
# Collect all trigger words from dynamic inputs def IS_CHANGED(
cls,
text: str,
clip: Any | None = None,
seed: int | None = None,
**kwargs: Any,
):
del clip, kwargs
if contains_dynamic_syntax(text) and seed is None:
return float("NaN")
return False
def encode(
self,
text: str,
clip: Any,
seed: int | None = None,
**kwargs: Any,
):
expanded_text = get_wildcard_service().expand_text(text, seed=seed)
trigger_words = [] trigger_words = []
for key, value in kwargs.items(): for key, value in kwargs.items():
if key.startswith("trigger_words") and value: if is_trigger_words_input(key) and value:
trigger_words.append(value) trigger_words.append(value)
# Build final prompt
if trigger_words: if trigger_words:
prompt = ", ".join(trigger_words + [text]) prompt = ", ".join(trigger_words + [expanded_text])
else: else:
prompt = text prompt = expanded_text
from nodes import CLIPTextEncode # type: ignore from nodes import CLIPTextEncode # type: ignore

View File

@@ -1,10 +1,15 @@
from __future__ import annotations
from ..services.wildcard_service import contains_dynamic_syntax, get_wildcard_service
class TextLM: class TextLM:
"""A simple text node with autocomplete support.""" """A simple text node with autocomplete support."""
NAME = "Text (LoraManager)" NAME = "Text (LoraManager)"
CATEGORY = "Lora Manager/utils" CATEGORY = "Lora Manager/utils"
DESCRIPTION = ( DESCRIPTION = (
"A simple text input node with autocomplete support for tags and styles." "A simple text input node with autocomplete support for tags, styles, and wildcard expansion."
) )
@classmethod @classmethod
@@ -15,8 +20,17 @@ class TextLM:
"AUTOCOMPLETE_TEXT_PROMPT,STRING", "AUTOCOMPLETE_TEXT_PROMPT,STRING",
{ {
"widgetType": "AUTOCOMPLETE_TEXT_PROMPT", "widgetType": "AUTOCOMPLETE_TEXT_PROMPT",
"placeholder": "Enter text... /char, /artist for quick tag search", "placeholder": "Enter text... /character, /artist, /wildcard for quick search",
"tooltip": "The text output.", "tooltip": "The text output. Wildcard references inserted with /wildcard are expanded at runtime.",
},
),
},
"optional": {
"seed": (
"INT",
{
"forceInput": True,
"tooltip": "Optional seed for wildcard generation. Leave unconnected for non-deterministic wildcard expansion.",
}, },
), ),
}, },
@@ -24,10 +38,14 @@ class TextLM:
RETURN_TYPES = ("STRING",) RETURN_TYPES = ("STRING",)
RETURN_NAMES = ("STRING",) RETURN_NAMES = ("STRING",)
OUTPUT_TOOLTIPS = ( OUTPUT_TOOLTIPS = ("The text output.",)
"The text output.",
)
FUNCTION = "process" FUNCTION = "process"
def process(self, text: str): @classmethod
return (text,) def IS_CHANGED(cls, text: str, seed: int | None = None):
if contains_dynamic_syntax(text) and seed is None:
return float("NaN")
return False
def process(self, text: str, seed: int | None = None):
return (get_wildcard_service().expand_text(text, seed=seed),)

View File

@@ -13,4 +13,5 @@ GEN_PARAM_KEYS = [
'seed', 'seed',
'size', 'size',
'clip_skip', 'clip_skip',
'denoising_strength',
] ]

View File

@@ -1,11 +1,11 @@
import logging import logging
import json import json
import re
import os import os
from typing import Any, Dict, Optional from typing import Any, Dict, Optional
from .merger import GenParamsMerger from .merger import GenParamsMerger
from .base import RecipeMetadataParser from .base import RecipeMetadataParser
from ..services.metadata_service import get_default_metadata_provider from ..services.metadata_service import get_default_metadata_provider
from ..utils.civitai_utils import extract_civitai_image_id
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -39,11 +39,12 @@ class RecipeEnricher:
source_url = recipe.get("source_url") or recipe.get("source_path", "") source_url = recipe.get("source_url") or recipe.get("source_path", "")
# Check if it's a Civitai image URL # Check if it's a Civitai image URL
image_id_match = re.search(r'civitai\.com/images/(\d+)', str(source_url)) image_id = extract_civitai_image_id(str(source_url))
if image_id_match: if image_id:
image_id = image_id_match.group(1)
try: try:
image_info = await civitai_client.get_image_info(image_id) image_info = await civitai_client.get_image_info(
image_id, source_url=str(source_url)
)
if image_info: if image_info:
# Handle nested meta often found in Civitai API responses # Handle nested meta often found in Civitai API responses
raw_meta = image_info.get("meta") raw_meta = image_info.get("meta")

View File

@@ -1,27 +1,33 @@
from typing import Any, Dict, Optional from typing import Any, Dict, Optional
import logging import logging
from .constants import GEN_PARAM_KEYS
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class GenParamsMerger: class GenParamsMerger:
"""Utility to merge generation parameters from multiple sources with priority.""" """Utility to merge generation parameters from multiple sources with priority."""
ALLOWED_KEYS = set(GEN_PARAM_KEYS)
BLACKLISTED_KEYS = { BLACKLISTED_KEYS = {
"id", "url", "userId", "username", "createdAt", "updatedAt", "hash", "meta", "id", "url", "userId", "username", "createdAt", "updatedAt", "hash", "meta",
"draft", "extra", "width", "height", "process", "quantity", "workflow", "draft", "extra", "width", "height", "process", "quantity", "workflow",
"baseModel", "resources", "disablePoi", "aspectRatio", "Created Date", "baseModel", "resources", "disablePoi", "aspectRatio", "Created Date",
"experimental", "civitaiResources", "civitai_resources", "Civitai resources", "experimental", "civitaiResources", "civitai_resources", "Civitai resources",
"modelVersionId", "modelId", "hashes", "Model", "Model hash", "checkpoint_hash", "modelVersionId", "modelId", "hashes", "Model", "Model hash", "checkpoint_hash",
"checkpoint", "checksum", "model_checksum" "checkpoint", "checksum", "model_checksum", "raw_metadata",
} }
NORMALIZATION_MAPPING = { NORMALIZATION_MAPPING = {
# Civitai specific "cfg": "cfg_scale",
"cfgScale": "cfg_scale", "cfgScale": "cfg_scale",
"clipSkip": "clip_skip", "clipSkip": "clip_skip",
"negativePrompt": "negative_prompt", "negativePrompt": "negative_prompt",
# Case variations
"Sampler": "sampler", "Sampler": "sampler",
"sampler_name": "sampler",
"scheduler": "sampler",
"Steps": "steps", "Steps": "steps",
"Seed": "seed", "Seed": "seed",
"Size": "size", "Size": "size",
@@ -36,63 +42,40 @@ class GenParamsMerger:
def merge( def merge(
request_params: Optional[Dict[str, Any]] = None, request_params: Optional[Dict[str, Any]] = None,
civitai_meta: Optional[Dict[str, Any]] = None, civitai_meta: Optional[Dict[str, Any]] = None,
embedded_metadata: Optional[Dict[str, Any]] = None embedded_metadata: Optional[Dict[str, Any]] = None,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
""" """
Merge generation parameters from three sources. Merge generation parameters from three sources.
Priority: request_params > civitai_meta > embedded_metadata Priority: request_params > civitai_meta > embedded_metadata
Args:
request_params: Params provided directly in the import request
civitai_meta: Params from Civitai Image API 'meta' field
embedded_metadata: Params extracted from image EXIF/embedded metadata
Returns:
Merged parameters dictionary
""" """
result = {} result: Dict[str, Any] = {}
# 1. Start with embedded metadata (lowest priority)
if embedded_metadata: if embedded_metadata:
# If it's a full recipe metadata, we use its gen_params if "gen_params" in embedded_metadata and isinstance(
if "gen_params" in embedded_metadata and isinstance(embedded_metadata["gen_params"], dict): embedded_metadata["gen_params"], dict
):
GenParamsMerger._update_normalized(result, embedded_metadata["gen_params"]) GenParamsMerger._update_normalized(result, embedded_metadata["gen_params"])
else: else:
# Otherwise assume the dict itself contains gen_params
GenParamsMerger._update_normalized(result, embedded_metadata) GenParamsMerger._update_normalized(result, embedded_metadata)
# 2. Layer Civitai meta (medium priority)
if civitai_meta: if civitai_meta:
GenParamsMerger._update_normalized(result, civitai_meta) GenParamsMerger._update_normalized(result, civitai_meta)
# 3. Layer request params (highest priority)
if request_params: if request_params:
GenParamsMerger._update_normalized(result, request_params) GenParamsMerger._update_normalized(result, request_params)
# Filter out blacklisted keys and also the original camelCase keys if they were normalized return result
final_result = {}
for k, v in result.items():
if k in GenParamsMerger.BLACKLISTED_KEYS:
continue
if k in GenParamsMerger.NORMALIZATION_MAPPING:
continue
final_result[k] = v
return final_result
@staticmethod @staticmethod
def _update_normalized(target: Dict[str, Any], source: Dict[str, Any]) -> None: def _update_normalized(target: Dict[str, Any], source: Dict[str, Any]) -> None:
"""Update target dict with normalized keys from source.""" """Update target dict with normalized, persistence-safe keys from source."""
for k, v in source.items(): for key, value in source.items():
normalized_key = GenParamsMerger.NORMALIZATION_MAPPING.get(k, k) if key in GenParamsMerger.BLACKLISTED_KEYS:
target[normalized_key] = v continue
# Also keep the original key for now if it's not the same,
# so we can filter at the end or avoid losing it if it wasn't supposed to be renamed? normalized_key = GenParamsMerger.NORMALIZATION_MAPPING.get(key, key)
# Actually, if we rename it, we should probably NOT keep both in 'target' if normalized_key not in GenParamsMerger.ALLOWED_KEYS:
# because we want to filter them out at the end anyway. continue
if normalized_key != k:
# If we are overwriting an existing snake_case key with a camelCase one's value, target[normalized_key] = value
# that's fine because of the priority order of calls to _update_normalized.
pass
target[k] = v

File diff suppressed because it is too large Load Diff

View File

@@ -19,6 +19,7 @@ from ...services.download_coordinator import DownloadCoordinator
from ...services.metadata_sync_service import MetadataSyncService from ...services.metadata_sync_service import MetadataSyncService
from ...services.model_file_service import ModelMoveService from ...services.model_file_service import ModelMoveService
from ...services.preview_asset_service import PreviewAssetService from ...services.preview_asset_service import PreviewAssetService
from ...services.service_registry import ServiceRegistry
from ...services.settings_manager import SettingsManager, get_settings_manager from ...services.settings_manager import SettingsManager, get_settings_manager
from ...services.tag_update_service import TagUpdateService from ...services.tag_update_service import TagUpdateService
from ...services.use_cases import ( from ...services.use_cases import (
@@ -64,7 +65,6 @@ class ModelPageView:
self._settings = settings_service self._settings = settings_service
self._server_i18n = server_i18n self._server_i18n = server_i18n
self._logger = logger self._logger = logger
self._app_version = self._get_app_version()
def _load_supporters(self) -> dict: def _load_supporters(self) -> dict:
"""Load supporters data from JSON file.""" """Load supporters data from JSON file."""
@@ -155,7 +155,7 @@ class ModelPageView:
"request": request, "request": request,
"folders": [], "folders": [],
"t": self._server_i18n.get_translation, "t": self._server_i18n.get_translation,
"version": self._app_version, "version": self._get_app_version(),
} }
if not is_initializing: if not is_initializing:
@@ -1532,6 +1532,20 @@ class ModelCivitaiHandler:
cache = await self._service.scanner.get_cached_data() cache = await self._service.scanner.get_cached_data()
version_index = cache.version_index version_index = cache.version_index
downloaded_version_ids: set[int] = set()
try:
history_service = await ServiceRegistry.get_downloaded_version_history_service()
downloaded_version_ids = set(
await history_service.get_downloaded_version_ids(
self._service.model_type,
model_id,
)
)
except Exception as exc: # pragma: no cover - defensive logging
self._logger.debug(
"Failed to load download history for CivitAI versions: %s",
exc,
)
for version in versions: for version in versions:
version_id = None version_id = None
@@ -1548,6 +1562,9 @@ class ModelCivitaiHandler:
else None else None
) )
version["existsLocally"] = cache_entry is not None version["existsLocally"] = cache_entry is not None
version["hasBeenDownloaded"] = (
version_id in downloaded_version_ids if version_id is not None else False
)
if cache_entry and isinstance(cache_entry, Mapping): if cache_entry and isinstance(cache_entry, Mapping):
local_path = cache_entry.get("file_path") local_path = cache_entry.get("file_path")
if local_path: if local_path:
@@ -2266,7 +2283,7 @@ class ModelUpdateHandler:
self, self,
record, record,
*, *,
version_context: Optional[Dict[int, Dict[str, Optional[str]]]] = None, version_context: Optional[Dict[int, Dict[str, Any]]] = None,
) -> Dict: ) -> Dict:
context = version_context or {} context = version_context or {}
# Check user setting for hiding early access versions # Check user setting for hiding early access versions
@@ -2295,7 +2312,7 @@ class ModelUpdateHandler:
@staticmethod @staticmethod
def _serialize_version( def _serialize_version(
version, context: Optional[Dict[str, Optional[str]]] version, context: Optional[Dict[str, Any]]
) -> Dict: ) -> Dict:
context = context or {} context = context or {}
preview_override = context.get("preview_override") preview_override = context.get("preview_override")
@@ -2329,6 +2346,7 @@ class ModelUpdateHandler:
"sizeBytes": version.size_bytes, "sizeBytes": version.size_bytes,
"previewUrl": preview_url, "previewUrl": preview_url,
"isInLibrary": version.is_in_library, "isInLibrary": version.is_in_library,
"hasBeenDownloaded": bool(context.get("has_been_downloaded", False)),
"shouldIgnore": version.should_ignore, "shouldIgnore": version.should_ignore,
"earlyAccessEndsAt": version.early_access_ends_at, "earlyAccessEndsAt": version.early_access_ends_at,
"isEarlyAccess": is_early_access, "isEarlyAccess": is_early_access,
@@ -2338,8 +2356,31 @@ class ModelUpdateHandler:
async def _build_version_context( async def _build_version_context(
self, record self, record
) -> Dict[int, Dict[str, Optional[str]]]: ) -> Dict[int, Dict[str, Any]]:
context: Dict[int, Dict[str, Optional[str]]] = {} context: Dict[int, Dict[str, Any]] = {}
downloaded_version_ids: set[int] = set()
try:
history_service = await ServiceRegistry.get_downloaded_version_history_service()
downloaded_version_ids = set(
await history_service.get_downloaded_version_ids(
record.model_type,
record.model_id,
)
)
except Exception as exc: # pragma: no cover - defensive logging
self._logger.debug(
"Failed to load download history while building version context: %s",
exc,
)
for version in record.versions:
context[version.version_id] = {
"file_path": None,
"file_name": None,
"preview_override": None,
"has_been_downloaded": version.version_id in downloaded_version_ids,
}
try: try:
cache = await self._service.scanner.get_cached_data() cache = await self._service.scanner.get_cached_data()
except Exception as exc: # pragma: no cover - defensive logging except Exception as exc: # pragma: no cover - defensive logging
@@ -2358,16 +2399,21 @@ class ModelUpdateHandler:
cache_entry = version_index.get(version.version_id) cache_entry = version_index.get(version.version_id)
if isinstance(cache_entry, Mapping): if isinstance(cache_entry, Mapping):
preview = cache_entry.get("preview_url") preview = cache_entry.get("preview_url")
context_entry: Dict[str, Optional[str]] = { context_entry = context.setdefault(
"file_path": cache_entry.get("file_path"), version.version_id,
"file_name": cache_entry.get("file_name"), {
"preview_override": None, "file_path": None,
} "file_name": None,
"preview_override": None,
"has_been_downloaded": version.version_id in downloaded_version_ids,
},
)
context_entry["file_path"] = cache_entry.get("file_path")
context_entry["file_name"] = cache_entry.get("file_name")
if isinstance(preview, str) and preview: if isinstance(preview, str) and preview:
context_entry["preview_override"] = config.get_preview_static_url( context_entry["preview_override"] = config.get_preview_static_url(
preview preview
) )
context[version.version_id] = context_entry
return context return context

View File

@@ -26,7 +26,7 @@ from ...services.recipes import (
RecipeValidationError, RecipeValidationError,
) )
from ...services.metadata_service import get_default_metadata_provider from ...services.metadata_service import get_default_metadata_provider
from ...utils.civitai_utils import rewrite_preview_url from ...utils.civitai_utils import extract_civitai_image_id, rewrite_preview_url
from ...utils.exif_utils import ExifUtils from ...utils.exif_utils import ExifUtils
from ...recipes.merger import GenParamsMerger from ...recipes.merger import GenParamsMerger
from ...recipes.enrichment import RecipeEnricher from ...recipes.enrichment import RecipeEnricher
@@ -756,6 +756,14 @@ class RecipeManagementHandler:
) )
gen_params_request = self._parse_gen_params(params.get("gen_params")) gen_params_request = self._parse_gen_params(params.get("gen_params"))
self._logger.info(
"Remote recipe import received: url=%s, request_gen_params_keys=%s, lora_count=%d, checkpoint_keys=%s",
image_url,
sorted(gen_params_request.keys()) if gen_params_request else [],
len(lora_entries),
sorted(checkpoint_entry.keys()) if isinstance(checkpoint_entry, dict) else [],
)
# 2. Initial Metadata Construction # 2. Initial Metadata Construction
metadata: Dict[str, Any] = { metadata: Dict[str, Any] = {
"base_model": params.get("base_model", "") or "", "base_model": params.get("base_model", "") or "",
@@ -1188,13 +1196,15 @@ class RecipeManagementHandler:
temp_path = temp_file.name temp_path = temp_file.name
download_url = image_url download_url = image_url
image_info = None image_info = None
civitai_match = re.match(r"https://civitai\.com/images/(\d+)", image_url) civitai_image_id = extract_civitai_image_id(image_url)
if civitai_match: if civitai_image_id:
if civitai_client is None: if civitai_client is None:
raise RecipeDownloadError( raise RecipeDownloadError(
"Civitai client unavailable for image download" "Civitai client unavailable for image download"
) )
image_info = await civitai_client.get_image_info(civitai_match.group(1)) image_info = await civitai_client.get_image_info(
civitai_image_id, source_url=image_url
)
if not image_info: if not image_info:
raise RecipeDownloadError( raise RecipeDownloadError(
"Failed to fetch image information from Civitai" "Failed to fetch image information from Civitai"
@@ -1228,7 +1238,7 @@ class RecipeManagementHandler:
return ( return (
file_obj.read(), file_obj.read(),
extension, extension,
image_info.get("meta") if civitai_match and image_info else None, image_info.get("meta") if civitai_image_id and image_info else None,
) )
except RecipeDownloadError: except RecipeDownloadError:
raise raise

View File

@@ -22,11 +22,16 @@ class RouteDefinition:
MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = ( MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
RouteDefinition("GET", "/api/lm/settings", "get_settings"), RouteDefinition("GET", "/api/lm/settings", "get_settings"),
RouteDefinition("POST", "/api/lm/settings", "update_settings"), RouteDefinition("POST", "/api/lm/settings", "update_settings"),
RouteDefinition("GET", "/api/lm/doctor/diagnostics", "get_doctor_diagnostics"),
RouteDefinition("POST", "/api/lm/doctor/repair-cache", "repair_doctor_cache"),
RouteDefinition("POST", "/api/lm/doctor/export-bundle", "export_doctor_bundle"),
RouteDefinition("GET", "/api/lm/priority-tags", "get_priority_tags"), RouteDefinition("GET", "/api/lm/priority-tags", "get_priority_tags"),
RouteDefinition("GET", "/api/lm/settings/libraries", "get_settings_libraries"), RouteDefinition("GET", "/api/lm/settings/libraries", "get_settings_libraries"),
RouteDefinition("POST", "/api/lm/settings/libraries/activate", "activate_library"), RouteDefinition("POST", "/api/lm/settings/libraries/activate", "activate_library"),
RouteDefinition("GET", "/api/lm/health-check", "health_check"), RouteDefinition("GET", "/api/lm/health-check", "health_check"),
RouteDefinition("GET", "/api/lm/supporters", "get_supporters"), RouteDefinition("GET", "/api/lm/supporters", "get_supporters"),
RouteDefinition("GET", "/api/lm/wildcards/search", "search_wildcards"),
RouteDefinition("POST", "/api/lm/wildcards/open-location", "open_wildcards_location"),
RouteDefinition("POST", "/api/lm/open-file-location", "open_file_location"), RouteDefinition("POST", "/api/lm/open-file-location", "open_file_location"),
RouteDefinition("POST", "/api/lm/update-usage-stats", "update_usage_stats"), RouteDefinition("POST", "/api/lm/update-usage-stats", "update_usage_stats"),
RouteDefinition("GET", "/api/lm/get-usage-stats", "get_usage_stats"), RouteDefinition("GET", "/api/lm/get-usage-stats", "get_usage_stats"),
@@ -62,6 +67,10 @@ MISC_ROUTE_DEFINITIONS: tuple[RouteDefinition, ...] = (
RouteDefinition( RouteDefinition(
"GET", "/api/lm/metadata-archive-status", "get_metadata_archive_status" "GET", "/api/lm/metadata-archive-status", "get_metadata_archive_status"
), ),
RouteDefinition("GET", "/api/lm/backup/status", "get_backup_status"),
RouteDefinition("POST", "/api/lm/backup/export", "export_backup"),
RouteDefinition("POST", "/api/lm/backup/import", "import_backup"),
RouteDefinition("POST", "/api/lm/backup/open-location", "open_backup_location"),
RouteDefinition( RouteDefinition(
"GET", "/api/lm/model-versions-status", "get_model_versions_status" "GET", "/api/lm/model-versions-status", "get_model_versions_status"
), ),

View File

@@ -19,10 +19,12 @@ from ..services.downloader import get_downloader
from ..utils.usage_stats import UsageStats from ..utils.usage_stats import UsageStats
from .handlers.misc_handlers import ( from .handlers.misc_handlers import (
CustomWordsHandler, CustomWordsHandler,
DoctorHandler,
ExampleWorkflowsHandler, ExampleWorkflowsHandler,
FileSystemHandler, FileSystemHandler,
HealthCheckHandler, HealthCheckHandler,
LoraCodeHandler, LoraCodeHandler,
BackupHandler,
MetadataArchiveHandler, MetadataArchiveHandler,
MiscHandlerSet, MiscHandlerSet,
ModelExampleFilesHandler, ModelExampleFilesHandler,
@@ -33,6 +35,7 @@ from .handlers.misc_handlers import (
SupportersHandler, SupportersHandler,
TrainedWordsHandler, TrainedWordsHandler,
UsageStatsHandler, UsageStatsHandler,
WildcardsHandler,
build_service_registry_adapter, build_service_registry_adapter,
) )
from .handlers.base_model_handlers import BaseModelHandlerSet from .handlers.base_model_handlers import BaseModelHandlerSet
@@ -116,6 +119,7 @@ class MiscRoutes:
settings_service=self._settings, settings_service=self._settings,
metadata_provider_updater=self._metadata_provider_updater, metadata_provider_updater=self._metadata_provider_updater,
) )
backup = BackupHandler()
filesystem = FileSystemHandler(settings_service=self._settings) filesystem = FileSystemHandler(settings_service=self._settings)
node_registry_handler = NodeRegistryHandler( node_registry_handler = NodeRegistryHandler(
node_registry=self._node_registry, node_registry=self._node_registry,
@@ -127,7 +131,9 @@ class MiscRoutes:
metadata_provider_factory=self._metadata_provider_factory, metadata_provider_factory=self._metadata_provider_factory,
) )
custom_words = CustomWordsHandler() custom_words = CustomWordsHandler()
wildcards = WildcardsHandler()
supporters = SupportersHandler() supporters = SupportersHandler()
doctor = DoctorHandler(settings_service=self._settings)
example_workflows = ExampleWorkflowsHandler() example_workflows = ExampleWorkflowsHandler()
base_model = BaseModelHandlerSet() base_model = BaseModelHandlerSet()
@@ -141,9 +147,12 @@ class MiscRoutes:
node_registry=node_registry_handler, node_registry=node_registry_handler,
model_library=model_library, model_library=model_library,
metadata_archive=metadata_archive, metadata_archive=metadata_archive,
backup=backup,
filesystem=filesystem, filesystem=filesystem,
custom_words=custom_words, custom_words=custom_words,
wildcards=wildcards,
supporters=supporters, supporters=supporters,
doctor=doctor,
example_workflows=example_workflows, example_workflows=example_workflows,
base_model=base_model, base_model=base_model,
) )

View File

@@ -0,0 +1,411 @@
from __future__ import annotations
import asyncio
import contextlib
import hashlib
import json
import logging
import os
import shutil
import tempfile
import time
import zipfile
from dataclasses import dataclass
from datetime import datetime, timezone
from pathlib import Path
from typing import Any, Iterable, Optional
from ..utils.cache_paths import CacheType, get_cache_base_dir, get_cache_file_path
from ..utils.settings_paths import get_settings_dir
from .settings_manager import get_settings_manager
logger = logging.getLogger(__name__)
BACKUP_MANIFEST_VERSION = 1
DEFAULT_BACKUP_RETENTION_COUNT = 5
DEFAULT_BACKUP_INTERVAL_SECONDS = 24 * 60 * 60
@dataclass(frozen=True)
class BackupEntry:
kind: str
archive_path: str
target_path: str
sha256: str
size: int
mtime: float
class BackupService:
"""Create and restore user-state backup archives."""
_instance: "BackupService | None" = None
_instance_lock = asyncio.Lock()
def __init__(self, *, settings_manager=None, backup_dir: str | None = None) -> None:
self._settings = settings_manager or get_settings_manager()
self._backup_dir = Path(backup_dir or self._resolve_backup_dir())
self._backup_dir.mkdir(parents=True, exist_ok=True)
self._lock = asyncio.Lock()
self._auto_task: asyncio.Task[None] | None = None
@classmethod
async def get_instance(cls) -> "BackupService":
async with cls._instance_lock:
if cls._instance is None:
cls._instance = cls()
cls._instance._ensure_auto_snapshot_task()
return cls._instance
@staticmethod
def _resolve_backup_dir() -> str:
return os.path.join(get_settings_dir(create=True), "backups")
def get_backup_dir(self) -> str:
return str(self._backup_dir)
def _ensure_auto_snapshot_task(self) -> None:
if self._auto_task is not None and not self._auto_task.done():
return
try:
loop = asyncio.get_running_loop()
except RuntimeError:
return
self._auto_task = loop.create_task(self._auto_backup_loop())
def _get_setting_bool(self, key: str, default: bool) -> bool:
try:
return bool(self._settings.get(key, default))
except Exception:
return default
def _get_setting_int(self, key: str, default: int) -> int:
try:
value = self._settings.get(key, default)
return max(1, int(value))
except Exception:
return default
def _settings_file_path(self) -> str:
settings_file = getattr(self._settings, "settings_file", None)
if settings_file:
return str(settings_file)
return os.path.join(get_settings_dir(create=True), "settings.json")
def _download_history_path(self) -> str:
base_dir = get_cache_base_dir(create=True)
history_dir = os.path.join(base_dir, "download_history")
os.makedirs(history_dir, exist_ok=True)
return os.path.join(history_dir, "downloaded_versions.sqlite")
def _model_update_dir(self) -> str:
return str(Path(get_cache_file_path(CacheType.MODEL_UPDATE, create_dir=True)).parent)
def _model_update_targets(self) -> list[tuple[str, str, str]]:
"""Return (kind, archive_path, target_path) tuples for backup."""
targets: list[tuple[str, str, str]] = []
settings_path = self._settings_file_path()
targets.append(("settings", "settings/settings.json", settings_path))
history_path = self._download_history_path()
targets.append(
(
"download_history",
"cache/download_history/downloaded_versions.sqlite",
history_path,
)
)
symlink_path = get_cache_file_path(CacheType.SYMLINK, create_dir=True)
targets.append(
(
"symlink_map",
"cache/symlink/symlink_map.json",
symlink_path,
)
)
model_update_dir = Path(self._model_update_dir())
if model_update_dir.exists():
for sqlite_file in sorted(model_update_dir.glob("*.sqlite")):
targets.append(
(
"model_update",
f"cache/model_update/{sqlite_file.name}",
str(sqlite_file),
)
)
return targets
@staticmethod
def _hash_file(path: str) -> tuple[str, int, float]:
digest = hashlib.sha256()
total = 0
with open(path, "rb") as handle:
for chunk in iter(lambda: handle.read(1024 * 1024), b""):
total += len(chunk)
digest.update(chunk)
mtime = os.path.getmtime(path)
return digest.hexdigest(), total, mtime
def _build_manifest(self, entries: Iterable[BackupEntry], *, snapshot_type: str) -> dict[str, Any]:
created_at = datetime.now(timezone.utc).isoformat()
active_library = None
try:
active_library = self._settings.get_active_library_name()
except Exception:
active_library = None
return {
"manifest_version": BACKUP_MANIFEST_VERSION,
"created_at": created_at,
"snapshot_type": snapshot_type,
"active_library": active_library,
"files": [
{
"kind": entry.kind,
"archive_path": entry.archive_path,
"target_path": entry.target_path,
"sha256": entry.sha256,
"size": entry.size,
"mtime": entry.mtime,
}
for entry in entries
],
}
def _write_archive(self, archive_path: str, entries: list[BackupEntry], manifest: dict[str, Any]) -> None:
with zipfile.ZipFile(
archive_path,
mode="w",
compression=zipfile.ZIP_DEFLATED,
compresslevel=6,
) as zf:
zf.writestr(
"manifest.json",
json.dumps(manifest, indent=2, ensure_ascii=False).encode("utf-8"),
)
for entry in entries:
zf.write(entry.target_path, arcname=entry.archive_path)
async def create_snapshot(self, *, snapshot_type: str = "manual", persist: bool = False) -> dict[str, Any]:
"""Create a backup archive.
If ``persist`` is true, the archive is stored in the backup directory
and retained according to the configured retention policy.
"""
async with self._lock:
raw_targets = self._model_update_targets()
entries: list[BackupEntry] = []
for kind, archive_path, target_path in raw_targets:
if not os.path.exists(target_path):
continue
sha256, size, mtime = self._hash_file(target_path)
entries.append(
BackupEntry(
kind=kind,
archive_path=archive_path,
target_path=target_path,
sha256=sha256,
size=size,
mtime=mtime,
)
)
if not entries:
raise FileNotFoundError("No backupable files were found")
manifest = self._build_manifest(entries, snapshot_type=snapshot_type)
archive_name = self._build_archive_name(snapshot_type=snapshot_type)
fd, temp_path = tempfile.mkstemp(suffix=".zip", dir=str(self._backup_dir))
os.close(fd)
try:
self._write_archive(temp_path, entries, manifest)
if persist:
final_path = self._backup_dir / archive_name
os.replace(temp_path, final_path)
self._prune_snapshots()
return {
"archive_path": str(final_path),
"archive_name": final_path.name,
"manifest": manifest,
}
with open(temp_path, "rb") as handle:
data = handle.read()
return {
"archive_name": archive_name,
"archive_bytes": data,
"manifest": manifest,
}
finally:
with contextlib.suppress(FileNotFoundError):
os.remove(temp_path)
def _build_archive_name(self, *, snapshot_type: str) -> str:
timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%SZ")
return f"lora-manager-backup-{timestamp}-{snapshot_type}.zip"
def _prune_snapshots(self) -> None:
retention = self._get_setting_int(
"backup_retention_count", DEFAULT_BACKUP_RETENTION_COUNT
)
archives = sorted(
self._backup_dir.glob("lora-manager-backup-*-auto.zip"),
key=lambda path: path.stat().st_mtime,
reverse=True,
)
for path in archives[retention:]:
with contextlib.suppress(OSError):
path.unlink()
async def restore_snapshot(self, archive_path: str) -> dict[str, Any]:
"""Restore backup contents from a ZIP archive."""
async with self._lock:
try:
zf = zipfile.ZipFile(archive_path, mode="r")
except zipfile.BadZipFile as exc:
raise ValueError("Backup archive is not a valid ZIP file") from exc
with zf:
try:
manifest = json.loads(zf.read("manifest.json").decode("utf-8"))
except KeyError as exc:
raise ValueError("Backup archive is missing manifest.json") from exc
if not isinstance(manifest, dict):
raise ValueError("Backup manifest is invalid")
if manifest.get("manifest_version") != BACKUP_MANIFEST_VERSION:
raise ValueError("Backup manifest version is not supported")
files = manifest.get("files", [])
if not isinstance(files, list):
raise ValueError("Backup manifest file list is invalid")
extracted_paths: list[tuple[str, str]] = []
temp_dir = Path(tempfile.mkdtemp(prefix="lora-manager-restore-"))
try:
for item in files:
if not isinstance(item, dict):
continue
archive_member = item.get("archive_path")
if not isinstance(archive_member, str) or not archive_member:
continue
archive_member_path = Path(archive_member)
if archive_member_path.is_absolute() or ".." in archive_member_path.parts:
raise ValueError(f"Invalid archive member path: {archive_member}")
kind = item.get("kind")
target_path = self._resolve_restore_target(kind, archive_member)
if target_path is None:
continue
extracted_path = temp_dir / archive_member_path
extracted_path.parent.mkdir(parents=True, exist_ok=True)
with zf.open(archive_member) as source, open(
extracted_path, "wb"
) as destination:
shutil.copyfileobj(source, destination)
expected_hash = item.get("sha256")
if isinstance(expected_hash, str) and expected_hash:
actual_hash, _, _ = self._hash_file(str(extracted_path))
if actual_hash != expected_hash:
raise ValueError(
f"Checksum mismatch for {archive_member}"
)
extracted_paths.append((str(extracted_path), target_path))
for extracted_path, target_path in extracted_paths:
os.makedirs(os.path.dirname(target_path), exist_ok=True)
os.replace(extracted_path, target_path)
finally:
shutil.rmtree(temp_dir, ignore_errors=True)
return {
"success": True,
"restored_files": len(extracted_paths),
"snapshot_type": manifest.get("snapshot_type"),
}
def _resolve_restore_target(self, kind: Any, archive_member: str) -> str | None:
if kind == "settings":
return self._settings_file_path()
if kind == "download_history":
return self._download_history_path()
if kind == "symlink_map":
return get_cache_file_path(CacheType.SYMLINK, create_dir=True)
if kind == "model_update":
filename = os.path.basename(archive_member)
return str(Path(get_cache_file_path(CacheType.MODEL_UPDATE, create_dir=True)).parent / filename)
return None
async def create_auto_snapshot_if_due(self) -> Optional[dict[str, Any]]:
if not self._get_setting_bool("backup_auto_enabled", True):
return None
latest = self.get_latest_auto_snapshot()
now = time.time()
if latest and now - latest["mtime"] < DEFAULT_BACKUP_INTERVAL_SECONDS:
return None
return await self.create_snapshot(snapshot_type="auto", persist=True)
async def _auto_backup_loop(self) -> None:
while True:
try:
await self.create_auto_snapshot_if_due()
await asyncio.sleep(DEFAULT_BACKUP_INTERVAL_SECONDS)
except asyncio.CancelledError:
raise
except Exception as exc: # pragma: no cover - defensive guard
logger.warning("Automatic backup snapshot failed: %s", exc, exc_info=True)
await asyncio.sleep(60)
def get_available_snapshots(self) -> list[dict[str, Any]]:
snapshots: list[dict[str, Any]] = []
for path in sorted(self._backup_dir.glob("lora-manager-backup-*.zip")):
try:
stat = path.stat()
except OSError:
continue
snapshots.append(
{
"name": path.name,
"path": str(path),
"size": stat.st_size,
"mtime": stat.st_mtime,
"is_auto": path.name.endswith("-auto.zip"),
}
)
snapshots.sort(key=lambda item: item["mtime"], reverse=True)
return snapshots
def get_latest_auto_snapshot(self) -> Optional[dict[str, Any]]:
autos = [snapshot for snapshot in self.get_available_snapshots() if snapshot["is_auto"]]
if not autos:
return None
return autos[0]
def get_status(self) -> dict[str, Any]:
snapshots = self.get_available_snapshots()
return {
"backupDir": self.get_backup_dir(),
"enabled": self._get_setting_bool("backup_auto_enabled", True),
"retentionCount": self._get_setting_int(
"backup_retention_count", DEFAULT_BACKUP_RETENTION_COUNT
),
"snapshotCount": len(snapshots),
"latestSnapshot": snapshots[0] if snapshots else None,
"latestAutoSnapshot": self.get_latest_auto_snapshot(),
}

View File

@@ -20,6 +20,7 @@ from .model_query import (
resolve_sub_type, resolve_sub_type,
) )
from .settings_manager import get_settings_manager from .settings_manager import get_settings_manager
from ..utils.civitai_utils import build_civitai_model_page_url
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -774,9 +775,12 @@ class BaseModelService(ABC):
version_id = civitai_data.get("id") version_id = civitai_data.get("id")
if model_id: if model_id:
civitai_url = f"https://civitai.com/models/{model_id}" civitai_host = self.settings.get("civitai_host", "civitai.com")
if version_id: civitai_url = build_civitai_model_page_url(
civitai_url += f"?modelVersionId={version_id}" model_id,
version_id,
host=civitai_host,
)
return { return {
"civitai_url": civitai_url, "civitai_url": civitai_url,

View File

@@ -105,12 +105,18 @@ class CheckpointScanner(ModelScanner):
return None return None
# Load current metadata # Load current metadata
metadata, _ = await MetadataManager.load_metadata( metadata, should_skip = await MetadataManager.load_metadata(
file_path, self.model_class file_path, self.model_class
) )
if metadata is None: if metadata is None:
logger.error(f"No metadata found for {file_path}") if should_skip:
return None logger.error(f"Invalid metadata found for {file_path}")
return None
created_metadata = await self._create_default_metadata(file_path)
if created_metadata is None:
logger.error(f"No metadata found for {file_path}")
return None
metadata = created_metadata
# Check if hash is already calculated # Check if hash is already calculated
if metadata.hash_status == "completed" and metadata.sha256: if metadata.hash_status == "completed" and metadata.sha256:

View File

@@ -30,7 +30,7 @@ class CivitaiBaseModelService:
DEFAULT_CACHE_TTL = 7 * 24 * 60 * 60 DEFAULT_CACHE_TTL = 7 * 24 * 60 * 60
# Civitai API endpoint for enums # Civitai API endpoint for enums
CIVITAI_ENUMS_URL = "https://civitai.com/api/v1/enums" CIVITAI_ENUMS_URL = "https://civitai.red/api/v1/enums"
@classmethod @classmethod
async def get_instance(cls) -> CivitaiBaseModelService: async def get_instance(cls) -> CivitaiBaseModelService:

View File

@@ -39,7 +39,10 @@ class CivitaiClient:
return return
self._initialized = True self._initialized = True
self.base_url = "https://civitai.com/api/v1" self.base_url = "https://civitai.red/api/v1"
def _build_image_info_url(self, image_id: str) -> str:
return f"{self.base_url}/images?imageId={image_id}&nsfw=X"
async def _make_request( async def _make_request(
self, self,
@@ -190,7 +193,9 @@ class CivitaiClient:
"""Get all versions of a model with local availability info""" """Get all versions of a model with local availability info"""
try: try:
success, result = await self._make_request( success, result = await self._make_request(
"GET", f"{self.base_url}/models/{model_id}", use_auth=True "GET",
f"{self.base_url}/models/{model_id}",
use_auth=True,
) )
if success: if success:
# Also return model type along with versions # Also return model type along with versions
@@ -346,7 +351,9 @@ class CivitaiClient:
async def _fetch_model_data(self, model_id: int) -> Optional[Dict]: async def _fetch_model_data(self, model_id: int) -> Optional[Dict]:
success, data = await self._make_request( success, data = await self._make_request(
"GET", f"{self.base_url}/models/{model_id}", use_auth=True "GET",
f"{self.base_url}/models/{model_id}",
use_auth=True,
) )
if success: if success:
return data return data
@@ -358,7 +365,9 @@ class CivitaiClient:
return None return None
success, version = await self._make_request( success, version = await self._make_request(
"GET", f"{self.base_url}/model-versions/{version_id}", use_auth=True "GET",
f"{self.base_url}/model-versions/{version_id}",
use_auth=True,
) )
if success: if success:
return version return version
@@ -371,7 +380,9 @@ class CivitaiClient:
return None return None
success, version = await self._make_request( success, version = await self._make_request(
"GET", f"{self.base_url}/model-versions/by-hash/{model_hash}", use_auth=True "GET",
f"{self.base_url}/model-versions/by-hash/{model_hash}",
use_auth=True,
) )
if success: if success:
return version return version
@@ -453,13 +464,11 @@ class CivitaiClient:
try: try:
url = f"{self.base_url}/model-versions/{version_id}" url = f"{self.base_url}/model-versions/{version_id}"
logger.debug(f"Resolving DNS for model version info: {url}") logger.debug("Resolving Civitai model version info: %s", url)
success, result = await self._make_request("GET", url, use_auth=True) success, result = await self._make_request("GET", url, use_auth=True)
if success: if success:
logger.debug( logger.debug("Successfully fetched model version info for: %s", version_id)
f"Successfully fetched model version info for: {version_id}"
)
self._remove_comfy_metadata(result) self._remove_comfy_metadata(result)
return result, None return result, None
@@ -479,48 +488,58 @@ class CivitaiClient:
logger.error(error_msg) logger.error(error_msg)
return None, error_msg return None, error_msg
async def get_image_info(self, image_id: str) -> Optional[Dict]: async def get_image_info(
self, image_id: str, source_url: str | None = None
) -> Optional[Dict]:
"""Fetch image information from Civitai API """Fetch image information from Civitai API
Args: Args:
image_id: The Civitai image ID image_id: The Civitai image ID
source_url: Original image page URL. Accepted for caller compatibility;
API requests always target ``civitai.red``.
Returns: Returns:
Optional[Dict]: The image data or None if not found Optional[Dict]: The image data or None if not found
""" """
try: try:
url = f"{self.base_url}/images?imageId={image_id}&nsfw=X"
requested_id = int(image_id) requested_id = int(image_id)
url = self._build_image_info_url(image_id)
logger.debug(f"Fetching image info for ID: {image_id}")
success, result = await self._make_request("GET", url, use_auth=True) success, result = await self._make_request("GET", url, use_auth=True)
if success: if not success:
if result and "items" in result and isinstance(result["items"], list): logger.error(
items = result["items"] "Failed to fetch image info for ID %s from civitai.red: %s",
image_id,
# First, try to find the item with matching ID result,
for item in items: )
if isinstance(item, dict) and item.get("id") == requested_id:
logger.debug(f"Successfully fetched image info for ID: {image_id}")
return item
# No matching ID found - log warning with details about returned items
returned_ids = [
item.get("id") for item in items
if isinstance(item, dict) and "id" in item
]
logger.warning(
f"CivitAI API returned no matching image for requested ID {image_id}. "
f"Returned {len(items)} item(s) with IDs: {returned_ids}. "
f"This may indicate the image was deleted, hidden, or there is a database lag."
)
return None
logger.warning(f"No image found with ID: {image_id}")
return None return None
logger.error(f"Failed to fetch image info for ID: {image_id}: {result}") if result and "items" in result and isinstance(result["items"], list):
items = result["items"]
for item in items:
if isinstance(item, dict) and item.get("id") == requested_id:
logger.debug(
"Successfully fetched image info for ID %s from civitai.red",
image_id,
)
return item
returned_ids = [
item.get("id")
for item in items
if isinstance(item, dict) and "id" in item
]
logger.warning(
"CivitAI API returned no matching image for requested ID %s from civitai.red. Returned %d item(s) with IDs: %s. This may indicate the image was deleted, hidden, or there is a database lag.",
image_id,
len(items),
returned_ids,
)
return None
logger.warning("No image found with ID: %s", image_id)
return None return None
except RateLimitError: except RateLimitError:
raise raise
@@ -539,8 +558,12 @@ class CivitaiClient:
return None return None
try: try:
url = f"{self.base_url}/models?username={username}" success, result = await self._make_request(
success, result = await self._make_request("GET", url, use_auth=True) "GET",
f"{self.base_url}/models",
use_auth=True,
params={"username": username},
)
if not success: if not success:
logger.error("Failed to fetch models for %s: %s", username, result) logger.error("Failed to fetch models for %s: %s", username, result)

View File

@@ -7,11 +7,13 @@ with category filtering and enriched results including post counts.
from __future__ import annotations from __future__ import annotations
import logging import logging
import re
from typing import List, Dict, Any, Optional from typing import List, Dict, Any, Optional
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_EMBEDDED_COMMAND_PATTERN = re.compile(r"\s/\w")
class CustomWordsService: class CustomWordsService:
"""Service for autocomplete via TagFTSIndex. """Service for autocomplete via TagFTSIndex.
@@ -77,12 +79,28 @@ class CustomWordsService:
Returns: Returns:
List of dicts with tag_name, category, and post_count. List of dicts with tag_name, category, and post_count.
""" """
normalized_search = search_term.strip()
if not normalized_search:
return []
# Prompt widgets should only send the active token, but guard against
# accidental full-prompt queries reaching the FTS path.
if (
"__" in normalized_search
or "," in normalized_search
or ">" in normalized_search
or "\n" in normalized_search
or "\r" in normalized_search
or _EMBEDDED_COMMAND_PATTERN.search(normalized_search)
):
logger.debug("Skipping prompt-like custom words query: %s", normalized_search)
return []
tag_index = self._get_tag_index() tag_index = self._get_tag_index()
if tag_index is not None: if tag_index is not None:
results = tag_index.search( return tag_index.search(
search_term, categories=categories, limit=limit, offset=offset normalized_search, categories=categories, limit=limit, offset=offset
) )
return results
logger.debug("TagFTSIndex not available, returning empty results") logger.debug("TagFTSIndex not available, returning empty results")
return [] return []

View File

@@ -31,6 +31,11 @@ import tempfile
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
CIVITAI_DOWNLOAD_URL_PREFIXES = (
"https://civitai.com/api/download/",
"https://civitai.red/api/download/",
)
class DownloadManager: class DownloadManager:
_instance = None _instance = None
@@ -647,12 +652,12 @@ class DownloadManager:
civitai_urls = [ civitai_urls = [
u u
for u in download_urls for u in download_urls
if u.startswith("https://civitai.com/api/download/") if u.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
] ]
non_civitai_urls = [ non_civitai_urls = [
u u
for u in download_urls for u in download_urls
if not u.startswith("https://civitai.com/api/download/") if not u.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
] ]
download_urls = non_civitai_urls + civitai_urls download_urls = non_civitai_urls + civitai_urls
else: else:
@@ -1133,7 +1138,7 @@ class DownloadManager:
pause_control.update_stall_timeout(downloader.stall_timeout) pause_control.update_stall_timeout(downloader.stall_timeout)
last_error = None last_error = None
for download_url in download_urls: for download_url in download_urls:
use_auth = download_url.startswith("https://civitai.com/api/download/") use_auth = download_url.startswith(CIVITAI_DOWNLOAD_URL_PREFIXES)
download_kwargs = { download_kwargs = {
"progress_callback": lambda progress, snapshot=None: ( "progress_callback": lambda progress, snapshot=None: (
self._handle_download_progress( self._handle_download_progress(

View File

@@ -12,6 +12,7 @@ from typing import Any, Dict, Iterable, List, Mapping, Optional, Sequence
from .errors import RateLimitError, ResourceNotFoundError from .errors import RateLimitError, ResourceNotFoundError
from .settings_manager import get_settings_manager from .settings_manager import get_settings_manager
from ..utils.cache_paths import CacheType, resolve_cache_path_with_migration
from ..utils.civitai_utils import rewrite_preview_url from ..utils.civitai_utils import rewrite_preview_url
from ..utils.preview_selection import resolve_mature_threshold, select_preview_media from ..utils.preview_selection import resolve_mature_threshold, select_preview_media
@@ -234,12 +235,52 @@ class ModelUpdateService:
ON model_update_versions(model_id); ON model_update_versions(model_id);
""" """
def __init__(self, db_path: str, *, ttl_seconds: int = 24 * 60 * 60, settings_manager=None) -> None: def __init__(
self._db_path = db_path self,
db_path: str | None = None,
*,
ttl_seconds: int = 24 * 60 * 60,
settings_manager=None,
) -> None:
self._settings = settings_manager or get_settings_manager()
self._library_name = self._get_active_library_name()
self._db_path = db_path or self._resolve_default_path(self._library_name)
self._ttl_seconds = ttl_seconds self._ttl_seconds = ttl_seconds
self._lock = asyncio.Lock() self._lock = asyncio.Lock()
self._schema_initialized = False self._schema_initialized = False
self._settings = settings_manager or get_settings_manager() self._custom_db_path = db_path is not None
self._ensure_directory()
self._initialize_schema()
def _get_active_library_name(self) -> str:
try:
value = self._settings.get_active_library_name()
except Exception:
value = None
return value or "default"
def _resolve_default_path(self, library_name: str) -> str:
env_override = os.environ.get("LORA_MANAGER_MODEL_UPDATE_DB")
return resolve_cache_path_with_migration(
CacheType.MODEL_UPDATE,
library_name=library_name,
env_override=env_override,
)
def on_library_changed(self) -> None:
"""Switch to the database for the active library."""
if self._custom_db_path:
return
library_name = self._get_active_library_name()
new_path = self._resolve_default_path(library_name)
if new_path == self._db_path:
return
self._library_name = library_name
self._db_path = new_path
self._schema_initialized = False
self._ensure_directory() self._ensure_directory()
self._initialize_schema() self._initialize_schema()
@@ -262,11 +303,114 @@ class ModelUpdateService:
conn.execute("PRAGMA foreign_keys = ON") conn.execute("PRAGMA foreign_keys = ON")
conn.executescript(self._SCHEMA) conn.executescript(self._SCHEMA)
self._apply_migrations(conn) self._apply_migrations(conn)
self._migrate_from_legacy_snapshot(conn)
self._schema_initialized = True self._schema_initialized = True
except Exception as exc: # pragma: no cover - defensive guard except Exception as exc: # pragma: no cover - defensive guard
logger.error("Failed to initialize update schema: %s", exc, exc_info=True) logger.error("Failed to initialize update schema: %s", exc, exc_info=True)
raise raise
def _migrate_from_legacy_snapshot(self, conn: sqlite3.Connection) -> None:
"""Copy update tracking data out of the legacy model snapshot database."""
if self._custom_db_path:
return
try:
from .persistent_model_cache import get_persistent_cache
legacy_path = get_persistent_cache(self._library_name).get_database_path()
except Exception:
return
if not legacy_path or os.path.abspath(legacy_path) == os.path.abspath(self._db_path):
return
if not os.path.exists(legacy_path):
return
try:
existing_row = conn.execute(
"SELECT 1 FROM model_update_status LIMIT 1"
).fetchone()
if existing_row:
return
except Exception:
return
try:
with sqlite3.connect(legacy_path, check_same_thread=False) as legacy_conn:
legacy_conn.row_factory = sqlite3.Row
status_rows = legacy_conn.execute(
"""
SELECT model_id, model_type, last_checked_at, should_ignore_model
FROM model_update_status
"""
).fetchall()
if not status_rows:
return
version_rows = legacy_conn.execute(
"""
SELECT model_id, version_id, sort_index, name, base_model, released_at,
size_bytes, preview_url, is_in_library, should_ignore,
early_access_ends_at, is_early_access
FROM model_update_versions
ORDER BY model_id ASC, sort_index ASC, version_id ASC
"""
).fetchall()
conn.execute("BEGIN")
conn.executemany(
"""
INSERT OR REPLACE INTO model_update_status (
model_id, model_type, last_checked_at, should_ignore_model
) VALUES (?, ?, ?, ?)
""",
[
(
int(row["model_id"]),
row["model_type"],
row["last_checked_at"],
int(row["should_ignore_model"] or 0),
)
for row in status_rows
],
)
conn.executemany(
"""
INSERT OR REPLACE INTO model_update_versions (
model_id, version_id, sort_index, name, base_model, released_at,
size_bytes, preview_url, is_in_library, should_ignore,
early_access_ends_at, is_early_access
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""",
[
(
int(row["model_id"]),
int(row["version_id"]),
int(row["sort_index"] or 0),
row["name"],
row["base_model"],
row["released_at"],
row["size_bytes"],
row["preview_url"],
int(row["is_in_library"] or 0),
int(row["should_ignore"] or 0),
row["early_access_ends_at"],
int(row["is_early_access"] or 0),
)
for row in version_rows
],
)
conn.commit()
logger.info(
"Migrated model update tracking data from legacy snapshot DB for %s",
self._library_name,
)
except sqlite3.OperationalError as exc:
logger.debug("Legacy model update migration skipped: %s", exc)
except Exception as exc: # pragma: no cover - defensive guard
logger.warning("Failed to migrate model update data: %s", exc, exc_info=True)
def _apply_migrations(self, conn: sqlite3.Connection) -> None: def _apply_migrations(self, conn: sqlite3.Connection) -> None:
"""Ensure legacy databases match the current schema without dropping data.""" """Ensure legacy databases match the current schema without dropping data."""

View File

@@ -18,6 +18,7 @@ from .service_registry import ServiceRegistry
from .lora_scanner import LoraScanner from .lora_scanner import LoraScanner
from .metadata_service import get_default_metadata_provider from .metadata_service import get_default_metadata_provider
from .checkpoint_scanner import CheckpointScanner from .checkpoint_scanner import CheckpointScanner
from .settings_manager import get_settings_manager
from .recipes.errors import RecipeNotFoundError from .recipes.errors import RecipeNotFoundError
from ..utils.utils import calculate_recipe_fingerprint, fuzzy_match from ..utils.utils import calculate_recipe_fingerprint, fuzzy_match
from natsort import natsorted from natsort import natsorted
@@ -951,6 +952,30 @@ class RecipeScanner:
except Exception as exc: except Exception as exc:
logger.debug("Failed to update FTS index for recipe: %s", exc) logger.debug("Failed to update FTS index for recipe: %s", exc)
@staticmethod
def _normalize_recipe_gen_params(recipe_data: Dict[str, Any]) -> Dict[str, Any]:
"""Return a recipe copy with normalized generation parameter aliases added."""
normalized_recipe = dict(recipe_data)
gen_params = recipe_data.get("gen_params")
if not isinstance(gen_params, dict):
return normalized_recipe
normalized_gen_params = dict(gen_params)
for key, value in gen_params.items():
if value in (None, ""):
continue
normalized_key = GenParamsMerger.NORMALIZATION_MAPPING.get(key, key)
if normalized_key not in GenParamsMerger.ALLOWED_KEYS:
continue
if normalized_gen_params.get(normalized_key) in (None, ""):
normalized_gen_params[normalized_key] = value
normalized_recipe["gen_params"] = normalized_gen_params
return normalized_recipe
async def _enrich_cache_metadata(self) -> None: async def _enrich_cache_metadata(self) -> None:
"""Perform remote metadata enrichment after the initial scan.""" """Perform remote metadata enrichment after the initial scan."""
@@ -1090,6 +1115,14 @@ class RecipeScanner:
@property @property
def recipes_dir(self) -> str: def recipes_dir(self) -> str:
"""Get path to recipes directory""" """Get path to recipes directory"""
custom_recipes_dir = get_settings_manager().get("recipes_path", "")
if isinstance(custom_recipes_dir, str) and custom_recipes_dir.strip():
recipes_dir = os.path.abspath(
os.path.normpath(os.path.expanduser(custom_recipes_dir.strip()))
)
os.makedirs(recipes_dir, exist_ok=True)
return recipes_dir
if not config.loras_roots: if not config.loras_roots:
return "" return ""
@@ -1336,6 +1369,7 @@ class RecipeScanner:
# Ensure gen_params exists # Ensure gen_params exists
if "gen_params" not in recipe_data: if "gen_params" not in recipe_data:
recipe_data["gen_params"] = {} recipe_data["gen_params"] = {}
recipe_data = self._normalize_recipe_gen_params(recipe_data)
# Update lora information with local paths and availability # Update lora information with local paths and availability
lora_metadata_updated = await self._update_lora_information(recipe_data) lora_metadata_updated = await self._update_lora_information(recipe_data)
@@ -2046,7 +2080,10 @@ class RecipeScanner:
end_idx = min(start_idx + page_size, total_items) end_idx = min(start_idx + page_size, total_items)
# Get paginated items # Get paginated items
paginated_items = filtered_data[start_idx:end_idx] paginated_items = [
self._normalize_recipe_gen_params(item)
for item in filtered_data[start_idx:end_idx]
]
# Add inLibrary information and URLs for each recipe # Add inLibrary information and URLs for each recipe
for item in paginated_items: for item in paginated_items:
@@ -2105,8 +2142,18 @@ class RecipeScanner:
if not recipe: if not recipe:
return None return None
# Prefer the on-disk recipe JSON for fields that are not persisted in the
# SQLite cache yet, such as source_path.
merged_recipe = self._normalize_recipe_gen_params({**recipe})
recipe_json = await self._load_recipe_json(recipe_id)
if recipe_json:
for field in ("source_path", "checkpoint", "loras", "gen_params"):
if field not in recipe_json:
merged_recipe.pop(field, None)
merged_recipe.update(recipe_json)
# Format the recipe with all needed information # Format the recipe with all needed information
formatted_recipe = {**recipe} # Copy all fields formatted_recipe = {**merged_recipe}
# Format file path to URL # Format file path to URL
if "file_path" in formatted_recipe: if "file_path" in formatted_recipe:
@@ -2140,6 +2187,30 @@ class RecipeScanner:
return formatted_recipe return formatted_recipe
async def _load_recipe_json(self, recipe_id: str) -> Optional[Dict[str, Any]]:
"""Load the raw recipe JSON payload for a recipe ID if it exists."""
recipe_json_path = await self.get_recipe_json_path(recipe_id)
if not recipe_json_path or not os.path.exists(recipe_json_path):
return None
try:
with open(recipe_json_path, "r", encoding="utf-8") as f:
recipe_data = json.load(f)
except Exception as exc:
logger.debug(
"Failed to load recipe JSON for %s from %s: %s",
recipe_id,
recipe_json_path,
exc,
)
return None
if not isinstance(recipe_data, dict):
return None
return self._normalize_recipe_gen_params(recipe_data)
def _format_file_url(self, file_path: str) -> str: def _format_file_url(self, file_path: str) -> str:
"""Format file path as URL for serving in web UI""" """Format file path as URL for serving in web UI"""
if not file_path: if not file_path:

View File

@@ -5,7 +5,6 @@ from __future__ import annotations
import base64 import base64
import io import io
import os import os
import re
import tempfile import tempfile
from dataclasses import dataclass from dataclasses import dataclass
from typing import Any, Callable, Optional from typing import Any, Callable, Optional
@@ -14,7 +13,7 @@ import numpy as np
from PIL import Image from PIL import Image
from ...utils.utils import calculate_recipe_fingerprint from ...utils.utils import calculate_recipe_fingerprint
from ...utils.civitai_utils import rewrite_preview_url from ...utils.civitai_utils import extract_civitai_image_id, rewrite_preview_url
from .errors import ( from .errors import (
RecipeDownloadError, RecipeDownloadError,
RecipeNotFoundError, RecipeNotFoundError,
@@ -104,9 +103,11 @@ class RecipeAnalysisService:
extension = ".jpg" # Default extension = ".jpg" # Default
try: try:
civitai_match = re.match(r"https://civitai\.com/images/(\d+)", url) civitai_image_id = extract_civitai_image_id(url)
if civitai_match: if civitai_image_id:
image_info = await civitai_client.get_image_info(civitai_match.group(1)) image_info = await civitai_client.get_image_info(
civitai_image_id, source_url=url
)
if not image_info: if not image_info:
raise RecipeDownloadError( raise RecipeDownloadError(
"Failed to fetch image information from Civitai" "Failed to fetch image information from Civitai"

View File

@@ -12,6 +12,7 @@ from dataclasses import dataclass
from typing import Any, Dict, Iterable, Optional from typing import Any, Dict, Iterable, Optional
from ...config import config from ...config import config
from ...recipes.constants import GEN_PARAM_KEYS
from ...utils.utils import calculate_recipe_fingerprint from ...utils.utils import calculate_recipe_fingerprint
from .errors import RecipeNotFoundError, RecipeValidationError from .errors import RecipeNotFoundError, RecipeValidationError
@@ -90,23 +91,7 @@ class RecipePersistenceService:
current_time = time.time() current_time = time.time()
loras_data = [self._normalise_lora_entry(lora) for lora in (metadata.get("loras") or [])] loras_data = [self._normalise_lora_entry(lora) for lora in (metadata.get("loras") or [])]
checkpoint_entry = self._sanitize_checkpoint_entry(self._extract_checkpoint_entry(metadata)) checkpoint_entry = self._sanitize_checkpoint_entry(self._extract_checkpoint_entry(metadata))
gen_params = self._sanitize_gen_params_for_storage(metadata)
gen_params = metadata.get("gen_params") or {}
if not gen_params and "raw_metadata" in metadata:
raw_metadata = metadata.get("raw_metadata", {})
gen_params = {
"prompt": raw_metadata.get("prompt", ""),
"negative_prompt": raw_metadata.get("negative_prompt", ""),
"steps": raw_metadata.get("steps", ""),
"sampler": raw_metadata.get("sampler", ""),
"cfg_scale": raw_metadata.get("cfg_scale", ""),
"seed": raw_metadata.get("seed", ""),
"size": raw_metadata.get("size", ""),
"clip_skip": raw_metadata.get("clip_skip", ""),
}
# Drop checkpoint duplication from generation parameters to store it only at top level
gen_params.pop("checkpoint", None)
fingerprint = calculate_recipe_fingerprint(loras_data) fingerprint = calculate_recipe_fingerprint(loras_data)
recipe_data: Dict[str, Any] = { recipe_data: Dict[str, Any] = {
@@ -133,6 +118,7 @@ class RecipePersistenceService:
json_filename = f"{recipe_id}.recipe.json" json_filename = f"{recipe_id}.recipe.json"
json_path = os.path.join(recipes_dir, json_filename) json_path = os.path.join(recipes_dir, json_filename)
json_path = os.path.normpath(json_path) json_path = os.path.normpath(json_path)
with open(json_path, "w", encoding="utf-8") as file_obj: with open(json_path, "w", encoding="utf-8") as file_obj:
json.dump(recipe_data, file_obj, indent=4, ensure_ascii=False) json.dump(recipe_data, file_obj, indent=4, ensure_ascii=False)
@@ -152,6 +138,30 @@ class RecipePersistenceService:
} }
) )
@staticmethod
def _sanitize_gen_params_for_storage(metadata: dict[str, Any]) -> dict[str, Any]:
gen_params = metadata.get("gen_params")
if isinstance(gen_params, dict) and gen_params:
source = gen_params
else:
source = metadata.get("raw_metadata")
if not isinstance(source, dict):
return {}
allowed_keys = set(GEN_PARAM_KEYS)
sanitized: dict[str, Any] = {}
for key in allowed_keys:
if key not in source:
continue
value = source.get(key)
if value in (None, ""):
continue
sanitized[key] = value
sanitized.pop("checkpoint", None)
return sanitized
async def delete_recipe(self, *, recipe_scanner, recipe_id: str) -> PersistenceResult: async def delete_recipe(self, *, recipe_scanner, recipe_id: str) -> PersistenceResult:
"""Delete an existing recipe.""" """Delete an existing recipe."""

View File

@@ -159,10 +159,9 @@ class ServiceRegistry:
return cls._services[service_name] return cls._services[service_name]
from .model_update_service import ModelUpdateService from .model_update_service import ModelUpdateService
from .persistent_model_cache import get_persistent_cache from .settings_manager import get_settings_manager
cache = get_persistent_cache() service = ModelUpdateService(settings_manager=get_settings_manager())
service = ModelUpdateService(cache.get_database_path())
cls._services[service_name] = service cls._services[service_name] = service
logger.debug(f"Created and registered {service_name}") logger.debug(f"Created and registered {service_name}")
return service return service
@@ -189,6 +188,26 @@ class ServiceRegistry:
logger.debug(f"Created and registered {service_name}") logger.debug(f"Created and registered {service_name}")
return service return service
@classmethod
async def get_backup_service(cls):
"""Get or create the backup service."""
service_name = "backup_service"
if service_name in cls._services:
return cls._services[service_name]
async with cls._get_lock(service_name):
if service_name in cls._services:
return cls._services[service_name]
from .backup_service import BackupService
service = await BackupService.get_instance()
cls._services[service_name] = service
logger.debug(f"Created and registered {service_name}")
return service
@classmethod @classmethod
async def get_civarchive_client(cls): async def get_civarchive_client(cls):
"""Get or create CivArchive client instance""" """Get or create CivArchive client instance"""

View File

@@ -3,6 +3,7 @@ import copy
import json import json
import os import os
import shutil import shutil
import tempfile
import logging import logging
from pathlib import Path from pathlib import Path
from datetime import datetime, timezone from datetime import datetime, timezone
@@ -53,6 +54,7 @@ DEFAULT_KEYS_CLEANUP_THRESHOLD = 10
DEFAULT_SETTINGS: Dict[str, Any] = { DEFAULT_SETTINGS: Dict[str, Any] = {
"civitai_api_key": "", "civitai_api_key": "",
"civitai_host": "civitai.com",
"use_portable_settings": False, "use_portable_settings": False,
"hash_chunk_size_mb": DEFAULT_HASH_CHUNK_SIZE_MB, "hash_chunk_size_mb": DEFAULT_HASH_CHUNK_SIZE_MB,
"language": "en", "language": "en",
@@ -70,6 +72,7 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
"default_checkpoint_root": "", "default_checkpoint_root": "",
"default_unet_root": "", "default_unet_root": "",
"default_embedding_root": "", "default_embedding_root": "",
"recipes_path": "",
"base_model_path_mappings": {}, "base_model_path_mappings": {},
"download_path_templates": {}, "download_path_templates": {},
"folder_paths": {}, "folder_paths": {},
@@ -93,6 +96,8 @@ DEFAULT_SETTINGS: Dict[str, Any] = {
"metadata_refresh_skip_paths": [], "metadata_refresh_skip_paths": [],
"skip_previously_downloaded_model_versions": False, "skip_previously_downloaded_model_versions": False,
"download_skip_base_models": [], "download_skip_base_models": [],
"backup_auto_enabled": True,
"backup_retention_count": 5,
} }
@@ -254,6 +259,7 @@ class SettingsManager:
default_checkpoint_root=merged.get("default_checkpoint_root"), default_checkpoint_root=merged.get("default_checkpoint_root"),
default_unet_root=merged.get("default_unet_root"), default_unet_root=merged.get("default_unet_root"),
default_embedding_root=merged.get("default_embedding_root"), default_embedding_root=merged.get("default_embedding_root"),
recipes_path=merged.get("recipes_path"),
) )
} }
merged["active_library"] = library_name merged["active_library"] = library_name
@@ -382,6 +388,7 @@ class SettingsManager:
), ),
default_unet_root=self.settings.get("default_unet_root", ""), default_unet_root=self.settings.get("default_unet_root", ""),
default_embedding_root=self.settings.get("default_embedding_root", ""), default_embedding_root=self.settings.get("default_embedding_root", ""),
recipes_path=self.settings.get("recipes_path", ""),
) )
libraries = {library_name: library_payload} libraries = {library_name: library_payload}
self.settings["libraries"] = libraries self.settings["libraries"] = libraries
@@ -429,6 +436,7 @@ class SettingsManager:
default_checkpoint_root=data.get("default_checkpoint_root"), default_checkpoint_root=data.get("default_checkpoint_root"),
default_unet_root=data.get("default_unet_root"), default_unet_root=data.get("default_unet_root"),
default_embedding_root=data.get("default_embedding_root"), default_embedding_root=data.get("default_embedding_root"),
recipes_path=data.get("recipes_path"),
metadata=data.get("metadata"), metadata=data.get("metadata"),
base=data, base=data,
) )
@@ -475,6 +483,7 @@ class SettingsManager:
self.settings["default_embedding_root"] = active_library.get( self.settings["default_embedding_root"] = active_library.get(
"default_embedding_root", "" "default_embedding_root", ""
) )
self.settings["recipes_path"] = active_library.get("recipes_path", "")
if save: if save:
self._save_settings() self._save_settings()
@@ -491,6 +500,7 @@ class SettingsManager:
default_checkpoint_root: Optional[str] = None, default_checkpoint_root: Optional[str] = None,
default_unet_root: Optional[str] = None, default_unet_root: Optional[str] = None,
default_embedding_root: Optional[str] = None, default_embedding_root: Optional[str] = None,
recipes_path: Optional[str] = None,
metadata: Optional[Mapping[str, Any]] = None, metadata: Optional[Mapping[str, Any]] = None,
base: Optional[Mapping[str, Any]] = None, base: Optional[Mapping[str, Any]] = None,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
@@ -529,6 +539,11 @@ class SettingsManager:
else: else:
payload.setdefault("default_embedding_root", "") payload.setdefault("default_embedding_root", "")
if recipes_path is not None:
payload["recipes_path"] = recipes_path
else:
payload.setdefault("recipes_path", "")
if metadata: if metadata:
merged_meta = dict(payload.get("metadata", {})) merged_meta = dict(payload.get("metadata", {}))
merged_meta.update(metadata) merged_meta.update(metadata)
@@ -630,6 +645,7 @@ class SettingsManager:
default_checkpoint_root: Optional[str] = None, default_checkpoint_root: Optional[str] = None,
default_unet_root: Optional[str] = None, default_unet_root: Optional[str] = None,
default_embedding_root: Optional[str] = None, default_embedding_root: Optional[str] = None,
recipes_path: Optional[str] = None,
) -> bool: ) -> bool:
libraries = self.settings.get("libraries", {}) libraries = self.settings.get("libraries", {})
active_name = self.settings.get("active_library") active_name = self.settings.get("active_library")
@@ -679,6 +695,10 @@ class SettingsManager:
library["default_embedding_root"] = default_embedding_root library["default_embedding_root"] = default_embedding_root
changed = True changed = True
if recipes_path is not None and library.get("recipes_path") != recipes_path:
library["recipes_path"] = recipes_path
changed = True
if changed: if changed:
library.setdefault("created_at", self._current_timestamp()) library.setdefault("created_at", self._current_timestamp())
library["updated_at"] = self._current_timestamp() library["updated_at"] = self._current_timestamp()
@@ -942,7 +962,9 @@ class SettingsManager:
extra_folder_paths=defaults.get("extra_folder_paths", {}), extra_folder_paths=defaults.get("extra_folder_paths", {}),
default_lora_root=defaults.get("default_lora_root"), default_lora_root=defaults.get("default_lora_root"),
default_checkpoint_root=defaults.get("default_checkpoint_root"), default_checkpoint_root=defaults.get("default_checkpoint_root"),
default_unet_root=defaults.get("default_unet_root"),
default_embedding_root=defaults.get("default_embedding_root"), default_embedding_root=defaults.get("default_embedding_root"),
recipes_path=defaults.get("recipes_path"),
) )
defaults["libraries"] = {library_name: default_library} defaults["libraries"] = {library_name: default_library}
defaults["active_library"] = library_name defaults["active_library"] = library_name
@@ -1236,6 +1258,193 @@ class SettingsManager:
"""Get setting value""" """Get setting value"""
return self.settings.get(key, default) return self.settings.get(key, default)
def _normalize_recipes_path_value(self, value: Any) -> str:
"""Return a normalized absolute recipes path or an empty string."""
if not isinstance(value, str):
value = "" if value is None else str(value)
stripped = value.strip()
if not stripped:
return ""
return os.path.abspath(os.path.normpath(os.path.expanduser(stripped)))
def _get_effective_recipes_dir(self, recipes_path: Optional[str] = None) -> str:
"""Resolve the effective recipes directory for the active library."""
normalized_custom = self._normalize_recipes_path_value(
self.settings.get("recipes_path", "")
if recipes_path is None
else recipes_path
)
if normalized_custom:
return normalized_custom
folder_paths = self.settings.get("folder_paths", {})
configured_lora_roots = []
if isinstance(folder_paths, Mapping):
raw_lora_roots = folder_paths.get("loras", [])
if isinstance(raw_lora_roots, Sequence) and not isinstance(
raw_lora_roots, (str, bytes)
):
configured_lora_roots = [
path
for path in raw_lora_roots
if isinstance(path, str) and path.strip()
]
if configured_lora_roots:
lora_root = sorted(configured_lora_roots, key=str.casefold)[0]
return os.path.abspath(os.path.join(lora_root, "recipes"))
config_lora_roots = [
path
for path in getattr(config, "loras_roots", []) or []
if isinstance(path, str) and path.strip()
]
if not config_lora_roots:
return ""
return os.path.abspath(
os.path.join(sorted(config_lora_roots, key=str.casefold)[0], "recipes")
)
def _validate_recipes_storage_path(self, normalized_path: str) -> None:
"""Ensure the recipes storage target is usable before saving it."""
if not normalized_path:
return
if os.path.exists(normalized_path) and not os.path.isdir(normalized_path):
raise ValueError("Recipes path must point to a directory")
try:
os.makedirs(normalized_path, exist_ok=True)
except Exception as exc:
raise ValueError(f"Unable to create recipes directory: {exc}") from exc
try:
fd, probe_path = tempfile.mkstemp(
prefix=".lora-manager-recipes-", dir=normalized_path
)
os.close(fd)
os.remove(probe_path)
except Exception as exc:
raise ValueError(f"Recipes path is not writable: {exc}") from exc
def _migrate_recipes_directory(self, source_dir: str, target_dir: str) -> None:
"""Move existing recipe files to a new recipes root and rewrite JSON paths."""
source = os.path.abspath(os.path.normpath(source_dir)) if source_dir else ""
target = os.path.abspath(os.path.normpath(target_dir)) if target_dir else ""
if not source or not target or source == target:
return
if not os.path.exists(source):
os.makedirs(target, exist_ok=True)
return
if os.path.exists(target) and not os.path.isdir(target):
raise ValueError("Recipes path must point to a directory")
try:
common_root = os.path.commonpath([source, target])
except ValueError as exc:
raise ValueError("Invalid recipes path change") from exc
if common_root == source:
raise ValueError("Recipes path cannot be moved into a nested directory")
planned_recipe_updates: Dict[str, Dict[str, Any]] = {}
file_pairs: List[Tuple[str, str]] = []
for root, _, files in os.walk(source):
for filename in files:
source_path = os.path.normpath(os.path.join(root, filename))
relative_path = os.path.relpath(source_path, source)
target_path = os.path.normpath(os.path.join(target, relative_path))
file_pairs.append((source_path, target_path))
if not filename.endswith(".recipe.json"):
continue
try:
with open(source_path, "r", encoding="utf-8") as handle:
payload = json.load(handle)
except Exception as exc:
raise ValueError(
f"Unable to read recipe metadata during migration: {source_path}: {exc}"
) from exc
if not isinstance(payload, dict):
continue
file_path = payload.get("file_path")
if isinstance(file_path, str) and file_path.strip():
normalized_file_path = os.path.abspath(
os.path.normpath(os.path.expanduser(file_path))
)
source_candidates = [source]
real_source = os.path.abspath(
os.path.normpath(os.path.realpath(source_dir))
)
if real_source not in source_candidates:
source_candidates.append(real_source)
rewritten = False
for source_candidate in source_candidates:
try:
file_common_root = os.path.commonpath(
[normalized_file_path, source_candidate]
)
except ValueError:
continue
if file_common_root != source_candidate:
continue
image_relative_path = os.path.relpath(
normalized_file_path, source_candidate
)
payload["file_path"] = os.path.normpath(
os.path.join(target, image_relative_path)
)
rewritten = True
break
if not rewritten and source_candidates:
logger.debug(
"Skipping recipe file_path rewrite during migration for %s",
normalized_file_path,
)
planned_recipe_updates[target_path] = payload
for _, target_path in file_pairs:
if os.path.exists(target_path):
raise ValueError(
f"Recipes path already contains conflicting file: {target_path}"
)
os.makedirs(target, exist_ok=True)
for source_path, target_path in file_pairs:
os.makedirs(os.path.dirname(target_path), exist_ok=True)
shutil.move(source_path, target_path)
for target_path, payload in planned_recipe_updates.items():
with open(target_path, "w", encoding="utf-8") as handle:
json.dump(payload, handle, indent=4, ensure_ascii=False)
for root, dirs, files in os.walk(source, topdown=False):
if dirs or files:
continue
try:
os.rmdir(root)
except OSError:
pass
def set(self, key: str, value: Any) -> None: def set(self, key: str, value: Any) -> None:
"""Set setting value and save""" """Set setting value and save"""
if key == "auto_organize_exclusions": if key == "auto_organize_exclusions":
@@ -1246,6 +1455,12 @@ class SettingsManager:
value = self.normalize_download_skip_base_models(value) value = self.normalize_download_skip_base_models(value)
elif key == "mature_blur_level": elif key == "mature_blur_level":
value = self.normalize_mature_blur_level(value) value = self.normalize_mature_blur_level(value)
elif key == "recipes_path":
current_recipes_dir = self._get_effective_recipes_dir()
value = self._normalize_recipes_path_value(value)
target_recipes_dir = self._get_effective_recipes_dir(value)
self._validate_recipes_storage_path(target_recipes_dir)
self._migrate_recipes_directory(current_recipes_dir, target_recipes_dir)
self.settings[key] = value self.settings[key] = value
portable_switch_pending = False portable_switch_pending = False
if key == "use_portable_settings" and isinstance(value, bool): if key == "use_portable_settings" and isinstance(value, bool):
@@ -1263,9 +1478,13 @@ class SettingsManager:
self._update_active_library_entry(default_unet_root=str(value)) self._update_active_library_entry(default_unet_root=str(value))
elif key == "default_embedding_root": elif key == "default_embedding_root":
self._update_active_library_entry(default_embedding_root=str(value)) self._update_active_library_entry(default_embedding_root=str(value))
elif key == "recipes_path":
self._update_active_library_entry(recipes_path=str(value))
elif key == "model_name_display": elif key == "model_name_display":
self._notify_model_name_display_change(value) self._notify_model_name_display_change(value)
self._save_settings() self._save_settings()
if key == "recipes_path":
self._notify_library_change(self.get_active_library_name())
if portable_switch_pending: if portable_switch_pending:
self._finalize_portable_switch() self._finalize_portable_switch()
@@ -1575,6 +1794,7 @@ class SettingsManager:
default_checkpoint_root: Optional[str] = None, default_checkpoint_root: Optional[str] = None,
default_unet_root: Optional[str] = None, default_unet_root: Optional[str] = None,
default_embedding_root: Optional[str] = None, default_embedding_root: Optional[str] = None,
recipes_path: Optional[str] = None,
metadata: Optional[Mapping[str, Any]] = None, metadata: Optional[Mapping[str, Any]] = None,
activate: bool = False, activate: bool = False,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
@@ -1618,6 +1838,11 @@ class SettingsManager:
if default_embedding_root is not None if default_embedding_root is not None
else existing.get("default_embedding_root") else existing.get("default_embedding_root")
), ),
recipes_path=(
recipes_path
if recipes_path is not None
else existing.get("recipes_path")
),
metadata=metadata if metadata is not None else existing.get("metadata"), metadata=metadata if metadata is not None else existing.get("metadata"),
base=existing, base=existing,
) )
@@ -1645,6 +1870,7 @@ class SettingsManager:
default_checkpoint_root: str = "", default_checkpoint_root: str = "",
default_unet_root: str = "", default_unet_root: str = "",
default_embedding_root: str = "", default_embedding_root: str = "",
recipes_path: str = "",
metadata: Optional[Mapping[str, Any]] = None, metadata: Optional[Mapping[str, Any]] = None,
activate: bool = False, activate: bool = False,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
@@ -1662,6 +1888,7 @@ class SettingsManager:
default_checkpoint_root=default_checkpoint_root, default_checkpoint_root=default_checkpoint_root,
default_unet_root=default_unet_root, default_unet_root=default_unet_root,
default_embedding_root=default_embedding_root, default_embedding_root=default_embedding_root,
recipes_path=recipes_path,
metadata=metadata, metadata=metadata,
activate=activate, activate=activate,
) )
@@ -1721,6 +1948,7 @@ class SettingsManager:
default_checkpoint_root: Optional[str] = None, default_checkpoint_root: Optional[str] = None,
default_unet_root: Optional[str] = None, default_unet_root: Optional[str] = None,
default_embedding_root: Optional[str] = None, default_embedding_root: Optional[str] = None,
recipes_path: Optional[str] = None,
) -> None: ) -> None:
"""Update folder paths for the active library.""" """Update folder paths for the active library."""
@@ -1733,6 +1961,7 @@ class SettingsManager:
default_checkpoint_root=default_checkpoint_root, default_checkpoint_root=default_checkpoint_root,
default_unet_root=default_unet_root, default_unet_root=default_unet_root,
default_embedding_root=default_embedding_root, default_embedding_root=default_embedding_root,
recipes_path=recipes_path,
activate=True, activate=True,
) )
@@ -1757,6 +1986,7 @@ class SettingsManager:
"checkpoint_scanner", "checkpoint_scanner",
"embedding_scanner", "embedding_scanner",
"recipe_scanner", "recipe_scanner",
"model_update_service",
): ):
service = ServiceRegistry.get_service_sync(service_name) service = ServiceRegistry.get_service_sync(service_name)
if service and hasattr(service, "on_library_changed"): if service and hasattr(service, "on_library_changed"):

View File

@@ -450,9 +450,9 @@ class TagFTSIndex:
the tag_name, the result will include a "matched_alias" field. the tag_name, the result will include a "matched_alias" field.
Ranking is based on a combination of: Ranking is based on a combination of:
1. FTS5 bm25 relevance score (how well the text matches) 1. Exact prefix match boost (tag_name starts with query)
2. Post count (popularity) 2. Post count to preserve expected autocomplete ordering
3. Exact prefix match boost (tag_name starts with query) 3. FTS5 bm25 relevance score as a deterministic tie-breaker
Args: Args:
query: The search query string. query: The search query string.
@@ -484,65 +484,17 @@ class TagFTSIndex:
with self._lock: with self._lock:
conn = self._connect(readonly=True) conn = self._connect(readonly=True)
try: try:
# Build the SQL query with bm25 ranking sql, params = self._build_search_statement(
# FTS5 bm25() returns negative scores, lower is better query_lower=query_lower,
# We use -bm25() to get higher=better scores fts_query=fts_query,
# Weights: -100.0 for exact matches, 1.0 for others categories=categories,
# Add LOG10(post_count) weighting to boost popular tags limit=limit,
# Use CASE to boost tag_name prefix matches above alias matches offset=offset,
if categories: )
placeholders = ",".join("?" * len(categories))
sql = f"""
SELECT t.tag_name, t.category, t.post_count, t.aliases,
CASE
WHEN t.tag_name LIKE ? ESCAPE '\\' THEN 1
ELSE 0
END AS is_tag_name_match,
bm25(tag_fts, -100.0, 1.0, 1.0) + LOG10(t.post_count + 1) * 10.0 AS rank_score
FROM tag_fts
JOIN tags t ON tag_fts.rowid = t.rowid
WHERE tag_fts.searchable_text MATCH ?
AND t.category IN ({placeholders})
ORDER BY is_tag_name_match DESC, rank_score DESC
LIMIT ? OFFSET ?
"""
# Escape special LIKE characters and add wildcard
query_escaped = (
query_lower.lstrip("/")
.replace("\\", "\\\\")
.replace("%", "\\%")
.replace("_", "\\_")
)
params = (
[query_escaped + "%", fts_query]
+ categories
+ [limit, offset]
)
else:
sql = """
SELECT t.tag_name, t.category, t.post_count, t.aliases,
CASE
WHEN t.tag_name LIKE ? ESCAPE '\\' THEN 1
ELSE 0
END AS is_tag_name_match,
bm25(tag_fts, -100.0, 1.0, 1.0) + LOG10(t.post_count + 1) * 10.0 AS rank_score
FROM tag_fts
JOIN tags t ON tag_fts.rowid = t.rowid
WHERE tag_fts.searchable_text MATCH ?
ORDER BY is_tag_name_match DESC, rank_score DESC
LIMIT ? OFFSET ?
"""
query_escaped = (
query_lower.lstrip("/")
.replace("\\", "\\\\")
.replace("%", "\\%")
.replace("_", "\\_")
)
params = [query_escaped + "%", fts_query, limit, offset]
cursor = conn.execute(sql, params) cursor = conn.execute(sql, params)
rows = cursor.fetchall()
results = [] results = []
for row in cursor.fetchall(): for row in rows:
result = { result = {
"tag_name": row[0], "tag_name": row[0],
"category": row[1], "category": row[1],
@@ -571,6 +523,62 @@ class TagFTSIndex:
logger.debug("Tag FTS search error for query '%s': %s", query, exc) logger.debug("Tag FTS search error for query '%s': %s", query, exc)
return [] return []
def _build_search_statement(
self,
query_lower: str,
fts_query: str,
categories: Optional[List[int]],
limit: int,
offset: int,
) -> tuple[str, list[object]]:
"""Build the SQL statement and params for a tag search."""
# Escape special LIKE characters and add wildcard
query_escaped = (
query_lower.lstrip("/")
.replace("\\", "\\\\")
.replace("%", "\\%")
.replace("_", "\\_")
)
# FTS5 bm25() returns negative scores, lower is better.
# We use -bm25() to get higher=better scores, but keep post_count as the
# primary sort within tag-name prefix matches so autocomplete ordering
# remains aligned with the existing popularity-first behavior.
if categories:
placeholders = ",".join("?" * len(categories))
sql = f"""
SELECT t.tag_name, t.category, t.post_count, t.aliases,
CASE
WHEN t.tag_name LIKE ? ESCAPE '\\' THEN 1
ELSE 0
END AS is_tag_name_match,
bm25(tag_fts, -100.0, 1.0, 1.0) AS rank_score
FROM tag_fts
CROSS JOIN tags t ON t.rowid = tag_fts.rowid
WHERE tag_fts.searchable_text MATCH ?
AND t.category IN ({placeholders})
ORDER BY is_tag_name_match DESC, t.post_count DESC, rank_score DESC
LIMIT ? OFFSET ?
"""
params = [query_escaped + "%", fts_query] + categories + [limit, offset]
else:
sql = """
SELECT t.tag_name, t.category, t.post_count, t.aliases,
CASE
WHEN t.tag_name LIKE ? ESCAPE '\\' THEN 1
ELSE 0
END AS is_tag_name_match,
bm25(tag_fts, -100.0, 1.0, 1.0) AS rank_score
FROM tag_fts
JOIN tags t ON tag_fts.rowid = t.rowid
WHERE tag_fts.searchable_text MATCH ?
ORDER BY is_tag_name_match DESC, t.post_count DESC, rank_score DESC
LIMIT ? OFFSET ?
"""
params = [query_escaped + "%", fts_query, limit, offset]
return sql, params
def _find_matched_alias( def _find_matched_alias(
self, query: str, tag_name: str, aliases_str: str self, query: str, tag_name: str, aliases_str: str
) -> Optional[str]: ) -> Optional[str]:

View File

@@ -0,0 +1,428 @@
"""Managed wildcard loading, search, and text expansion."""
from __future__ import annotations
import json
import logging
import os
import random
import re
from dataclasses import dataclass
from typing import Any, Optional
import yaml
from ..utils.settings_paths import get_settings_dir
logger = logging.getLogger(__name__)
_WILDCARD_PATTERN = re.compile(r"__([\w\s.\-+/*\\]+?)__")
_OPTION_PATTERN = re.compile(r"{([^{}]*?)}")
_TRIGGER_WORD_PATTERN = re.compile(r"^trigger_words\d+$")
_WEIGHTED_OPTION_PATTERN = re.compile(r"^\s*([0-9.]+)::")
_NUMERIC_PATTERN = re.compile(r"^-?\d+(\.\d+)?$")
def _normalize_wildcard_key(value: str) -> str:
return value.replace("\\", "/").strip("/").lower()
def _is_numeric_string(value: str) -> bool:
return bool(_NUMERIC_PATTERN.match(value))
def contains_dynamic_syntax(text: str) -> bool:
"""Return True when text contains supported wildcard or option syntax."""
return isinstance(text, str) and bool(
_WILDCARD_PATTERN.search(text) or _OPTION_PATTERN.search(text)
)
def get_wildcards_dir(create: bool = False) -> str:
"""Return the managed wildcard directory inside the settings folder."""
settings_dir = get_settings_dir(create=create)
wildcards_dir = os.path.join(settings_dir, "wildcards")
if create:
os.makedirs(wildcards_dir, exist_ok=True)
return wildcards_dir
@dataclass(frozen=True)
class WildcardEntry:
key: str
values_count: int
@dataclass(frozen=True)
class WildcardMetadata:
has_wildcards: bool
wildcards_dir: str
supported_formats: tuple[str, ...]
class WildcardService:
"""Discover wildcard keys and expand wildcard syntax."""
_instance: Optional["WildcardService"] = None
def __new__(cls) -> "WildcardService":
if cls._instance is None:
cls._instance = super().__new__(cls)
return cls._instance
def __init__(self) -> None:
if getattr(self, "_initialized", False):
return
self._initialized = True
self._cached_signature: tuple[tuple[str, int, int], ...] | None = None
self._wildcard_dict: dict[str, list[str]] = {}
@classmethod
def get_instance(cls) -> "WildcardService":
return cls()
def search_keys(
self, search_term: str, limit: int = 20, offset: int = 0
) -> list[str]:
"""Search wildcard keys for autocomplete."""
normalized_term = _normalize_wildcard_key(search_term).strip()
if not normalized_term:
return []
ranked: list[tuple[int, str]] = []
compact_term = normalized_term.replace("/", "")
for key in self.get_wildcard_dict().keys():
score = self._score_entry(key, normalized_term, compact_term)
if score is not None:
ranked.append((score, key))
ranked.sort(key=lambda item: (-item[0], item[1]))
keys = [key for _, key in ranked]
return keys[offset : offset + limit]
def expand_text(self, text: str, seed: int | None = None) -> str:
"""Expand wildcard and dynamic prompt syntax for a text value."""
if not isinstance(text, str) or not text:
return text
rng = random.Random(seed) if seed is not None else random.Random()
wildcard_dict = self.get_wildcard_dict()
if not wildcard_dict:
return self._expand_options_only(text, rng)
current = text
remaining_depth = 100
while remaining_depth > 0:
remaining_depth -= 1
after_options, options_replaced = self._replace_options(current, rng)
current, wildcards_replaced = self._replace_wildcards(
after_options, rng, wildcard_dict
)
if not options_replaced and not wildcards_replaced:
break
return current
def get_wildcard_dict(self) -> dict[str, list[str]]:
signature = self._build_signature()
if signature != self._cached_signature:
self._wildcard_dict = self._scan_wildcard_dict()
self._cached_signature = signature
return self._wildcard_dict
def get_entries(self) -> list[WildcardEntry]:
return [
WildcardEntry(key=key, values_count=len(values))
for key, values in sorted(self.get_wildcard_dict().items())
]
def get_metadata(self, *, create_dir: bool = False) -> WildcardMetadata:
wildcards_dir = get_wildcards_dir(create=create_dir)
return WildcardMetadata(
has_wildcards=bool(self.get_wildcard_dict()),
wildcards_dir=wildcards_dir,
supported_formats=(".txt", ".yaml", ".yml", ".json"),
)
def _build_signature(self) -> tuple[tuple[str, int, int], ...]:
root = get_wildcards_dir(create=False)
if not os.path.isdir(root):
return ()
signature: list[tuple[str, int, int]] = []
for current_root, _dirs, files in os.walk(root, followlinks=True):
for file_name in sorted(files):
if not file_name.lower().endswith((".txt", ".yaml", ".yml", ".json")):
continue
file_path = os.path.join(current_root, file_name)
try:
stat = os.stat(file_path)
except OSError:
continue
rel_path = os.path.relpath(file_path, root).replace("\\", "/")
signature.append((rel_path, int(stat.st_mtime_ns), int(stat.st_size)))
signature.sort()
return tuple(signature)
def _scan_wildcard_dict(self) -> dict[str, list[str]]:
root = get_wildcards_dir(create=False)
if not os.path.isdir(root):
return {}
collected: dict[str, list[str]] = {}
for current_root, _dirs, files in os.walk(root, followlinks=True):
for file_name in sorted(files):
file_path = os.path.join(current_root, file_name)
lower_name = file_name.lower()
try:
if lower_name.endswith(".txt"):
rel_path = os.path.relpath(file_path, root)
key = _normalize_wildcard_key(os.path.splitext(rel_path)[0])
values = self._read_txt(file_path)
if values:
collected[key] = values
elif lower_name.endswith((".yaml", ".yml")):
payload = self._read_yaml(file_path)
self._merge_nested_entries(collected, payload)
elif lower_name.endswith(".json"):
payload = self._read_json(file_path)
self._merge_nested_entries(collected, payload)
except Exception as exc: # pragma: no cover - defensive logging
logger.warning("Failed to load wildcard file %s: %s", file_path, exc)
return collected
def _read_txt(self, file_path: str) -> list[str]:
try:
with open(file_path, "r", encoding="utf-8", errors="ignore") as handle:
return [line.strip() for line in handle.read().splitlines() if line.strip()]
except OSError as exc:
logger.warning("Failed to read wildcard txt file %s: %s", file_path, exc)
return []
def _read_yaml(self, file_path: str) -> Any:
with open(file_path, "r", encoding="utf-8") as handle:
return yaml.safe_load(handle) or {}
def _read_json(self, file_path: str) -> Any:
with open(file_path, "r", encoding="utf-8") as handle:
return json.load(handle)
def _merge_nested_entries(
self, collected: dict[str, list[str]], payload: Any
) -> None:
for key, values in self._flatten_payload(payload):
collected[key] = values
def _flatten_payload(
self, payload: Any, prefix: str = ""
) -> list[tuple[str, list[str]]]:
entries: list[tuple[str, list[str]]] = []
if isinstance(payload, dict):
for key, value in payload.items():
next_prefix = f"{prefix}/{key}" if prefix else str(key)
entries.extend(self._flatten_payload(value, next_prefix))
return entries
if isinstance(payload, list):
normalized_prefix = _normalize_wildcard_key(prefix)
values = [value.strip() for value in payload if isinstance(value, str) and value.strip()]
if normalized_prefix and values:
entries.append((normalized_prefix, values))
return entries
return entries
def _score_entry(
self, key: str, normalized_term: str, compact_term: str
) -> int | None:
key_compact = key.replace("/", "")
if key == normalized_term:
return 5000
if key.startswith(normalized_term):
return 4000
if f"/{normalized_term}" in key:
return 3500
if normalized_term in key:
return 3000
if compact_term and key_compact.startswith(compact_term):
return 2500
if compact_term and compact_term in key_compact:
return 2000
return None
def _expand_options_only(self, text: str, rng: random.Random) -> str:
current = text
remaining_depth = 100
while remaining_depth > 0:
remaining_depth -= 1
current, replaced = self._replace_options(current, rng)
if not replaced:
break
return current
def _replace_options(
self, text: str, rng: random.Random
) -> tuple[str, bool]:
replaced_any = False
def replace_option(match: re.Match[str]) -> str:
nonlocal replaced_any
replacement = self._resolve_option_group(match.group(1), rng)
replaced_any = True
return replacement
return _OPTION_PATTERN.sub(replace_option, text), replaced_any
def _resolve_option_group(self, group_text: str, rng: random.Random) -> str:
options = group_text.split("|")
multi_select_pattern = options[0].split("$$")
select_range: tuple[int, int] | None = None
select_separator = " "
if len(multi_select_pattern) > 1:
count_spec = multi_select_pattern[0]
range_match = re.match(r"(\d+)(-(\d+))?$", count_spec)
shorthand_match = re.match(r"-(\d+)$", count_spec)
if range_match:
start_text = range_match.group(1)
end_text = range_match.group(3)
if end_text is not None and _is_numeric_string(start_text) and _is_numeric_string(end_text):
select_range = (int(start_text), int(end_text))
elif _is_numeric_string(start_text):
value = int(start_text)
select_range = (value, value)
elif shorthand_match:
end_text = shorthand_match.group(1)
if _is_numeric_string(end_text):
select_range = (1, int(end_text))
if select_range is not None and len(multi_select_pattern) == 2:
options[0] = multi_select_pattern[1]
elif select_range is not None and len(multi_select_pattern) >= 3:
select_separator = multi_select_pattern[1]
options[0] = multi_select_pattern[2]
weighted_options: list[tuple[float, str]] = []
for option in options:
weight = 1.0
parts = option.split("::", 1)
if len(parts) == 2 and _is_numeric_string(parts[0].strip()):
weight = float(parts[0].strip())
weighted_options.append((weight, option))
if select_range is None:
selection_count = 1
else:
selection_count = rng.randint(select_range[0], select_range[1])
if selection_count <= 1:
return self._strip_weight_prefix(self._weighted_choice(weighted_options, rng))
selection_count = min(selection_count, len(weighted_options))
selected: list[str] = []
used_indexes: set[int] = set()
while len(selected) < selection_count:
picked_index = self._weighted_choice_index(weighted_options, rng)
if picked_index in used_indexes:
if len(used_indexes) == len(weighted_options):
break
continue
used_indexes.add(picked_index)
selected.append(
self._strip_weight_prefix(weighted_options[picked_index][1])
)
return select_separator.join(selected)
def _weighted_choice(
self, weighted_options: list[tuple[float, str]], rng: random.Random
) -> str:
return weighted_options[self._weighted_choice_index(weighted_options, rng)][1]
def _weighted_choice_index(
self, weighted_options: list[tuple[float, str]], rng: random.Random
) -> int:
total_weight = sum(max(weight, 0.0) for weight, _value in weighted_options)
if total_weight <= 0:
return rng.randrange(len(weighted_options))
threshold = rng.uniform(0, total_weight)
cumulative = 0.0
for index, (weight, _value) in enumerate(weighted_options):
cumulative += max(weight, 0.0)
if threshold <= cumulative:
return index
return len(weighted_options) - 1
def _strip_weight_prefix(self, value: str) -> str:
return _WEIGHTED_OPTION_PATTERN.sub("", value, count=1)
def _replace_wildcards(
self,
text: str,
rng: random.Random,
wildcard_dict: dict[str, list[str]],
) -> tuple[str, bool]:
replaced_any = False
def replace_match(match: re.Match[str]) -> str:
nonlocal replaced_any
replacement = self._resolve_wildcard_match(match.group(1), rng, wildcard_dict)
if replacement is None:
return match.group(0)
replaced_any = True
return replacement
return _WILDCARD_PATTERN.sub(replace_match, text), replaced_any
def _resolve_wildcard_match(
self,
raw_key: str,
rng: random.Random,
wildcard_dict: dict[str, list[str]],
) -> str | None:
keyword = _normalize_wildcard_key(raw_key)
if keyword in wildcard_dict:
return rng.choice(wildcard_dict[keyword])
if "*" in keyword:
regex_pattern = keyword.replace("*", ".*").replace("+", r"\+")
compiled = re.compile(f"^{regex_pattern}$")
aggregated: list[str] = []
for key, values in wildcard_dict.items():
if compiled.match(key):
aggregated.extend(values)
if aggregated:
return rng.choice(aggregated)
if "/" not in keyword:
fallback_keyword = _normalize_wildcard_key(f"*/{keyword}")
if fallback_keyword != keyword:
return self._resolve_wildcard_match(fallback_keyword, rng, wildcard_dict)
return None
def is_trigger_words_input(name: str) -> bool:
return bool(_TRIGGER_WORD_PATTERN.match(name))
def get_wildcard_service() -> WildcardService:
return WildcardService.get_instance()
__all__ = [
"WildcardService",
"WildcardMetadata",
"contains_dynamic_syntax",
"get_wildcard_service",
"get_wildcards_dir",
"is_trigger_words_input",
]

View File

@@ -11,6 +11,8 @@ Target structure:
│ └── symlink_map.json │ └── symlink_map.json
├── model/ ├── model/
│ └── {library_name}.sqlite │ └── {library_name}.sqlite
├── model_update/
│ └── {library_name}.sqlite
├── recipe/ ├── recipe/
│ └── {library_name}.sqlite │ └── {library_name}.sqlite
└── fts/ └── fts/
@@ -36,6 +38,7 @@ class CacheType(Enum):
"""Types of cache files managed by the cache path resolver.""" """Types of cache files managed by the cache path resolver."""
MODEL = "model" MODEL = "model"
MODEL_UPDATE = "model_update"
RECIPE = "recipe" RECIPE = "recipe"
RECIPE_FTS = "recipe_fts" RECIPE_FTS = "recipe_fts"
TAG_FTS = "tag_fts" TAG_FTS = "tag_fts"
@@ -45,6 +48,7 @@ class CacheType(Enum):
# Subdirectory structure for each cache type # Subdirectory structure for each cache type
_CACHE_SUBDIRS = { _CACHE_SUBDIRS = {
CacheType.MODEL: "model", CacheType.MODEL: "model",
CacheType.MODEL_UPDATE: "model_update",
CacheType.RECIPE: "recipe", CacheType.RECIPE: "recipe",
CacheType.RECIPE_FTS: "fts", CacheType.RECIPE_FTS: "fts",
CacheType.TAG_FTS: "fts", CacheType.TAG_FTS: "fts",
@@ -54,6 +58,7 @@ _CACHE_SUBDIRS = {
# Filename patterns for each cache type # Filename patterns for each cache type
_CACHE_FILENAMES = { _CACHE_FILENAMES = {
CacheType.MODEL: "{library_name}.sqlite", CacheType.MODEL: "{library_name}.sqlite",
CacheType.MODEL_UPDATE: "{library_name}.sqlite",
CacheType.RECIPE: "{library_name}.sqlite", CacheType.RECIPE: "{library_name}.sqlite",
CacheType.RECIPE_FTS: "recipe_fts.sqlite", CacheType.RECIPE_FTS: "recipe_fts.sqlite",
CacheType.TAG_FTS: "tag_fts.sqlite", CacheType.TAG_FTS: "tag_fts.sqlite",

View File

@@ -2,10 +2,13 @@
from __future__ import annotations from __future__ import annotations
import re
from typing import Any, Dict, Iterable, Mapping, Sequence from typing import Any, Dict, Iterable, Mapping, Sequence
from urllib.parse import urlparse, urlunparse from urllib.parse import parse_qs, urlparse, urlunparse
_SUPPORTED_CIVITAI_PAGE_HOSTS = frozenset({"civitai.com", "civitai.red"})
DEFAULT_CIVITAI_PAGE_HOST = "civitai.com"
_DEFAULT_ALLOW_COMMERCIAL_USE: Sequence[str] = ("Sell",) _DEFAULT_ALLOW_COMMERCIAL_USE: Sequence[str] = ("Sell",)
_LICENSE_DEFAULTS: Dict[str, Any] = { _LICENSE_DEFAULTS: Dict[str, Any] = {
"allowNoCredit": True, "allowNoCredit": True,
@@ -17,6 +20,115 @@ _COMMERCIAL_ALLOWED_VALUES = {"sell", "rent", "rentcivit", "image"}
_COMMERCIAL_SHIFT = 1 _COMMERCIAL_SHIFT = 1
def is_supported_civitai_page_host(hostname: str | None) -> bool:
"""Return whether the hostname is a supported Civitai page domain."""
if not hostname:
return False
return hostname.lower() in _SUPPORTED_CIVITAI_PAGE_HOSTS
def normalize_civitai_page_host(hostname: str | None) -> str:
"""Return a supported Civitai page host or the default host."""
if not isinstance(hostname, str):
return DEFAULT_CIVITAI_PAGE_HOST
normalized = hostname.strip().lower()
if is_supported_civitai_page_host(normalized):
return normalized
return DEFAULT_CIVITAI_PAGE_HOST
def build_civitai_model_page_url(
model_id: str | int | None,
version_id: str | int | None = None,
*,
host: str | None = None,
) -> str | None:
"""Build a Civitai model or model-version page URL."""
normalized_host = normalize_civitai_page_host(host)
normalized_model_id = str(model_id).strip() if model_id is not None else ""
normalized_version_id = str(version_id).strip() if version_id is not None else ""
if normalized_model_id:
path = f"/models/{normalized_model_id}"
query = f"modelVersionId={normalized_version_id}" if normalized_version_id else ""
return urlunparse(("https", normalized_host, path, "", query, ""))
if normalized_version_id:
return urlunparse(
("https", normalized_host, f"/model-versions/{normalized_version_id}", "", "", "")
)
return None
def _parse_supported_civitai_page_url(url: str | None):
if not url:
return None
try:
parsed = urlparse(url)
except ValueError:
return None
if parsed.scheme not in {"http", "https"}:
return None
if not is_supported_civitai_page_host(parsed.hostname):
return None
return parsed
def extract_civitai_model_url_parts(
url: str | None,
) -> tuple[str | None, str | None]:
"""Extract model and version identifiers from a supported Civitai model URL."""
parsed = _parse_supported_civitai_page_url(url)
if parsed is None:
return None, None
path_match = re.search(r"/models/(\d+)", parsed.path)
if not path_match:
return None, None
model_id = path_match.group(1)
query_params = parse_qs(parsed.query)
version_values = query_params.get("modelVersionId") or []
version_id = version_values[0] if version_values else None
return model_id, version_id
def extract_civitai_image_id(url: str | None) -> str | None:
"""Extract the image identifier from a supported Civitai image page URL."""
parsed = _parse_supported_civitai_page_url(url)
if parsed is None:
return None
path_match = re.search(r"/images/(\d+)", parsed.path)
if not path_match:
return None
return path_match.group(1)
def extract_civitai_page_host(url: str | None) -> str | None:
"""Extract the supported Civitai page host from a URL."""
parsed = _parse_supported_civitai_page_url(url)
if parsed is None:
return None
return parsed.hostname.lower() if parsed.hostname else None
def _normalize_commercial_values(value: Any) -> Sequence[str]: def _normalize_commercial_values(value: Any) -> Sequence[str]:
"""Return a normalized list of commercial permissions preserving source values.""" """Return a normalized list of commercial permissions preserving source values."""
@@ -199,6 +311,10 @@ def rewrite_preview_url(
__all__ = [ __all__ = [
"build_license_flags", "build_license_flags",
"extract_civitai_image_id",
"extract_civitai_page_host",
"extract_civitai_model_url_parts",
"is_supported_civitai_page_host",
"resolve_license_payload", "resolve_license_payload",
"resolve_license_info", "resolve_license_info",
"rewrite_preview_url", "rewrite_preview_url",

View File

@@ -101,6 +101,7 @@ DEFAULT_PRIORITY_TAG_CONFIG = {
DIFFUSION_MODEL_BASE_MODELS = frozenset( DIFFUSION_MODEL_BASE_MODELS = frozenset(
[ [
"ZImageTurbo", "ZImageTurbo",
"ZImageBase",
"Wan Video 1.3B t2v", "Wan Video 1.3B t2v",
"Wan Video 14B t2v", "Wan Video 14B t2v",
"Wan Video 14B i2v 480p", "Wan Video 14B i2v 480p",

136
py/utils/session_logging.py Normal file
View File

@@ -0,0 +1,136 @@
from __future__ import annotations
import logging
import os
import threading
import uuid
from collections import deque
from dataclasses import dataclass
from datetime import datetime, timezone
from typing import Any
LOG_FORMAT = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
_SESSION_HANDLER_NAME = "lora_manager_standalone_session_memory"
_FILE_HANDLER_NAME = "lora_manager_standalone_session_file"
_session_state: "StandaloneSessionLogState | None" = None
_session_lock = threading.Lock()
@dataclass
class StandaloneSessionLogState:
started_at: str
session_id: str
log_file_path: str | None
memory_handler: "StandaloneSessionMemoryHandler"
class StandaloneSessionMemoryHandler(logging.Handler):
def __init__(self, capacity: int = 4000) -> None:
super().__init__()
self._entries: deque[str] = deque(maxlen=capacity)
self._lock = threading.Lock()
def emit(self, record: logging.LogRecord) -> None:
try:
rendered = self.format(record)
except Exception:
rendered = record.getMessage()
with self._lock:
self._entries.append(rendered)
def render(self, max_lines: int | None = None) -> str:
with self._lock:
entries = list(self._entries)
if max_lines is not None and max_lines > 0:
entries = entries[-max_lines:]
if not entries:
return ""
return "\n".join(entries) + "\n"
def _build_log_file_path(settings_file: str | None, started_at: datetime) -> str | None:
if not settings_file:
return None
settings_dir = os.path.dirname(os.path.abspath(settings_file))
log_dir = os.path.join(settings_dir, "logs")
os.makedirs(log_dir, exist_ok=True)
timestamp = started_at.strftime("%Y%m%dT%H%M%SZ")
return os.path.join(log_dir, f"standalone-session-{timestamp}.log")
def setup_standalone_session_logging(settings_file: str | None) -> StandaloneSessionLogState:
global _session_state
with _session_lock:
if _session_state is not None:
return _session_state
started_dt = datetime.now(timezone.utc)
started_at = started_dt.replace(microsecond=0).isoformat()
session_id = f"{started_dt.strftime('%Y%m%dT%H%M%SZ')}-{uuid.uuid4().hex[:8]}"
formatter = logging.Formatter(LOG_FORMAT)
root_logger = logging.getLogger()
if root_logger.level > logging.INFO:
root_logger.setLevel(logging.INFO)
memory_handler = StandaloneSessionMemoryHandler()
memory_handler.set_name(_SESSION_HANDLER_NAME)
memory_handler.setFormatter(formatter)
root_logger.addHandler(memory_handler)
log_file_path = _build_log_file_path(settings_file, started_dt)
if log_file_path:
file_handler = logging.FileHandler(log_file_path, encoding="utf-8")
file_handler.set_name(_FILE_HANDLER_NAME)
file_handler.setFormatter(formatter)
root_logger.addHandler(file_handler)
_session_state = StandaloneSessionLogState(
started_at=started_at,
session_id=session_id,
log_file_path=log_file_path,
memory_handler=memory_handler,
)
logger = logging.getLogger("lora-manager-standalone")
logger.info("LoRA Manager standalone startup time: %s", started_at)
logger.info("LoRA Manager standalone session id: %s", session_id)
if log_file_path:
logger.info("LoRA Manager standalone session log path: %s", log_file_path)
return _session_state
def get_standalone_session_log_snapshot(max_lines: int = 2000) -> dict[str, Any] | None:
state = _session_state
if state is None:
return None
return {
"started_at": state.started_at,
"session_id": state.session_id,
"log_file_path": state.log_file_path,
"in_memory_text": state.memory_handler.render(max_lines=max_lines),
}
def reset_standalone_session_logging_for_tests() -> None:
global _session_state
with _session_lock:
root_logger = logging.getLogger()
handlers_to_remove = [
handler
for handler in root_logger.handlers
if handler.get_name() in {_SESSION_HANDLER_NAME, _FILE_HANDLER_NAME}
]
for handler in handlers_to_remove:
root_logger.removeHandler(handler)
handler.close()
_session_state = None

View File

@@ -29,6 +29,18 @@ if not standalone_mode:
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_DEFAULT_CHECKPOINT_EXTENSIONS = {
".ckpt",
".pt",
".pt2",
".bin",
".pth",
".safetensors",
".pkl",
".sft",
".gguf",
}
class UsageStats: class UsageStats:
"""Track usage statistics for models and save to JSON""" """Track usage statistics for models and save to JSON"""
@@ -292,6 +304,151 @@ class UsageStats:
if LORAS in metadata and isinstance(metadata[LORAS], dict): if LORAS in metadata and isinstance(metadata[LORAS], dict):
await self._process_loras(metadata[LORAS], today) await self._process_loras(metadata[LORAS], today)
def _increment_usage_counter(self, category: str, stat_key: str, today_date: str) -> None:
"""Increment usage counters for a resolved stats key."""
if stat_key not in self.stats[category]:
self.stats[category][stat_key] = {
"total": 0,
"history": {}
}
self.stats[category][stat_key]["total"] += 1
if today_date not in self.stats[category][stat_key]["history"]:
self.stats[category][stat_key]["history"][today_date] = 0
self.stats[category][stat_key]["history"][today_date] += 1
def _normalize_model_lookup_name(self, model_name: str) -> str:
"""Normalize a model reference to its base filename without extension."""
return os.path.splitext(os.path.basename(model_name))[0]
async def _find_cached_checkpoint_entry(self, checkpoint_scanner, model_name: str):
"""Best-effort lookup for a checkpoint cache entry by filename/model name."""
get_cached_data = getattr(checkpoint_scanner, "get_cached_data", None)
if not callable(get_cached_data):
return None
cache = await get_cached_data()
raw_data = getattr(cache, "raw_data", None)
if not isinstance(raw_data, list):
return None
normalized_name = self._normalize_model_lookup_name(model_name)
for entry in raw_data:
if not isinstance(entry, dict):
continue
for candidate_key in ("file_name", "model_name", "file_path"):
candidate_value = entry.get(candidate_key)
if not candidate_value or not isinstance(candidate_value, str):
continue
if self._normalize_model_lookup_name(candidate_value) == normalized_name:
return entry
return None
async def _find_checkpoint_file_on_disk(self, checkpoint_scanner, model_name: str):
"""Search checkpoint roots directly for a matching file.
This is used when usage tracking sees a checkpoint name before the cache has
been refreshed. The lookup is intentionally exact: we only match the model
basename and supported checkpoint extensions.
"""
get_model_roots = getattr(checkpoint_scanner, "get_model_roots", None)
if not callable(get_model_roots):
return None
roots = [root for root in get_model_roots() if root]
if not roots:
return None
supported_extensions = getattr(
checkpoint_scanner, "file_extensions", _DEFAULT_CHECKPOINT_EXTENSIONS
)
if not isinstance(supported_extensions, (set, frozenset, list, tuple)):
supported_extensions = _DEFAULT_CHECKPOINT_EXTENSIONS
normalized_name = self._normalize_model_lookup_name(model_name)
matches: list[str] = []
for root_path in roots:
if not os.path.exists(root_path):
continue
for dirpath, _dirnames, filenames in os.walk(root_path):
for filename in filenames:
extension = os.path.splitext(filename)[1].lower()
if extension not in supported_extensions:
continue
if os.path.splitext(filename)[0] != normalized_name:
continue
matches.append(os.path.join(dirpath, filename).replace(os.sep, "/"))
if len(matches) > 1:
logger.warning(
"Multiple checkpoint files matched '%s'; skipping usage tracking: %s",
normalized_name,
", ".join(matches),
)
return None
return matches[0] if matches else None
async def _resolve_checkpoint_hash(self, checkpoint_scanner, model_name: str):
"""Resolve a checkpoint hash, calculating pending hashes on demand when needed."""
model_filename = self._normalize_model_lookup_name(model_name)
model_hash = checkpoint_scanner.get_hash_by_filename(model_filename)
if model_hash:
return model_hash
cached_entry = await self._find_cached_checkpoint_entry(checkpoint_scanner, model_name)
if cached_entry:
cached_hash = cached_entry.get("sha256")
if cached_hash:
return cached_hash
hash_status = cached_entry.get("hash_status")
if hash_status and hash_status != "pending":
logger.warning(
"Checkpoint '%s' has hash_status=%s; skipping usage tracking",
model_filename,
hash_status,
)
return None
file_path = cached_entry.get("file_path") if cached_entry else None
if not file_path:
file_path = await self._find_checkpoint_file_on_disk(
checkpoint_scanner, model_name
)
if not file_path:
logger.warning(
f"No hash found for checkpoint '{model_filename}', skipping usage tracking"
)
return None
calculate_hash = getattr(checkpoint_scanner, "calculate_hash_for_model", None)
if not callable(calculate_hash):
logger.warning("Checkpoint scanner not available for usage tracking")
return None
logger.info(
"Calculating hash for checkpoint '%s' from %s",
model_filename,
file_path,
)
calculated_hash = await calculate_hash(file_path)
if calculated_hash:
return calculated_hash
logger.warning(
f"Failed to calculate hash for checkpoint '{model_filename}', skipping usage tracking"
)
return None
async def _process_checkpoints(self, models_data, today_date): async def _process_checkpoints(self, models_data, today_date):
"""Process checkpoint models from metadata""" """Process checkpoint models from metadata"""
try: try:
@@ -312,26 +469,11 @@ class UsageStats:
if not model_name: if not model_name:
continue continue
# Clean up filename (remove extension if present) model_hash = await self._resolve_checkpoint_hash(checkpoint_scanner, model_name)
model_filename = os.path.splitext(os.path.basename(model_name))[0] if not model_hash:
continue
# Get hash for this checkpoint self._increment_usage_counter("checkpoints", model_hash, today_date)
model_hash = checkpoint_scanner.get_hash_by_filename(model_filename)
if model_hash:
# Update stats for this checkpoint with date tracking
if model_hash not in self.stats["checkpoints"]:
self.stats["checkpoints"][model_hash] = {
"total": 0,
"history": {}
}
# Increment total count
self.stats["checkpoints"][model_hash]["total"] += 1
# Increment today's count
if today_date not in self.stats["checkpoints"][model_hash]["history"]:
self.stats["checkpoints"][model_hash]["history"][today_date] = 0
self.stats["checkpoints"][model_hash]["history"][today_date] += 1
except Exception as e: except Exception as e:
logger.error(f"Error processing checkpoint usage: {e}", exc_info=True) logger.error(f"Error processing checkpoint usage: {e}", exc_info=True)
@@ -360,21 +502,11 @@ class UsageStats:
# Get hash for this LoRA # Get hash for this LoRA
lora_hash = lora_scanner.get_hash_by_filename(lora_name) lora_hash = lora_scanner.get_hash_by_filename(lora_name)
if lora_hash: if not lora_hash:
# Update stats for this LoRA with date tracking logger.warning(f"No hash found for LoRA '{lora_name}', skipping usage tracking")
if lora_hash not in self.stats["loras"]: continue
self.stats["loras"][lora_hash] = {
"total": 0,
"history": {}
}
# Increment total count self._increment_usage_counter("loras", lora_hash, today_date)
self.stats["loras"][lora_hash]["total"] += 1
# Increment today's count
if today_date not in self.stats["loras"][lora_hash]["history"]:
self.stats["loras"][lora_hash]["history"][today_date] = 0
self.stats["loras"][lora_hash]["history"][today_date] += 1
except Exception as e: except Exception as e:
logger.error(f"Error processing LoRA usage: {e}", exc_info=True) logger.error(f"Error processing LoRA usage: {e}", exc_info=True)

View File

@@ -1,7 +1,7 @@
[project] [project]
name = "comfyui-lora-manager" name = "comfyui-lora-manager"
description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!" description = "Revolutionize your workflow with the ultimate LoRA companion for ComfyUI!"
version = "1.0.2" version = "1.0.4"
license = {file = "LICENSE"} license = {file = "LICENSE"}
dependencies = [ dependencies = [
"aiohttp", "aiohttp",
@@ -14,7 +14,8 @@ dependencies = [
"natsort", "natsort",
"GitPython", "GitPython",
"aiosqlite", "aiosqlite",
"platformdirs" "platformdirs",
"pyyaml"
] ]
[project.urls] [project.urls]

View File

@@ -11,3 +11,4 @@ GitPython
aiosqlite aiosqlite
beautifulsoup4 beautifulsoup4
platformdirs platformdirs
pyyaml

View File

@@ -113,6 +113,8 @@ import asyncio
import logging import logging
from aiohttp import web from aiohttp import web
from py.utils.session_logging import setup_standalone_session_logging
# Increase allowable header size to align with in-ComfyUI configuration. # Increase allowable header size to align with in-ComfyUI configuration.
HEADER_SIZE_LIMIT = 16384 HEADER_SIZE_LIMIT = 16384
@@ -125,6 +127,8 @@ logger = logging.getLogger("lora-manager-standalone")
# Configure aiohttp access logger to be less verbose # Configure aiohttp access logger to be less verbose
logging.getLogger("aiohttp.access").setLevel(logging.WARNING) logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
setup_standalone_session_logging(ensure_settings_file(logger))
# Add specific suppression for connection reset errors # Add specific suppression for connection reset errors
class ConnectionResetFilter(logging.Filter): class ConnectionResetFilter(logging.Filter):

View File

@@ -163,6 +163,18 @@
cursor: pointer; cursor: pointer;
} }
.model-version-row.is-clickable .version-actions,
.model-version-row.is-clickable .version-badges,
.model-version-row.is-clickable .version-action,
.model-version-row.is-clickable .version-civitai-link {
cursor: default;
}
.model-version-row.is-clickable .version-action,
.model-version-row.is-clickable .version-civitai-link {
cursor: pointer;
}
.model-version-row.is-current { .model-version-row.is-current {
border-color: var(--lora-accent); border-color: var(--lora-accent);
box-shadow: 0 0 0 1px color-mix(in oklch, var(--lora-accent) 65%, transparent), box-shadow: 0 0 0 1px color-mix(in oklch, var(--lora-accent) 65%, transparent),
@@ -217,6 +229,7 @@
gap: 8px; gap: 8px;
font-weight: 600; font-weight: 600;
font-size: 0.95rem; font-size: 0.95rem;
min-width: 0;
} }
.versions-tab-version-name { .versions-tab-version-name {
@@ -226,6 +239,27 @@
max-width: 100%; max-width: 100%;
} }
.version-civitai-link {
display: inline-flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
border-radius: 999px;
color: var(--text-muted);
text-decoration: none;
flex: 0 0 auto;
transition: color 0.2s ease, background-color 0.2s ease, transform 0.2s ease;
}
.version-civitai-link:hover,
.version-civitai-link:focus-visible {
color: var(--lora-accent);
background: color-mix(in oklch, var(--lora-accent) 12%, transparent);
transform: translateY(-1px);
outline: none;
}
.version-badges { .version-badges {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

View File

@@ -311,6 +311,161 @@ button:disabled,
color: var(--lora-error, #ef4444); color: var(--lora-error, #ef4444);
} }
.backup-status {
background: rgba(0, 0, 0, 0.03);
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: var(--border-radius-sm);
padding: var(--space-3);
}
[data-theme="dark"] .backup-status {
background: rgba(255, 255, 255, 0.03);
border: 1px solid var(--lora-border);
}
.backup-summary-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
gap: var(--space-2);
margin-bottom: var(--space-3);
}
.backup-summary-card {
background: rgba(255, 255, 255, 0.5);
border: 1px solid rgba(0, 0, 0, 0.06);
border-radius: var(--border-radius-sm);
padding: var(--space-2);
}
[data-theme="dark"] .backup-summary-card {
background: rgba(255, 255, 255, 0.02);
border-color: rgba(255, 255, 255, 0.05);
}
.backup-summary-label {
color: var(--text-color);
font-size: 0.85rem;
opacity: 0.7;
margin-bottom: 6px;
}
.backup-summary-value {
color: var(--text-color);
font-size: 1.1rem;
font-weight: 600;
line-height: 1.3;
word-break: break-word;
}
.backup-summary-value.status-enabled {
color: var(--lora-success, #10b981);
}
.backup-summary-value.status-disabled {
color: var(--lora-error, #ef4444);
}
.backup-status-list {
display: flex;
flex-direction: column;
gap: var(--space-2);
}
.backup-status-row {
display: grid;
grid-template-columns: minmax(140px, 180px) 1fr;
gap: var(--space-2);
align-items: start;
}
.backup-status-label {
color: var(--text-color);
font-weight: 500;
opacity: 0.8;
}
.backup-status-content {
min-width: 0;
}
.backup-status-primary {
color: var(--text-color);
font-weight: 600;
line-height: 1.4;
}
.backup-status-secondary {
color: var(--text-color);
opacity: 0.72;
font-size: 0.88rem;
line-height: 1.4;
word-break: break-word;
margin-top: 2px;
}
.backup-location-details {
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: var(--border-radius-sm);
background: rgba(0, 0, 0, 0.02);
}
[data-theme="dark"] .backup-location-details {
border-color: var(--lora-border);
background: rgba(255, 255, 255, 0.02);
}
.backup-location-details summary {
cursor: pointer;
padding: var(--space-2) var(--space-3);
color: var(--text-color);
font-weight: 500;
}
.backup-location-panel {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: var(--space-2);
align-items: center;
width: 100%;
max-width: 100%;
box-sizing: border-box;
padding: 0 var(--space-3) var(--space-3);
}
.backup-location-panel .text-btn {
justify-self: end;
}
.backup-location-path {
display: block;
min-width: 0;
max-width: 100%;
padding: 6px 8px;
border-radius: var(--border-radius-sm);
background: rgba(0, 0, 0, 0.05);
color: var(--text-color);
overflow-wrap: anywhere;
word-break: break-word;
}
[data-theme="dark"] .backup-location-path {
background: rgba(255, 255, 255, 0.05);
}
@media (max-width: 768px) {
.backup-status-row {
grid-template-columns: 1fr;
}
.backup-location-panel {
grid-template-columns: 1fr;
}
.backup-location-panel .text-btn {
justify-self: start;
}
}
/* Add styles for delete preview image */ /* Add styles for delete preview image */
.delete-preview { .delete-preview {
max-width: 150px; max-width: 150px;

View File

@@ -0,0 +1,281 @@
.doctor-trigger {
min-width: 120px;
position: relative;
border-color: color-mix(in srgb, var(--lora-accent) 24%, var(--border-color));
}
.doctor-trigger i {
color: var(--lora-accent);
}
.doctor-status-badge {
display: inline-flex;
align-items: center;
justify-content: center;
min-width: 18px;
height: 18px;
padding: 0 5px;
border-radius: 999px;
background: var(--lora-error);
color: #fff;
font-size: 11px;
line-height: 1;
font-weight: 700;
}
.doctor-status-badge.hidden {
display: none;
}
.doctor-modal {
width: min(960px, 92vw);
max-width: 960px;
}
.doctor-shell {
display: flex;
flex-direction: column;
gap: var(--space-3);
padding-top: var(--space-2);
}
.doctor-hero {
display: flex;
justify-content: space-between;
gap: var(--space-3);
align-items: flex-start;
margin-top: var(--space-2);
padding: var(--space-3);
border-radius: var(--border-radius-sm);
border: 1px solid var(--lora-border);
background: rgba(0, 0, 0, 0.03);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.03);
}
.doctor-kicker {
display: inline-block;
font-size: 0.75rem;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.08em;
color: var(--lora-accent);
margin-bottom: 6px;
}
.doctor-hero h2 {
margin: 0 0 8px;
}
.doctor-hero p {
margin: 0;
color: var(--text-color);
opacity: 0.88;
}
.doctor-summary-badge {
display: inline-flex;
align-items: center;
gap: 8px;
border-radius: 999px;
padding: 8px 12px;
font-weight: 700;
white-space: nowrap;
border: 1px solid transparent;
}
.doctor-status-ok {
background: color-mix(in oklch, var(--lora-success) 14%, transparent);
border-color: color-mix(in oklch, var(--lora-success) 28%, transparent);
color: color-mix(in oklch, var(--lora-success) 72%, var(--text-color));
}
.doctor-status-warning {
background: color-mix(in oklch, var(--lora-warning) 16%, transparent);
border-color: color-mix(in oklch, var(--lora-warning) 30%, transparent);
color: color-mix(in oklch, var(--lora-warning) 70%, var(--text-color));
}
.doctor-status-error {
background: color-mix(in oklch, var(--lora-error) 16%, transparent);
border-color: color-mix(in oklch, var(--lora-error) 30%, transparent);
color: color-mix(in oklch, var(--lora-error) 68%, var(--text-color));
}
.doctor-loading-state {
display: inline-flex;
align-items: center;
gap: 10px;
padding: 12px 16px;
min-height: 22px;
border-radius: var(--border-radius-sm);
background: var(--lora-surface);
border: 1px solid var(--lora-border);
visibility: hidden;
opacity: 0;
pointer-events: none;
transition: opacity 0.18s ease, visibility 0.18s ease;
}
.doctor-loading-state.visible {
visibility: visible;
opacity: 1;
}
.doctor-issues-list {
display: grid;
gap: var(--space-2);
}
.doctor-issue-card {
border: 1px solid rgba(0, 0, 0, 0.1);
background: rgba(0, 0, 0, 0.03);
border-radius: var(--border-radius-sm);
padding: var(--space-3);
box-shadow: none;
}
.doctor-issue-card[data-status="warning"] {
border-color: color-mix(in oklch, var(--lora-warning) 32%, var(--lora-border));
}
.doctor-issue-card[data-status="error"] {
border-color: color-mix(in oklch, var(--lora-error) 28%, var(--lora-border));
}
.doctor-issue-header {
display: flex;
justify-content: space-between;
gap: var(--space-2);
align-items: flex-start;
}
.doctor-issue-header h3 {
margin: 0 0 6px;
font-size: 1rem;
}
.doctor-issue-summary {
margin: 0;
color: var(--text-color);
opacity: 0.92;
}
.doctor-issue-tag {
display: inline-flex;
align-items: center;
gap: 6px;
border-radius: 999px;
padding: 6px 10px;
font-size: 0.8rem;
font-weight: 700;
}
.doctor-issue-card[data-status="ok"] .doctor-issue-tag {
background: color-mix(in oklch, var(--lora-success) 14%, transparent);
color: color-mix(in oklch, var(--lora-success) 72%, var(--text-color));
}
.doctor-issue-card[data-status="warning"] .doctor-issue-tag {
background: color-mix(in oklch, var(--lora-warning) 16%, transparent);
color: color-mix(in oklch, var(--lora-warning) 70%, var(--text-color));
}
.doctor-issue-card[data-status="error"] .doctor-issue-tag {
background: color-mix(in oklch, var(--lora-error) 16%, transparent);
color: color-mix(in oklch, var(--lora-error) 68%, var(--text-color));
}
.doctor-issue-details {
margin: 14px 0 0;
padding-left: 18px;
color: var(--text-color);
}
.doctor-issue-details li + li {
margin-top: 8px;
}
.doctor-issue-actions {
display: flex;
flex-wrap: wrap;
gap: 10px;
margin-top: 16px;
}
.doctor-inline-detail-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
gap: 10px;
margin-top: 14px;
}
.doctor-inline-detail {
padding: 10px 12px;
border-radius: var(--border-radius-xs);
background: var(--lora-surface);
border: 1px solid var(--lora-border);
}
.doctor-inline-detail strong {
display: block;
margin-bottom: 4px;
font-size: 0.82rem;
}
.doctor-footer {
display: flex;
justify-content: space-between;
gap: var(--space-2);
align-items: center;
padding-top: var(--space-1);
}
.doctor-footer-note {
color: var(--text-color);
opacity: 0.82;
}
.doctor-footer-actions {
display: flex;
gap: 10px;
}
[data-theme="dark"] .doctor-hero,
[data-theme="dark"] .doctor-issue-card {
background: rgba(255, 255, 255, 0.03);
border-color: var(--lora-border);
box-shadow: none;
}
@media (max-width: 760px) {
.doctor-trigger {
min-width: auto;
padding-inline: 10px;
}
.doctor-trigger span:not(.doctor-status-badge) {
display: none;
}
.doctor-hero,
.doctor-footer {
flex-direction: column;
align-items: stretch;
}
.doctor-hero {
padding-right: var(--space-3);
}
.doctor-summary-badge {
align-self: flex-start;
}
.doctor-footer-actions {
width: 100%;
}
.doctor-footer-actions button {
flex: 1;
}
}

View File

@@ -102,6 +102,13 @@
overflow-y: auto; overflow-y: auto;
padding: var(--space-3); padding: var(--space-3);
scroll-behavior: smooth; scroll-behavior: smooth;
scrollbar-gutter: stable;
}
@supports not (scrollbar-gutter: stable) {
.settings-content {
overflow-y: scroll;
}
} }
.settings-content .settings-form { .settings-content .settings-form {

View File

@@ -1036,6 +1036,73 @@
} }
} }
@media (max-height: 860px) {
#recipeModal .modal-content {
padding-top: var(--space-2);
padding-bottom: var(--space-2);
}
.recipe-modal-header {
padding-bottom: 6px;
margin-bottom: 8px;
}
.recipe-modal-header h2 {
font-size: 1.25em;
max-height: 2.5em;
}
.recipe-tags-container {
margin-bottom: 6px;
}
.recipe-top-section {
grid-template-columns: 1fr;
gap: var(--space-1);
margin-bottom: var(--space-1);
}
.recipe-preview-container {
display: none;
}
.recipe-gen-params {
height: auto;
max-height: 210px;
}
.recipe-gen-params h3 {
margin-bottom: var(--space-1);
font-size: 1.05em;
}
.gen-params-container {
gap: var(--space-1);
}
.param-content {
max-height: 90px;
padding: 10px;
}
.param-textarea {
min-height: 100px;
}
.other-params {
margin-top: 0;
gap: 6px;
}
.recipe-bottom-section {
padding-top: var(--space-1);
}
.recipe-section-header {
margin-bottom: var(--space-1);
}
}
.badge-container { .badge-container {
position: relative; position: relative;
display: flex; display: flex;

View File

@@ -21,6 +21,27 @@
font-size: 0.9em; font-size: 0.9em;
} }
.downloaded-badge {
display: inline-flex;
align-items: center;
background: color-mix(in oklch, var(--badge-update-bg, #4a90e2) 22%, transparent);
color: var(--badge-update-bg, #4a90e2);
border: 1px solid color-mix(in oklch, var(--badge-update-bg, #4a90e2) 50%, transparent);
padding: 4px 8px;
border-radius: var(--border-radius-xs);
font-size: 0.8em;
font-weight: 500;
white-space: nowrap;
flex-shrink: 0;
transform: translateZ(0);
will-change: transform;
}
.downloaded-badge i {
margin-right: 4px;
font-size: 0.9em;
}
/* Early Access Badge */ /* Early Access Badge */
.early-access-badge { .early-access-badge {
display: inline-flex; display: inline-flex;

View File

@@ -12,6 +12,7 @@
@import 'components/modal/delete-modal.css'; @import 'components/modal/delete-modal.css';
@import 'components/modal/update-modal.css'; @import 'components/modal/update-modal.css';
@import 'components/modal/settings-modal.css'; @import 'components/modal/settings-modal.css';
@import 'components/modal/doctor-modal.css';
@import 'components/modal/help-modal.css'; @import 'components/modal/help-modal.css';
@import 'components/modal/relink-civitai-modal.css'; @import 'components/modal/relink-civitai-modal.css';
@import 'components/modal/example-access-modal.css'; @import 'components/modal/example-access-modal.css';

View File

@@ -1,6 +1,7 @@
import { RecipeCard } from '../components/RecipeCard.js'; import { RecipeCard } from '../components/RecipeCard.js';
import { state, getCurrentPageState } from '../state/index.js'; import { state, getCurrentPageState } from '../state/index.js';
import { showToast } from '../utils/uiHelpers.js'; import { showToast } from '../utils/uiHelpers.js';
import { captureScrollPosition, restoreScrollPosition } from '../utils/infiniteScroll.js';
const RECIPE_ENDPOINTS = { const RECIPE_ENDPOINTS = {
list: '/api/lm/recipes', list: '/api/lm/recipes',
@@ -31,6 +32,20 @@ export function extractRecipeId(filePath) {
return dotIndex > 0 ? basename.substring(0, dotIndex) : basename; return dotIndex > 0 ? basename.substring(0, dotIndex) : basename;
} }
export async function fetchRecipeDetails(recipeId) {
if (!recipeId) {
throw new Error('Unable to determine recipe ID');
}
const encodedRecipeId = encodeURIComponent(recipeId);
const response = await fetch(`${RECIPE_ENDPOINTS.detail}/${encodedRecipeId}`);
if (!response.ok) {
throw new Error(`Failed to load recipe: ${response.statusText}`);
}
return response.json();
}
/** /**
* Fetch recipes with pagination for virtual scrolling * Fetch recipes with pagination for virtual scrolling
* @param {number} page - Page number to fetch * @param {number} page - Page number to fetch
@@ -61,7 +76,9 @@ export async function fetchRecipesPage(page = 1, pageSize = 100) {
// If we have a specific recipe ID to load // If we have a specific recipe ID to load
if (pageState.customFilter?.active && pageState.customFilter?.recipeId) { if (pageState.customFilter?.active && pageState.customFilter?.recipeId) {
// Special case: load specific recipe // Special case: load specific recipe
const response = await fetch(`${RECIPE_ENDPOINTS.detail}/${pageState.customFilter.recipeId}`); const response = await fetch(
`${RECIPE_ENDPOINTS.detail}/${encodeURIComponent(pageState.customFilter.recipeId)}`
);
if (!response.ok) { if (!response.ok) {
throw new Error(`Failed to load recipe: ${response.statusText}`); throw new Error(`Failed to load recipe: ${response.statusText}`);
@@ -166,10 +183,12 @@ export async function resetAndReloadWithVirtualScroll(options = {}) {
const { const {
modelType = 'lora', modelType = 'lora',
updateFolders = false, updateFolders = false,
fetchPageFunction fetchPageFunction,
preserveScroll = false
} = options; } = options;
const pageState = getCurrentPageState(); const pageState = getCurrentPageState();
const scrollSnapshot = preserveScroll ? captureScrollPosition() : null;
try { try {
pageState.isLoading = true; pageState.isLoading = true;
@@ -191,6 +210,10 @@ export async function resetAndReloadWithVirtualScroll(options = {}) {
pageState.hasMore = result.hasMore; pageState.hasMore = result.hasMore;
pageState.currentPage = 2; // Next page will be 2 pageState.currentPage = 2; // Next page will be 2
if (scrollSnapshot) {
await restoreScrollPosition(scrollSnapshot);
}
return result; return result;
} catch (error) { } catch (error) {
console.error(`Error reloading ${modelType}s:`, error); console.error(`Error reloading ${modelType}s:`, error);
@@ -211,10 +234,12 @@ export async function loadMoreWithVirtualScroll(options = {}) {
modelType = 'lora', modelType = 'lora',
resetPage = false, resetPage = false,
updateFolders = false, updateFolders = false,
fetchPageFunction fetchPageFunction,
preserveScroll = false
} = options; } = options;
const pageState = getCurrentPageState(); const pageState = getCurrentPageState();
const scrollSnapshot = preserveScroll ? captureScrollPosition() : null;
try { try {
// Start loading state // Start loading state
@@ -239,6 +264,10 @@ export async function loadMoreWithVirtualScroll(options = {}) {
pageState.hasMore = result.hasMore; pageState.hasMore = result.hasMore;
pageState.currentPage = 2; // Next page to load would be 2 pageState.currentPage = 2; // Next page to load would be 2
if (scrollSnapshot) {
await restoreScrollPosition(scrollSnapshot);
}
return result; return result;
} catch (error) { } catch (error) {
console.error(`Error loading ${modelType}s:`, error); console.error(`Error loading ${modelType}s:`, error);
@@ -254,11 +283,12 @@ export async function loadMoreWithVirtualScroll(options = {}) {
* @param {boolean} updateFolders - Whether to update folder tags * @param {boolean} updateFolders - Whether to update folder tags
* @returns {Promise<Object>} The fetch result * @returns {Promise<Object>} The fetch result
*/ */
export async function resetAndReload(updateFolders = false) { export async function resetAndReload(updateFolders = false, options = {}) {
return resetAndReloadWithVirtualScroll({ return resetAndReloadWithVirtualScroll({
modelType: 'recipe', modelType: 'recipe',
updateFolders, updateFolders,
fetchPageFunction: fetchRecipesPage fetchPageFunction: fetchRecipesPage,
preserveScroll: options.preserveScroll === true
}); });
} }
@@ -270,7 +300,7 @@ export async function syncChanges() {
state.loadingManager.showSimpleLoading('Syncing changes...'); state.loadingManager.showSimpleLoading('Syncing changes...');
// Simply reload the recipes without rebuilding cache // Simply reload the recipes without rebuilding cache
await resetAndReload(); await resetAndReload(false, { preserveScroll: true });
showToast('toast.recipes.syncComplete', {}, 'success'); showToast('toast.recipes.syncComplete', {}, 'success');
} catch (error) { } catch (error) {
@@ -298,7 +328,7 @@ export async function refreshRecipes() {
} }
// After successful cache rebuild, reload the recipes // After successful cache rebuild, reload the recipes
await resetAndReload(); await resetAndReload(false, { preserveScroll: true });
showToast('toast.recipes.refreshComplete', {}, 'success'); showToast('toast.recipes.refreshComplete', {}, 'success');
} catch (error) { } catch (error) {
@@ -349,9 +379,10 @@ export function createRecipeCard(recipe) {
* @param {Object} updates - The metadata updates to apply * @param {Object} updates - The metadata updates to apply
* @returns {Promise<Object>} The updated recipe data * @returns {Promise<Object>} The updated recipe data
*/ */
export async function updateRecipeMetadata(filePath, updates) { export async function updateRecipeMetadata(filePath, updates, options = {}) {
try { try {
state.loadingManager.showSimpleLoading('Saving metadata...'); state.loadingManager.showSimpleLoading('Saving metadata...');
const listFilePath = options.listFilePath || filePath;
// Extract recipeId from filePath (basename without extension) // Extract recipeId from filePath (basename without extension)
const recipeId = extractRecipeId(filePath); const recipeId = extractRecipeId(filePath);
@@ -359,7 +390,7 @@ export async function updateRecipeMetadata(filePath, updates) {
throw new Error('Unable to determine recipe ID'); throw new Error('Unable to determine recipe ID');
} }
const response = await fetch(`${RECIPE_ENDPOINTS.update}/${recipeId}/update`, { const response = await fetch(`${RECIPE_ENDPOINTS.update}/${encodeURIComponent(recipeId)}/update`, {
method: 'PUT', method: 'PUT',
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@@ -374,7 +405,7 @@ export async function updateRecipeMetadata(filePath, updates) {
throw new Error(data.error || 'Failed to update recipe'); throw new Error(data.error || 'Failed to update recipe');
} }
state.virtualScroller.updateSingleItem(filePath, updates); state.virtualScroller.updateSingleItem(listFilePath, updates);
return data; return data;
} catch (error) { } catch (error) {

View File

@@ -6,6 +6,7 @@ import { bulkManager } from '../../managers/BulkManager.js';
import { MODEL_CONFIG } from '../../api/apiConfig.js'; import { MODEL_CONFIG } from '../../api/apiConfig.js';
import { translate } from '../../utils/i18nHelpers.js'; import { translate } from '../../utils/i18nHelpers.js';
import { getNsfwLevelSelector } from '../shared/NsfwLevelSelector.js'; import { getNsfwLevelSelector } from '../shared/NsfwLevelSelector.js';
import { extractCivitaiModelUrlParts } from '../../utils/civitaiUtils.js';
// Mixin with shared functionality for LoraContextMenu and CheckpointContextMenu // Mixin with shared functionality for LoraContextMenu and CheckpointContextMenu
export const ModelContextMenuMixin = { export const ModelContextMenuMixin = {
@@ -154,25 +155,7 @@ export const ModelContextMenuMixin = {
}, },
extractModelVersionId(url) { extractModelVersionId(url) {
try { return extractCivitaiModelUrlParts(url);
// Handle all three URL formats:
// 1. https://civitai.com/models/649516
// 2. https://civitai.com/models/649516?modelVersionId=726676
// 3. https://civitai.com/models/649516/cynthia-pokemon-diamond-and-pearl-pdxl-lora?modelVersionId=726676
const parsedUrl = new URL(url);
// Extract model ID from path
const pathMatch = parsedUrl.pathname.match(/\/models\/(\d+)/);
const modelId = pathMatch ? pathMatch[1] : null;
// Extract model version ID from query parameters
const modelVersionId = parsedUrl.searchParams.get('modelVersionId');
return { modelId, modelVersionId };
} catch (e) {
return { modelId: null, modelVersionId: null };
}
}, },
parseModelId(value) { parseModelId(value) {

View File

@@ -23,7 +23,7 @@ export class RecipeContextMenu extends BaseContextMenu {
// Override resetAndReload for recipe context // Override resetAndReload for recipe context
async resetAndReload() { async resetAndReload() {
const { resetAndReload } = await import('../../api/recipeApi.js'); const { resetAndReload } = await import('../../api/recipeApi.js');
return resetAndReload(); return resetAndReload(false, { preserveScroll: true });
} }
showMenu(x, y, card) { showMenu(x, y, card) {

View File

@@ -3,16 +3,105 @@ import { showToast, copyToClipboard, sendLoraToWorkflow, sendModelPathToWorkflow
import { translate } from '../utils/i18nHelpers.js'; import { translate } from '../utils/i18nHelpers.js';
import { state } from '../state/index.js'; import { state } from '../state/index.js';
import { setSessionItem, removeSessionItem } from '../utils/storageHelpers.js'; import { setSessionItem, removeSessionItem } from '../utils/storageHelpers.js';
import { updateRecipeMetadata } from '../api/recipeApi.js'; import { fetchRecipeDetails, updateRecipeMetadata } from '../api/recipeApi.js';
import { downloadManager } from '../managers/DownloadManager.js'; import { downloadManager } from '../managers/DownloadManager.js';
import { MODEL_TYPES } from '../api/apiConfig.js'; import { MODEL_TYPES } from '../api/apiConfig.js';
const ALLOWED_GEN_PARAM_KEYS = new Set([
'prompt',
'negative_prompt',
'steps',
'sampler',
'cfg_scale',
'seed',
'size',
'clip_skip',
'denoising_strength',
]);
const GEN_PARAM_NORMALIZATION = {
cfg: 'cfg_scale',
cfgScale: 'cfg_scale',
clipSkip: 'clip_skip',
negativePrompt: 'negative_prompt',
Sampler: 'sampler',
sampler_name: 'sampler',
scheduler: 'sampler',
Steps: 'steps',
Seed: 'seed',
Size: 'size',
Prompt: 'prompt',
'Negative prompt': 'negative_prompt',
'Cfg scale': 'cfg_scale',
'Clip skip': 'clip_skip',
'Denoising strength': 'denoising_strength',
};
class RecipeModal { class RecipeModal {
constructor() { constructor() {
this.promptEditorState = {}; this.promptEditorState = {};
this.recipeHydrationRequestId = 0;
this.resetLocalEditState();
this.init(); this.init();
} }
createLocalEditState() {
return {
title: { commitVersion: 0, isDirty: false },
tags: { commitVersion: 0, isDirty: false },
prompt: { commitVersion: 0, isDirty: false },
negative_prompt: { commitVersion: 0, isDirty: false },
source_path: { commitVersion: 0, isDirty: false },
};
}
resetLocalEditState() {
this.localEditState = this.createLocalEditState();
this.sourceUrlEditState = this.localEditState.source_path;
}
getLocalEditState(field) {
if (!this.localEditState[field]) {
this.localEditState[field] = { commitVersion: 0, isDirty: false };
}
return this.localEditState[field];
}
markFieldDirty(field) {
this.getLocalEditState(field).isDirty = true;
}
clearFieldDirty(field) {
this.getLocalEditState(field).isDirty = false;
}
commitField(field) {
const fieldState = this.getLocalEditState(field);
fieldState.isDirty = false;
fieldState.commitVersion += 1;
}
captureLocalEditVersions() {
return Object.fromEntries(
Object.entries(this.localEditState).map(([field, state]) => [
field,
state.commitVersion,
])
);
}
shouldPreserveField(field, requestVersions) {
const fieldState = this.getLocalEditState(field);
const requestVersion = requestVersions?.[field] ?? fieldState.commitVersion;
return fieldState.isDirty || fieldState.commitVersion !== requestVersion;
}
hasFieldCommittedSinceRequest(field, requestVersions) {
const fieldState = this.getLocalEditState(field);
const requestVersion = requestVersions?.[field] ?? fieldState.commitVersion;
return fieldState.commitVersion !== requestVersion;
}
init() { init() {
this.setupCopyButtons(); this.setupCopyButtons();
this.setupPromptEditors(); this.setupPromptEditors();
@@ -87,8 +176,10 @@ class RecipeModal {
} }
showRecipeDetails(recipe) { showRecipeDetails(recipe) {
const hydratedRecipe = recipe || {};
this.resetLocalEditState();
// Store the full recipe for editing // Store the full recipe for editing
this.currentRecipe = recipe; this.currentRecipe = hydratedRecipe;
this.resetPromptEditors(); this.resetPromptEditors();
// Set modal title with edit icon // Set modal title with edit icon
@@ -96,11 +187,11 @@ class RecipeModal {
if (modalTitle) { if (modalTitle) {
modalTitle.innerHTML = ` modalTitle.innerHTML = `
<div class="editable-content"> <div class="editable-content">
<span class="content-text">${recipe.title || 'Recipe Details'}</span> <span class="content-text">${hydratedRecipe.title || 'Recipe Details'}</span>
<button class="edit-icon" title="Edit recipe name"><i class="fas fa-pencil-alt"></i></button> <button class="edit-icon" title="Edit recipe name"><i class="fas fa-pencil-alt"></i></button>
</div> </div>
<div id="recipeTitleEditor" class="content-editor"> <div id="recipeTitleEditor" class="content-editor">
<input type="text" class="title-input" value="${recipe.title || ''}"> <input type="text" class="title-input" value="${hydratedRecipe.title || ''}">
</div> </div>
`; `;
@@ -122,8 +213,9 @@ class RecipeModal {
} }
// Store the recipe ID for copy syntax API call // Store the recipe ID for copy syntax API call
this.recipeId = recipe.id; this.recipeId = hydratedRecipe.id;
this.filePath = recipe.file_path; this.filePath = hydratedRecipe.file_path;
this.listFilePath = hydratedRecipe.file_path;
// Set recipe tags if they exist // Set recipe tags if they exist
const tagsCompactElement = document.getElementById('recipeTagsCompact'); const tagsCompactElement = document.getElementById('recipeTagsCompact');
@@ -143,11 +235,11 @@ class RecipeModal {
const tagsDisplay = tagsCompactElement.querySelector('.tags-display'); const tagsDisplay = tagsCompactElement.querySelector('.tags-display');
if (recipe.tags && recipe.tags.length > 0) { if (hydratedRecipe.tags && hydratedRecipe.tags.length > 0) {
// Limit displayed tags to 5, show a "+X more" button if needed // Limit displayed tags to 5, show a "+X more" button if needed
const maxVisibleTags = 5; const maxVisibleTags = 5;
const visibleTags = recipe.tags.slice(0, maxVisibleTags); const visibleTags = hydratedRecipe.tags.slice(0, maxVisibleTags);
const remainingTags = recipe.tags.length > maxVisibleTags ? recipe.tags.slice(maxVisibleTags) : []; const remainingTags = hydratedRecipe.tags.length > maxVisibleTags ? hydratedRecipe.tags.slice(maxVisibleTags) : [];
// Add visible tags // Add visible tags
visibleTags.forEach(tag => { visibleTags.forEach(tag => {
@@ -184,7 +276,7 @@ class RecipeModal {
// Add all tags to tooltip // Add all tags to tooltip
if (tagsTooltipContent) { if (tagsTooltipContent) {
tagsTooltipContent.innerHTML = ''; tagsTooltipContent.innerHTML = '';
recipe.tags.forEach(tag => { hydratedRecipe.tags.forEach(tag => {
const tooltipTag = document.createElement('div'); const tooltipTag = document.createElement('div');
tooltipTag.className = 'tooltip-tag'; tooltipTag.className = 'tooltip-tag';
tooltipTag.textContent = tag; tooltipTag.textContent = tag;
@@ -201,8 +293,8 @@ class RecipeModal {
const tagsInput = tagsCompactElement.querySelector('.tags-input'); const tagsInput = tagsCompactElement.querySelector('.tags-input');
// Set current tags in the input // Set current tags in the input
if (recipe.tags && recipe.tags.length > 0) { if (hydratedRecipe.tags && hydratedRecipe.tags.length > 0) {
tagsInput.value = recipe.tags.join(', '); tagsInput.value = hydratedRecipe.tags.join(', ');
} }
editTagsIcon.addEventListener('click', () => this.showTagsEditor()); editTagsIcon.addEventListener('click', () => this.showTagsEditor());
@@ -222,49 +314,15 @@ class RecipeModal {
// Set recipe image // Set recipe image
const mediaContainer = document.getElementById('recipePreviewContainer'); const mediaContainer = document.getElementById('recipePreviewContainer');
if (mediaContainer) { if (mediaContainer) {
// Stop any playing video before replacing content this.syncPreviewMedia(hydratedRecipe);
const existingVideo = mediaContainer.querySelector('video'); mediaContainer.querySelector('.source-url-container')?.remove();
if (existingVideo) { mediaContainer.querySelector('.source-url-editor')?.remove();
existingVideo.pause();
existingVideo.currentTime = 0;
}
// Clear the container
mediaContainer.innerHTML = '';
// Ensure file_url exists, fallback to file_path if needed
const imageUrl = recipe.file_url ||
(recipe.file_path ? `/loras_static/root1/preview/${recipe.file_path.split('/').pop()}` :
'/loras_static/images/no-preview.png');
// Check if the file is a video (mp4)
const isVideo = imageUrl.toLowerCase().endsWith('.mp4');
if (isVideo) {
const videoElement = document.createElement('video');
videoElement.id = 'recipeModalVideo';
videoElement.src = imageUrl;
videoElement.controls = true;
videoElement.autoplay = false;
videoElement.loop = true;
videoElement.muted = true;
videoElement.className = 'recipe-preview-media';
videoElement.alt = recipe.title || 'Recipe Preview';
mediaContainer.appendChild(videoElement);
} else {
const imgElement = document.createElement('img');
imgElement.id = 'recipeModalImage';
imgElement.src = imageUrl;
imgElement.className = 'recipe-preview-media';
imgElement.alt = recipe.title || 'Recipe Preview';
mediaContainer.appendChild(imgElement);
}
// Add source URL container if the recipe has a source_path // Add source URL container if the recipe has a source_path
const sourceUrlContainer = document.createElement('div'); const sourceUrlContainer = document.createElement('div');
sourceUrlContainer.className = 'source-url-container'; sourceUrlContainer.className = 'source-url-container';
const hasSourceUrl = recipe.source_path && recipe.source_path.trim().length > 0; const hasSourceUrl = hydratedRecipe.source_path && hydratedRecipe.source_path.trim().length > 0;
const sourceUrl = hasSourceUrl ? recipe.source_path : ''; const sourceUrl = hasSourceUrl ? hydratedRecipe.source_path : '';
const isValidUrl = hasSourceUrl && (sourceUrl.startsWith('http://') || sourceUrl.startsWith('https://')); const isValidUrl = hasSourceUrl && (sourceUrl.startsWith('http://') || sourceUrl.startsWith('https://'));
sourceUrlContainer.innerHTML = ` sourceUrlContainer.innerHTML = `
@@ -293,40 +351,273 @@ class RecipeModal {
mediaContainer.appendChild(sourceUrlContainer); mediaContainer.appendChild(sourceUrlContainer);
mediaContainer.appendChild(sourceUrlEditor); mediaContainer.appendChild(sourceUrlEditor);
// Set up event listeners for source URL functionality // Delay binding slightly so modal layout is stable, but skip if this render was torn down.
const sourceUrlContainerRef = sourceUrlContainer;
const sourceUrlEditorRef = sourceUrlEditor;
setTimeout(() => { setTimeout(() => {
if (!document.body.contains(sourceUrlContainerRef) || !document.body.contains(sourceUrlEditorRef)) {
return;
}
this.setupSourceUrlHandlers(); this.setupSourceUrlHandlers();
}, 50); }, 50);
} }
// Set generation parameters this.syncGenerationParams(hydratedRecipe.gen_params);
this.syncResourcesSection(hydratedRecipe);
// Show the modal
modalManager.showModal('recipeModal');
if (this.recipeId) {
const hydrationRequestId = ++this.recipeHydrationRequestId;
const requestEditVersions = this.captureLocalEditVersions();
this.hydrateRecipeDetails(
this.recipeId,
hydrationRequestId,
requestEditVersions
);
}
}
async hydrateRecipeDetails(recipeId, requestId, requestEditVersions = {}) {
try {
const fullRecipe = await fetchRecipeDetails(recipeId);
if (requestId !== this.recipeHydrationRequestId || !fullRecipe) {
return;
}
const nextRecipe = { ...this.currentRecipe };
if (!this.hasFieldCommittedSinceRequest('title', requestEditVersions) && fullRecipe.title !== undefined) {
nextRecipe.title = fullRecipe.title;
}
if (!this.hasFieldCommittedSinceRequest('tags', requestEditVersions) && fullRecipe.tags !== undefined) {
nextRecipe.tags = Array.isArray(fullRecipe.tags) ? [...fullRecipe.tags] : fullRecipe.tags;
}
if (!this.hasFieldCommittedSinceRequest('source_path', requestEditVersions)) {
nextRecipe.source_path = fullRecipe.source_path || '';
}
const previousFilePath = nextRecipe.file_path;
if (fullRecipe.file_path !== undefined) {
nextRecipe.file_path = fullRecipe.file_path;
}
if (fullRecipe.file_url !== undefined) {
nextRecipe.file_url = fullRecipe.file_url;
}
if (fullRecipe.preview_url !== undefined) {
nextRecipe.preview_url = fullRecipe.preview_url;
}
if (
fullRecipe.file_path !== undefined &&
fullRecipe.file_path !== previousFilePath &&
fullRecipe.file_url === undefined &&
fullRecipe.preview_url === undefined
) {
delete nextRecipe.file_url;
delete nextRecipe.preview_url;
}
if (fullRecipe.gen_params !== undefined) {
const previousGenParams = nextRecipe.gen_params || {};
const incomingGenParams = { ...(fullRecipe.gen_params || {}) };
for (const [key, value] of Object.entries(previousGenParams)) {
if (this.hasFieldCommittedSinceRequest(key, requestEditVersions)) {
incomingGenParams[key] = value;
}
}
nextRecipe.gen_params = incomingGenParams;
} else {
const previousGenParams = nextRecipe.gen_params || {};
const preservedGenParams = {};
for (const [key, value] of Object.entries(previousGenParams)) {
if (this.hasFieldCommittedSinceRequest(key, requestEditVersions)) {
preservedGenParams[key] = value;
}
}
nextRecipe.gen_params = preservedGenParams;
}
if (fullRecipe.checkpoint !== undefined) {
nextRecipe.checkpoint = fullRecipe.checkpoint;
} else {
delete nextRecipe.checkpoint;
}
if (fullRecipe.loras !== undefined) {
nextRecipe.loras = Array.isArray(fullRecipe.loras) ? [...fullRecipe.loras] : fullRecipe.loras;
} else {
delete nextRecipe.loras;
}
this.currentRecipe = nextRecipe;
this.filePath = this.currentRecipe.file_path || this.filePath;
this.syncHydratedRecipeFields(requestEditVersions);
} catch (error) {
// Keep the cached recipe visible if hydration fails.
console.warn('Failed to hydrate recipe details:', error);
}
}
syncHydratedRecipeFields(requestEditVersions = {}) {
this.syncPreviewMedia(this.currentRecipe);
if (!this.shouldPreserveField('title', requestEditVersions)) {
this.syncTitleDisplay(this.currentRecipe?.title || '');
}
if (!this.shouldPreserveField('tags', requestEditVersions)) {
this.syncTagsDisplay(this.currentRecipe?.tags || []);
}
if (!this.shouldPreserveField('prompt', requestEditVersions)) {
this.syncPromptField(
'prompt',
this.currentRecipe?.gen_params?.prompt || '',
'No prompt information available'
);
}
if (!this.shouldPreserveField('negative_prompt', requestEditVersions)) {
this.syncPromptField(
'negative_prompt',
this.currentRecipe?.gen_params?.negative_prompt || '',
'No negative prompt information available'
);
}
this.syncGenerationParams(this.currentRecipe?.gen_params, { promptFieldsOnly: true });
this.syncResourcesSection(this.currentRecipe);
if (!this.shouldPreserveField('source_path', requestEditVersions)) {
this.updateSourceUrlDisplay(this.currentRecipe.source_path || '', { forceInputSync: true });
} else {
this.updateSourceUrlDisplay(this.currentRecipe.source_path || '');
}
}
getPreviewMediaUrl(recipe = {}) {
return recipe.file_url ||
recipe.preview_url ||
(recipe.file_path ? `/loras_static/root1/preview/${recipe.file_path.split('/').pop()}` :
'/loras_static/images/no-preview.png');
}
syncPreviewMedia(recipe = {}) {
const mediaContainer = document.getElementById('recipePreviewContainer');
if (!mediaContainer) {
return;
}
const previewUrl = this.getPreviewMediaUrl(recipe);
const isVideo = previewUrl.toLowerCase().endsWith('.mp4');
const expectedElementId = isVideo ? 'recipeModalVideo' : 'recipeModalImage';
let previewElement = mediaContainer.querySelector(`#${expectedElementId}`);
const existingPreviewElement = mediaContainer.querySelector('.recipe-preview-media');
if (!previewElement || (existingPreviewElement && existingPreviewElement !== previewElement)) {
if (existingPreviewElement?.tagName === 'VIDEO') {
const existingVideo = existingPreviewElement;
existingVideo.pause();
existingVideo.currentTime = 0;
}
existingPreviewElement?.remove();
previewElement = document.createElement(isVideo ? 'video' : 'img');
previewElement.id = expectedElementId;
previewElement.className = 'recipe-preview-media';
mediaContainer.prepend(previewElement);
}
previewElement.src = previewUrl;
previewElement.alt = recipe.title || 'Recipe Preview';
if (isVideo) {
previewElement.controls = true;
previewElement.autoplay = false;
previewElement.loop = true;
previewElement.muted = true;
}
}
getMetadataUpdateOptions() {
return this.listFilePath ? { listFilePath: this.listFilePath } : {};
}
syncTitleDisplay(title) {
const titleContainer = document.getElementById('recipeModalTitle');
if (!titleContainer) {
return;
}
const contentText = titleContainer.querySelector('.content-text');
if (contentText) {
contentText.textContent = title || 'Recipe Details';
}
const titleInput = titleContainer.querySelector('.title-input');
if (titleInput) {
titleInput.value = title || '';
}
}
syncTagsDisplay(tags) {
const tagsContainer = document.getElementById('recipeTagsCompact');
if (!tagsContainer) {
return;
}
this.updateTagsDisplay(tagsContainer, tags || []);
const tagsInput = tagsContainer.querySelector('.tags-input');
if (tagsInput) {
tagsInput.value = tags && tags.length > 0 ? tags.join(', ') : '';
}
}
syncPromptField(field, value, placeholder) {
const contentId = field === 'prompt' ? 'recipePrompt' : 'recipeNegativePrompt';
const editorId = field === 'prompt' ? 'recipePromptEditor' : 'recipeNegativePromptEditor';
const inputId = field === 'prompt' ? 'recipePromptInput' : 'recipeNegativePromptInput';
this.renderPromptContent(document.getElementById(contentId), value, placeholder);
const input = document.getElementById(inputId);
if (input) {
input.value = value || '';
}
}
syncGenerationParams(genParams, options = {}) {
const promptElement = document.getElementById('recipePrompt'); const promptElement = document.getElementById('recipePrompt');
const negativePromptElement = document.getElementById('recipeNegativePrompt'); const negativePromptElement = document.getElementById('recipeNegativePrompt');
const otherParamsElement = document.getElementById('recipeOtherParams'); const otherParamsElement = document.getElementById('recipeOtherParams');
const promptInput = document.getElementById('recipePromptInput'); const promptInput = document.getElementById('recipePromptInput');
const negativePromptInput = document.getElementById('recipeNegativePromptInput'); const negativePromptInput = document.getElementById('recipeNegativePromptInput');
const promptFieldsOnly = options.promptFieldsOnly === true;
const sanitizedGenParams = this.sanitizeGenParams(genParams);
if (recipe.gen_params) { if (sanitizedGenParams) {
this.renderPromptContent(promptElement, recipe.gen_params.prompt, 'No prompt information available'); if (!promptFieldsOnly) {
this.renderPromptContent(negativePromptElement, recipe.gen_params.negative_prompt, 'No negative prompt information available'); this.renderPromptContent(promptElement, sanitizedGenParams.prompt, 'No prompt information available');
this.renderPromptContent(negativePromptElement, sanitizedGenParams.negative_prompt, 'No negative prompt information available');
if (promptInput) { if (promptInput) {
promptInput.value = recipe.gen_params.prompt || ''; promptInput.value = sanitizedGenParams.prompt || '';
}
if (negativePromptInput) {
negativePromptInput.value = sanitizedGenParams.negative_prompt || '';
}
} }
if (negativePromptInput) {
negativePromptInput.value = recipe.gen_params.negative_prompt || '';
}
// Set other parameters
if (otherParamsElement) { if (otherParamsElement) {
// Clear previous params
otherParamsElement.innerHTML = ''; otherParamsElement.innerHTML = '';
// Add all other parameters except prompt and negative_prompt
const excludedParams = ['prompt', 'negative_prompt']; const excludedParams = ['prompt', 'negative_prompt'];
for (const [key, value] of Object.entries(recipe.gen_params)) { for (const [key, value] of Object.entries(sanitizedGenParams)) {
if (!excludedParams.includes(key) && value !== undefined && value !== null) { if (!excludedParams.includes(key) && value !== undefined && value !== null) {
const paramTag = document.createElement('div'); const paramTag = document.createElement('div');
paramTag.className = 'param-tag'; paramTag.className = 'param-tag';
@@ -338,22 +629,68 @@ class RecipeModal {
} }
} }
// If no other params, show a message
if (otherParamsElement.children.length === 0) { if (otherParamsElement.children.length === 0) {
otherParamsElement.innerHTML = '<div class="no-params">No additional parameters available</div>'; otherParamsElement.innerHTML = '<div class="no-params">No additional parameters available</div>';
} }
} }
} else { return;
// No generation parameters available }
if (!promptFieldsOnly) {
this.renderPromptContent(promptElement, '', 'No prompt information available'); this.renderPromptContent(promptElement, '', 'No prompt information available');
this.renderPromptContent(negativePromptElement, '', 'No negative prompt information available'); this.renderPromptContent(negativePromptElement, '', 'No negative prompt information available');
if (promptInput) promptInput.value = ''; if (promptInput) promptInput.value = '';
if (negativePromptInput) negativePromptInput.value = ''; if (negativePromptInput) negativePromptInput.value = '';
if (otherParamsElement) otherParamsElement.innerHTML = '<div class="no-params">No parameters available</div>';
} }
if (otherParamsElement) {
otherParamsElement.innerHTML = '<div class="no-params">No parameters available</div>';
}
}
sanitizeGenParams(genParams) {
if (!genParams || typeof genParams !== 'object') {
return null;
}
const sanitized = {};
for (const [key, value] of Object.entries(genParams)) {
if (value === undefined || value === null || value === '') {
continue;
}
if (!ALLOWED_GEN_PARAM_KEYS.has(key)) {
continue;
}
sanitized[key] = value;
}
for (const [key, value] of Object.entries(genParams)) {
if (value === undefined || value === null || value === '') {
continue;
}
const normalizedKey = GEN_PARAM_NORMALIZATION[key] || key;
if (!ALLOWED_GEN_PARAM_KEYS.has(normalizedKey)) {
continue;
}
if (sanitized[normalizedKey] === undefined || sanitized[normalizedKey] === null || sanitized[normalizedKey] === '') {
sanitized[normalizedKey] = value;
}
}
return sanitized;
}
syncResourcesSection(recipe = {}) {
const checkpointContainer = document.getElementById('recipeCheckpoint'); const checkpointContainer = document.getElementById('recipeCheckpoint');
const resourceDivider = document.getElementById('recipeResourceDivider'); const resourceDivider = document.getElementById('recipeResourceDivider');
const lorasListElement = document.getElementById('recipeLorasList');
const lorasCountElement = document.getElementById('recipeLorasCount');
const loras = Array.isArray(recipe.loras) ? recipe.loras : [];
if (checkpointContainer) { if (checkpointContainer) {
checkpointContainer.innerHTML = ''; checkpointContainer.innerHTML = '';
@@ -364,59 +701,43 @@ class RecipeModal {
} }
} }
// Set LoRAs list and count
const lorasListElement = document.getElementById('recipeLorasList');
const lorasCountElement = document.getElementById('recipeLorasCount');
// Check all LoRAs status
let allLorasAvailable = true; let allLorasAvailable = true;
let missingLorasCount = 0; let missingLorasCount = 0;
let deletedLorasCount = 0; let deletedLorasCount = 0;
if (recipe.loras && recipe.loras.length > 0) { loras.forEach(lora => {
recipe.loras.forEach(lora => { if (lora.isDeleted) {
if (lora.isDeleted) { deletedLorasCount++;
deletedLorasCount++; } else if (!lora.inLibrary) {
} else if (!lora.inLibrary) { allLorasAvailable = false;
allLorasAvailable = false; missingLorasCount++;
missingLorasCount++; }
} });
});
}
// Set LoRAs count and status if (lorasCountElement) {
if (lorasCountElement && recipe.loras) { const totalCount = loras.length;
const totalCount = recipe.loras.length;
// Create status indicator based on LoRA states
let statusHTML = ''; let statusHTML = '';
if (totalCount > 0) { if (totalCount > 0) {
if (allLorasAvailable && deletedLorasCount === 0) { if (allLorasAvailable && deletedLorasCount === 0) {
// All LoRAs are available
statusHTML = `<div class="recipe-status ready"><i class="fas fa-check-circle"></i> Ready to use</div>`; statusHTML = `<div class="recipe-status ready"><i class="fas fa-check-circle"></i> Ready to use</div>`;
} else if (missingLorasCount > 0) { } else if (missingLorasCount > 0) {
// Some LoRAs are missing (prioritize showing missing over deleted)
statusHTML = `<div class="recipe-status missing"> statusHTML = `<div class="recipe-status missing">
<i class="fas fa-exclamation-triangle"></i> ${missingLorasCount} missing <i class="fas fa-exclamation-triangle"></i> ${missingLorasCount} missing
<div class="missing-tooltip">Click to download missing LoRAs</div> <div class="missing-tooltip">Click to download missing LoRAs</div>
</div>`; </div>`;
} else if (deletedLorasCount > 0 && missingLorasCount === 0) { } else if (deletedLorasCount > 0 && missingLorasCount === 0) {
// Some LoRAs are deleted but none are missing
statusHTML = `<div class="recipe-status partial"><i class="fas fa-info-circle"></i> ${deletedLorasCount} deleted</div>`; statusHTML = `<div class="recipe-status partial"><i class="fas fa-info-circle"></i> ${deletedLorasCount} deleted</div>`;
} }
} }
lorasCountElement.innerHTML = `<i class="fas fa-layer-group"></i> ${totalCount} LoRAs ${statusHTML}`; lorasCountElement.innerHTML = `<i class="fas fa-layer-group"></i> ${totalCount} LoRAs ${statusHTML}`;
// Add event listeners for buttons and status indicators
setTimeout(() => { setTimeout(() => {
// Set up click handler for View LoRAs button
const viewRecipeLorasBtn = document.getElementById('viewRecipeLorasBtn'); const viewRecipeLorasBtn = document.getElementById('viewRecipeLorasBtn');
if (viewRecipeLorasBtn) { if (viewRecipeLorasBtn) {
viewRecipeLorasBtn.addEventListener('click', () => this.navigateToLorasPage()); viewRecipeLorasBtn.addEventListener('click', () => this.navigateToLorasPage());
} }
// Add click handler for missing LoRAs status
const missingStatus = document.querySelector('.recipe-status.missing'); const missingStatus = document.querySelector('.recipe-status.missing');
if (missingStatus && missingLorasCount > 0) { if (missingStatus && missingLorasCount > 0) {
missingStatus.classList.add('clickable'); missingStatus.classList.add('clickable');
@@ -425,13 +746,12 @@ class RecipeModal {
}, 100); }, 100);
} }
if (lorasListElement && recipe.loras && recipe.loras.length > 0) { if (lorasListElement && loras.length > 0) {
lorasListElement.innerHTML = recipe.loras.map(lora => { lorasListElement.innerHTML = loras.map(lora => {
const existsLocally = lora.inLibrary; const existsLocally = lora.inLibrary;
const isDeleted = lora.isDeleted; const isDeleted = lora.isDeleted;
const localPath = lora.localPath || ''; const localPath = lora.localPath || '';
// Create status badge based on LoRA state
let localStatus; let localStatus;
if (existsLocally) { if (existsLocally) {
localStatus = ` localStatus = `
@@ -441,7 +761,7 @@ class RecipeModal {
</div>`; </div>`;
} else if (isDeleted) { } else if (isDeleted) {
localStatus = ` localStatus = `
<div class="deleted-badge reconnectable" data-lora-index="${recipe.loras.indexOf(lora)}"> <div class="deleted-badge reconnectable" data-lora-index="${loras.indexOf(lora)}">
<span class="badge-text"><i class="fas fa-trash-alt"></i> Deleted</span> <span class="badge-text"><i class="fas fa-trash-alt"></i> Deleted</span>
<div class="reconnect-tooltip">Click to reconnect with a local LoRA</div> <div class="reconnect-tooltip">Click to reconnect with a local LoRA</div>
</div>`; </div>`;
@@ -452,7 +772,6 @@ class RecipeModal {
</div>`; </div>`;
} }
// Check if preview is a video
const isPreviewVideo = lora.preview_url && lora.preview_url.toLowerCase().endsWith('.mp4'); const isPreviewVideo = lora.preview_url && lora.preview_url.toLowerCase().endsWith('.mp4');
const previewMedia = isPreviewVideo ? const previewMedia = isPreviewVideo ?
`<video class="thumbnail-video" autoplay loop muted playsinline> `<video class="thumbnail-video" autoplay loop muted playsinline>
@@ -460,7 +779,6 @@ class RecipeModal {
</video>` : </video>` :
`<img src="${lora.preview_url || '/loras_static/images/no-preview.png'}" alt="LoRA preview">`; `<img src="${lora.preview_url || '/loras_static/images/no-preview.png'}" alt="LoRA preview">`;
// Determine CSS class based on LoRA state
let loraItemClass = 'recipe-lora-item'; let loraItemClass = 'recipe-lora-item';
if (existsLocally) { if (existsLocally) {
loraItemClass += ' exists-locally'; loraItemClass += ' exists-locally';
@@ -471,7 +789,7 @@ class RecipeModal {
} }
return ` return `
<div class="${loraItemClass}" data-lora-index="${recipe.loras.indexOf(lora)}"> <div class="${loraItemClass}" data-lora-index="${loras.indexOf(lora)}">
<div class="recipe-lora-thumbnail"> <div class="recipe-lora-thumbnail">
${previewMedia} ${previewMedia}
</div> </div>
@@ -485,7 +803,7 @@ class RecipeModal {
<div class="recipe-lora-weight">Weight: ${lora.strength || 1.0}</div> <div class="recipe-lora-weight">Weight: ${lora.strength || 1.0}</div>
${lora.baseModel ? `<div class="base-model">${lora.baseModel}</div>` : ''} ${lora.baseModel ? `<div class="base-model">${lora.baseModel}</div>` : ''}
</div> </div>
<div class="lora-reconnect-container" data-lora-index="${recipe.loras.indexOf(lora)}"> <div class="lora-reconnect-container" data-lora-index="${loras.indexOf(lora)}">
<div class="reconnect-instructions"> <div class="reconnect-instructions">
<p>Enter LoRA Syntax or Name to Reconnect:</p> <p>Enter LoRA Syntax or Name to Reconnect:</p>
<small>Example: <code>&lt;lora:Boris_Vallejo_BV_flux_D:1&gt;</code> or just <code>Boris_Vallejo_BV_flux_D</code></small> <small>Example: <code>&lt;lora:Boris_Vallejo_BV_flux_D:1&gt;</code> or just <code>Boris_Vallejo_BV_flux_D</code></small>
@@ -503,15 +821,12 @@ class RecipeModal {
`; `;
}).join(''); }).join('');
// Add event listeners for reconnect functionality
setTimeout(() => { setTimeout(() => {
this.setupReconnectButtons(); this.setupReconnectButtons();
this.setupLoraItemsClickable(); this.setupLoraItemsClickable();
}, 100); }, 100);
// Generate recipe syntax for copy button (this is now a placeholder, actual syntax will be fetched from the API)
this.recipeLorasSyntax = ''; this.recipeLorasSyntax = '';
} else if (lorasListElement) { } else if (lorasListElement) {
lorasListElement.innerHTML = '<div class="no-loras">No LoRAs associated with this recipe</div>'; lorasListElement.innerHTML = '<div class="no-loras">No LoRAs associated with this recipe</div>';
this.recipeLorasSyntax = ''; this.recipeLorasSyntax = '';
@@ -522,9 +837,31 @@ class RecipeModal {
const hasLoraItems = lorasListElement && lorasListElement.querySelector('.recipe-lora-item'); const hasLoraItems = lorasListElement && lorasListElement.querySelector('.recipe-lora-item');
resourceDivider.style.display = hasCheckpoint && hasLoraItems ? 'block' : 'none'; resourceDivider.style.display = hasCheckpoint && hasLoraItems ? 'block' : 'none';
} }
}
// Show the modal updateSourceUrlDisplay(sourcePath, options = {}) {
modalManager.showModal('recipeModal'); const sourceUrlContainer = document.querySelector('.source-url-container');
const sourceUrlEditor = document.querySelector('.source-url-editor');
if (!sourceUrlContainer || !sourceUrlEditor) {
return;
}
const sourceUrlText = sourceUrlContainer.querySelector('.source-url-text');
const sourceUrlInput = sourceUrlEditor.querySelector('.source-url-input');
if (!sourceUrlText || !sourceUrlInput) {
return;
}
const normalizedSourcePath = typeof sourcePath === 'string' ? sourcePath.trim() : '';
const isValidUrl = normalizedSourcePath.startsWith('http://') || normalizedSourcePath.startsWith('https://');
sourceUrlText.textContent = normalizedSourcePath || 'No source URL';
sourceUrlText.title = normalizedSourcePath
? (isValidUrl ? 'Click to open source URL' : 'No valid URL')
: 'No valid URL';
if (options.forceInputSync || !sourceUrlEditor.classList.contains('active') || !this.sourceUrlEditState.isDirty) {
sourceUrlInput.value = normalizedSourcePath;
}
} }
// Title editing methods // Title editing methods
@@ -535,6 +872,7 @@ class RecipeModal {
const editor = titleContainer.querySelector('#recipeTitleEditor'); const editor = titleContainer.querySelector('#recipeTitleEditor');
editor.classList.add('active'); editor.classList.add('active');
const input = editor.querySelector('input'); const input = editor.querySelector('input');
input.oninput = () => this.markFieldDirty('title');
input.focus(); input.focus();
input.select(); input.select();
} }
@@ -553,19 +891,23 @@ class RecipeModal {
titleContainer.querySelector('.content-text').textContent = newTitle; titleContainer.querySelector('.content-text').textContent = newTitle;
// Update the recipe on the server // Update the recipe on the server
updateRecipeMetadata(this.filePath, { title: newTitle }) updateRecipeMetadata(this.filePath, { title: newTitle }, this.getMetadataUpdateOptions())
.then(data => { .then(data => {
// Show success toast // Show success toast
showToast('toast.recipes.nameUpdated', {}, 'success'); showToast('toast.recipes.nameUpdated', {}, 'success');
// Update the current recipe object // Update the current recipe object
this.currentRecipe.title = newTitle; this.currentRecipe.title = newTitle;
this.commitField('title');
}) })
.catch(error => { .catch(error => {
// Error is handled in the API function // Error is handled in the API function
// Reset the UI if needed // Reset the UI if needed
titleContainer.querySelector('.content-text').textContent = this.currentRecipe.title || ''; titleContainer.querySelector('.content-text').textContent = this.currentRecipe.title || '';
this.clearFieldDirty('title');
}); });
} else {
this.clearFieldDirty('title');
} }
// Hide editor // Hide editor
@@ -581,6 +923,7 @@ class RecipeModal {
const editor = titleContainer.querySelector('#recipeTitleEditor'); const editor = titleContainer.querySelector('#recipeTitleEditor');
const input = editor.querySelector('input'); const input = editor.querySelector('input');
input.value = this.currentRecipe.title || ''; input.value = this.currentRecipe.title || '';
this.clearFieldDirty('title');
// Hide editor // Hide editor
editor.classList.remove('active'); editor.classList.remove('active');
@@ -596,6 +939,7 @@ class RecipeModal {
const editor = tagsContainer.querySelector('#recipeTagsEditor'); const editor = tagsContainer.querySelector('#recipeTagsEditor');
editor.classList.add('active'); editor.classList.add('active');
const input = editor.querySelector('input'); const input = editor.querySelector('input');
input.oninput = () => this.markFieldDirty('tags');
input.focus(); input.focus();
} }
} }
@@ -623,20 +967,24 @@ class RecipeModal {
if (tagsChanged) { if (tagsChanged) {
// Update the recipe on the server // Update the recipe on the server
updateRecipeMetadata(this.filePath, { tags: newTags }) updateRecipeMetadata(this.filePath, { tags: newTags }, this.getMetadataUpdateOptions())
.then(data => { .then(data => {
// Show success toast // Show success toast
showToast('toast.recipes.tagsUpdated', {}, 'success'); showToast('toast.recipes.tagsUpdated', {}, 'success');
// Update the current recipe object // Update the current recipe object
this.currentRecipe.tags = newTags; this.currentRecipe.tags = newTags;
this.commitField('tags');
// Update tags in the UI // Update tags in the UI
this.updateTagsDisplay(tagsContainer, newTags); this.updateTagsDisplay(tagsContainer, newTags);
}) })
.catch(error => { .catch(error => {
// Error is handled in the API function // Error is handled in the API function
this.clearFieldDirty('tags');
}); });
} else {
this.clearFieldDirty('tags');
} }
// Hide editor // Hide editor
@@ -708,6 +1056,7 @@ class RecipeModal {
const editor = tagsContainer.querySelector('#recipeTagsEditor'); const editor = tagsContainer.querySelector('#recipeTagsEditor');
const input = editor.querySelector('input'); const input = editor.querySelector('input');
input.value = this.currentRecipe.tags ? this.currentRecipe.tags.join(', ') : ''; input.value = this.currentRecipe.tags ? this.currentRecipe.tags.join(', ') : '';
this.clearFieldDirty('tags');
// Hide editor // Hide editor
editor.classList.remove('active'); editor.classList.remove('active');
@@ -748,6 +1097,7 @@ class RecipeModal {
} }
if (input) { if (input) {
input.addEventListener('input', () => this.markFieldDirty(config.field));
input.addEventListener('keydown', (event) => { input.addEventListener('keydown', (event) => {
if (event.key === 'Escape') { if (event.key === 'Escape') {
event.preventDefault(); event.preventDefault();
@@ -840,9 +1190,10 @@ class RecipeModal {
const currentGenParams = this.currentRecipe.gen_params || {}; const currentGenParams = this.currentRecipe.gen_params || {};
const nextValue = input.value.trim() === '' ? '' : input.value; const nextValue = input.value.trim() === '' ? '' : input.value;
const currentValue = currentGenParams[config.field] || ''; const currentValue = this.sanitizeGenParams(currentGenParams)?.[config.field] || '';
if (nextValue === currentValue) { if (nextValue === currentValue) {
this.clearFieldDirty(config.field);
this.hidePromptEditor(config); this.hidePromptEditor(config);
return; return;
} }
@@ -857,14 +1208,17 @@ class RecipeModal {
...promptState, ...promptState,
isSaving: true, isSaving: true,
}; };
await updateRecipeMetadata(this.filePath, { gen_params: nextGenParams }); await updateRecipeMetadata(this.filePath, { gen_params: nextGenParams }, this.getMetadataUpdateOptions());
this.currentRecipe.gen_params = nextGenParams; this.currentRecipe.gen_params = nextGenParams;
this.renderPromptContent(content, nextValue, config.placeholder); this.renderPromptContent(content, nextValue, config.placeholder);
showToast(config.successKey, {}, 'success', config.successFallback); showToast(config.successKey, {}, 'success', config.successFallback);
this.commitField(config.field);
} catch (error) { } catch (error) {
this.renderPromptContent(content, currentValue, config.placeholder); this.renderPromptContent(content, currentValue, config.placeholder);
input.value = currentValue; input.value = currentValue;
this.clearFieldDirty(config.field);
} finally { } finally {
this.clearFieldDirty(config.field);
this.hidePromptEditor(config); this.hidePromptEditor(config);
} }
} }
@@ -872,10 +1226,10 @@ class RecipeModal {
cancelPromptEdit(config) { cancelPromptEdit(config) {
const input = document.getElementById(config.inputId); const input = document.getElementById(config.inputId);
if (input) { if (input) {
const initialValue = this.promptEditorState[config.field]?.initialValue; input.value = this.currentRecipe?.gen_params?.[config.field] || '';
input.value = initialValue ?? (this.currentRecipe?.gen_params?.[config.field] || '');
} }
this.clearFieldDirty(config.field);
this.hidePromptEditor(config); this.hidePromptEditor(config);
} }
@@ -918,11 +1272,16 @@ class RecipeModal {
sourceUrlInput.focus(); sourceUrlInput.focus();
}); });
sourceUrlInput.addEventListener('input', () => {
this.sourceUrlEditState.isDirty = true;
});
// Cancel editing // Cancel editing
sourceUrlCancelBtn.addEventListener('click', () => { sourceUrlCancelBtn.addEventListener('click', () => {
sourceUrlEditor.classList.remove('active'); sourceUrlEditor.classList.remove('active');
sourceUrlContainer.classList.remove('hide'); sourceUrlContainer.classList.remove('hide');
sourceUrlInput.value = this.currentRecipe.source_path || ''; this.updateSourceUrlDisplay(this.currentRecipe.source_path || '', { forceInputSync: true });
this.clearFieldDirty('source_path');
}); });
// Save new source URL // Save new source URL
@@ -930,23 +1289,24 @@ class RecipeModal {
const newSourceUrl = sourceUrlInput.value.trim(); const newSourceUrl = sourceUrlInput.value.trim();
if (newSourceUrl !== this.currentRecipe.source_path) { if (newSourceUrl !== this.currentRecipe.source_path) {
// Update the recipe on the server // Update the recipe on the server
updateRecipeMetadata(this.filePath, { source_path: newSourceUrl }) updateRecipeMetadata(this.filePath, { source_path: newSourceUrl }, this.getMetadataUpdateOptions())
.then(data => { .then(data => {
// Show success toast // Show success toast
showToast('toast.recipes.sourceUrlUpdated', {}, 'success'); showToast('toast.recipes.sourceUrlUpdated', {}, 'success');
// Update source URL in the UI // Update source URL in the UI
sourceUrlText.textContent = newSourceUrl || 'No source URL'; this.commitField('source_path');
sourceUrlText.title = newSourceUrl && (newSourceUrl.startsWith('http://') || this.updateSourceUrlDisplay(newSourceUrl, { forceInputSync: true });
newSourceUrl.startsWith('https://')) ?
'Click to open source URL' : 'No valid URL';
// Update the current recipe object // Update the current recipe object
this.currentRecipe.source_path = newSourceUrl; this.currentRecipe.source_path = newSourceUrl;
}) })
.catch(error => { .catch(error => {
// Error is handled in the API function // Error is handled in the API function
this.clearFieldDirty('source_path');
}); });
} else {
this.clearFieldDirty('source_path');
} }
// Hide editor // Hide editor
@@ -1286,7 +1646,7 @@ class RecipeModal {
this.showRecipeDetails(this.currentRecipe); this.showRecipeDetails(this.currentRecipe);
}, 500); }, 500);
state.virtualScroller.updateSingleItem(this.currentRecipe.file_path, { state.virtualScroller.updateSingleItem(this.listFilePath || this.currentRecipe.file_path, {
loras: this.currentRecipe.loras loras: this.currentRecipe.loras
}); });
} else { } else {

View File

@@ -1,7 +1,7 @@
// 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 } from '../../utils/storageHelpers.js'; import { getStorageItem, setStorageItem, getSessionItem, setSessionItem } from '../../utils/storageHelpers.js';
import { showToast } 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';
@@ -354,17 +354,7 @@ export class PageControls {
const civitaiId = metaData.modelId; const civitaiId = metaData.modelId;
const versionId = metaData.id; const versionId = metaData.id;
// Build URL openCivitaiByMetadata(civitaiId, versionId, modelName);
if (civitaiId) {
let url = `https://civitai.com/models/${civitaiId}`;
if (versionId) {
url += `?modelVersionId=${versionId}`;
}
window.open(url, '_blank');
} else {
// If no ID, try searching by name
window.open(`https://civitai.com/models?query=${encodeURIComponent(modelName)}`, '_blank');
}
} }
/** /**

View File

@@ -1,26 +1,21 @@
import { getModelApiClient } from '../../api/modelApiFactory.js'; import { getModelApiClient } from '../../api/modelApiFactory.js';
import { downloadManager } from '../../managers/DownloadManager.js'; import { downloadManager } from '../../managers/DownloadManager.js';
import { modalManager } from '../../managers/ModalManager.js'; import { modalManager } from '../../managers/ModalManager.js';
import { showToast } from '../../utils/uiHelpers.js'; import { openCivitaiUrl, showToast } from '../../utils/uiHelpers.js';
import { translate } from '../../utils/i18nHelpers.js'; import { translate } from '../../utils/i18nHelpers.js';
import { state } from '../../state/index.js'; import { state } from '../../state/index.js';
import { buildCivitaiModelUrl } from '../../utils/civitaiUtils.js';
import { formatFileSize } from './utils.js'; import { formatFileSize } from './utils.js';
const VIDEO_EXTENSIONS = ['.mp4', '.webm', '.mov', '.mkv']; const VIDEO_EXTENSIONS = ['.mp4', '.webm', '.mov', '.mkv'];
const PREVIEW_PLACEHOLDER_URL = '/loras_static/images/no-preview.png'; const PREVIEW_PLACEHOLDER_URL = '/loras_static/images/no-preview.png';
function buildCivitaiVersionUrl(modelId, versionId) { function buildCivitaiVersionUrl(modelId, versionId) {
if (modelId == null || versionId == null) { return buildCivitaiModelUrl(
return null; modelId,
} versionId,
const normalizedModelId = String(modelId).trim(); state?.global?.settings?.civitai_host
const normalizedVersionId = String(versionId).trim(); );
if (!normalizedModelId || !normalizedVersionId) {
return null;
}
const encodedModelId = encodeURIComponent(normalizedModelId);
const encodedVersionId = encodeURIComponent(normalizedVersionId);
return `https://civitai.com/models/${encodedModelId}?modelVersionId=${encodedVersionId}`;
} }
function escapeHtml(value) { function escapeHtml(value) {
@@ -220,8 +215,31 @@ function buildMetaMarkup(version, options = {}) {
.join('<span class="version-meta-separator">•</span>'); .join('<span class="version-meta-separator">•</span>');
} }
function buildBadge(label, tone) { function buildBadge(label, tone, options = {}) {
return `<span class="version-badge version-badge-${tone}">${escapeHtml(label)}</span>`; const attributes = [];
if (options.title) {
attributes.push(`title="${escapeHtml(options.title)}"`);
}
if (options.ariaLabel) {
attributes.push(`aria-label="${escapeHtml(options.ariaLabel)}"`);
}
const suffix = attributes.length ? ` ${attributes.join(' ')}` : '';
return `<span class="version-badge version-badge-${tone}"${suffix}>${escapeHtml(label)}</span>`;
}
function buildActionButton(label, variant, action, options = {}) {
const attributes = [
`class="version-action ${variant}"`,
`data-version-action="${escapeHtml(action)}"`,
];
if (options.title) {
attributes.push(`title="${escapeHtml(options.title)}"`);
attributes.push(`aria-label="${escapeHtml(options.title)}"`);
}
if (options.extraAttributes) {
attributes.push(options.extraAttributes);
}
return `<button ${attributes.join(' ')}>${options.iconMarkup || ''}${escapeHtml(label)}</button>`;
} }
const DISPLAY_FILTER_MODES = Object.freeze({ const DISPLAY_FILTER_MODES = Object.freeze({
@@ -426,23 +444,72 @@ function renderRow(version, options) {
version.versionId > latestLibraryVersionId; version.versionId > latestLibraryVersionId;
const isEarlyAccess = isEarlyAccessActive(version); const isEarlyAccess = isEarlyAccessActive(version);
const badges = []; const badges = [];
const openedBadgeLabel = translate('modals.model.versions.badges.current', {}, 'Opened Version');
const inLibraryBadgeLabel = translate('modals.model.versions.badges.inLibrary', {}, 'In Library');
const downloadedBadgeLabel = translate('modals.model.versions.badges.downloaded', {}, 'Downloaded');
const newerBadgeLabel = translate('modals.model.versions.badges.newer', {}, 'Newer Version');
const earlyAccessBadgeLabel = translate('modals.model.versions.badges.earlyAccess', {}, 'Early Access');
const ignoredBadgeLabel = translate('modals.model.versions.badges.ignored', {}, 'Ignored');
const versionName = version.name || translate('modals.model.versions.labels.unnamed', {}, 'Untitled Version');
if (isCurrent) { if (isCurrent) {
badges.push(buildBadge(translate('modals.model.versions.badges.current', {}, 'Current Version'), 'current')); badges.push(buildBadge(openedBadgeLabel, 'current', {
title: translate(
'modals.model.versions.badges.currentTooltip',
{},
'This is the version you opened this modal from'
),
}));
} }
if (version.isInLibrary) { if (version.isInLibrary) {
badges.push(buildBadge(translate('modals.model.versions.badges.inLibrary', {}, 'In Library'), 'success')); badges.push(buildBadge(inLibraryBadgeLabel, 'success', {
} else if (isNewer && !version.shouldIgnore) { title: translate(
badges.push(buildBadge(translate('modals.model.versions.badges.newer', {}, 'Newer Version'), 'info')); 'modals.model.versions.badges.inLibraryTooltip',
{},
'This version exists in your local library'
),
}));
}
if (!version.isInLibrary && version.hasBeenDownloaded) {
badges.push(buildBadge(downloadedBadgeLabel, 'info', {
title: translate(
'modals.model.versions.badges.downloadedTooltip',
{},
'This version was downloaded before, but is not currently in your library'
),
}));
}
if (!version.isInLibrary && isNewer && !version.shouldIgnore) {
badges.push(buildBadge(newerBadgeLabel, 'info', {
title: translate(
'modals.model.versions.badges.newerTooltip',
{},
'This version is newer than your latest local version'
),
}));
} }
if (isEarlyAccess) { if (isEarlyAccess) {
badges.push(buildBadge(translate('modals.model.versions.badges.earlyAccess', {}, 'Early Access'), 'early-access')); badges.push(buildBadge(earlyAccessBadgeLabel, 'early-access', {
title: translate(
'modals.model.versions.badges.earlyAccessTooltip',
{},
'This version currently requires Civitai early access'
),
}));
} }
if (version.shouldIgnore) { if (version.shouldIgnore) {
badges.push(buildBadge(translate('modals.model.versions.badges.ignored', {}, 'Ignored'), 'muted')); badges.push(buildBadge(ignoredBadgeLabel, 'muted', {
title: translate(
'modals.model.versions.badges.ignoredTooltip',
{},
'Update notifications are disabled for this version'
),
}));
} }
const downloadLabel = translate('modals.model.versions.actions.download', {}, 'Download'); const downloadLabel = translate('modals.model.versions.actions.download', {}, 'Download');
@@ -459,29 +526,82 @@ function renderRow(version, options) {
if (!version.isInLibrary) { if (!version.isInLibrary) {
// Download button with optional EA bolt icon // Download button with optional EA bolt icon
const downloadIcon = isEarlyAccess ? '<i class="fas fa-bolt"></i> ' : ''; const downloadIcon = isEarlyAccess ? '<i class="fas fa-bolt"></i> ' : '';
actions.push( actions.push(buildActionButton(
`<button class="version-action version-action-primary" data-version-action="download">${downloadIcon}${escapeHtml(downloadLabel)}</button>` downloadLabel,
); 'version-action-primary',
'download',
{
title: isEarlyAccess
? translate(
'modals.model.versions.actions.downloadEarlyAccessTooltip',
{},
'Download this early access version from Civitai'
)
: translate(
'modals.model.versions.actions.downloadTooltip',
{},
'Download this version'
),
iconMarkup: downloadIcon,
}
));
} else if (version.filePath) { } else if (version.filePath) {
actions.push( actions.push(buildActionButton(
`<button class="version-action version-action-danger" data-version-action="delete">${escapeHtml(deleteLabel)}</button>` deleteLabel,
); 'version-action-danger',
'delete',
{
title: translate(
'modals.model.versions.actions.deleteTooltip',
{},
'Delete this local version'
),
}
));
} }
actions.push( actions.push(buildActionButton(
`<button class="version-action version-action-ghost" data-version-action="toggle-ignore" data-ignore-state="${ ignoreLabel,
version.shouldIgnore ? 'ignored' : 'active' 'version-action-ghost',
}">${escapeHtml(ignoreLabel)}</button>` 'toggle-ignore',
); {
title: version.shouldIgnore
? translate(
'modals.model.versions.actions.unignoreTooltip',
{},
'Resume update notifications for this version'
)
: translate(
'modals.model.versions.actions.ignoreTooltip',
{},
'Ignore update notifications for this version'
),
extraAttributes: `data-ignore-state="${version.shouldIgnore ? 'ignored' : 'active'}"`,
}
));
const linkTarget = buildCivitaiVersionUrl( const linkTarget = buildCivitaiVersionUrl(
version.modelId || parentModelId, version.modelId || parentModelId,
version.versionId version.versionId
); );
const civitaiTooltip = translate( const civitaiTooltip = translate(
'modals.model.actions.viewOnCivitai', 'modals.model.versions.actions.viewVersionOnCivitai',
{}, {},
'View on Civitai' 'View version on Civitai'
); );
const civitaiLinkMarkup = linkTarget
? `
<a
class="version-civitai-link"
href="${escapeHtml(linkTarget)}"
target="_blank"
rel="noopener noreferrer"
title="${escapeHtml(civitaiTooltip)}"
aria-label="${escapeHtml(civitaiTooltip)}"
>
<i class="fas fa-arrow-up-right-from-square" aria-hidden="true"></i>
</a>
`
: '';
const rowAttributes = [ const rowAttributes = [
`class="model-version-row${isCurrent ? ' is-current' : ''}${linkTarget ? ' is-clickable' : ''}${isEarlyAccess ? ' is-early-access' : ''}"`, `class="model-version-row${isCurrent ? ' is-current' : ''}${linkTarget ? ' is-clickable' : ''}${isEarlyAccess ? ' is-early-access' : ''}"`,
@@ -489,7 +609,6 @@ function renderRow(version, options) {
]; ];
if (linkTarget) { if (linkTarget) {
rowAttributes.push(`data-civitai-url="${escapeHtml(linkTarget)}"`); rowAttributes.push(`data-civitai-url="${escapeHtml(linkTarget)}"`);
rowAttributes.push(`title="${escapeHtml(civitaiTooltip)}"`);
} }
return ` return `
@@ -497,7 +616,8 @@ function renderRow(version, options) {
${renderMediaMarkup(version)} ${renderMediaMarkup(version)}
<div class="version-details"> <div class="version-details">
<div class="version-title"> <div class="version-title">
<span class="versions-tab-version-name">${escapeHtml(version.name || translate('modals.model.versions.labels.unnamed', {}, 'Untitled Version'))}</span> <span class="versions-tab-version-name">${escapeHtml(versionName)}</span>
${civitaiLinkMarkup}
</div> </div>
<div class="version-badges">${badges.join('')}</div> <div class="version-badges">${badges.join('')}</div>
<div class="version-meta"> <div class="version-meta">
@@ -1227,9 +1347,17 @@ export function initVersionsTab({
} }
const row = event.target.closest('.model-version-row.is-clickable'); const row = event.target.closest('.model-version-row.is-clickable');
const civitaiLink = event.target.closest('.version-civitai-link');
if (civitaiLink) {
event.preventDefault();
openCivitaiUrl(civitaiLink.href);
return;
}
if (!row) { if (!row) {
return; return;
} }
if (event.target.closest('button')) { if (event.target.closest('button')) {
return; return;
} }
@@ -1245,7 +1373,7 @@ export function initVersionsTab({
return; return;
} }
event.preventDefault(); event.preventDefault();
window.open(targetUrl, '_blank', 'noopener,noreferrer'); openCivitaiUrl(targetUrl);
}); });
// Listen for extension-triggered refresh requests // Listen for extension-triggered refresh requests

View File

@@ -9,6 +9,7 @@ import { moveManager } from './managers/MoveManager.js';
import { bulkManager } from './managers/BulkManager.js'; import { bulkManager } from './managers/BulkManager.js';
import { ExampleImagesManager } from './managers/ExampleImagesManager.js'; import { ExampleImagesManager } from './managers/ExampleImagesManager.js';
import { helpManager } from './managers/HelpManager.js'; import { helpManager } from './managers/HelpManager.js';
import { doctorManager } from './managers/DoctorManager.js';
import { bannerService } from './managers/BannerService.js'; import { bannerService } from './managers/BannerService.js';
import { initTheme, initBackToTop } from './utils/uiHelpers.js'; import { initTheme, initBackToTop } from './utils/uiHelpers.js';
import { initializeInfiniteScroll } from './utils/infiniteScroll.js'; import { initializeInfiniteScroll } from './utils/infiniteScroll.js';
@@ -58,6 +59,7 @@ export class AppCore {
const exampleImagesManager = new ExampleImagesManager(); const exampleImagesManager = new ExampleImagesManager();
window.exampleImagesManager = exampleImagesManager; window.exampleImagesManager = exampleImagesManager;
window.helpManager = helpManager; window.helpManager = helpManager;
window.doctorManager = doctorManager;
window.moveManager = moveManager; window.moveManager = moveManager;
window.bulkManager = bulkManager; window.bulkManager = bulkManager;
@@ -77,6 +79,7 @@ export class AppCore {
exampleImagesManager.initialize(); exampleImagesManager.initialize();
// Initialize the help manager // Initialize the help manager
helpManager.initialize(); helpManager.initialize();
doctorManager.initialize();
const cardInfoDisplay = state.global.settings.card_info_display || 'always'; const cardInfoDisplay = state.global.settings.card_info_display || 'always';
document.body.classList.toggle('hover-reveal', cardInfoDisplay === 'hover'); document.body.classList.toggle('hover-reveal', cardInfoDisplay === 'hover');

View File

@@ -432,7 +432,7 @@ export class BatchImportManager {
// Refresh recipes list to show newly imported recipes // Refresh recipes list to show newly imported recipes
if (window.recipeManager && typeof window.recipeManager.loadRecipes === 'function') { if (window.recipeManager && typeof window.recipeManager.loadRecipes === 'function') {
window.recipeManager.loadRecipes(); window.recipeManager.loadRecipes({ preserveScroll: true });
} }
// Show results step // Show results step

View File

@@ -311,7 +311,7 @@ export class BulkMissingLoraDownloadManager {
// Refresh the recipes list to update LoRA status // Refresh the recipes list to update LoRA status
if (window.recipeManager) { if (window.recipeManager) {
window.recipeManager.loadRecipes(); window.recipeManager.loadRecipes({ preserveScroll: true });
} }
} }

View File

@@ -0,0 +1,397 @@
import { modalManager } from './ModalManager.js';
import { showToast } from '../utils/uiHelpers.js';
import { translate } from '../utils/i18nHelpers.js';
import { escapeHtml } from '../components/shared/utils.js';
const MAX_CONSOLE_ENTRIES = 200;
function stringifyConsoleArg(value) {
if (typeof value === 'string') {
return value;
}
try {
return JSON.stringify(value);
} catch (_error) {
return String(value);
}
}
export class DoctorManager {
constructor() {
this.initialized = false;
this.lastDiagnostics = null;
this.consoleEntries = [];
}
initialize() {
if (this.initialized) {
return;
}
this.triggerButton = document.getElementById('doctorTriggerBtn');
this.badge = document.getElementById('doctorStatusBadge');
this.modal = document.getElementById('doctorModal');
this.issuesList = document.getElementById('doctorIssuesList');
this.summaryText = document.getElementById('doctorSummaryText');
this.summaryBadge = document.getElementById('doctorSummaryBadge');
this.loadingState = document.getElementById('doctorLoadingState');
this.refreshButton = document.getElementById('doctorRefreshBtn');
this.exportButton = document.getElementById('doctorExportBtn');
this.installConsoleCapture();
this.bindEvents();
this.initialized = true;
}
bindEvents() {
if (this.triggerButton) {
this.triggerButton.addEventListener('click', async () => {
modalManager.showModal('doctorModal');
await this.refreshDiagnostics();
});
}
if (this.refreshButton) {
this.refreshButton.addEventListener('click', async () => {
await this.refreshDiagnostics();
});
}
if (this.exportButton) {
this.exportButton.addEventListener('click', async () => {
await this.exportBundle();
});
}
}
installConsoleCapture() {
if (window.__lmDoctorConsolePatched) {
this.consoleEntries = window.__lmDoctorConsoleEntries || [];
return;
}
const originalConsole = {};
const levels = ['log', 'info', 'warn', 'error', 'debug'];
window.__lmDoctorConsoleEntries = this.consoleEntries;
levels.forEach((level) => {
const original = console[level]?.bind(console);
originalConsole[level] = original;
console[level] = (...args) => {
this.consoleEntries.push({
level,
timestamp: new Date().toISOString(),
message: args.map(stringifyConsoleArg).join(' '),
});
if (this.consoleEntries.length > MAX_CONSOLE_ENTRIES) {
this.consoleEntries.splice(0, this.consoleEntries.length - MAX_CONSOLE_ENTRIES);
}
if (original) {
original(...args);
}
};
});
window.__lmDoctorConsolePatched = true;
}
getClientVersion() {
return document.body?.dataset?.appVersion || '';
}
buildReloadUrl() {
const url = new URL(window.location.href);
url.searchParams.set('_lm_reload', Date.now().toString());
return url.toString();
}
reloadUi() {
window.location.replace(this.buildReloadUrl());
}
setLoading(isLoading) {
if (this.loadingState) {
this.loadingState.classList.toggle('visible', isLoading);
}
if (this.refreshButton) {
this.refreshButton.disabled = isLoading;
}
if (this.exportButton) {
this.exportButton.disabled = isLoading;
}
}
async refreshDiagnostics({ silent = false } = {}) {
this.setLoading(true);
try {
const clientVersion = encodeURIComponent(this.getClientVersion());
const response = await fetch(`/api/lm/doctor/diagnostics?clientVersion=${clientVersion}`);
const payload = await response.json();
if (!response.ok || payload.success === false) {
throw new Error(payload.error || 'Failed to load doctor diagnostics');
}
this.lastDiagnostics = payload;
this.updateTriggerState(payload.summary);
this.renderDiagnostics(payload);
} catch (error) {
console.error('Doctor diagnostics failed:', error);
if (!silent) {
showToast('doctor.toast.loadFailed', { message: error.message }, 'error');
}
} finally {
this.setLoading(false);
}
}
updateTriggerState(summary = {}) {
if (!this.badge || !this.triggerButton) {
return;
}
const issueCount = Number(summary.issue_count || 0);
this.badge.textContent = issueCount > 9 ? '9+' : String(issueCount);
this.badge.classList.toggle('hidden', issueCount === 0);
this.triggerButton.classList.remove('doctor-status-warning', 'doctor-status-error');
if (summary.status === 'error') {
this.triggerButton.classList.add('doctor-status-error');
} else if (summary.status === 'warning') {
this.triggerButton.classList.add('doctor-status-warning');
}
}
renderDiagnostics(payload) {
if (!this.modal || !this.issuesList || !this.summaryText || !this.summaryBadge) {
return;
}
const { summary = {}, diagnostics = [] } = payload;
this.summaryText.textContent = this.getSummaryText(summary);
this.summaryBadge.className = `doctor-summary-badge ${this.getStatusClass(summary.status)}`;
this.summaryBadge.innerHTML = `
<i class="fas ${summary.status === 'error' ? 'fa-triangle-exclamation' : summary.status === 'warning' ? 'fa-stethoscope' : 'fa-heartbeat'}"></i>
<span>${escapeHtml(this.getStatusLabel(summary.status))}</span>
`;
this.issuesList.innerHTML = diagnostics.map((item) => this.renderIssueCard(item)).join('');
this.attachIssueActions();
}
getSummaryText(summary) {
if (summary.status === 'error') {
return translate(
'doctor.summary.error',
{ count: summary.issue_count || 0 },
`${summary.issue_count || 0} issue(s) need attention before the app is fully healthy.`
);
}
if (summary.status === 'warning') {
return translate(
'doctor.summary.warning',
{ count: summary.issue_count || 0 },
`${summary.issue_count || 0} issue(s) were found. Most can be fixed directly from this panel.`
);
}
return translate(
'doctor.summary.ok',
{},
'No active issues were found in the current environment.'
);
}
getStatusClass(status) {
if (status === 'error') {
return 'doctor-status-error';
}
if (status === 'warning') {
return 'doctor-status-warning';
}
return 'doctor-status-ok';
}
getStatusLabel(status) {
return translate(`doctor.status.${status || 'ok'}`, {}, status || 'ok');
}
renderIssueCard(item) {
const status = item.status || 'ok';
const tagLabel = this.getStatusLabel(status);
const details = Array.isArray(item.details) ? item.details : [];
const listItems = details
.filter((detail) => typeof detail === 'string')
.map((detail) => `<li>${escapeHtml(detail)}</li>`)
.join('');
const inlineDetails = details
.filter((detail) => detail && typeof detail === 'object')
.map((detail) => this.renderInlineDetail(detail))
.join('');
const actions = (item.actions || [])
.map((action) => `
<button class="${action.id === 'repair-cache' || action.id === 'reload-page' ? 'primary-btn' : 'secondary-btn'}" data-doctor-action="${escapeHtml(action.id)}">
${escapeHtml(action.label)}
</button>
`)
.join('');
return `
<section class="doctor-issue-card" data-status="${escapeHtml(status)}" data-issue-id="${escapeHtml(item.id || '')}">
<div class="doctor-issue-header">
<div>
<h3>${escapeHtml(item.title || '')}</h3>
<p class="doctor-issue-summary">${escapeHtml(item.summary || '')}</p>
</div>
<span class="doctor-issue-tag">${escapeHtml(tagLabel)}</span>
</div>
${inlineDetails ? `<div class="doctor-inline-detail-grid">${inlineDetails}</div>` : ''}
${listItems ? `<ul class="doctor-issue-details">${listItems}</ul>` : ''}
${actions ? `<div class="doctor-issue-actions">${actions}</div>` : ''}
</section>
`;
}
renderInlineDetail(detail) {
if (detail.client_version || detail.server_version) {
return `
<div class="doctor-inline-detail">
<strong>${escapeHtml(translate('common.status.version', {}, 'Version'))}</strong>
<div>${escapeHtml(`Client: ${detail.client_version || 'unknown'}`)}</div>
<div>${escapeHtml(`Server: ${detail.server_version || 'unknown'}`)}</div>
</div>
`;
}
const label = detail.label || detail.model_type || detail.client_version || detail.server_version || 'Detail';
const message = detail.message
|| detail.corruption_rate
|| detail.server_version
|| detail.client_version
|| '';
if (detail.model_type) {
return `
<div class="doctor-inline-detail">
<strong>${escapeHtml(detail.label || detail.model_type)}</strong>
<div>${escapeHtml(detail.message || '')}</div>
${detail.corruption_rate ? `<div>${escapeHtml(detail.corruption_rate)} invalid</div>` : ''}
</div>
`;
}
return `
<div class="doctor-inline-detail">
<strong>${escapeHtml(label)}</strong>
<div>${escapeHtml(message)}</div>
</div>
`;
}
attachIssueActions() {
this.issuesList.querySelectorAll('[data-doctor-action]').forEach((button) => {
button.addEventListener('click', async (event) => {
const action = event.currentTarget.dataset.doctorAction;
await this.handleAction(action);
});
});
}
async handleAction(action) {
switch (action) {
case 'open-settings':
modalManager.showModal('settingsModal');
window.setTimeout(() => {
const input = document.getElementById('civitaiApiKey');
if (input) {
input.focus();
input.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
}, 100);
break;
case 'repair-cache':
await this.repairCache();
break;
case 'reload-page':
this.reloadUi();
break;
default:
break;
}
}
async repairCache() {
try {
this.setLoading(true);
const response = await fetch('/api/lm/doctor/repair-cache', { method: 'POST' });
const payload = await response.json();
if (!response.ok || payload.success === false) {
throw new Error(payload.error || translate('doctor.toast.repairFailed', {}, 'Cache rebuild failed.'));
}
showToast('doctor.toast.repairSuccess', {}, 'success');
await this.refreshDiagnostics({ silent: true });
} catch (error) {
console.error('Doctor cache repair failed:', error);
showToast('doctor.toast.repairFailed', { message: error.message }, 'error');
} finally {
this.setLoading(false);
}
}
async exportBundle() {
try {
this.setLoading(true);
const response = await fetch('/api/lm/doctor/export-bundle', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({
summary: this.lastDiagnostics?.summary || null,
diagnostics: this.lastDiagnostics?.diagnostics || [],
frontend_logs: this.consoleEntries,
client_context: {
url: window.location.href,
user_agent: navigator.userAgent,
language: navigator.language,
app_version: this.getClientVersion(),
},
}),
});
if (!response.ok) {
const payload = await response.json().catch(() => ({}));
throw new Error(payload.error || 'Failed to export diagnostics bundle');
}
const blob = await response.blob();
const disposition = response.headers.get('Content-Disposition') || '';
const match = disposition.match(/filename=\"([^\"]+)\"/);
const filename = match?.[1] || 'lora-manager-doctor.zip';
const url = URL.createObjectURL(blob);
const anchor = document.createElement('a');
anchor.href = url;
anchor.download = filename;
document.body.appendChild(anchor);
anchor.click();
anchor.remove();
URL.revokeObjectURL(url);
showToast('doctor.toast.exportSuccess', {}, 'success');
} catch (error) {
console.error('Doctor export failed:', error);
showToast('doctor.toast.exportFailed', { message: error.message }, 'error');
} finally {
this.setLoading(false);
}
}
}
export const doctorManager = new DoctorManager();

View File

@@ -6,6 +6,7 @@ import { getModelApiClient, resetAndReload } from '../api/modelApiFactory.js';
import { getStorageItem, setStorageItem } from '../utils/storageHelpers.js'; import { getStorageItem, setStorageItem } from '../utils/storageHelpers.js';
import { FolderTreeManager } from '../components/FolderTreeManager.js'; import { FolderTreeManager } from '../components/FolderTreeManager.js';
import { translate } from '../utils/i18nHelpers.js'; import { translate } from '../utils/i18nHelpers.js';
import { extractCivitaiModelUrlParts } from '../utils/civitaiUtils.js';
export class DownloadManager { export class DownloadManager {
constructor() { constructor() {
@@ -197,21 +198,22 @@ export class DownloadManager {
} }
extractModelId(url) { extractModelId(url) {
const versionMatch = url.match(/modelVersionId=(\d+)/i);
this.modelVersionId = versionMatch ? versionMatch[1] : null;
const civarchiveMatch = url.match(/https?:\/\/(?:www\.)?(?:civitaiarchive|civarchive)\.com\/models\/(\d+)/i); const civarchiveMatch = url.match(/https?:\/\/(?:www\.)?(?:civitaiarchive|civarchive)\.com\/models\/(\d+)/i);
if (civarchiveMatch) { if (civarchiveMatch) {
const versionMatch = url.match(/modelVersionId=(\d+)/i);
this.modelVersionId = versionMatch ? versionMatch[1] : null;
this.source = 'civarchive'; this.source = 'civarchive';
return civarchiveMatch[1]; return civarchiveMatch[1];
} }
const civitaiMatch = url.match(/https?:\/\/(?:www\.)?civitai\.com\/models\/(\d+)/i); const { modelId, modelVersionId } = extractCivitaiModelUrlParts(url);
if (civitaiMatch) { if (modelId) {
this.modelVersionId = modelVersionId;
this.source = null; this.source = null;
return civitaiMatch[1]; return modelId;
} }
this.modelVersionId = null;
this.source = null; this.source = null;
return null; return null;
} }
@@ -250,6 +252,7 @@ export class DownloadManager {
(version.files[0]?.sizeKB / 1024).toFixed(2); (version.files[0]?.sizeKB / 1024).toFixed(2);
const existsLocally = version.existsLocally; const existsLocally = version.existsLocally;
const hasBeenDownloaded = version.hasBeenDownloaded && !existsLocally;
const localPath = version.localPath; const localPath = version.localPath;
const isEarlyAccess = version.availability === 'EarlyAccess'; const isEarlyAccess = version.availability === 'EarlyAccess';
@@ -262,11 +265,22 @@ export class DownloadManager {
`; `;
} }
const localStatus = existsLocally ? let localStatus = '';
`<div class="local-badge"> if (existsLocally) {
localStatus = `<div class="local-badge">
<i class="fas fa-check"></i> ${translate('modals.download.inLibrary')} <i class="fas fa-check"></i> ${translate('modals.download.inLibrary')}
<div class="local-path">${localPath || ''}</div> <div class="local-path">${localPath || ''}</div>
</div>` : ''; </div>`;
} else if (hasBeenDownloaded) {
const downloadedTooltip = translate(
'modals.download.downloadedTooltip',
{},
'Previously downloaded, but it is not currently in your library.'
);
localStatus = `<div class="downloaded-badge" title="${downloadedTooltip.replace(/"/g, '&quot;')}">
<i class="fas fa-history"></i> ${translate('modals.download.downloaded', {}, 'Downloaded')}
</div>`;
}
return ` return `
<div class="version-item ${this.currentVersion?.id === version.id ? 'selected' : ''} <div class="version-item ${this.currentVersion?.id === version.id ? 'selected' : ''}

View File

@@ -84,6 +84,18 @@ export class ModalManager {
}); });
} }
const doctorModal = document.getElementById('doctorModal');
if (doctorModal) {
this.registerModal('doctorModal', {
element: doctorModal,
onClose: () => {
this.getModal('doctorModal').element.style.display = 'none';
document.body.classList.remove('modal-open');
},
closeOnOutsideClick: true
});
}
// Add moveModal registration // Add moveModal registration
const moveModal = document.getElementById('moveModal'); const moveModal = document.getElementById('moveModal');
if (moveModal) { if (moveModal) {

View File

@@ -361,6 +361,13 @@ export class SettingsManager {
}); });
} }
const openBackupLocationButton = document.getElementById('backupOpenLocationBtn');
if (openBackupLocationButton) {
openBackupLocationButton.addEventListener('click', () => {
this.openBackupLocation();
});
}
['lora', 'checkpoint', 'embedding'].forEach(modelType => { ['lora', 'checkpoint', 'embedding'].forEach(modelType => {
const customInput = document.getElementById(`${modelType}CustomTemplate`); const customInput = document.getElementById(`${modelType}CustomTemplate`);
if (customInput) { if (customInput) {
@@ -742,6 +749,35 @@ export class SettingsManager {
} }
} }
async openBackupLocation() {
try {
const response = await fetch('/api/lm/backup/open-location', {
method: 'POST'
});
if (!response.ok) {
throw new Error(`Request failed with status ${response.status}`);
}
const data = await response.json();
if (data.mode === 'clipboard' && data.path) {
try {
await navigator.clipboard.writeText(data.path);
showToast('settings.backup.locationCopied', { path: data.path }, 'success');
} catch (clipboardErr) {
console.warn('Clipboard API not available:', clipboardErr);
showToast('settings.backup.locationClipboardFallback', { path: data.path }, 'info');
}
} else {
showToast('settings.backup.openFolderSuccess', {}, 'success');
}
} catch (error) {
console.error('Failed to open backup folder:', error);
showToast('settings.backup.openFolderFailed', {}, 'error');
}
}
async loadSettingsToUI() { async loadSettingsToUI() {
// Set frontend settings from state // Set frontend settings from state
const blurMatureContentCheckbox = document.getElementById('blurMatureContent'); const blurMatureContentCheckbox = document.getElementById('blurMatureContent');
@@ -766,6 +802,16 @@ export class SettingsManager {
usePortableCheckbox.checked = !!state.global.settings.use_portable_settings; usePortableCheckbox.checked = !!state.global.settings.use_portable_settings;
} }
const civitaiHostSelect = document.getElementById('civitaiHost');
if (civitaiHostSelect) {
civitaiHostSelect.value = state.global.settings.civitai_host || 'civitai.com';
}
const recipesPathInput = document.getElementById('recipesPath');
if (recipesPathInput) {
recipesPathInput.value = state.global.settings.recipes_path || '';
}
const autoOrganizeExclusionsInput = document.getElementById('autoOrganizeExclusions'); const autoOrganizeExclusionsInput = document.getElementById('autoOrganizeExclusions');
if (autoOrganizeExclusionsInput) { if (autoOrganizeExclusionsInput) {
const patterns = this.normalizePatternList(state.global.settings.auto_organize_exclusions); const patterns = this.normalizePatternList(state.global.settings.auto_organize_exclusions);
@@ -873,6 +919,9 @@ export class SettingsManager {
// Load metadata archive settings // Load metadata archive settings
await this.loadMetadataArchiveSettings(); await this.loadMetadataArchiveSettings();
// Load backup settings
await this.loadBackupSettings();
// Load base model path mappings // Load base model path mappings
this.loadBaseModelMappings(); this.loadBaseModelMappings();
@@ -1399,12 +1448,12 @@ export class SettingsManager {
// Add empty row for new path if no paths exist // Add empty row for new path if no paths exist
if (paths.length === 0) { if (paths.length === 0) {
this.addExtraFolderPathRow(modelType, ''); this.addExtraFolderPathRow(modelType, '', false);
} }
}); });
} }
addExtraFolderPathRow(modelType, path = '') { addExtraFolderPathRow(modelType, path = '', shouldFocus = true) {
const container = document.getElementById(`extraFolderPaths-${modelType}`); const container = document.getElementById(`extraFolderPaths-${modelType}`);
if (!container) return; if (!container) return;
@@ -1428,7 +1477,7 @@ export class SettingsManager {
container.appendChild(row); container.appendChild(row);
// Focus the input if it's empty (new row) // Focus the input if it's empty (new row)
if (!path) { if (!path && shouldFocus) {
const input = row.querySelector('.extra-folder-path-input'); const input = row.querySelector('.extra-folder-path-input');
if (input) { if (input) {
setTimeout(() => input.focus(), 0); setTimeout(() => input.focus(), 0);
@@ -1852,6 +1901,10 @@ export class SettingsManager {
await this.updateMetadataArchiveStatus(); await this.updateMetadataArchiveStatus();
} }
if (settingKey === 'backup_auto_enabled') {
await this.updateBackupStatus();
}
showToast('toast.settings.settingsUpdated', { setting: settingKey.replace(/_/g, ' ') }, 'success'); showToast('toast.settings.settingsUpdated', { setting: settingKey.replace(/_/g, ' ') }, 'success');
// Apply frontend settings immediately // Apply frontend settings immediately
@@ -1940,6 +1993,163 @@ export class SettingsManager {
} }
} }
async loadBackupSettings() {
const backupAutoEnabledCheckbox = document.getElementById('backupAutoEnabled');
if (backupAutoEnabledCheckbox) {
backupAutoEnabledCheckbox.checked = state.global.settings.backup_auto_enabled ?? true;
}
const backupRetentionCountInput = document.getElementById('backupRetentionCount');
if (backupRetentionCountInput) {
backupRetentionCountInput.value = state.global.settings.backup_retention_count ?? 5;
}
await this.updateBackupStatus();
}
async updateBackupStatus() {
try {
const response = await fetch('/api/lm/backup/status');
const data = await response.json();
const statusContainer = document.getElementById('backupStatus');
if (!statusContainer || !data.success) {
return;
}
const status = data.status || {};
const latestAutoSnapshot = status.latestAutoSnapshot;
const retentionCount = status.retentionCount ?? state.global.settings.backup_retention_count ?? 5;
const enabled = status.enabled ?? state.global.settings.backup_auto_enabled ?? true;
const backupDir = status.backupDir || '';
const backupLocationPath = document.getElementById('backupLocationPath');
if (backupLocationPath) {
backupLocationPath.textContent = backupDir;
backupLocationPath.title = backupDir;
}
const formatTimestamp = (timestamp) => {
if (!timestamp) {
return translate('common.status.unknown', {}, 'Unknown');
}
return new Date(timestamp * 1000).toLocaleString();
};
const renderSnapshotDetail = (snapshot) => {
if (!snapshot) {
return translate('settings.backup.noneAvailable', {}, 'No snapshots yet');
}
const size = typeof snapshot.size === 'number' ? ` (${this.formatFileSize(snapshot.size)})` : '';
return `${snapshot.name}${size}`;
};
statusContainer.innerHTML = `
<div class="backup-summary-grid">
<div class="backup-summary-card">
<div class="backup-summary-label">${translate('settings.backup.autoEnabled', {}, 'Automatic snapshots')}</div>
<div class="backup-summary-value status-${enabled ? 'enabled' : 'disabled'}">
${enabled ? translate('common.status.enabled') : translate('common.status.disabled')}
</div>
</div>
<div class="backup-summary-card">
<div class="backup-summary-label">${translate('settings.backup.retention', {}, 'Retention')}</div>
<div class="backup-summary-value">${retentionCount}</div>
</div>
<div class="backup-summary-card">
<div class="backup-summary-label">${translate('settings.backup.snapshotCount', {}, 'Saved snapshots')}</div>
<div class="backup-summary-value">${status.snapshotCount ?? 0}</div>
</div>
</div>
<div class="backup-status-list">
<div class="backup-status-row">
<div class="backup-status-label">${translate('settings.backup.latestAutoSnapshot', {}, 'Latest auto snapshot')}</div>
<div class="backup-status-content">
<div class="backup-status-primary">${formatTimestamp(latestAutoSnapshot?.mtime)}</div>
<div class="backup-status-secondary">${renderSnapshotDetail(latestAutoSnapshot)}</div>
</div>
</div>
</div>
`;
} catch (error) {
console.error('Error updating backup status:', error);
}
}
async exportBackup() {
try {
const response = await fetch('/api/lm/backup/export', {
method: 'POST',
});
if (!response.ok) {
throw new Error(`Request failed with status ${response.status}`);
}
const blob = await response.blob();
const contentDisposition = response.headers.get('Content-Disposition') || '';
const match = contentDisposition.match(/filename="([^"]+)"/);
const filename = match?.[1] || `lora-manager-backup-${Date.now()}.zip`;
const url = window.URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
link.download = filename;
document.body.appendChild(link);
link.click();
link.remove();
window.URL.revokeObjectURL(url);
showToast('settings.backup.exportSuccess', {}, 'success');
} catch (error) {
console.error('Failed to export backup:', error);
showToast('settings.backup.exportFailed', { message: error.message }, 'error');
}
}
triggerBackupImport() {
const input = document.getElementById('backupImportInput');
input?.click();
}
async handleBackupImportFile(input) {
if (!(input instanceof HTMLInputElement)) {
return;
}
const file = input.files?.[0];
input.value = '';
if (!file) {
return;
}
if (!confirm(translate('settings.backup.importConfirm', {}, 'Import this backup and overwrite local user state?'))) {
return;
}
try {
const formData = new FormData();
formData.append('archive', file);
const response = await fetch('/api/lm/backup/import', {
method: 'POST',
body: formData,
});
const data = await response.json();
if (!response.ok || data.success === false) {
throw new Error(data.error || `Request failed with status ${response.status}`);
}
showToast('settings.backup.importSuccess', {}, 'success');
await this.updateBackupStatus();
window.location.reload();
} catch (error) {
console.error('Failed to import backup:', error);
showToast('settings.backup.importFailed', { message: error.message }, 'error');
}
}
async updateMetadataArchiveStatus() { async updateMetadataArchiveStatus() {
try { try {
const response = await fetch('/api/lm/metadata-archive-status'); const response = await fetch('/api/lm/metadata-archive-status');
@@ -2464,14 +2674,24 @@ export class SettingsManager {
if (!element) return; if (!element) return;
const value = element.value.trim(); // Trim whitespace const value = element.value.trim(); // Trim whitespace
const shouldShowLoading = settingKey === 'recipes_path';
try { try {
// Check if value has changed from existing value // Check if value has changed from existing value
const currentValue = state.global.settings[settingKey] || ''; const currentValue = state.global.settings[settingKey];
if (value === currentValue) { const normalizedCurrentValue = currentValue === undefined || currentValue === null
? ''
: String(currentValue).trim();
if (value === normalizedCurrentValue) {
return; // No change, exit early return; // No change, exit early
} }
if (shouldShowLoading) {
state.loadingManager?.showSimpleLoading(
translate('settings.folderSettings.recipesPathMigrating', {}, 'Migrating recipes...')
);
}
// For username and password, handle empty values specially // For username and password, handle empty values specially
if ((settingKey === 'proxy_username' || settingKey === 'proxy_password') && value === '') { if ((settingKey === 'proxy_username' || settingKey === 'proxy_password') && value === '') {
// Remove from state instead of setting to empty string // Remove from state instead of setting to empty string
@@ -2497,10 +2717,28 @@ export class SettingsManager {
await this.saveSetting(settingKey, value); await this.saveSetting(settingKey, value);
} }
showToast('toast.settings.settingsUpdated', { setting: settingKey.replace(/_/g, ' ') }, 'success'); if (shouldShowLoading) {
state.loadingManager?.hide();
}
if (settingKey === 'recipes_path') {
showToast('toast.settings.recipesPathUpdated', {}, 'success');
} else if (settingKey === 'backup_retention_count') {
await this.updateBackupStatus();
showToast('toast.settings.settingsUpdated', { setting: settingKey.replace(/_/g, ' ') }, 'success');
} else {
showToast('toast.settings.settingsUpdated', { setting: settingKey.replace(/_/g, ' ') }, 'success');
}
} catch (error) { } catch (error) {
showToast('toast.settings.settingSaveFailed', { message: error.message }, 'error'); if (shouldShowLoading) {
state.loadingManager?.hide();
}
if (settingKey === 'recipes_path') {
showToast('toast.settings.recipesPathSaveFailed', { message: error.message }, 'error');
} else {
showToast('toast.settings.settingSaveFailed', { message: error.message }, 'error');
}
} }
} }

View File

@@ -122,7 +122,7 @@ export class DownloadManager {
modalManager.closeModal('importModal'); modalManager.closeModal('importModal');
// Refresh the recipe // Refresh the recipe
window.recipeManager.loadRecipes(); window.recipeManager.loadRecipes({ preserveScroll: true });
} catch (error) { } catch (error) {
console.error('Error:', error); console.error('Error:', error);

View File

@@ -328,16 +328,32 @@ class RecipeManager {
}); });
} }
normalizeLoadRecipesOptions(options = true) {
if (typeof options === 'boolean') {
return {
resetPage: options,
preserveScroll: false
};
}
return {
resetPage: options?.resetPage !== false,
preserveScroll: options?.preserveScroll === true
};
}
// This method is kept for compatibility but now uses virtual scrolling // This method is kept for compatibility but now uses virtual scrolling
async loadRecipes(resetPage = true) { async loadRecipes(options = true) {
// Skip loading if in duplicates mode // Skip loading if in duplicates mode
const pageState = getCurrentPageState(); const pageState = getCurrentPageState();
if (pageState.duplicatesMode) { if (pageState.duplicatesMode) {
return; return;
} }
const { resetPage, preserveScroll } = this.normalizeLoadRecipesOptions(options);
if (resetPage) { if (resetPage) {
refreshVirtualScroll(); await refreshVirtualScroll({ preserveScroll });
} }
} }

View File

@@ -5,6 +5,7 @@ import { DEFAULT_PATH_TEMPLATES, DEFAULT_PRIORITY_TAG_CONFIG } from '../utils/co
const DEFAULT_SETTINGS_BASE = Object.freeze({ const DEFAULT_SETTINGS_BASE = Object.freeze({
civitai_api_key: '', civitai_api_key: '',
civitai_host: 'civitai.com',
use_portable_settings: false, use_portable_settings: false,
language: 'en', language: 'en',
show_only_sfw: false, show_only_sfw: false,
@@ -18,6 +19,7 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
default_lora_root: '', default_lora_root: '',
default_checkpoint_root: '', default_checkpoint_root: '',
default_embedding_root: '', default_embedding_root: '',
recipes_path: '',
base_model_path_mappings: {}, base_model_path_mappings: {},
download_path_templates: {}, download_path_templates: {},
example_images_path: '', example_images_path: '',
@@ -40,6 +42,8 @@ const DEFAULT_SETTINGS_BASE = Object.freeze({
metadata_refresh_skip_paths: [], metadata_refresh_skip_paths: [],
skip_previously_downloaded_model_versions: false, skip_previously_downloaded_model_versions: false,
download_skip_base_models: [], download_skip_base_models: [],
backup_auto_enabled: true,
backup_retention_count: 5,
}); });
export function createDefaultSettings() { export function createDefaultSettings() {

View File

@@ -13,6 +13,64 @@ export const OptimizationMode = {
THUMBNAIL: 'thumbnail', THUMBNAIL: 'thumbnail',
}; };
export const DEFAULT_CIVITAI_PAGE_HOST = 'civitai.com';
const SUPPORTED_CIVITAI_PAGE_HOSTS = new Set([
'civitai.com',
'civitai.red',
]);
export function normalizeCivitaiPageHost(hostname) {
if (!hostname || typeof hostname !== 'string') {
return DEFAULT_CIVITAI_PAGE_HOST;
}
const normalized = hostname.trim().toLowerCase();
if (SUPPORTED_CIVITAI_PAGE_HOSTS.has(normalized)) {
return normalized;
}
return DEFAULT_CIVITAI_PAGE_HOST;
}
export function buildCivitaiModelUrl(modelId, versionId = null, host = DEFAULT_CIVITAI_PAGE_HOST) {
const normalizedHost = normalizeCivitaiPageHost(host);
const normalizedModelId = modelId == null ? '' : String(modelId).trim();
const normalizedVersionId = versionId == null ? '' : String(versionId).trim();
if (normalizedModelId) {
const encodedModelId = encodeURIComponent(normalizedModelId);
let url = `https://${normalizedHost}/models/${encodedModelId}`;
if (normalizedVersionId) {
url += `?modelVersionId=${encodeURIComponent(normalizedVersionId)}`;
}
return url;
}
if (normalizedVersionId) {
return `https://${normalizedHost}/model-versions/${encodeURIComponent(normalizedVersionId)}`;
}
return null;
}
export function buildCivitaiSearchUrl(query, host = DEFAULT_CIVITAI_PAGE_HOST) {
const normalizedQuery = query == null ? '' : String(query).trim();
if (!normalizedQuery) {
return null;
}
const normalizedHost = normalizeCivitaiPageHost(host);
return `https://${normalizedHost}/models?query=${encodeURIComponent(normalizedQuery)}`;
}
export function buildCivitaiUrl({ modelId = null, versionId = null, modelName = null, host = DEFAULT_CIVITAI_PAGE_HOST } = {}) {
return (
buildCivitaiModelUrl(modelId, versionId, host)
|| buildCivitaiSearchUrl(modelName, host)
);
}
/** /**
* Rewrite Civitai preview URLs to use optimized renditions. * Rewrite Civitai preview URLs to use optimized renditions.
* Mirrors the backend's rewrite_preview_url() function from py/utils/civitai_utils.py * Mirrors the backend's rewrite_preview_url() function from py/utils/civitai_utils.py
@@ -119,3 +177,50 @@ export function isCivitaiUrl(url) {
return false; return false;
} }
} }
export function isSupportedCivitaiPageHost(hostname) {
if (!hostname) {
return false;
}
return SUPPORTED_CIVITAI_PAGE_HOSTS.has(hostname.toLowerCase());
}
export function extractCivitaiModelUrlParts(url) {
if (!url) {
return { modelId: null, modelVersionId: null };
}
try {
const parsedUrl = new URL(url);
if (!isSupportedCivitaiPageHost(parsedUrl.hostname)) {
return { modelId: null, modelVersionId: null };
}
const pathMatch = parsedUrl.pathname.match(/\/models\/(\d+)/);
const modelId = pathMatch ? pathMatch[1] : null;
const modelVersionId = parsedUrl.searchParams.get('modelVersionId');
return { modelId, modelVersionId };
} catch (e) {
return { modelId: null, modelVersionId: null };
}
}
export function extractCivitaiImageId(url) {
if (!url) {
return null;
}
try {
const parsedUrl = new URL(url);
if (!isSupportedCivitaiPageHost(parsedUrl.hostname)) {
return null;
}
const pathMatch = parsedUrl.pathname.match(/\/images\/(\d+)/);
return pathMatch ? pathMatch[1] : null;
} catch (e) {
return null;
}
}

View File

@@ -4,6 +4,43 @@ import { createModelCard, setupModelCardEventDelegation } from '../components/sh
import { getModelApiClient } from '../api/modelApiFactory.js'; import { getModelApiClient } from '../api/modelApiFactory.js';
import { showToast } from './uiHelpers.js'; import { showToast } from './uiHelpers.js';
function getScrollContainer() {
return document.querySelector('.page-content');
}
function getClampedScrollTop(scrollContainer, scrollTop) {
const maxScrollTop = Math.max(0, scrollContainer.scrollHeight - scrollContainer.clientHeight);
return Math.min(Math.max(scrollTop, 0), maxScrollTop);
}
function waitForAnimationFrame() {
return new Promise(resolve => requestAnimationFrame(resolve));
}
export function captureScrollPosition() {
const scrollContainer = getScrollContainer();
if (!scrollContainer) {
return null;
}
return {
scrollContainer,
scrollTop: scrollContainer.scrollTop
};
}
export async function restoreScrollPosition(snapshot) {
if (!snapshot?.scrollContainer) {
return;
}
// Wait for layout and the scheduled virtual-scroll render to settle.
await waitForAnimationFrame();
await waitForAnimationFrame();
snapshot.scrollContainer.scrollTop = getClampedScrollTop(snapshot.scrollContainer, snapshot.scrollTop);
}
// Function to dynamically import the appropriate card creator based on page type // Function to dynamically import the appropriate card creator based on page type
async function getCardCreator(pageType) { async function getCardCreator(pageType) {
if (pageType === 'recipes') { if (pageType === 'recipes') {
@@ -87,7 +124,7 @@ async function initializeVirtualScroll(pageType) {
} }
// Change this line to get the actual scrolling container // Change this line to get the actual scrolling container
const scrollContainer = document.querySelector('.page-content'); const scrollContainer = getScrollContainer();
const gridContainer = scrollContainer.querySelector('.container'); const gridContainer = scrollContainer.querySelector('.container');
if (!gridContainer) { if (!gridContainer) {
@@ -200,9 +237,16 @@ export function cleanupKeyboardNavigation() {
} }
// Export a method to refresh the virtual scroller when filters change // Export a method to refresh the virtual scroller when filters change
export function refreshVirtualScroll() { export async function refreshVirtualScroll(options = {}) {
const { preserveScroll = false } = options;
if (state.virtualScroller) { if (state.virtualScroller) {
const scrollSnapshot = preserveScroll ? captureScrollPosition() : null;
state.virtualScroller.reset(); state.virtualScroller.reset();
state.virtualScroller.initialize(); await state.virtualScroller.initialize();
if (scrollSnapshot) {
await restoreScrollPosition(scrollSnapshot);
}
} }
} }

View File

@@ -3,6 +3,66 @@ import { state, getCurrentPageState } from '../state/index.js';
import { getStorageItem, setStorageItem } from './storageHelpers.js'; import { getStorageItem, setStorageItem } from './storageHelpers.js';
import { NODE_TYPE_ICONS, DEFAULT_NODE_COLOR } from './constants.js'; import { NODE_TYPE_ICONS, DEFAULT_NODE_COLOR } from './constants.js';
import { eventManager } from './EventManager.js'; import { eventManager } from './EventManager.js';
import { bannerService } from '../managers/BannerService.js';
import { modalManager } from '../managers/ModalManager.js';
import { buildCivitaiUrl, normalizeCivitaiPageHost } from './civitaiUtils.js';
const CIVITAI_HOST_INFO_BANNER_ID = 'civitai-host-preference';
const CIVITAI_HOST_INFO_BANNER_SEEN_KEY = 'civitai_host_info_banner_seen';
function getPreferredCivitaiHost() {
return normalizeCivitaiPageHost(state?.global?.settings?.civitai_host);
}
function maybeRegisterCivitaiHostInfoBanner() {
if (getStorageItem(CIVITAI_HOST_INFO_BANNER_SEEN_KEY, false)) {
return;
}
setStorageItem(CIVITAI_HOST_INFO_BANNER_SEEN_KEY, true);
bannerService.registerBanner(CIVITAI_HOST_INFO_BANNER_ID, {
id: CIVITAI_HOST_INFO_BANNER_ID,
title: translate(
'settings.civitaiHostBanner.title',
{},
'Civitai host preference available'
),
content: translate(
'settings.civitaiHostBanner.content',
{},
'Civitai now uses civitai.com for SFW content and civitai.red for unrestricted content. You can change which site opens by default in Settings.'
),
actions: [
{
text: translate('settings.civitaiHostBanner.openSettings', {}, 'Open Settings'),
icon: 'fas fa-cog',
action: 'open-settings-modal',
type: 'primary',
},
],
dismissible: true,
priority: 70,
onRegister: (bannerElement) => {
const button = bannerElement.querySelector('.banner-action[data-action="open-settings-modal"]');
if (button) {
button.addEventListener('click', (event) => {
event.preventDefault();
modalManager.showModal('settingsModal');
});
}
},
});
}
export function openCivitaiUrl(url) {
if (!url) {
return null;
}
maybeRegisterCivitaiHostInfoBanner();
return window.open(url, '_blank', 'noopener,noreferrer');
}
/** /**
* Utility function to copy text to clipboard with fallback for older browsers * Utility function to copy text to clipboard with fallback for older browsers
@@ -184,14 +244,15 @@ function filterByFolder(folderPath) {
} }
export function openCivitaiByMetadata(civitaiId, versionId, modelName = null) { export function openCivitaiByMetadata(civitaiId, versionId, modelName = null) {
if (versionId) { const url = buildCivitaiUrl({
// Use model-versions endpoint which auto-redirects to correct model page modelId: civitaiId,
window.open(`https://civitai.com/model-versions/${versionId}`, '_blank'); versionId,
} else if (civitaiId) { modelName,
window.open(`https://civitai.com/models/${civitaiId}`, '_blank'); host: getPreferredCivitaiHost(),
} else if (modelName) { });
// Fallback: search by name
window.open(`https://civitai.com/models?query=${encodeURIComponent(modelName)}`, '_blank'); if (url) {
openCivitaiUrl(url);
} }
} }

View File

@@ -62,7 +62,7 @@
</head> </head>
{% set page_id = self.page_id() %} {% set page_id = self.page_id() %}
<body data-page="{{ page_id }}"> <body data-page="{{ page_id }}" data-app-version="{{ version }}">
<!-- Header is always visible, even during initialization --> <!-- Header is always visible, even during initialization -->
{% include 'components/header.html' %} {% include 'components/header.html' %}

View File

@@ -84,6 +84,13 @@
</div> </div>
<div class="controls-right"> <div class="controls-right">
<div class="control-group doctor-control-group">
<button id="doctorTriggerBtn" class="doctor-trigger" title="{{ t('doctor.buttonTitle', default='Run diagnostics and common fixes') }}">
<i class="fas fa-stethoscope"></i>
<span>{{ t('doctor.title', default='Doctor') }}</span>
<span id="doctorStatusBadge" class="doctor-status-badge hidden" aria-hidden="true"></span>
</button>
</div>
<div class="keyboard-nav-hint tooltip"> <div class="keyboard-nav-hint tooltip">
<i class="fas fa-keyboard"></i> <i class="fas fa-keyboard"></i>
<span class="tooltiptext"> <span class="tooltiptext">

View File

@@ -3,6 +3,7 @@
{% include 'components/modals/confirm_modals.html' %} {% include 'components/modals/confirm_modals.html' %}
{% include 'components/modals/settings_modal.html' %} {% include 'components/modals/settings_modal.html' %}
{% include 'components/modals/doctor_modal.html' %}
{% include 'components/modals/support_modal.html' %} {% include 'components/modals/support_modal.html' %}
{% include 'components/modals/update_modal.html' %} {% include 'components/modals/update_modal.html' %}
{% include 'components/modals/help_modal.html' %} {% include 'components/modals/help_modal.html' %}

View File

@@ -0,0 +1,40 @@
<div id="doctorModal" class="modal">
<div class="modal-content doctor-modal">
<button class="close" onclick="modalManager.closeModal('doctorModal')">&times;</button>
<div class="doctor-shell">
<div class="doctor-hero">
<div class="doctor-hero-copy">
<span class="doctor-kicker">{{ t('doctor.kicker', default='System diagnostics') }}</span>
<h2>{{ t('doctor.title', default='Doctor') }}</h2>
<p id="doctorSummaryText">{{ t('doctor.summary.idle', default='Run a health check for settings, cache integrity, and UI consistency.') }}</p>
</div>
<div id="doctorSummaryBadge" class="doctor-summary-badge doctor-status-ok">
<i class="fas fa-heartbeat"></i>
<span>{{ t('doctor.status.ok', default='Healthy') }}</span>
</div>
</div>
<div id="doctorLoadingState" class="doctor-loading-state">
<i class="fas fa-spinner fa-spin"></i>
<span>{{ t('doctor.loading', default='Checking environment...') }}</span>
</div>
<div id="doctorIssuesList" class="doctor-issues-list"></div>
<div class="doctor-footer">
<div class="doctor-footer-note">{{ t('doctor.footer', default='Export a diagnostics bundle if the issues remain after repair.') }}</div>
<div class="doctor-footer-actions">
<button id="doctorRefreshBtn" class="secondary-btn">
<i class="fas fa-sync-alt"></i>
<span>{{ t('doctor.actions.runAgain', default='Run Again') }}</span>
</button>
<button id="doctorExportBtn" class="primary-btn">
<i class="fas fa-file-export"></i>
<span>{{ t('doctor.actions.exportBundle', default='Export Bundle') }}</span>
</button>
</div>
</div>
</div>
</div>
</div>

View File

@@ -114,6 +114,111 @@
</div> </div>
</div> </div>
<div class="setting-item">
<div class="setting-row">
<div class="setting-info">
<label for="civitaiHost">{{ t('settings.civitaiHost.label') }}</label>
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.civitaiHost.help') }}"></i>
</div>
<div class="setting-control select-control">
<select id="civitaiHost" onchange="settingsManager.saveSelectSetting('civitaiHost', 'civitai_host')">
<option value="civitai.com">{{ t('settings.civitaiHost.options.com') }}</option>
<option value="civitai.red">{{ t('settings.civitaiHost.options.red') }}</option>
</select>
</div>
</div>
</div>
<!-- Backup -->
<div class="settings-subsection">
<div class="settings-subsection-header">
<h4>{{ t('settings.sections.backup') }}</h4>
</div>
<div class="settings-help-text subtle">
{{ t('settings.backup.scopeHelp') }}
</div>
<div class="setting-item">
<div class="setting-row">
<div class="setting-info">
<label for="backupAutoEnabled">
{{ t('settings.backup.autoEnabled') }}
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.backup.autoEnabledHelp') }}"></i>
</label>
</div>
<div class="setting-control">
<label class="toggle-switch">
<input type="checkbox" id="backupAutoEnabled"
onchange="settingsManager.saveToggleSetting('backupAutoEnabled', 'backup_auto_enabled')">
<span class="toggle-slider"></span>
</label>
</div>
</div>
</div>
<div class="setting-item">
<div class="setting-row">
<div class="setting-info">
<label for="backupRetentionCount">
{{ t('settings.backup.retention') }}
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.backup.retentionHelp') }}"></i>
</label>
</div>
<div class="setting-control">
<div class="text-input-wrapper">
<input
type="number"
id="backupRetentionCount"
min="1"
step="1"
onblur="settingsManager.saveInputSetting('backupRetentionCount', 'backup_retention_count')"
onkeydown="if(event.key === 'Enter') { this.blur(); }"
/>
</div>
</div>
</div>
</div>
<div class="setting-item">
<div class="setting-row">
<div class="setting-info">
<label>
{{ t('settings.backup.management') }}
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.backup.managementHelp') }}"></i>
</label>
</div>
<div class="setting-control">
<button type="button" class="secondary-btn" onclick="settingsManager.exportBackup()">
{{ t('settings.backup.exportButton') }}
</button>
<button type="button" class="secondary-btn" onclick="settingsManager.triggerBackupImport()" style="margin-left: 10px;">
{{ t('settings.backup.importButton') }}
</button>
<input
type="file"
id="backupImportInput"
accept=".zip,application/zip"
style="display: none;"
onchange="settingsManager.handleBackupImportFile(this)"
/>
</div>
</div>
</div>
<div class="setting-item">
<details class="backup-location-details">
<summary>{{ t('settings.backup.locationSummary') }}</summary>
<div class="backup-location-panel">
<code id="backupLocationPath" class="backup-location-path"></code>
<button type="button" class="secondary-btn" id="backupOpenLocationBtn">
{{ t('settings.backup.openFolderButton') }}
</button>
</div>
</details>
</div>
<div class="setting-item">
<div class="backup-status" id="backupStatus">
<!-- Status will be populated by JavaScript -->
</div>
</div>
</div>
<!-- Proxy Settings --> <!-- Proxy Settings -->
<div class="settings-subsection"> <div class="settings-subsection">
<div class="settings-subsection-header"> <div class="settings-subsection-header">
@@ -450,6 +555,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Section 3: Library --> <!-- Section 3: Library -->
@@ -530,6 +636,32 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- Recipe Settings -->
<div class="settings-subsection">
<div class="settings-subsection-header">
<h4>{{ t('settings.sections.recipeSettings') }}</h4>
</div>
<div class="setting-item">
<div class="setting-row">
<div class="setting-info">
<label for="recipesPath">
{{ t('settings.folderSettings.recipesPath') }}
<i class="fas fa-info-circle info-icon" data-tooltip="{{ t('settings.folderSettings.recipesPathHelp') }}"></i>
</label>
</div>
<div class="setting-control">
<div class="text-input-wrapper">
<input type="text" id="recipesPath"
placeholder="{{ t('settings.folderSettings.recipesPathPlaceholder') }}"
onblur="settingsManager.saveInputSetting('recipesPath', 'recipes_path')"
onkeydown="if(event.key === 'Enter') { this.blur(); }" />
</div>
</div>
</div>
</div>
</div> </div>
<!-- Extra Folder Paths --> <!-- Extra Folder Paths -->

View File

@@ -120,6 +120,13 @@
</div> </div>
<div class="controls-right"> <div class="controls-right">
<div class="control-group doctor-control-group">
<button id="doctorTriggerBtn" class="doctor-trigger" title="{{ t('doctor.buttonTitle', default='Run diagnostics and common fixes') }}">
<i class="fas fa-stethoscope"></i>
<span>{{ t('doctor.title', default='Doctor') }}</span>
<span id="doctorStatusBadge" class="doctor-status-badge hidden" aria-hidden="true"></span>
</button>
</div>
<div class="keyboard-nav-hint tooltip"> <div class="keyboard-nav-hint tooltip">
<i class="fas fa-keyboard"></i> <i class="fas fa-keyboard"></i>
<span class="tooltiptext"> <span class="tooltiptext">

View File

@@ -4,7 +4,15 @@ const showToastMock = vi.hoisted(() => vi.fn());
const loadingManagerMock = vi.hoisted(() => ({ const loadingManagerMock = vi.hoisted(() => ({
showSimpleLoading: vi.fn(), showSimpleLoading: vi.fn(),
hide: vi.fn(), hide: vi.fn(),
restoreProgressBar: vi.fn(),
})); }));
const virtualScrollerMock = vi.hoisted(() => ({
updateSingleItem: vi.fn(),
refreshWithData: vi.fn(),
}));
const getCurrentPageStateMock = vi.hoisted(() => vi.fn());
const captureScrollPositionMock = vi.hoisted(() => vi.fn());
const restoreScrollPositionMock = vi.hoisted(() => vi.fn());
vi.mock('../../../static/js/utils/uiHelpers.js', () => { vi.mock('../../../static/js/utils/uiHelpers.js', () => {
return { return {
@@ -20,17 +28,41 @@ vi.mock('../../../static/js/state/index.js', () => {
return { return {
state: { state: {
loadingManager: loadingManagerMock, loadingManager: loadingManagerMock,
virtualScroller: virtualScrollerMock,
}, },
getCurrentPageState: vi.fn(), getCurrentPageState: getCurrentPageStateMock,
}; };
}); });
import { RecipeSidebarApiClient } from '../../../static/js/api/recipeApi.js'; vi.mock('../../../static/js/utils/infiniteScroll.js', () => ({
captureScrollPosition: captureScrollPositionMock,
restoreScrollPosition: restoreScrollPositionMock,
}));
import {
RecipeSidebarApiClient,
fetchRecipeDetails,
resetAndReload,
syncChanges,
updateRecipeMetadata
} from '../../../static/js/api/recipeApi.js';
describe('RecipeSidebarApiClient bulk operations', () => { describe('RecipeSidebarApiClient bulk operations', () => {
beforeEach(() => { beforeEach(() => {
vi.clearAllMocks(); vi.clearAllMocks();
global.fetch = vi.fn(); global.fetch = vi.fn();
getCurrentPageStateMock.mockReturnValue({
pageSize: 50,
currentPage: 1,
hasMore: true,
isLoading: false,
sortBy: 'date:desc',
showFavoritesOnly: false,
activeFolder: null,
searchOptions: { recursive: true },
customFilter: { active: false },
filters: {},
});
}); });
afterEach(() => { afterEach(() => {
@@ -111,4 +143,77 @@ describe('RecipeSidebarApiClient bulk operations', () => {
}); });
expect(loadingManagerMock.hide).toHaveBeenCalled(); expect(loadingManagerMock.hide).toHaveBeenCalled();
}); });
it('encodes recipe IDs when fetching recipe details', async () => {
global.fetch.mockResolvedValue({
ok: true,
json: async () => ({ id: 'abc' }),
});
await fetchRecipeDetails('recipe#1?name=foo%bar');
expect(global.fetch).toHaveBeenCalledWith('/api/lm/recipe/recipe%231%3Fname%3Dfoo%25bar');
});
it('updates the virtual scroller using the original list path when provided', async () => {
global.fetch.mockResolvedValue({
ok: true,
json: async () => ({ success: true }),
});
await updateRecipeMetadata(
'/recipes/new-folder/recipe#1.webp',
{ title: 'Updated Title' },
{ listFilePath: '/recipes/old-folder/recipe#1.webp' }
);
expect(global.fetch).toHaveBeenCalledWith(
'/api/lm/recipe/recipe%231/update',
expect.objectContaining({ method: 'PUT' })
);
expect(virtualScrollerMock.updateSingleItem).toHaveBeenCalledWith(
'/recipes/old-folder/recipe#1.webp',
{ title: 'Updated Title' }
);
});
it('preserves scroll position for recipe reloads when requested', async () => {
const scrollSnapshot = { scrollContainer: { scrollTop: 480 }, scrollTop: 480 };
captureScrollPositionMock.mockReturnValue(scrollSnapshot);
global.fetch.mockResolvedValue({
ok: true,
json: async () => ({
items: [{ id: 'recipe-1' }],
total: 1,
total_pages: 1,
}),
});
await resetAndReload(false, { preserveScroll: true });
expect(captureScrollPositionMock).toHaveBeenCalledTimes(1);
expect(virtualScrollerMock.refreshWithData).toHaveBeenCalledWith(
[{ id: 'recipe-1' }],
1,
false
);
expect(restoreScrollPositionMock).toHaveBeenCalledWith(scrollSnapshot);
});
it('uses scroll-preserving reloads for syncChanges', async () => {
global.fetch.mockResolvedValue({
ok: true,
json: async () => ({
items: [],
total: 0,
total_pages: 0,
}),
});
await syncChanges();
expect(captureScrollPositionMock).toHaveBeenCalledTimes(1);
expect(restoreScrollPositionMock).toHaveBeenCalledTimes(1);
expect(loadingManagerMock.restoreProgressBar).toHaveBeenCalledTimes(1);
});
}); });

View File

@@ -69,6 +69,9 @@ describe('AutoComplete widget interactions', () => {
if (key === 'loramanager.autocomplete_append_comma') { if (key === 'loramanager.autocomplete_append_comma') {
return true; return true;
} }
if (key === 'loramanager.autocomplete_auto_format') {
return true;
}
if (key === 'loramanager.autocomplete_accept_key') { if (key === 'loramanager.autocomplete_accept_key') {
return 'both'; return 'both';
} }
@@ -123,6 +126,31 @@ describe('AutoComplete widget interactions', () => {
expect(caretHelperInstance.getCursorOffset).toHaveBeenCalled(); expect(caretHelperInstance.getCursorOffset).toHaveBeenCalled();
}); });
it('deduplicates duplicate-equivalent query variations before issuing requests', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({ success: true, words: [] }),
});
caretHelperInstance.getBeforeCursor.mockReturnValue('Example');
const input = document.createElement('textarea');
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
new AutoComplete(input, 'prompt', { debounceDelay: 0, showPreview: false, minChars: 1 });
input.value = 'Example';
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(fetchApiMock).toHaveBeenCalledTimes(1);
expect(fetchApiMock).toHaveBeenCalledWith('/lm/custom-words/search?enriched=true&search=Example&limit=100');
});
it('inserts the selected LoRA with usage tip strengths and restores focus', async () => { it('inserts the selected LoRA with usage tip strengths and restores focus', async () => {
fetchApiMock.mockImplementation((url) => { fetchApiMock.mockImplementation((url) => {
if (url.includes('usage-tips-by-path')) { if (url.includes('usage-tips-by-path')) {
@@ -188,6 +216,106 @@ describe('AutoComplete widget interactions', () => {
expect(insertSelectionSpy).toHaveBeenCalledWith('example_completion'); expect(insertSelectionSpy).toHaveBeenCalledWith('example_completion');
}); });
it('formats duplicate commas and extra spaces when the textarea loses focus', async () => {
const input = document.createElement('textarea');
input.value = 'foo bar, , baz ,, qux';
document.body.append(input);
const inputListener = vi.fn();
input.addEventListener('input', inputListener);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
new AutoComplete(input,'prompt', { showPreview: false });
input.dispatchEvent(new Event('blur', { bubbles: true }));
expect(input.value).toBe('foo bar, baz, qux');
expect(inputListener).toHaveBeenCalledTimes(1);
});
it('skips blur formatting when autocomplete auto format is disabled', async () => {
settingGetMock.mockImplementation((key) => {
if (key === 'loramanager.autocomplete_append_comma') {
return true;
}
if (key === 'loramanager.autocomplete_auto_format') {
return false;
}
if (key === 'loramanager.autocomplete_accept_key') {
return 'both';
}
if (key === 'loramanager.prompt_tag_autocomplete') {
return true;
}
if (key === 'loramanager.tag_space_replacement') {
return false;
}
return undefined;
});
const input = document.createElement('textarea');
input.value = 'foo bar, , baz ,, qux';
document.body.append(input);
const inputListener = vi.fn();
input.addEventListener('input', inputListener);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
new AutoComplete(input,'prompt', { showPreview: false });
input.dispatchEvent(new Event('blur', { bubbles: true }));
expect(input.value).toBe('foo bar, , baz ,, qux');
expect(inputListener).not.toHaveBeenCalled();
});
it('shows the full command list when typing a single slash', async () => {
const input = document.createElement('textarea');
input.value = '/';
input.selectionStart = input.value.length;
document.body.append(input);
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', { showPreview: false, minChars: 1 });
input.dispatchEvent(new Event('input', { bubbles: true }));
const commandNames = autoComplete.items.map((item) => item.command);
expect(commandNames).toContain('/character');
expect(commandNames).toContain('/artist');
expect(commandNames).toContain('/general');
expect(commandNames).toContain('/copyright');
expect(commandNames).toContain('/meta');
expect(commandNames).toContain('/species');
expect(commandNames).toContain('/lore');
expect(commandNames).toContain('/emb');
expect(commandNames).toContain('/embedding');
expect(commandNames).toContain('/wildcard');
});
it('renders every command item when slash opens the command list', async () => {
const input = document.createElement('textarea');
input.value = '/';
input.selectionStart = input.value.length;
document.body.append(input);
caretHelperInstance.getBeforeCursor.mockReturnValue('/');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input, 'prompt', { showPreview: false, minChars: 1 });
input.dispatchEvent(new Event('input', { bubbles: true }));
const renderedCommands = autoComplete.contentContainer.querySelectorAll('.lm-autocomplete-command-name');
expect(renderedCommands).toHaveLength(autoComplete.items.length);
});
it('accepts the selected suggestion with Enter', async () => { it('accepts the selected suggestion with Enter', async () => {
caretHelperInstance.getBeforeCursor.mockReturnValue('example'); caretHelperInstance.getBeforeCursor.mockReturnValue('example');
@@ -244,6 +372,66 @@ describe('AutoComplete widget interactions', () => {
expect(insertSelectionSpy).toHaveBeenCalledWith('loop'); expect(insertSelectionSpy).toHaveBeenCalledWith('loop');
}); });
it('preserves manual ArrowDown selection when Tab accepts a suggestion', async () => {
caretHelperInstance.getBeforeCursor.mockReturnValue('loop');
const input = document.createElement('textarea');
input.value = 'loop';
input.selectionStart = input.value.length;
input.focus = vi.fn();
input.setSelectionRange = vi.fn();
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', { showPreview: false, minChars: 1 });
autoComplete.searchType = 'custom_words';
autoComplete.items = [
{ tag_name: 'looking_to_the_side', category: 0, post_count: 1000 },
{ tag_name: 'loop', category: 0, post_count: 500 },
];
autoComplete.currentSearchTerm = 'loo';
autoComplete.selectedIndex = 0;
autoComplete.isVisible = true;
const insertSelectionSpy = vi.spyOn(autoComplete,'insertSelection').mockResolvedValue();
input.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }));
input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Tab', bubbles: true, cancelable: true }));
expect(autoComplete.selectedIndex).toBe(1);
expect(insertSelectionSpy).toHaveBeenCalledWith('loop');
});
it('preserves manual ArrowDown selection when Enter accepts a suggestion', async () => {
caretHelperInstance.getBeforeCursor.mockReturnValue('loop');
const input = document.createElement('textarea');
input.value = 'loop';
input.selectionStart = input.value.length;
input.focus = vi.fn();
input.setSelectionRange = vi.fn();
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', { showPreview: false, minChars: 1 });
autoComplete.searchType = 'custom_words';
autoComplete.items = [
{ tag_name: 'looking_to_the_side', category: 0, post_count: 1000 },
{ tag_name: 'loop', category: 0, post_count: 500 },
];
autoComplete.currentSearchTerm = 'loo';
autoComplete.selectedIndex = 0;
autoComplete.isVisible = true;
const insertSelectionSpy = vi.spyOn(autoComplete,'insertSelection').mockResolvedValue();
input.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown', bubbles: true }));
input.dispatchEvent(new KeyboardEvent('keydown', { key: 'Enter', bubbles: true, cancelable: true }));
expect(autoComplete.selectedIndex).toBe(1);
expect(insertSelectionSpy).toHaveBeenCalledWith('loop');
});
it('accepts the first available suggestion with Tab even if delayed auto-selection has not happened yet', async () => { it('accepts the first available suggestion with Tab even if delayed auto-selection has not happened yet', async () => {
caretHelperInstance.getBeforeCursor.mockReturnValue('loop'); caretHelperInstance.getBeforeCursor.mockReturnValue('loop');
@@ -275,6 +463,9 @@ describe('AutoComplete widget interactions', () => {
if (key === 'loramanager.autocomplete_append_comma') { if (key === 'loramanager.autocomplete_append_comma') {
return true; return true;
} }
if (key === 'loramanager.autocomplete_auto_format') {
return true;
}
if (key === 'loramanager.autocomplete_accept_key') { if (key === 'loramanager.autocomplete_accept_key') {
return 'tab_only'; return 'tab_only';
} }
@@ -322,6 +513,9 @@ describe('AutoComplete widget interactions', () => {
if (key === 'loramanager.autocomplete_append_comma') { if (key === 'loramanager.autocomplete_append_comma') {
return true; return true;
} }
if (key === 'loramanager.autocomplete_auto_format') {
return true;
}
if (key === 'loramanager.autocomplete_accept_key') { if (key === 'loramanager.autocomplete_accept_key') {
return 'enter_only'; return 'enter_only';
} }
@@ -681,12 +875,12 @@ describe('AutoComplete widget interactions', () => {
json: () => Promise.resolve({ success: true, words: mockTags }), json: () => Promise.resolve({ success: true, words: mockTags }),
}); });
// Simulate "/char looking to the side" input // Simulate "/character looking to the side" input
caretHelperInstance.getBeforeCursor.mockReturnValue('/char looking to the side'); caretHelperInstance.getBeforeCursor.mockReturnValue('/character looking to the side');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 }); caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const input = document.createElement('textarea'); const input = document.createElement('textarea');
input.value = '/char looking to the side'; input.value = '/character looking to the side';
input.selectionStart = input.value.length; input.selectionStart = input.value.length;
input.focus = vi.fn(); input.focus = vi.fn();
input.setSelectionRange = vi.fn(); input.setSelectionRange = vi.fn();
@@ -704,7 +898,7 @@ describe('AutoComplete widget interactions', () => {
autoComplete.activeCommand = { categories: [4, 11], label: 'Character' }; autoComplete.activeCommand = { categories: [4, 11], label: 'Character' };
autoComplete.items = mockTags; autoComplete.items = mockTags;
autoComplete.selectedIndex = 0; autoComplete.selectedIndex = 0;
autoComplete.currentSearchTerm = '/char looking to the side'; autoComplete.currentSearchTerm = '/character looking to the side';
await autoComplete.insertSelection('looking_to_the_side'); await autoComplete.insertSelection('looking_to_the_side');
@@ -1011,6 +1205,253 @@ describe('AutoComplete widget interactions', () => {
expect(fetchApiMock).toHaveBeenCalledWith('/lm/custom-words/search?enriched=true&search=cat&limit=100'); expect(fetchApiMock).toHaveBeenCalledWith('/lm/custom-words/search?enriched=true&search=cat&limit=100');
}); });
it('searches wildcard keys when using the /wildcard command', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({
success: true,
words: ['animals/cat'],
meta: {
has_wildcards: true,
wildcards_dir: '/tmp/settings/wildcards',
supported_formats: ['.txt', '.yaml', '.yml', '.json'],
},
}),
});
caretHelperInstance.getBeforeCursor.mockReturnValue('/wildcard cat');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const input = document.createElement('textarea');
input.value = '/wildcard cat';
input.selectionStart = input.value.length;
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
fetchApiMock.mockClear();
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(fetchApiMock).toHaveBeenCalledWith('/lm/wildcards/search?search=cat&limit=100');
expect(autoComplete.searchType).toBe('wildcards');
expect(autoComplete.items).toEqual(['animals/cat']);
});
it('shows wildcard onboarding when /wildcard is used before any files exist', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({
success: true,
words: [],
meta: {
has_wildcards: false,
wildcards_dir: '/tmp/settings/wildcards',
supported_formats: ['.txt', '.yaml', '.yml', '.json'],
},
}),
});
caretHelperInstance.getBeforeCursor.mockReturnValue('/wildcard cat');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const input = document.createElement('textarea');
input.value = '/wildcard cat';
input.selectionStart = input.value.length;
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(autoComplete.isVisible).toBe(true);
expect(autoComplete.items).toHaveLength(1);
expect(autoComplete.items[0].type).toBe('wildcard_empty_state');
expect(autoComplete.dropdown.textContent).toContain('No wildcards found yet');
expect(autoComplete.dropdown.textContent).toContain('/tmp/settings/wildcards');
expect(autoComplete.dropdown.textContent).toContain('.txt, .yaml, .yml, .json');
});
it('shows wildcard onboarding when only the /wildcard command is entered', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({
success: true,
words: [],
meta: {
has_wildcards: false,
wildcards_dir: '/tmp/settings/wildcards',
supported_formats: ['.txt', '.yaml', '.yml', '.json'],
},
}),
});
caretHelperInstance.getBeforeCursor.mockReturnValue('/wildcard ');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const input = document.createElement('textarea');
input.value = '/wildcard ';
input.selectionStart = input.value.length;
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(fetchApiMock).toHaveBeenCalledWith('/lm/wildcards/search?search=&limit=100');
expect(autoComplete.isVisible).toBe(true);
expect(autoComplete.items).toHaveLength(1);
expect(autoComplete.items[0].type).toBe('wildcard_empty_state');
expect(autoComplete.dropdown.textContent).toContain('No wildcards found yet');
});
it('shows a lightweight no-match state when wildcard files exist but search misses', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({
success: true,
words: [],
meta: {
has_wildcards: true,
wildcards_dir: '/tmp/settings/wildcards',
supported_formats: ['.txt', '.yaml', '.yml', '.json'],
},
}),
});
caretHelperInstance.getBeforeCursor.mockReturnValue('/wildcard dragon');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const input = document.createElement('textarea');
input.value = '/wildcard dragon';
input.selectionStart = input.value.length;
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(autoComplete.items).toHaveLength(1);
expect(autoComplete.items[0].type).toBe('wildcard_no_matches');
expect(autoComplete.dropdown.textContent).toContain('No wildcard matches');
expect(autoComplete.dropdown.textContent).not.toContain('Open wildcards folder');
});
it('inserts wildcard references when accepting a /wildcard result', async () => {
caretHelperInstance.getBeforeCursor.mockReturnValue('/wildcard animals/cat');
const input = document.createElement('textarea');
input.value = '/wildcard animals/cat';
input.selectionStart = input.value.length;
input.focus = vi.fn();
input.setSelectionRange = vi.fn();
document.body.append(input);
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
autoComplete.searchType = 'wildcards';
autoComplete.activeCommand = { type: 'wildcard', label: 'Wildcards' };
autoComplete.items = ['animals/cat'];
autoComplete.selectedIndex = 0;
await autoComplete.insertSelection('animals/cat');
expect(input.value).toBe('__animals/cat__,');
expect(input.focus).toHaveBeenCalled();
expect(input.setSelectionRange).toHaveBeenCalled();
});
it('does not reopen autocomplete on blur after inserting a wildcard literal', async () => {
const input = document.createElement('textarea');
input.value = '__flower__,';
input.selectionStart = input.value.length;
document.body.append(input);
caretHelperInstance.getBeforeCursor.mockReturnValue('__flower__,');
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
const hideSpy = vi.spyOn(autoComplete, 'hide');
input.dispatchEvent(new Event('blur', { bubbles: true }));
expect(fetchApiMock).not.toHaveBeenCalled();
expect(hideSpy).toHaveBeenCalled();
expect(autoComplete.isVisible).toBe(false);
});
it('treats a command after a wildcard literal as the active token', async () => {
vi.useFakeTimers();
fetchApiMock.mockResolvedValue({
json: () => Promise.resolve({
success: true,
words: [{ tag_name: 'flower_field', category: 4, post_count: 1234 }],
}),
});
const input = document.createElement('textarea');
input.value = '__flower__ /character f';
input.selectionStart = input.value.length;
document.body.append(input);
caretHelperInstance.getBeforeCursor.mockReturnValue('__flower__ /character f');
caretHelperInstance.getCursorOffset.mockReturnValue({ left: 15, top: 25 });
const { AutoComplete } = await import(AUTOCOMPLETE_MODULE);
const autoComplete = new AutoComplete(input,'prompt', {
debounceDelay: 0,
showPreview: false,
minChars: 1,
});
input.dispatchEvent(new Event('input', { bubbles: true }));
await vi.runAllTimersAsync();
await Promise.resolve();
expect(autoComplete.getSearchTerm(input.value)).toBe('/character f');
});
it('invalidates stale autocomplete metadata and falls back to delimiter-based matching', async () => { it('invalidates stale autocomplete metadata and falls back to delimiter-based matching', async () => {
settingGetMock.mockImplementation((key) => { settingGetMock.mockImplementation((key) => {
if (key === 'loramanager.autocomplete_append_comma') { if (key === 'loramanager.autocomplete_append_comma') {

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,21 @@
import { describe, expect, it } from 'vitest';
import { ModelContextMenuMixin } from '../../../static/js/components/ContextMenu/ModelContextMenuMixin.js';
describe('ModelContextMenuMixin.extractModelVersionId', () => {
it('accepts civitai.red model URLs', () => {
expect(
ModelContextMenuMixin.extractModelVersionId(
'https://civitai.red/models/65423/nijimecha-artstyle?modelVersionId=777'
)
).toEqual({ modelId: '65423', modelVersionId: '777' });
});
it('rejects model-like URLs from unsupported hosts', () => {
expect(
ModelContextMenuMixin.extractModelVersionId(
'https://example.com/models/65423?modelVersionId=777'
)
).toEqual({ modelId: null, modelVersionId: null });
});
});

View File

@@ -26,6 +26,7 @@ vi.mock(DOWNLOAD_MANAGER_MODULE, () => ({
vi.mock(UI_HELPERS_MODULE, () => ({ vi.mock(UI_HELPERS_MODULE, () => ({
showToast: vi.fn(), showToast: vi.fn(),
openCivitaiUrl: vi.fn(),
})); }));
const stateMock = { const stateMock = {
@@ -349,4 +350,59 @@ describe('ModelVersionsTab media rendering', () => {
); );
expect(firstBadges).toContain('Newer Version'); expect(firstBadges).toContain('Newer Version');
}); });
it('shows downloaded badge only for previously downloaded versions that are not in library', async () => {
fetchModelUpdateVersions.mockResolvedValue({
success: true,
record: {
shouldIgnore: false,
inLibraryVersionIds: [8],
versions: [
{
versionId: 9,
name: 'History only',
baseModel: 'SDXL',
previewUrl: '/api/lm/previews/v9.png',
sizeBytes: 1024,
isInLibrary: false,
hasBeenDownloaded: true,
shouldIgnore: false,
},
{
versionId: 8,
name: 'Local copy',
baseModel: 'SDXL',
previewUrl: '/api/lm/previews/v8.png',
sizeBytes: 2048,
isInLibrary: true,
hasBeenDownloaded: true,
shouldIgnore: false,
},
],
},
});
const { initVersionsTab } = await import(MODEL_VERSIONS_MODULE);
const controller = initVersionsTab({
modalId: 'model-versions-modal',
modelType: 'loras',
modelId: 654,
currentVersionId: 8,
});
await controller.load();
const rows = document.querySelectorAll('.model-version-row');
const historyBadges = Array.from(rows[0].querySelectorAll('.version-badge')).map(
badge => badge.textContent?.trim()
);
const localBadges = Array.from(rows[1].querySelectorAll('.version-badge')).map(
badge => badge.textContent?.trim()
);
expect(historyBadges).toContain('Downloaded');
expect(historyBadges).not.toContain('In Library');
expect(localBadges).toContain('In Library');
expect(localBadges).not.toContain('Downloaded');
});
}); });

View File

@@ -12,6 +12,7 @@ const apiClientMock = {
}; };
const showToastMock = vi.fn(); const showToastMock = vi.fn();
const openCivitaiByMetadataMock = vi.fn();
const updatePanelPositionsMock = vi.fn(); const updatePanelPositionsMock = vi.fn();
const downloadManagerMock = { const downloadManagerMock = {
showDownloadModal: vi.fn(), showDownloadModal: vi.fn(),
@@ -40,6 +41,7 @@ vi.mock('../../../static/js/api/modelApiFactory.js', () => ({
vi.mock('../../../static/js/utils/uiHelpers.js', () => ({ vi.mock('../../../static/js/utils/uiHelpers.js', () => ({
showToast: showToastMock, showToast: showToastMock,
openCivitaiByMetadata: openCivitaiByMetadataMock,
updatePanelPositions: updatePanelPositionsMock, updatePanelPositions: updatePanelPositionsMock,
})); }));

View File

@@ -50,6 +50,12 @@ vi.mock('../../../static/js/managers/HelpManager.js', () => ({
}, },
})); }));
vi.mock('../../../static/js/managers/DoctorManager.js', () => ({
doctorManager: {
initialize: vi.fn(),
},
}));
vi.mock('../../../static/js/managers/BannerService.js', () => ({ vi.mock('../../../static/js/managers/BannerService.js', () => ({
bannerService: { bannerService: {
initialize: vi.fn(), initialize: vi.fn(),
@@ -103,6 +109,7 @@ import { moveManager } from '../../../static/js/managers/MoveManager.js';
import { bulkManager } from '../../../static/js/managers/BulkManager.js'; import { bulkManager } from '../../../static/js/managers/BulkManager.js';
import { ExampleImagesManager } from '../../../static/js/managers/ExampleImagesManager.js'; import { ExampleImagesManager } from '../../../static/js/managers/ExampleImagesManager.js';
import { helpManager } from '../../../static/js/managers/HelpManager.js'; import { helpManager } from '../../../static/js/managers/HelpManager.js';
import { doctorManager } from '../../../static/js/managers/DoctorManager.js';
import { bannerService } from '../../../static/js/managers/BannerService.js'; import { bannerService } from '../../../static/js/managers/BannerService.js';
import { initTheme, initBackToTop } from '../../../static/js/utils/uiHelpers.js'; import { initTheme, initBackToTop } from '../../../static/js/utils/uiHelpers.js';
import { onboardingManager } from '../../../static/js/managers/OnboardingManager.js'; import { onboardingManager } from '../../../static/js/managers/OnboardingManager.js';
@@ -187,6 +194,7 @@ describe('AppCore initialization flow', () => {
delete window.helpManager; delete window.helpManager;
delete window.moveManager; delete window.moveManager;
delete window.bulkManager; delete window.bulkManager;
delete window.doctorManager;
delete window.headerManager; delete window.headerManager;
delete window.i18n; delete window.i18n;
delete window.pageContextMenu; delete window.pageContextMenu;
@@ -214,6 +222,7 @@ describe('AppCore initialization flow', () => {
expect(bannerService.initialize).toHaveBeenCalledTimes(1); expect(bannerService.initialize).toHaveBeenCalledTimes(1);
expect(window.modalManager).toBe(modalManager); expect(window.modalManager).toBe(modalManager);
expect(window.settingsManager).toBe(settingsManager); expect(window.settingsManager).toBe(settingsManager);
expect(window.doctorManager).toBe(doctorManager);
expect(window.moveManager).toBe(moveManager); expect(window.moveManager).toBe(moveManager);
expect(window.bulkManager).toBe(bulkManager); expect(window.bulkManager).toBe(bulkManager);
expect(HeaderManager).toHaveBeenCalledTimes(1); expect(HeaderManager).toHaveBeenCalledTimes(1);
@@ -227,6 +236,7 @@ describe('AppCore initialization flow', () => {
expect(window.exampleImagesManager).toBe(exampleImagesManagerInstance); expect(window.exampleImagesManager).toBe(exampleImagesManagerInstance);
expect(exampleImagesManagerInitialize).toHaveBeenCalledTimes(1); expect(exampleImagesManagerInitialize).toHaveBeenCalledTimes(1);
expect(helpManager.initialize).toHaveBeenCalledTimes(1); expect(helpManager.initialize).toHaveBeenCalledTimes(1);
expect(doctorManager.initialize).toHaveBeenCalledTimes(1);
expect(document.body.classList.contains('hover-reveal')).toBe(true); expect(document.body.classList.contains('hover-reveal')).toBe(true);
expect(initializeEventManagement).toHaveBeenCalledTimes(1); expect(initializeEventManagement).toHaveBeenCalledTimes(1);
expect(onboardingManager.start).not.toHaveBeenCalled(); expect(onboardingManager.start).not.toHaveBeenCalled();

View File

@@ -0,0 +1,78 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { mountMarkup, resetDom } from '../utils/domFixtures.js';
vi.mock('../../../static/js/managers/ModalManager.js', () => ({
modalManager: {
showModal: vi.fn(),
},
}));
vi.mock('../../../static/js/utils/uiHelpers.js', () => ({
showToast: vi.fn(),
}));
vi.mock('../../../static/js/utils/i18nHelpers.js', () => ({
translate: vi.fn((key, _params, fallback) => fallback || key),
}));
vi.mock('../../../static/js/components/shared/utils.js', () => ({
escapeHtml: vi.fn((value) => String(value)),
}));
import { DoctorManager } from '../../../static/js/managers/DoctorManager.js';
function renderDoctorFixture() {
mountMarkup(`
<button id="doctorTriggerBtn"></button>
<span id="doctorStatusBadge" class="hidden"></span>
<div id="doctorModal"></div>
<div id="doctorIssuesList"></div>
<div id="doctorSummaryText"></div>
<div id="doctorSummaryBadge"></div>
<div id="doctorLoadingState"></div>
<button id="doctorRefreshBtn"></button>
<button id="doctorExportBtn"></button>
`);
document.body.dataset.appVersion = '1.2.3-test';
}
describe('DoctorManager', () => {
beforeEach(() => {
resetDom();
vi.clearAllMocks();
delete window.__lmDoctorConsolePatched;
delete window.__lmDoctorConsoleEntries;
});
it('does not run diagnostics during initialize', () => {
renderDoctorFixture();
const manager = new DoctorManager();
const refreshSpy = vi.spyOn(manager, 'refreshDiagnostics').mockResolvedValue(undefined);
manager.initialize();
expect(refreshSpy).not.toHaveBeenCalled();
});
it('builds a cache-busted reload URL that preserves the current location', () => {
renderDoctorFixture();
window.history.replaceState({}, '', '/loras?filter=active#details');
vi.spyOn(Date, 'now').mockReturnValue(1234567890);
const manager = new DoctorManager();
const url = manager.buildReloadUrl();
expect(url).toBe('http://localhost:3000/loras?filter=active&_lm_reload=1234567890#details');
});
it('delegates reload-page actions to reloadUi', async () => {
renderDoctorFixture();
const manager = new DoctorManager();
const reloadSpy = vi.spyOn(manager, 'reloadUi').mockImplementation(() => undefined);
await manager.handleAction('reload-page');
expect(reloadSpy).toHaveBeenCalledTimes(1);
});
});

View File

@@ -0,0 +1,149 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
const {
DOWNLOAD_MANAGER_MODULE,
MODAL_MANAGER_MODULE,
UI_HELPERS_MODULE,
STATE_MODULE,
LOADING_MANAGER_MODULE,
API_FACTORY_MODULE,
STORAGE_HELPERS_MODULE,
FOLDER_TREE_MANAGER_MODULE,
I18N_HELPERS_MODULE,
} = vi.hoisted(() => ({
DOWNLOAD_MANAGER_MODULE: new URL('../../../static/js/managers/DownloadManager.js', import.meta.url).pathname,
MODAL_MANAGER_MODULE: new URL('../../../static/js/managers/ModalManager.js', import.meta.url).pathname,
UI_HELPERS_MODULE: new URL('../../../static/js/utils/uiHelpers.js', import.meta.url).pathname,
STATE_MODULE: new URL('../../../static/js/state/index.js', import.meta.url).pathname,
LOADING_MANAGER_MODULE: new URL('../../../static/js/managers/LoadingManager.js', import.meta.url).pathname,
API_FACTORY_MODULE: new URL('../../../static/js/api/modelApiFactory.js', import.meta.url).pathname,
STORAGE_HELPERS_MODULE: new URL('../../../static/js/utils/storageHelpers.js', import.meta.url).pathname,
FOLDER_TREE_MANAGER_MODULE: new URL('../../../static/js/components/FolderTreeManager.js', import.meta.url).pathname,
I18N_HELPERS_MODULE: new URL('../../../static/js/utils/i18nHelpers.js', import.meta.url).pathname,
}));
vi.mock(MODAL_MANAGER_MODULE, () => ({
modalManager: {
showModal: vi.fn(),
closeModal: vi.fn(),
},
}));
vi.mock(UI_HELPERS_MODULE, () => ({
showToast: vi.fn(),
}));
vi.mock(STATE_MODULE, () => ({
state: {
global: {
settings: {},
},
},
}));
vi.mock(LOADING_MANAGER_MODULE, () => ({
LoadingManager: vi.fn(() => ({
showSimpleLoading: vi.fn(),
hide: vi.fn(),
restoreProgressBar: vi.fn(),
showDownloadProgress: vi.fn(() => vi.fn()),
setStatus: vi.fn(),
})),
}));
vi.mock(API_FACTORY_MODULE, () => ({
getModelApiClient: vi.fn(() => ({
apiConfig: {
config: {
displayName: 'LoRA',
singularName: 'lora',
},
},
})),
resetAndReload: vi.fn(),
}));
vi.mock(STORAGE_HELPERS_MODULE, () => ({
getStorageItem: vi.fn((_key, defaultValue) => defaultValue),
setStorageItem: vi.fn(),
}));
vi.mock(FOLDER_TREE_MANAGER_MODULE, () => ({
FolderTreeManager: vi.fn(() => ({
clearSelection: vi.fn(),
init: vi.fn(),
})),
}));
vi.mock(I18N_HELPERS_MODULE, () => ({
translate: vi.fn((_, __, fallback) => fallback ?? ''),
}));
describe('DownloadManager version history badges', () => {
let DownloadManager;
beforeEach(async () => {
vi.resetModules();
document.body.innerHTML = `
<div id="urlStep"></div>
<div id="versionStep"></div>
<div id="versionList"></div>
<button id="nextFromVersion"></button>
`;
({ DownloadManager } = await import(DOWNLOAD_MANAGER_MODULE));
});
afterEach(() => {
document.body.innerHTML = '';
});
it('shows downloaded badge only for versions missing locally', () => {
const manager = new DownloadManager();
manager.versions = [
{
id: 101,
name: 'History only',
images: [],
files: [{ sizeKB: 2048 }],
createdAt: '2026-01-01T00:00:00Z',
existsLocally: false,
hasBeenDownloaded: true,
},
{
id: 102,
name: 'Still local',
images: [],
files: [{ sizeKB: 2048 }],
createdAt: '2026-01-01T00:00:00Z',
existsLocally: true,
hasBeenDownloaded: true,
localPath: '/models/still-local.safetensors',
},
];
manager.showVersionStep();
const items = document.querySelectorAll('.version-item');
expect(items).toHaveLength(2);
expect(items[0].querySelector('.downloaded-badge')?.textContent).toContain('Downloaded');
expect(items[0].querySelector('.downloaded-badge')?.getAttribute('title')).toContain(
'Previously downloaded, but it is not currently in your library.'
);
expect(items[0].querySelector('.local-badge')).toBeNull();
expect(items[1].querySelector('.local-badge')).not.toBeNull();
expect(items[1].querySelector('.local-path')?.textContent).toContain('/models/still-local.safetensors');
expect(items[1].querySelector('.downloaded-badge')).toBeNull();
});
it('extracts model and version ids from civitai.red URLs', () => {
const manager = new DownloadManager();
expect(
manager.extractModelId('https://civitai.red/models/65423/nijimecha-artstyle?modelVersionId=777')
).toBe('65423');
expect(manager.modelVersionId).toBe('777');
expect(manager.source).toBeNull();
});
});

View File

@@ -96,6 +96,7 @@ beforeEach(() => {
}); });
afterEach(() => { afterEach(() => {
vi.useRealTimers();
delete global.fetch; delete global.fetch;
delete document.hidden; delete document.hidden;
Object.defineProperty(window, 'location', { Object.defineProperty(window, 'location', {
@@ -205,4 +206,103 @@ describe('SettingsManager library controls', () => {
expect(select.value).toBe('alpha'); expect(select.value).toBe('alpha');
expect(activateSpy).not.toHaveBeenCalled(); expect(activateSpy).not.toHaveBeenCalled();
}); });
it('loads recipes_path into the settings input', async () => {
const manager = createManager();
const input = document.createElement('input');
input.id = 'recipesPath';
document.body.appendChild(input);
global.fetch = vi.fn().mockResolvedValue({
ok: true,
json: async () => ({
success: true,
isAvailable: false,
isEnabled: false,
databaseSize: 0,
}),
});
state.global.settings = {
recipes_path: '/custom/recipes',
};
await manager.loadSettingsToUI();
expect(input.value).toBe('/custom/recipes');
});
it('does not autofocus empty extra folder path rows during initial settings load', async () => {
vi.useFakeTimers();
const manager = createManager();
document.body.innerHTML = `
<div id="extraFolderPaths-loras"></div>
<div id="extraFolderPaths-checkpoints"></div>
<div id="extraFolderPaths-unet"></div>
<div id="extraFolderPaths-embeddings"></div>
`;
vi.spyOn(manager, 'loadMetadataArchiveSettings').mockResolvedValue();
vi.spyOn(manager, 'loadBackupSettings').mockResolvedValue();
vi.spyOn(manager, 'loadLibraries').mockResolvedValue();
vi.spyOn(manager, 'loadLoraRoots').mockResolvedValue();
vi.spyOn(manager, 'loadCheckpointRoots').mockResolvedValue();
vi.spyOn(manager, 'loadUnetRoots').mockResolvedValue();
vi.spyOn(manager, 'loadEmbeddingRoots').mockResolvedValue();
const focusSpy = vi.spyOn(HTMLElement.prototype, 'focus').mockImplementation(() => {});
state.global.settings = {
extra_folder_paths: {},
};
await manager.loadSettingsToUI();
await vi.runAllTimersAsync();
expect(focusSpy).not.toHaveBeenCalled();
});
it('still focuses an extra folder path row when it is added explicitly', async () => {
vi.useFakeTimers();
const manager = createManager();
document.body.innerHTML = '<div id="extraFolderPaths-embeddings"></div>';
const focusSpy = vi.spyOn(HTMLElement.prototype, 'focus').mockImplementation(() => {});
manager.addExtraFolderPathRow('embeddings', '');
await vi.runAllTimersAsync();
expect(focusSpy).toHaveBeenCalledTimes(1);
});
it('shows loading while saving recipes_path', async () => {
const manager = createManager();
const input = document.createElement('input');
input.id = 'recipesPath';
input.value = '/custom/recipes';
document.body.appendChild(input);
state.global.settings = {
recipes_path: '',
};
global.fetch = vi.fn().mockResolvedValue({
ok: true,
json: async () => ({ success: true }),
});
await manager.saveInputSetting('recipesPath', 'recipes_path');
expect(state.loadingManager.showSimpleLoading).toHaveBeenCalledWith(
'Migrating recipes...'
);
expect(state.loadingManager.hide).toHaveBeenCalledTimes(1);
expect(showToast).toHaveBeenCalledWith(
'toast.settings.recipesPathUpdated',
{},
'success',
);
});
}); });

View File

@@ -7,6 +7,8 @@ const getCurrentPageStateMock = vi.fn();
const getSessionItemMock = vi.fn(); const getSessionItemMock = vi.fn();
const removeSessionItemMock = vi.fn(); const removeSessionItemMock = vi.fn();
const getStorageItemMock = vi.fn(); const getStorageItemMock = vi.fn();
const setStorageItemMock = vi.fn();
const removeStorageItemMock = vi.fn();
const RecipeContextMenuMock = vi.fn(); const RecipeContextMenuMock = vi.fn();
const refreshVirtualScrollMock = vi.fn(); const refreshVirtualScrollMock = vi.fn();
const refreshRecipesMock = vi.fn(); const refreshRecipesMock = vi.fn();
@@ -53,6 +55,8 @@ vi.mock('../../../static/js/utils/storageHelpers.js', () => ({
getSessionItem: getSessionItemMock, getSessionItem: getSessionItemMock,
removeSessionItem: removeSessionItemMock, removeSessionItem: removeSessionItemMock,
getStorageItem: getStorageItemMock, getStorageItem: getStorageItemMock,
setStorageItem: setStorageItemMock,
removeStorageItem: removeStorageItemMock,
})); }));
vi.mock('../../../static/js/components/ContextMenu/index.js', () => ({ vi.mock('../../../static/js/components/ContextMenu/index.js', () => ({
@@ -212,6 +216,19 @@ describe('RecipeManager', () => {
expect(refreshVirtualScrollMock).toHaveBeenCalledTimes(1); expect(refreshVirtualScrollMock).toHaveBeenCalledTimes(1);
}); });
it('supports preserve-scroll options while keeping boolean compatibility', async () => {
const manager = new RecipeManager();
await manager.loadRecipes({ preserveScroll: true });
expect(refreshVirtualScrollMock).toHaveBeenNthCalledWith(1, { preserveScroll: true });
await manager.loadRecipes(false);
expect(refreshVirtualScrollMock).toHaveBeenCalledTimes(1);
await manager.loadRecipes({ resetPage: true, preserveScroll: false });
expect(refreshVirtualScrollMock).toHaveBeenNthCalledWith(2, { preserveScroll: false });
});
it('proxies duplicate management and refresh helpers', async () => { it('proxies duplicate management and refresh helpers', async () => {
const manager = new RecipeManager(); const manager = new RecipeManager();

View File

@@ -14,6 +14,7 @@ describe('state module', () => {
expect(defaultSettings).toMatchObject({ expect(defaultSettings).toMatchObject({
civitai_api_key: '', civitai_api_key: '',
civitai_host: 'civitai.com',
language: 'en', language: 'en',
blur_mature_content: true, blur_mature_content: true,
mature_blur_level: 'R' mature_blur_level: 'R'

View File

@@ -1,10 +1,18 @@
import { describe, it, expect } from 'vitest'; import { describe, it, expect } from 'vitest';
import { import {
DEFAULT_CIVITAI_PAGE_HOST,
normalizeCivitaiPageHost,
buildCivitaiModelUrl,
buildCivitaiSearchUrl,
buildCivitaiUrl,
rewriteCivitaiUrl, rewriteCivitaiUrl,
getOptimizedUrl, getOptimizedUrl,
getShowcaseUrl, getShowcaseUrl,
getThumbnailUrl, getThumbnailUrl,
extractCivitaiImageId,
extractCivitaiModelUrlParts,
isCivitaiUrl, isCivitaiUrl,
isSupportedCivitaiPageHost,
OptimizationMode OptimizationMode
} from '../../../static/js/utils/civitaiUtils.js'; } from '../../../static/js/utils/civitaiUtils.js';
@@ -16,6 +24,47 @@ describe('civitaiUtils', () => {
}); });
}); });
describe('Civitai page URL helpers', () => {
it('normalizes invalid hosts to the default page host', () => {
expect(DEFAULT_CIVITAI_PAGE_HOST).toBe('civitai.com');
expect(normalizeCivitaiPageHost('civitai.red')).toBe('civitai.red');
expect(normalizeCivitaiPageHost(' CIVITAI.COM ')).toBe('civitai.com');
expect(normalizeCivitaiPageHost('example.com')).toBe('civitai.com');
expect(normalizeCivitaiPageHost(null)).toBe('civitai.com');
});
it('builds model URLs using the configured host', () => {
expect(buildCivitaiModelUrl(123, 456, 'civitai.red')).toBe(
'https://civitai.red/models/123?modelVersionId=456'
);
expect(buildCivitaiModelUrl(123, null, 'civitai.com')).toBe(
'https://civitai.com/models/123'
);
});
it('falls back to the model-versions endpoint when only a version id is available', () => {
expect(buildCivitaiModelUrl(null, 456, 'civitai.red')).toBe(
'https://civitai.red/model-versions/456'
);
});
it('builds search URLs using the configured host', () => {
expect(buildCivitaiSearchUrl('demo model', 'civitai.red')).toBe(
'https://civitai.red/models?query=demo%20model'
);
expect(buildCivitaiSearchUrl('', 'civitai.red')).toBe(null);
});
it('prefers model/version URLs and falls back to search URLs', () => {
expect(buildCivitaiUrl({ modelId: 321, versionId: 654, host: 'civitai.red' })).toBe(
'https://civitai.red/models/321?modelVersionId=654'
);
expect(buildCivitaiUrl({ modelName: 'search me', host: 'civitai.red' })).toBe(
'https://civitai.red/models?query=search%20me'
);
});
});
describe('rewriteCivitaiUrl', () => { describe('rewriteCivitaiUrl', () => {
it('should rewrite image URLs with /original=true for thumbnail mode', () => { it('should rewrite image URLs with /original=true for thumbnail mode', () => {
const originalUrl = 'https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/abc123/original=true/12345.jpeg'; const originalUrl = 'https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/abc123/original=true/12345.jpeg';
@@ -217,4 +266,43 @@ describe('civitaiUtils', () => {
expect(isCivitaiUrl('not-a-url')).toBe(false); expect(isCivitaiUrl('not-a-url')).toBe(false);
}); });
}); });
describe('isSupportedCivitaiPageHost', () => {
it('accepts civitai.com and civitai.red page hosts', () => {
expect(isSupportedCivitaiPageHost('civitai.com')).toBe(true);
expect(isSupportedCivitaiPageHost('civitai.red')).toBe(true);
});
it('rejects unrelated hosts', () => {
expect(isSupportedCivitaiPageHost('www.civitai.com')).toBe(false);
expect(isSupportedCivitaiPageHost('www.civitai.red')).toBe(false);
expect(isSupportedCivitaiPageHost('example.com')).toBe(false);
expect(isSupportedCivitaiPageHost('')).toBe(false);
expect(isSupportedCivitaiPageHost(null)).toBe(false);
});
});
describe('extractCivitaiModelUrlParts', () => {
it('extracts model and version ids from civitai.red model URLs', () => {
expect(
extractCivitaiModelUrlParts('https://civitai.red/models/65423/name?modelVersionId=98765')
).toEqual({ modelId: '65423', modelVersionId: '98765' });
});
it('rejects model-like URLs from unsupported hosts', () => {
expect(
extractCivitaiModelUrlParts('https://example.com/models/65423?modelVersionId=98765')
).toEqual({ modelId: null, modelVersionId: null });
});
});
describe('extractCivitaiImageId', () => {
it('extracts image ids from civitai.red image URLs', () => {
expect(extractCivitaiImageId('https://civitai.red/images/126920345')).toBe('126920345');
});
it('rejects image-like URLs from unsupported hosts', () => {
expect(extractCivitaiImageId('https://example.com/images/126920345')).toBe(null);
});
});
}); });

View File

@@ -6,6 +6,8 @@ const {
STORAGE_MODULE, STORAGE_MODULE,
CONSTANTS_MODULE, CONSTANTS_MODULE,
EVENT_MANAGER_MODULE, EVENT_MANAGER_MODULE,
BANNER_SERVICE_MODULE,
MODAL_MANAGER_MODULE,
UI_HELPERS_MODULE, UI_HELPERS_MODULE,
} = vi.hoisted(() => ({ } = vi.hoisted(() => ({
I18N_MODULE: new URL('../../../static/js/utils/i18nHelpers.js', import.meta.url).pathname, I18N_MODULE: new URL('../../../static/js/utils/i18nHelpers.js', import.meta.url).pathname,
@@ -13,12 +15,16 @@ const {
STORAGE_MODULE: new URL('../../../static/js/utils/storageHelpers.js', import.meta.url).pathname, STORAGE_MODULE: new URL('../../../static/js/utils/storageHelpers.js', import.meta.url).pathname,
CONSTANTS_MODULE: new URL('../../../static/js/utils/constants.js', import.meta.url).pathname, CONSTANTS_MODULE: new URL('../../../static/js/utils/constants.js', import.meta.url).pathname,
EVENT_MANAGER_MODULE: new URL('../../../static/js/utils/EventManager.js', import.meta.url).pathname, EVENT_MANAGER_MODULE: new URL('../../../static/js/utils/EventManager.js', import.meta.url).pathname,
BANNER_SERVICE_MODULE: new URL('../../../static/js/managers/BannerService.js', import.meta.url).pathname,
MODAL_MANAGER_MODULE: new URL('../../../static/js/managers/ModalManager.js', import.meta.url).pathname,
UI_HELPERS_MODULE: new URL('../../../static/js/utils/uiHelpers.js', import.meta.url).pathname, UI_HELPERS_MODULE: new URL('../../../static/js/utils/uiHelpers.js', import.meta.url).pathname,
})); }));
const translateMock = vi.fn((key, _params, fallback) => fallback || key); const translateMock = vi.fn((key, _params, fallback) => fallback || key);
const getStorageItemMock = vi.fn(); const getStorageItemMock = vi.fn();
const setStorageItemMock = vi.fn(); const setStorageItemMock = vi.fn();
const registerBannerMock = vi.fn();
const showModalMock = vi.fn();
vi.mock(I18N_MODULE, () => ({ vi.mock(I18N_MODULE, () => ({
translate: translateMock, translate: translateMock,
@@ -50,6 +56,18 @@ vi.mock(EVENT_MANAGER_MODULE, () => ({
}, },
})); }));
vi.mock(BANNER_SERVICE_MODULE, () => ({
bannerService: {
registerBanner: registerBannerMock,
},
}));
vi.mock(MODAL_MANAGER_MODULE, () => ({
modalManager: {
showModal: showModalMock,
},
}));
describe('UI helper DOM utilities', () => { describe('UI helper DOM utilities', () => {
beforeEach(() => { beforeEach(() => {
document.body.innerHTML = ''; document.body.innerHTML = '';
@@ -57,6 +75,8 @@ describe('UI helper DOM utilities', () => {
document.documentElement.removeAttribute('data-theme'); document.documentElement.removeAttribute('data-theme');
getStorageItemMock.mockReset(); getStorageItemMock.mockReset();
setStorageItemMock.mockReset(); setStorageItemMock.mockReset();
registerBannerMock.mockReset();
showModalMock.mockReset();
translateMock.mockReset(); translateMock.mockReset();
globalThis.requestAnimationFrame = (cb) => cb(); globalThis.requestAnimationFrame = (cb) => cb();
}); });
@@ -156,4 +176,58 @@ describe('UI helper DOM utilities', () => {
'#2 (Character Subgraph) Nested Loader', '#2 (Character Subgraph) Nested Loader',
]); ]);
}); });
it('opens Civitai links using the preferred host and registers the first-use banner once', async () => {
const openSpy = vi.fn();
globalThis.window.open = openSpy;
getStorageItemMock.mockImplementation((key, defaultValue) => {
if (key === 'civitai_host_info_banner_seen') {
return false;
}
return defaultValue;
});
const { openCivitaiByMetadata } = await import(UI_HELPERS_MODULE);
openCivitaiByMetadata(123, 456, 'Demo Model');
expect(setStorageItemMock).toHaveBeenCalledWith('civitai_host_info_banner_seen', true);
expect(registerBannerMock).toHaveBeenCalledTimes(1);
expect(openSpy).toHaveBeenCalledWith(
'https://civitai.com/models/123?modelVersionId=456',
'_blank',
'noopener,noreferrer'
);
});
it('uses the configured red host for fallback searches', async () => {
const openSpy = vi.fn();
globalThis.window.open = openSpy;
getStorageItemMock.mockImplementation((key, defaultValue) => {
if (key === 'civitai_host_info_banner_seen') {
return true;
}
return defaultValue;
});
const stateModule = await import(STATE_MODULE);
stateModule.state.global = {
settings: {
civitai_host: 'civitai.red',
},
};
const { openCivitaiByMetadata } = await import(UI_HELPERS_MODULE);
openCivitaiByMetadata(null, null, 'Demo Model');
expect(registerBannerMock).not.toHaveBeenCalled();
expect(openSpy).toHaveBeenCalledWith(
'https://civitai.red/models?query=Demo%20Model',
'_blank',
'noopener,noreferrer'
);
});
}); });

View File

@@ -98,6 +98,199 @@ def test_metadata_processor_extracts_generation_params(populated_registry, monke
assert isinstance(value, str) assert isinstance(value, str)
def test_attention_bias_clip_text_encode_prompts_are_collected(metadata_registry, monkeypatch):
import types
prompt_graph = {
"encode_pos": {
"class_type": "CLIPTextEncodeAttentionBias",
"inputs": {"text": "A <big dog=1.25> on a hill", "clip": ["clip", 0]},
},
"encode_neg": {
"class_type": "CLIPTextEncodeAttentionBias",
"inputs": {"text": "low quality", "clip": ["clip", 0]},
},
"sampler": {
"class_type": "KSampler",
"inputs": {
"seed": types.SimpleNamespace(seed=123),
"steps": 20,
"cfg": 7.0,
"sampler_name": "Euler",
"scheduler": "karras",
"denoise": 1.0,
"positive": ["encode_pos", 0],
"negative": ["encode_neg", 0],
"latent_image": {"samples": types.SimpleNamespace(shape=(1, 4, 16, 16))},
},
},
}
prompt = SimpleNamespace(original_prompt=prompt_graph)
pos_conditioning = object()
neg_conditioning = object()
monkeypatch.setattr(metadata_processor, "standalone_mode", False)
metadata_registry.start_collection("prompt-attention")
metadata_registry.set_current_prompt(prompt)
metadata_registry.record_node_execution(
"encode_pos",
"CLIPTextEncodeAttentionBias",
{"text": "A <big dog=1.25> on a hill"},
None,
)
metadata_registry.update_node_execution(
"encode_pos", "CLIPTextEncodeAttentionBias", [(pos_conditioning,)]
)
metadata_registry.record_node_execution(
"encode_neg",
"CLIPTextEncodeAttentionBias",
{"text": "low quality"},
None,
)
metadata_registry.update_node_execution(
"encode_neg", "CLIPTextEncodeAttentionBias", [(neg_conditioning,)]
)
metadata_registry.record_node_execution(
"sampler",
"KSampler",
{
"seed": types.SimpleNamespace(seed=123),
"positive": pos_conditioning,
"negative": neg_conditioning,
"latent_image": {"samples": types.SimpleNamespace(shape=(1, 4, 16, 16))},
},
None,
)
metadata = metadata_registry.get_metadata("prompt-attention")
sampler_data = metadata[SAMPLING]["sampler"]
prompt_results = MetadataProcessor.match_conditioning_to_prompts(metadata, "sampler")
assert metadata[PROMPTS]["encode_pos"]["text"] == "A <big dog=1.25> on a hill"
assert metadata[PROMPTS]["encode_neg"]["text"] == "low quality"
assert sampler_data["node_id"] == "sampler"
assert sampler_data["is_sampler"] is True
assert prompt_results["prompt"] == "A <big dog=1.25> on a hill"
assert prompt_results["negative_prompt"] == "low quality"
def test_sampler_custom_advanced_recovers_prompt_text_through_guidance_nodes(metadata_registry, monkeypatch):
import types
prompt_graph = {
"encode_pos": {
"class_type": "CLIPTextEncodeAttentionBias",
"inputs": {
"text": "A low-angle, medium close-up portrait of her.",
"clip": ["clip", 0],
},
},
"encode_neg": {
"class_type": "CLIPTextEncodeAttentionBias",
"inputs": {
"text": " This low quality greyscale unfinished sketch is inaccurate and flawed. The image is very blurred and lacks detail with excessive chromatic aberrations and artifacts. The image is overly saturated with excessive bloom. It has a toony aesthetic with bold outlines and flat colors. ",
"clip": ["clip", 0],
},
},
"scheduled_cfg_guidance": {
"class_type": "ScheduledCFGGuidance",
"inputs": {
"model": ["model", 0],
"positive": ["encode_pos", 0],
"negative": ["encode_neg", 0],
"cfg": 2.6,
"start_percent": 0.0,
"end_percent": 0.62,
},
},
"sampler": {
"class_type": "SamplerCustomAdvanced",
"inputs": {
"noise": types.SimpleNamespace(seed=174),
"guider": ["scheduled_cfg_guidance", 0],
"sampler": ["sampler_select", 0],
"sigmas": ["scheduler", 0],
"latent_image": {"samples": types.SimpleNamespace(shape=(1, 4, 128, 128))},
},
},
"sampler_select": {
"class_type": "KSamplerSelect",
"inputs": {"sampler_name": "multistep/deis_2m"},
},
"scheduler": {
"class_type": "BasicScheduler",
"inputs": {"steps": 20, "scheduler": "power_shift", "denoise": 1.0},
},
}
prompt = SimpleNamespace(original_prompt=prompt_graph)
pos_conditioning = object()
neg_conditioning = object()
monkeypatch.setattr(metadata_processor, "standalone_mode", False)
metadata_registry.start_collection("prompt-guidance")
metadata_registry.set_current_prompt(prompt)
metadata_registry.record_node_execution(
"encode_pos",
"CLIPTextEncodeAttentionBias",
{"text": "A low-angle, medium close-up portrait of her."},
None,
)
metadata_registry.update_node_execution(
"encode_pos", "CLIPTextEncodeAttentionBias", [(pos_conditioning,)]
)
metadata_registry.record_node_execution(
"encode_neg",
"CLIPTextEncodeAttentionBias",
{
"text": " This low quality greyscale unfinished sketch is inaccurate and flawed. The image is very blurred and lacks detail with excessive chromatic aberrations and artifacts. The image is overly saturated with excessive bloom. It has a toony aesthetic with bold outlines and flat colors. ",
},
None,
)
metadata_registry.update_node_execution(
"encode_neg", "CLIPTextEncodeAttentionBias", [(neg_conditioning,)]
)
metadata_registry.record_node_execution(
"scheduled_cfg_guidance",
"ScheduledCFGGuidance",
{
"positive": pos_conditioning,
"negative": neg_conditioning,
"cfg": 2.6,
},
None,
)
metadata_registry.record_node_execution(
"sampler",
"SamplerCustomAdvanced",
{
"noise": types.SimpleNamespace(seed=174),
"guider": {
"positive": pos_conditioning,
"negative": neg_conditioning,
},
"sampler": ["sampler_select", 0],
"sigmas": ["scheduler", 0],
"latent_image": {"samples": types.SimpleNamespace(shape=(1, 4, 128, 128))},
},
None,
)
metadata = metadata_registry.get_metadata("prompt-guidance")
params = MetadataProcessor.extract_generation_params(metadata)
assert params["prompt"] == "A low-angle, medium close-up portrait of her."
assert (
params["negative_prompt"]
== " This low quality greyscale unfinished sketch is inaccurate and flawed. The image is very blurred and lacks detail with excessive chromatic aberrations and artifacts. The image is overly saturated with excessive bloom. It has a toony aesthetic with bold outlines and flat colors. "
)
def test_metadata_registry_caches_and_rehydrates(populated_registry): def test_metadata_registry_caches_and_rehydrates(populated_registry):
registry = populated_registry["registry"] registry = populated_registry["registry"]
prompt = populated_registry["prompt"] prompt = populated_registry["prompt"]

View File

@@ -0,0 +1,84 @@
from __future__ import annotations
from py.nodes.prompt import PromptLM
from py.nodes.text import TextLM
def test_text_lm_expands_wildcards_before_output(monkeypatch):
node = TextLM()
expand_calls = []
class StubService:
def expand_text(self, text, seed=None):
expand_calls.append((text, seed))
return "expanded text"
monkeypatch.setattr("py.nodes.text.get_wildcard_service", lambda: StubService())
assert node.process("__flower__", seed=9) == ("expanded text",)
assert expand_calls == [("__flower__", 9)]
def test_prompt_lm_expands_before_appending_trigger_words(monkeypatch):
node = PromptLM()
class StubService:
def expand_text(self, text, seed=None):
assert text == "__flower__"
assert seed == 42
return "rose"
class StubEncoder:
def encode(self, clip, prompt):
assert clip == "clip"
assert prompt == "artist style, rose"
return ("conditioning",)
monkeypatch.setattr("py.nodes.prompt.get_wildcard_service", lambda: StubService())
monkeypatch.setattr("nodes.CLIPTextEncode", lambda: StubEncoder(), raising=False)
result = node.encode("__flower__", "clip", seed=42, trigger_words1="artist style")
assert result == ("conditioning", "artist style, rose")
def test_prompt_lm_input_types_expose_input_only_seed():
input_types = PromptLM.INPUT_TYPES()
seed_type, seed_options = input_types["optional"]["seed"]
assert seed_type == "INT"
assert seed_options["forceInput"] is True
assert "wildcard generation" in seed_options["tooltip"]
def test_text_lm_input_types_expose_input_only_seed():
input_types = TextLM.INPUT_TYPES()
seed_type, seed_options = input_types["optional"]["seed"]
assert seed_type == "INT"
assert seed_options["forceInput"] is True
assert "wildcard generation" in seed_options["tooltip"]
def test_text_lm_is_changed_forces_rerun_without_seed_when_text_is_dynamic():
result = TextLM.IS_CHANGED("__flower__", seed=None)
assert result != result
def test_text_lm_is_changed_keeps_cache_for_seeded_or_static_text():
assert TextLM.IS_CHANGED("__flower__", seed=7) is False
assert TextLM.IS_CHANGED("plain text", seed=None) is False
assert TextLM.IS_CHANGED("{red|blue}", seed=7) is False
def test_prompt_lm_is_changed_forces_rerun_without_seed_when_text_is_dynamic():
result = PromptLM.IS_CHANGED("{red|blue}", clip="clip", seed=None)
assert result != result
def test_prompt_lm_is_changed_keeps_cache_for_seeded_or_static_text():
assert PromptLM.IS_CHANGED("__flower__", clip="clip", seed=11) is False
assert PromptLM.IS_CHANGED("plain text", clip="clip", seed=None) is False

View File

@@ -1,6 +1,9 @@
import io
import json import json
import logging
import os import os
import subprocess import subprocess
import zipfile
from types import SimpleNamespace from types import SimpleNamespace
from unittest.mock import patch, MagicMock from unittest.mock import patch, MagicMock
@@ -8,16 +11,24 @@ import pytest
from aiohttp import web from aiohttp import web
from py.routes.handlers.misc_handlers import ( from py.routes.handlers.misc_handlers import (
BackupHandler,
DoctorHandler,
FileSystemHandler,
LoraCodeHandler, LoraCodeHandler,
ModelLibraryHandler, ModelLibraryHandler,
NodeRegistry, NodeRegistry,
NodeRegistryHandler, NodeRegistryHandler,
ServiceRegistryAdapter, ServiceRegistryAdapter,
SettingsHandler, SettingsHandler,
_collect_comfyui_session_logs,
_is_wsl, _is_wsl,
_wsl_to_windows_path, _wsl_to_windows_path,
_is_docker, _is_docker,
) )
from py.utils.session_logging import (
reset_standalone_session_logging_for_tests,
setup_standalone_session_logging,
)
from py.routes.misc_route_registrar import MISC_ROUTE_DEFINITIONS, MiscRouteRegistrar from py.routes.misc_route_registrar import MISC_ROUTE_DEFINITIONS, MiscRouteRegistrar
from py.routes.misc_routes import MiscRoutes from py.routes.misc_routes import MiscRoutes
@@ -35,6 +46,7 @@ class FakeRequest:
class DummySettings: class DummySettings:
def __init__(self, data=None): def __init__(self, data=None):
self.data = data or {} self.data = data or {}
self.settings = self.data
def get(self, key, default=None): def get(self, key, default=None):
return self.data.get(key, default) return self.data.get(key, default)
@@ -65,6 +77,31 @@ async def dummy_downloader_factory():
return DummyDownloader() return DummyDownloader()
class DummyDoctorScanner:
def __init__(self, *, model_type='lora', raw_data=None, rebuild_error=None):
self.model_type = model_type
self._raw_data = list(raw_data or [])
self._rebuild_error = rebuild_error
self._persistent_cache = SimpleNamespace(
load_cache=lambda _model_type: SimpleNamespace(raw_data=list(self._raw_data))
)
async def get_cached_data(self, force_refresh=False, rebuild_cache=False):
if rebuild_cache and self._rebuild_error:
raise self._rebuild_error
return SimpleNamespace(raw_data=list(self._raw_data))
class DummyCivitaiClient:
def __init__(self, *, success=True, result=None):
self.base_url = 'https://civitai.red/api/v1'
self._success = success
self._result = result if result is not None else {'items': []}
async def _make_request(self, *_args, **_kwargs):
return self._success, self._result
@pytest.mark.asyncio @pytest.mark.asyncio
async def test_get_settings_excludes_no_sync_keys(): async def test_get_settings_excludes_no_sync_keys():
"""Verify that settings in _NO_SYNC_KEYS are not synced, but others are.""" """Verify that settings in _NO_SYNC_KEYS are not synced, but others are."""
@@ -111,6 +148,389 @@ async def test_update_settings_rejects_missing_example_path(tmp_path):
assert "Path does not exist" in payload["error"] assert "Path does not exist" in payload["error"]
@pytest.mark.asyncio
async def test_doctor_handler_reports_key_cache_and_ui_issues():
settings_service = DummySettings({"civitai_api_key": ""})
invalid_entry = {"file_path": "/tmp/missing.safetensors"}
async def civitai_factory():
return DummyCivitaiClient()
async def scanner_factory():
return DummyDoctorScanner(model_type="lora", raw_data=[invalid_entry])
handler = DoctorHandler(
settings_service=settings_service,
civitai_client_factory=civitai_factory,
scanner_factories=(("lora", "LoRAs", scanner_factory),),
app_version_getter=lambda: "1.2.3-server",
)
response = await handler.get_doctor_diagnostics(
FakeRequest(query={"clientVersion": "1.2.2-client"}, method="GET")
)
payload = json.loads(response.text)
assert payload["success"] is True
assert payload["summary"]["status"] == "error"
diagnostic_map = {item["id"]: item for item in payload["diagnostics"]}
assert diagnostic_map["civitai_api_key"]["status"] == "warning"
assert diagnostic_map["cache_health"]["status"] == "error"
assert diagnostic_map["ui_version"]["status"] == "warning"
@pytest.mark.asyncio
async def test_doctor_handler_can_repair_cache():
scanner = DummyDoctorScanner(model_type="lora", raw_data=[])
async def civitai_factory():
return DummyCivitaiClient()
async def scanner_factory():
return scanner
handler = DoctorHandler(
settings_service=DummySettings({"civitai_api_key": "token"}),
civitai_client_factory=civitai_factory,
scanner_factories=(("lora", "LoRAs", scanner_factory),),
)
response = await handler.repair_doctor_cache(FakeRequest())
payload = json.loads(response.text)
assert response.status == 200
assert payload["success"] is True
assert payload["repaired"] == [{"model_type": "lora", "label": "LoRAs"}]
@pytest.mark.asyncio
async def test_doctor_handler_exports_support_bundle():
async def civitai_factory():
return DummyCivitaiClient()
handler = DoctorHandler(
settings_service=DummySettings({"civitai_api_key": "secret-key"}),
civitai_client_factory=civitai_factory,
scanner_factories=(),
app_version_getter=lambda: "9.9.9-test",
)
response = await handler.export_doctor_bundle(
FakeRequest(
json_data={
"summary": {"status": "warning"},
"diagnostics": [{"id": "cache_health", "status": "warning"}],
"frontend_logs": [{"level": "error", "message": "boom"}],
"client_context": {"app_version": "9.9.8-old"},
}
)
)
assert response.status == 200
with zipfile.ZipFile(io.BytesIO(response.body), "r") as archive:
names = set(archive.namelist())
assert "doctor-report.json" in names
assert "settings-sanitized.json" in names
assert "backend-log-source.json" in names
settings_payload = json.loads(archive.read("settings-sanitized.json").decode("utf-8"))
assert settings_payload["civitai_api_key"].startswith("secr")
@pytest.mark.asyncio
async def test_doctor_handler_redacts_string_secrets_in_bundle():
async def civitai_factory():
return DummyCivitaiClient()
handler = DoctorHandler(
settings_service=DummySettings({"civitai_api_key": "secret-key"}),
civitai_client_factory=civitai_factory,
scanner_factories=(),
app_version_getter=lambda: "9.9.9-test",
)
response = await handler.export_doctor_bundle(
FakeRequest(
json_data={
"frontend_logs": [
{
"level": "error",
"message": "Authorization: Bearer abcdef123456 token=xyz password=hunter2",
}
],
}
)
)
assert response.status == 200
with zipfile.ZipFile(io.BytesIO(response.body), "r") as archive:
frontend_logs = archive.read("frontend-console.json").decode("utf-8")
assert "abcdef123456" not in frontend_logs
assert "hunter2" not in frontend_logs
assert "Bearer ***" in frontend_logs
backend_logs = archive.read("backend-logs.txt").decode("utf-8")
assert "hunter2" not in backend_logs
@pytest.mark.asyncio
async def test_doctor_handler_redacts_json_shaped_string_secrets_in_bundle():
async def civitai_factory():
return DummyCivitaiClient()
handler = DoctorHandler(
settings_service=DummySettings({"civitai_api_key": "secret-key"}),
civitai_client_factory=civitai_factory,
scanner_factories=(),
app_version_getter=lambda: "9.9.9-test",
)
handler._collect_backend_session_logs = lambda: {
"mode": "standalone",
"source_method": "standalone_memory",
"session_started_at": "2026-04-11T10:00:00+00:00",
"session_id": "session-123",
"persistent_log_path": None,
"persistent_log_text": "",
"session_log_text": '{"token":"abcd1234","authorization":"Bearer qwerty","password":"hunter2"}\n',
"notes": [],
}
response = await handler.export_doctor_bundle(
FakeRequest(
json_data={
"frontend_logs": [
{
"level": "error",
"message": '{"token":"abcd1234","authorization":"Bearer qwerty","password":"hunter2"}',
}
],
}
)
)
assert response.status == 200
with zipfile.ZipFile(io.BytesIO(response.body), "r") as archive:
frontend_logs = archive.read("frontend-console.json").decode("utf-8")
backend_logs = archive.read("backend-logs.txt").decode("utf-8")
assert '"token":"abcd1234"' not in frontend_logs
assert '"password":"hunter2"' not in frontend_logs
assert 'Bearer qwerty' not in frontend_logs
assert '\\"token\\":\\"***\\"' in frontend_logs
assert '\\"password\\":\\"***\\"' in frontend_logs
assert 'Bearer ***' in frontend_logs
assert '"token":"abcd1234"' not in backend_logs
assert '"password":"hunter2"' not in backend_logs
assert 'Bearer qwerty' not in backend_logs
@pytest.mark.asyncio
async def test_doctor_handler_exports_backend_session_logs_from_helper():
async def civitai_factory():
return DummyCivitaiClient()
handler = DoctorHandler(
settings_service=DummySettings({"civitai_api_key": "secret-key"}),
civitai_client_factory=civitai_factory,
scanner_factories=(),
app_version_getter=lambda: "9.9.9-test",
)
handler._collect_backend_session_logs = lambda: {
"mode": "standalone",
"source_method": "standalone_session_file",
"session_started_at": "2026-04-11T10:00:00+00:00",
"session_id": "session-123",
"persistent_log_path": "/tmp/standalone.log",
"persistent_log_text": "token=abcd1234\n",
"session_log_text": "Authorization: Bearer supersecret\n",
"notes": [],
}
response = await handler.export_doctor_bundle(FakeRequest(json_data={}))
assert response.status == 200
with zipfile.ZipFile(io.BytesIO(response.body), "r") as archive:
backend_logs = archive.read("backend-logs.txt").decode("utf-8")
backend_source = json.loads(
archive.read("backend-log-source.json").decode("utf-8")
)
assert "supersecret" not in backend_logs
assert backend_source["source_method"] == "standalone_session_file"
assert backend_source["session_id"] == "session-123"
def test_collect_comfyui_session_logs_only_uses_matching_current_session_file(tmp_path):
log_file = tmp_path / "comfyui.log"
log_file.write_text(
"** ComfyUI startup time: 2026-04-11 12:00:00.000\n"
"[2026-04-11 12:00:01.000] file log line\n",
encoding="utf-8",
)
result = _collect_comfyui_session_logs(
log_entries=[
{
"t": "2026-04-11 12:05:00.000",
"m": "** ComfyUI startup time: 2026-04-11 12:05:00.000\n",
},
{"t": "2026-04-11 12:05:01.000", "m": "current session line\n"},
],
log_file_path=str(log_file),
)
assert result["persistent_log_text"] == ""
assert any("does not match" in note for note in result["notes"])
def test_setup_standalone_session_logging_creates_current_session_file(tmp_path):
reset_standalone_session_logging_for_tests()
settings_file = tmp_path / "settings.json"
settings_file.write_text("{}", encoding="utf-8")
state = setup_standalone_session_logging(str(settings_file))
logger = logging.getLogger("lora-manager-standalone-test")
logger.info("standalone current session line")
assert state.log_file_path is not None
assert os.path.isfile(state.log_file_path)
with open(state.log_file_path, "r", encoding="utf-8") as handle:
payload = handle.read()
assert "LoRA Manager standalone startup time:" in payload
class DummyBackupService:
def __init__(self):
self.restore_calls = []
async def create_snapshot(self, *, snapshot_type="manual", persist=False):
return {
"archive_name": "backup.zip",
"archive_bytes": b"zip-bytes",
"manifest": {"snapshot_type": snapshot_type},
}
async def restore_snapshot(self, archive_path):
self.restore_calls.append(archive_path)
return {"success": True, "restored_files": 3, "snapshot_type": "manual"}
def get_status(self):
return {
"backupDir": "/tmp/backups",
"enabled": True,
"retentionCount": 5,
"snapshotCount": 1,
}
def get_available_snapshots(self):
return [{"name": "backup.zip", "path": "/tmp/backup.zip", "size": 8, "mtime": 1.0, "is_auto": False}]
@pytest.mark.asyncio
async def test_backup_handler_returns_status_and_exports(monkeypatch):
service = DummyBackupService()
async def factory():
return service
handler = BackupHandler(backup_service_factory=factory)
status_response = await handler.get_backup_status(FakeRequest())
status_payload = json.loads(status_response.text)
assert status_payload["success"] is True
assert status_payload["status"]["backupDir"] == "/tmp/backups"
assert status_payload["status"]["enabled"] is True
assert status_payload["snapshots"][0]["name"] == "backup.zip"
export_response = await handler.export_backup(FakeRequest())
assert export_response.status == 200
assert export_response.body == b"zip-bytes"
@pytest.mark.asyncio
async def test_backup_handler_rejects_missing_import_archive():
service = DummyBackupService()
async def factory():
return service
handler = BackupHandler(backup_service_factory=factory)
class EmptyRequest:
content_type = "application/octet-stream"
async def read(self):
return b""
response = await handler.import_backup(EmptyRequest())
payload = json.loads(response.text)
assert response.status == 400
assert payload["success"] is False
@pytest.mark.asyncio
async def test_open_backup_location_uses_settings_directory(tmp_path, monkeypatch):
settings_dir = tmp_path / "settings"
settings_dir.mkdir(parents=True, exist_ok=True)
settings_file = settings_dir / "settings.json"
settings_file.write_text("{}", encoding="utf-8")
backup_dir = settings_dir / "backups"
backup_dir.mkdir(parents=True, exist_ok=True)
handler = FileSystemHandler(settings_service=SimpleNamespace(settings_file=str(settings_file)))
calls = []
def fake_popen(args):
calls.append(args)
return MagicMock()
monkeypatch.setattr(subprocess, "Popen", fake_popen)
monkeypatch.setattr("py.routes.handlers.misc_handlers._is_docker", lambda: False)
monkeypatch.setattr("py.routes.handlers.misc_handlers._is_wsl", lambda: False)
response = await handler.open_backup_location(FakeRequest())
payload = json.loads(response.text)
assert response.status == 200
assert payload["success"] is True
assert payload["path"] == str(backup_dir)
assert calls == [["xdg-open", str(backup_dir)]]
@pytest.mark.asyncio
async def test_open_wildcards_location_creates_and_opens_directory(tmp_path, monkeypatch):
wildcards_dir = tmp_path / "settings" / "wildcards"
handler = FileSystemHandler(settings_service=SimpleNamespace(settings_file=str(tmp_path / "settings.json")))
calls = []
def fake_popen(args):
calls.append(args)
return MagicMock()
monkeypatch.setattr(subprocess, "Popen", fake_popen)
monkeypatch.setattr("py.routes.handlers.misc_handlers._is_docker", lambda: False)
monkeypatch.setattr("py.routes.handlers.misc_handlers._is_wsl", lambda: False)
monkeypatch.setattr(
"py.services.wildcard_service.get_wildcards_dir",
lambda create=False: str(wildcards_dir.mkdir(parents=True, exist_ok=True) or wildcards_dir)
if create
else str(wildcards_dir),
)
response = await handler.open_wildcards_location(FakeRequest())
payload = json.loads(response.text)
assert response.status == 200
assert payload["success"] is True
assert payload["path"] == str(wildcards_dir)
assert wildcards_dir.is_dir()
assert calls == [["xdg-open", str(wildcards_dir)]]
class RecordingRouter: class RecordingRouter:
def __init__(self): def __init__(self):
self.calls = [] self.calls = []

View File

@@ -0,0 +1,66 @@
from __future__ import annotations
from types import SimpleNamespace
import jinja2
from py.routes.handlers.model_handlers import ModelPageView
class DummySettings:
def get(self, key, default=None):
return default
class DummyI18n:
def __init__(self):
self.locale = None
def set_locale(self, locale):
self.locale = locale
def get_translation(self, key, default=None, **_kwargs):
return default or key
def create_template_filter(self):
return lambda key, *_args, **_kwargs: key
class DummyScanner:
def __init__(self):
self._cache = SimpleNamespace()
async def get_cached_data(self, *_args, **_kwargs):
return SimpleNamespace(folders=[])
class DummyService:
def __init__(self):
self.scanner = DummyScanner()
async def test_model_page_view_reads_version_per_request():
template_env = jinja2.Environment(
loader=jinja2.DictLoader({"dummy.html": "{{ version }}"}),
autoescape=True,
)
view = ModelPageView(
template_env=template_env,
template_name="dummy.html",
service=DummyService(),
settings_service=DummySettings(),
server_i18n=DummyI18n(),
logger=SimpleNamespace(
debug=lambda *_args, **_kwargs: None,
error=lambda *_args, **_kwargs: None,
),
)
view._get_app_version = lambda: "1.0.2-old"
first = await view.handle(SimpleNamespace())
view._get_app_version = lambda: "1.0.2-new"
second = await view.handle(SimpleNamespace())
assert first.text == "1.0.2-old"
assert second.text == "1.0.2-new"

View File

@@ -6,7 +6,8 @@ from types import SimpleNamespace
import pytest import pytest
from py.config import config from py.config import config
from py.routes.handlers.model_handlers import ModelUpdateHandler from py.routes.handlers.model_handlers import ModelCivitaiHandler, ModelUpdateHandler
from py.services.service_registry import ServiceRegistry
from py.utils.metadata_manager import MetadataManager from py.utils.metadata_manager import MetadataManager
from py.services.model_update_service import ModelUpdateRecord, ModelVersionRecord from py.services.model_update_service import ModelUpdateRecord, ModelVersionRecord
@@ -91,7 +92,131 @@ async def test_build_version_context_includes_static_urls():
overrides = await handler._build_version_context(record) overrides = await handler._build_version_context(record)
expected = config.get_preview_static_url("/tmp/previews/example.png") expected = config.get_preview_static_url("/tmp/previews/example.png")
assert overrides == {123: {"file_path": None, "file_name": None, "preview_override": expected}} assert overrides == {
123: {
"file_path": None,
"file_name": None,
"preview_override": expected,
"has_been_downloaded": False,
}
}
@pytest.mark.asyncio
async def test_build_version_context_includes_download_history(monkeypatch):
cache = SimpleNamespace(version_index={})
service = DummyService(cache)
handler = ModelUpdateHandler(
service=service,
update_service=SimpleNamespace(),
metadata_provider_selector=lambda *_: None,
settings_service=SimpleNamespace(get=lambda *_: False),
logger=logging.getLogger(__name__),
)
class DummyHistoryService:
async def get_downloaded_version_ids(self, model_type, model_id):
assert model_type == "lora"
assert model_id == 42
return [123]
async def fake_history_service_factory():
return DummyHistoryService()
monkeypatch.setattr(
ServiceRegistry,
"get_downloaded_version_history_service",
staticmethod(fake_history_service_factory),
)
record = ModelUpdateRecord(
model_type="lora",
model_id=42,
versions=[
ModelVersionRecord(
version_id=123,
name="Downloaded",
base_model=None,
released_at=None,
size_bytes=None,
preview_url=None,
is_in_library=False,
should_ignore=False,
),
ModelVersionRecord(
version_id=124,
name="Fresh",
base_model=None,
released_at=None,
size_bytes=None,
preview_url=None,
is_in_library=False,
should_ignore=False,
),
],
last_checked_at=None,
should_ignore_model=False,
)
overrides = await handler._build_version_context(record)
assert overrides[123]["has_been_downloaded"] is True
assert overrides[124]["has_been_downloaded"] is False
@pytest.mark.asyncio
async def test_get_civitai_versions_degrades_when_download_history_unavailable(monkeypatch):
cache = SimpleNamespace(version_index={})
service = DummyService(cache)
class DummyProvider:
async def get_model_versions(self, model_id):
assert model_id == "42"
return {
"type": "lora",
"modelVersions": [
{
"id": 7,
"name": "Version 7",
"files": [],
}
],
}
async def fake_history_service_factory():
raise RuntimeError("download history unavailable")
monkeypatch.setattr(
ServiceRegistry,
"get_downloaded_version_history_service",
staticmethod(fake_history_service_factory),
)
async def metadata_provider_factory():
return DummyProvider()
handler = ModelCivitaiHandler(
service=service,
settings_service=SimpleNamespace(get=lambda *_: False),
ws_manager=SimpleNamespace(),
logger=logging.getLogger(__name__),
metadata_provider_factory=metadata_provider_factory,
validate_model_type=lambda *_: True,
expected_model_types=lambda: "LoRA",
find_model_file=lambda *_: None,
metadata_sync=SimpleNamespace(),
metadata_refresh_use_case=SimpleNamespace(),
metadata_progress_callback=lambda *_args, **_kwargs: None,
)
response = await handler.get_civitai_versions(
SimpleNamespace(match_info={"model_id": "42"})
)
payload = json.loads(response.text)
assert response.status == 200
assert payload[0]["id"] == 7
assert payload[0]["existsLocally"] is False
assert payload[0]["hasBeenDownloaded"] is False
@pytest.mark.asyncio @pytest.mark.asyncio

Some files were not shown because too many files have changed in this diff Show More