Compare commits

...

12 Commits

Author SHA1 Message Date
Will Miao
e97648c70b feat(import): add import-only option for recipes without downloading missing LoRAs
Add dual-button design in recipe import flow:
- Details step: [Import Recipe Only] [Import & Download]
- Location step: [Back] [Import & Download] (removed redundant Import Only)

Changes:
- templates/components/import_modal.html: Add secondary button for import-only
- static/js/managers/ImportManager.js: Add saveRecipeOnlyFromDetails() method
- static/js/managers/import/RecipeDataManager.js: Update button state management
- static/js/managers/import/DownloadManager.js: Support skipDownload flag
- locales/*.json: Complete all translation TODOs

Closes #868
2026-03-25 11:56:34 +08:00
Will Miao
8b85e083e2 feat(recipe-parser): add SuiImage metadata format support
- Add SuiImageParamsParser for sui_image_params JSON format
- Register new parser in RecipeParserFactory
- Fix metadata_provider auto-initialization when not ready
- Add 10 test cases for SuiImageParamsParser

Fixes batch import failure for images with sui_image_params metadata.
2026-03-25 08:43:33 +08:00
Will Miao
9112cd3b62 chore: Add .claude/ to gitignore
Exclude Claude Code personal configuration directory containing:
- settings.local.json (personal permissions and local paths)
- skills/ (personal skills)

These contain machine-specific paths and personal preferences
that should not be shared across the team.
2026-03-22 14:17:15 +08:00
Will Miao
7df4e8d037 fix(metadata_hook): correct function signature to fix bound method error
Fix issue #866 where the metadata hook's async wrapper used *args/**kwargs
which caused AttributeError when ComfyUI's make_locked_method_func tried
to access __func__ on the func parameter.

The async_map_node_over_list_with_metadata wrapper now uses the exact
same signature as ComfyUI's _async_map_node_over_list:
- Removed: *args, **kwargs
- Added: explicit v3_data=None parameter

This ensures the func parameter (always a string like obj.FUNCTION) is
passed correctly to make_locked_method_func without any type conversion.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-22 13:25:04 +08:00
Will Miao
4000b7f7e7 feat: Add configurable LoRA strength adjustment step setting
Implements issue #808 - Allow users to customize the strength
variation range for LoRA widget arrow buttons.

Changes:
- Add 'Strength Adjustment Step' setting (0.01-0.1) in settings.js
- Replace hardcoded 0.05 increments with configurable step value
- Apply to both LoRA strength and CLIP strength controls

Fixes #808
2026-03-19 17:33:18 +08:00
Will Miao
76c15105e6 feat(lora-pool): add regex include/exclude name pattern filtering (#839)
Add name pattern filtering to LoRA Pool node allowing users to filter
LoRAs by filename or model name using either plain text or regex patterns.

Features:
- Include patterns: only show LoRAs matching at least one pattern
- Exclude patterns: exclude LoRAs matching any pattern
- Regex toggle: switch between substring and regex matching
- Case-insensitive matching for both modes
- Invalid regex automatically falls back to substring matching
- Filters apply to both file_name and model_name fields

Backend:
- Update LoraPoolLM._default_config() with namePatterns structure
- Add name pattern filtering to _apply_pool_filters() and _apply_specific_filters()
- Add API parameter parsing for name_pattern_include/exclude/use_regex
- Update LoraPoolConfig type with namePatterns field

Frontend:
- Add NamePatternsSection.vue component with pattern input UI
- Update useLoraPoolState to manage pattern state and API integration
- Update LoraPoolSummaryView to display NamePatternsSection
- Increase LORA_POOL_WIDGET_MIN_HEIGHT to accommodate new UI

Tests:
- Add 7 test cases covering text/regex include, exclude, combined
  filtering, model name fallback, and invalid regex handling

Closes #839
2026-03-19 17:15:05 +08:00
Will Miao
b11c90e19b feat: add type ignore comments and remove unused imports
- Add `# type: ignore` comments to comfy.sd and folder_paths imports
- Remove unused imports: os, random, and extract_lora_name
- Clean up import statements across checkpoint_loader, lora_randomizer, and unet_loader nodes
2026-03-19 15:54:49 +08:00
pixelpaws
9f5d2d0c18 Merge pull request #862 from EnragedAntelope/claude/add-webp-image-support-t8kG9
Improve webp image support
2026-03-19 15:35:16 +08:00
Will Miao
a0dc5229f4 feat(unet_loader): move torch import inside methods for lazy loading
- Delay torch import until needed in load_unet and load_unet_gguf methods
- This improves module loading performance by avoiding unnecessary imports
- Maintains functionality while reducing initial import overhead
2026-03-19 15:29:41 +08:00
EnragedAntelope
a32325402e Merge branch 'willmiao:main' into claude/add-webp-image-support-t8kG9 2026-03-17 08:37:46 -04:00
Claude
05ebd7493d chore: update package-lock.json after npm install
https://claude.ai/code/session_01SgT2pkisi27bEQELX5EeXZ
2026-03-17 01:33:34 +00:00
Claude
90986bd795 feat: add case-insensitive webp support for lora cover photos
Make preview file discovery case-insensitive so files with uppercase
extensions like .WEBP are found on case-sensitive filesystems. Also
explicitly list image/webp in the file picker accept attribute for
broader browser compatibility.

https://claude.ai/code/session_01SgT2pkisi27bEQELX5EeXZ
2026-03-17 01:32:48 +00:00
44 changed files with 2356 additions and 726 deletions

1
.gitignore vendored
View File

@@ -14,6 +14,7 @@ model_cache/
# agent # agent
.opencode/ .opencode/
.claude/
# Vue widgets development cache (but keep build output) # Vue widgets development cache (but keep build output)
vue-widgets/node_modules/ vue-widgets/node_modules/

View File

@@ -645,6 +645,8 @@
"root": "Stammverzeichnis", "root": "Stammverzeichnis",
"browseFolders": "Ordner durchsuchen:", "browseFolders": "Ordner durchsuchen:",
"downloadAndSaveRecipe": "Herunterladen & Rezept speichern", "downloadAndSaveRecipe": "Herunterladen & Rezept speichern",
"importRecipeOnly": "Nur Rezept importieren",
"importAndDownload": "Importieren & Herunterladen",
"downloadMissingLoras": "Fehlende LoRAs herunterladen", "downloadMissingLoras": "Fehlende LoRAs herunterladen",
"saveRecipe": "Rezept speichern", "saveRecipe": "Rezept speichern",
"loraCountInfo": "({existing}/{total} in Bibliothek)", "loraCountInfo": "({existing}/{total} in Bibliothek)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "Verarbeitungsfehler: {message}", "processingError": "Verarbeitungsfehler: {message}",
"folderBrowserError": "Fehler beim Laden des Ordner-Browsers: {message}", "folderBrowserError": "Fehler beim Laden des Ordner-Browsers: {message}",
"recipeSaveFailed": "Fehler beim Speichern des Rezepts: {error}", "recipeSaveFailed": "Fehler beim Speichern des Rezepts: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "Import fehlgeschlagen: {message}", "importFailed": "Import fehlgeschlagen: {message}",
"folderTreeFailed": "Fehler beim Laden des Ordnerbaums", "folderTreeFailed": "Fehler beim Laden des Ordnerbaums",
"folderTreeError": "Fehler beim Laden des Ordnerbaums", "folderTreeError": "Fehler beim Laden des Ordnerbaums",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "Keine Modelle ausgewählt", "noModelsSelected": "Keine Modelle ausgewählt",

View File

@@ -645,6 +645,8 @@
"root": "Root", "root": "Root",
"browseFolders": "Browse Folders:", "browseFolders": "Browse Folders:",
"downloadAndSaveRecipe": "Download & Save Recipe", "downloadAndSaveRecipe": "Download & Save Recipe",
"importRecipeOnly": "Import Recipe Only",
"importAndDownload": "Import & Download",
"downloadMissingLoras": "Download Missing LoRAs", "downloadMissingLoras": "Download Missing LoRAs",
"saveRecipe": "Save Recipe", "saveRecipe": "Save Recipe",
"loraCountInfo": "({existing}/{total} in library)", "loraCountInfo": "({existing}/{total} in library)",
@@ -1495,6 +1497,7 @@
"processingError": "Processing error: {message}", "processingError": "Processing error: {message}",
"folderBrowserError": "Error loading folder browser: {message}", "folderBrowserError": "Error loading folder browser: {message}",
"recipeSaveFailed": "Failed to save recipe: {error}", "recipeSaveFailed": "Failed to save recipe: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "Import failed: {message}", "importFailed": "Import failed: {message}",
"folderTreeFailed": "Failed to load folder tree", "folderTreeFailed": "Failed to load folder tree",
"folderTreeError": "Error loading folder tree", "folderTreeError": "Error loading folder tree",

View File

@@ -645,6 +645,8 @@
"root": "Raíz", "root": "Raíz",
"browseFolders": "Explorar carpetas:", "browseFolders": "Explorar carpetas:",
"downloadAndSaveRecipe": "Descargar y guardar receta", "downloadAndSaveRecipe": "Descargar y guardar receta",
"importRecipeOnly": "Importar solo la receta",
"importAndDownload": "Importar y descargar",
"downloadMissingLoras": "Descargar LoRAs faltantes", "downloadMissingLoras": "Descargar LoRAs faltantes",
"saveRecipe": "Guardar receta", "saveRecipe": "Guardar receta",
"loraCountInfo": "({existing}/{total} en la biblioteca)", "loraCountInfo": "({existing}/{total} en la biblioteca)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "Error de procesamiento: {message}", "processingError": "Error de procesamiento: {message}",
"folderBrowserError": "Error cargando explorador de carpetas: {message}", "folderBrowserError": "Error cargando explorador de carpetas: {message}",
"recipeSaveFailed": "Error al guardar receta: {error}", "recipeSaveFailed": "Error al guardar receta: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "Importación falló: {message}", "importFailed": "Importación falló: {message}",
"folderTreeFailed": "Error al cargar árbol de carpetas", "folderTreeFailed": "Error al cargar árbol de carpetas",
"folderTreeError": "Error cargando árbol de carpetas", "folderTreeError": "Error cargando árbol de carpetas",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "No hay modelos seleccionados", "noModelsSelected": "No hay modelos seleccionados",

View File

@@ -645,6 +645,8 @@
"root": "Racine", "root": "Racine",
"browseFolders": "Parcourir les dossiers :", "browseFolders": "Parcourir les dossiers :",
"downloadAndSaveRecipe": "Télécharger et sauvegarder la recipe", "downloadAndSaveRecipe": "Télécharger et sauvegarder la recipe",
"importRecipeOnly": "Importer uniquement la recette",
"importAndDownload": "Importer et télécharger",
"downloadMissingLoras": "Télécharger les LoRAs manquants", "downloadMissingLoras": "Télécharger les LoRAs manquants",
"saveRecipe": "Sauvegarder la recipe", "saveRecipe": "Sauvegarder la recipe",
"loraCountInfo": "({existing}/{total} dans la bibliothèque)", "loraCountInfo": "({existing}/{total} dans la bibliothèque)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "Erreur de traitement : {message}", "processingError": "Erreur de traitement : {message}",
"folderBrowserError": "Erreur lors du chargement du navigateur de dossiers : {message}", "folderBrowserError": "Erreur lors du chargement du navigateur de dossiers : {message}",
"recipeSaveFailed": "Échec de la sauvegarde de la recipe : {error}", "recipeSaveFailed": "Échec de la sauvegarde de la recipe : {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "Échec de l'importation : {message}", "importFailed": "Échec de l'importation : {message}",
"folderTreeFailed": "Échec du chargement de l'arborescence des dossiers", "folderTreeFailed": "Échec du chargement de l'arborescence des dossiers",
"folderTreeError": "Erreur lors du chargement de l'arborescence des dossiers", "folderTreeError": "Erreur lors du chargement de l'arborescence des dossiers",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "Aucun modèle sélectionné", "noModelsSelected": "Aucun modèle sélectionné",

View File

@@ -645,6 +645,8 @@
"root": "שורש", "root": "שורש",
"browseFolders": "דפדף בתיקיות:", "browseFolders": "דפדף בתיקיות:",
"downloadAndSaveRecipe": "הורד ושמור מתכון", "downloadAndSaveRecipe": "הורד ושמור מתכון",
"importRecipeOnly": "יבא רק מתכון",
"importAndDownload": "יבא והורד",
"downloadMissingLoras": "הורד LoRAs חסרים", "downloadMissingLoras": "הורד LoRAs חסרים",
"saveRecipe": "שמור מתכון", "saveRecipe": "שמור מתכון",
"loraCountInfo": "({existing}/{total} בספרייה)", "loraCountInfo": "({existing}/{total} בספרייה)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "שגיאת עיבוד: {message}", "processingError": "שגיאת עיבוד: {message}",
"folderBrowserError": "שגיאה בטעינת דפדפן התיקיות: {message}", "folderBrowserError": "שגיאה בטעינת דפדפן התיקיות: {message}",
"recipeSaveFailed": "שמירת המתכון נכשלה: {error}", "recipeSaveFailed": "שמירת המתכון נכשלה: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "הייבוא נכשל: {message}", "importFailed": "הייבוא נכשל: {message}",
"folderTreeFailed": "טעינת עץ התיקיות נכשלה", "folderTreeFailed": "טעינת עץ התיקיות נכשלה",
"folderTreeError": "שגיאה בטעינת עץ התיקיות", "folderTreeError": "שגיאה בטעינת עץ התיקיות",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "לא נבחרו מודלים", "noModelsSelected": "לא נבחרו מודלים",

View File

@@ -645,6 +645,8 @@
"root": "ルート", "root": "ルート",
"browseFolders": "フォルダを参照:", "browseFolders": "フォルダを参照:",
"downloadAndSaveRecipe": "ダウンロード & レシピ保存", "downloadAndSaveRecipe": "ダウンロード & レシピ保存",
"importRecipeOnly": "レシピのみインポート",
"importAndDownload": "インポートとダウンロード",
"downloadMissingLoras": "不足しているLoRAをダウンロード", "downloadMissingLoras": "不足しているLoRAをダウンロード",
"saveRecipe": "レシピを保存", "saveRecipe": "レシピを保存",
"loraCountInfo": "{existing}/{total} ライブラリ内)", "loraCountInfo": "{existing}/{total} ライブラリ内)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "処理エラー:{message}", "processingError": "処理エラー:{message}",
"folderBrowserError": "フォルダブラウザの読み込みエラー:{message}", "folderBrowserError": "フォルダブラウザの読み込みエラー:{message}",
"recipeSaveFailed": "レシピの保存に失敗しました:{error}", "recipeSaveFailed": "レシピの保存に失敗しました:{error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "インポートに失敗しました:{message}", "importFailed": "インポートに失敗しました:{message}",
"folderTreeFailed": "フォルダツリーの読み込みに失敗しました", "folderTreeFailed": "フォルダツリーの読み込みに失敗しました",
"folderTreeError": "フォルダツリー読み込みエラー", "folderTreeError": "フォルダツリー読み込みエラー",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "モデルが選択されていません", "noModelsSelected": "モデルが選択されていません",

View File

@@ -645,6 +645,8 @@
"root": "루트", "root": "루트",
"browseFolders": "폴더 탐색:", "browseFolders": "폴더 탐색:",
"downloadAndSaveRecipe": "다운로드 및 레시피 저장", "downloadAndSaveRecipe": "다운로드 및 레시피 저장",
"importRecipeOnly": "레시피만 가져오기",
"importAndDownload": "가져오기 및 다운로드",
"downloadMissingLoras": "누락된 LoRA 다운로드", "downloadMissingLoras": "누락된 LoRA 다운로드",
"saveRecipe": "레시피 저장", "saveRecipe": "레시피 저장",
"loraCountInfo": "({existing}/{total} 라이브러리에 있음)", "loraCountInfo": "({existing}/{total} 라이브러리에 있음)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "처리 오류: {message}", "processingError": "처리 오류: {message}",
"folderBrowserError": "폴더 브라우저 로딩 오류: {message}", "folderBrowserError": "폴더 브라우저 로딩 오류: {message}",
"recipeSaveFailed": "레시피 저장 실패: {error}", "recipeSaveFailed": "레시피 저장 실패: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "가져오기 실패: {message}", "importFailed": "가져오기 실패: {message}",
"folderTreeFailed": "폴더 트리 로딩 실패", "folderTreeFailed": "폴더 트리 로딩 실패",
"folderTreeError": "폴더 트리 로딩 오류", "folderTreeError": "폴더 트리 로딩 오류",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "선택된 모델이 없습니다", "noModelsSelected": "선택된 모델이 없습니다",

View File

@@ -645,6 +645,8 @@
"root": "Корень", "root": "Корень",
"browseFolders": "Обзор папок:", "browseFolders": "Обзор папок:",
"downloadAndSaveRecipe": "Скачать и сохранить рецепт", "downloadAndSaveRecipe": "Скачать и сохранить рецепт",
"importRecipeOnly": "Импортировать только рецепт",
"importAndDownload": "Импорт и скачивание",
"downloadMissingLoras": "Скачать отсутствующие LoRAs", "downloadMissingLoras": "Скачать отсутствующие LoRAs",
"saveRecipe": "Сохранить рецепт", "saveRecipe": "Сохранить рецепт",
"loraCountInfo": "({existing}/{total} в библиотеке)", "loraCountInfo": "({existing}/{total} в библиотеке)",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "Batch Import Recipes",
"action": "[TODO: Translate] Batch Import", "action": "Batch Import",
"urlList": "[TODO: Translate] URL List", "urlList": "URL List",
"directory": "[TODO: Translate] Directory", "directory": "Directory",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "Enter image URLs or local file paths (one per line). Each will be imported as a recipe.",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "Enter a directory path to import all images from that folder.",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "Image URLs or Local Paths",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "Enter one URL or path per line",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "Directory Path",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "Browse",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "Include subdirectories",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "Tags (optional, applied to all recipes)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "Enter tags separated by commas",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "Tags will be added to all imported recipes",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "Skip images without metadata",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "Images without LoRA metadata will be skipped automatically.",
"start": "[TODO: Translate] Start Import", "start": "Start Import",
"startImport": "[TODO: Translate] Start Import", "startImport": "Start Import",
"importing": "[TODO: Translate] Importing...", "importing": "Importing...",
"progress": "[TODO: Translate] Progress", "progress": "Progress",
"total": "[TODO: Translate] Total", "total": "Total",
"success": "[TODO: Translate] Success", "success": "Success",
"failed": "[TODO: Translate] Failed", "failed": "Failed",
"skipped": "[TODO: Translate] Skipped", "skipped": "Skipped",
"current": "[TODO: Translate] Current", "current": "Current",
"currentItem": "[TODO: Translate] Current", "currentItem": "Current",
"preparing": "[TODO: Translate] Preparing...", "preparing": "Preparing...",
"cancel": "[TODO: Translate] Cancel", "cancel": "Cancel",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "Cancel",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "Import cancelled",
"completed": "[TODO: Translate] Import completed", "completed": "Import completed",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "Completed with errors",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "Successfully imported {count} recipe(s)",
"successCount": "[TODO: Translate] Successful", "successCount": "Successful",
"failedCount": "[TODO: Translate] Failed", "failedCount": "Failed",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "Skipped",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "Total processed",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "View Details",
"newImport": "[TODO: Translate] New Import", "newImport": "New Import",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "Please enter the directory path manually. File browser is not available in this browser.",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "Directory selected: {path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "File browser not available. Please enter the directory path manually.",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "Back to parent directory",
"folders": "[TODO: Translate] Folders", "folders": "Folders",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} folders",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "Image Files",
"images": "[TODO: Translate] images", "images": "images",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} images",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "Select This Folder",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "Please enter at least one URL or path",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "Please enter a directory path",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "Failed to start import: {message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "Ошибка обработки: {message}", "processingError": "Ошибка обработки: {message}",
"folderBrowserError": "Ошибка загрузки браузера папок: {message}", "folderBrowserError": "Ошибка загрузки браузера папок: {message}",
"recipeSaveFailed": "Не удалось сохранить рецепт: {error}", "recipeSaveFailed": "Не удалось сохранить рецепт: {error}",
"recipeSaved": "Recipe saved successfully",
"importFailed": "Импорт не удался: {message}", "importFailed": "Импорт не удался: {message}",
"folderTreeFailed": "Не удалось загрузить дерево папок", "folderTreeFailed": "Не удалось загрузить дерево папок",
"folderTreeError": "Ошибка загрузки дерева папок", "folderTreeError": "Ошибка загрузки дерева папок",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "Failed to start batch import: {message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "Cancelling batch import...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "Failed to cancel batch import: {message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "Please enter at least one URL or file path",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "Please enter a directory path",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "Failed to browse directory: {message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "Directory selected: {path}"
}, },
"models": { "models": {
"noModelsSelected": "Модели не выбраны", "noModelsSelected": "Модели не выбраны",

View File

@@ -645,6 +645,8 @@
"root": "根目录", "root": "根目录",
"browseFolders": "浏览文件夹:", "browseFolders": "浏览文件夹:",
"downloadAndSaveRecipe": "下载并保存配方", "downloadAndSaveRecipe": "下载并保存配方",
"importRecipeOnly": "仅导入配方",
"importAndDownload": "导入并下载",
"downloadMissingLoras": "下载缺失的 LoRA", "downloadMissingLoras": "下载缺失的 LoRA",
"saveRecipe": "保存配方", "saveRecipe": "保存配方",
"loraCountInfo": "({existing}/{total} in library)", "loraCountInfo": "({existing}/{total} in library)",
@@ -734,55 +736,55 @@
"batchImport": { "batchImport": {
"title": "批量导入配方", "title": "批量导入配方",
"action": "批量导入", "action": "批量导入",
"urlList": "[TODO: Translate] URL List", "urlList": "URL 列表",
"directory": "[TODO: Translate] Directory", "directory": "目录",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "输入图像 URL 或本地文件路径(每行一个)。每个都将作为配方导入。",
"directoryDescription": "输入目录路径以导入该文件夹中的所有图片。", "directoryDescription": "输入目录路径以导入该文件夹中的所有图片。",
"urlsLabel": "图片 URL 或本地路径", "urlsLabel": "图片 URL 或本地路径",
"urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "每行输入一个 URL 或路径",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "目录路径",
"directoryPlaceholder": "/图片/文件夹/路径", "directoryPlaceholder": "/图片/文件夹/路径",
"browse": "[TODO: Translate] Browse", "browse": "浏览",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "包含子目录",
"tagsOptional": "标签(可选,应用于所有配方)", "tagsOptional": "标签(可选,应用于所有配方)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "输入以逗号分隔的标签",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "标签将被添加到所有导入的配方中",
"skipNoMetadata": "跳过无元数据的图片", "skipNoMetadata": "跳过无元数据的图片",
"skipNoMetadataHelp": "没有 LoRA 元数据的图片将自动跳过。", "skipNoMetadataHelp": "没有 LoRA 元数据的图片将自动跳过。",
"start": "[TODO: Translate] Start Import", "start": "开始导入",
"startImport": "开始导入", "startImport": "开始导入",
"importing": "正在导入配方...", "importing": "正在导入配方...",
"progress": "进度", "progress": "进度",
"total": "[TODO: Translate] Total", "total": "总计",
"success": "[TODO: Translate] Success", "success": "成功",
"failed": "[TODO: Translate] Failed", "failed": "失败",
"skipped": "[TODO: Translate] Skipped", "skipped": "跳过",
"current": "[TODO: Translate] Current", "current": "当前",
"currentItem": "当前", "currentItem": "当前",
"preparing": "准备中...", "preparing": "准备中...",
"cancel": "[TODO: Translate] Cancel", "cancel": "取消",
"cancelImport": "取消", "cancelImport": "取消",
"cancelled": "批量导入已取消", "cancelled": "批量导入已取消",
"completed": "导入完成", "completed": "导入完成",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "导入完成但有错误",
"completedSuccess": "成功导入 {count} 个配方", "completedSuccess": "成功导入 {count} 个配方",
"successCount": "成功", "successCount": "成功",
"failedCount": "失败", "failedCount": "失败",
"skippedCount": "跳过", "skippedCount": "跳过",
"totalProcessed": "总计处理", "totalProcessed": "总计处理",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "查看详情",
"newImport": "[TODO: Translate] New Import", "newImport": "新建导入",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "请手动输入目录路径。此浏览器中文件浏览器不可用。",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "已选择目录:{path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "文件浏览器不可用。请手动输入目录路径。",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "返回上级目录",
"folders": "[TODO: Translate] Folders", "folders": "文件夹",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} 个文件夹",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "图像文件",
"images": "[TODO: Translate] images", "images": "图像",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} 个图像",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "选择此文件夹",
"errors": { "errors": {
"enterUrls": "请至少输入一个 URL 或路径", "enterUrls": "请至少输入一个 URL 或路径",
"enterDirectory": "请输入目录路径", "enterDirectory": "请输入目录路径",
@@ -1495,16 +1497,17 @@
"processingError": "处理出错:{message}", "processingError": "处理出错:{message}",
"folderBrowserError": "加载文件夹浏览器出错:{message}", "folderBrowserError": "加载文件夹浏览器出错:{message}",
"recipeSaveFailed": "保存配方失败:{error}", "recipeSaveFailed": "保存配方失败:{error}",
"recipeSaved": "配方保存成功",
"importFailed": "导入失败:{message}", "importFailed": "导入失败:{message}",
"folderTreeFailed": "加载文件夹树失败", "folderTreeFailed": "加载文件夹树失败",
"folderTreeError": "加载文件夹树出错", "folderTreeError": "加载文件夹树出错",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "启动批量导入失败:{message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "正在取消批量导入...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "取消批量导入失败:{message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "请输入至少一个 URL 或文件路径",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "请输入目录路径",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "浏览目录失败:{message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "已选择目录:{path}"
}, },
"models": { "models": {
"noModelsSelected": "未选中模型", "noModelsSelected": "未选中模型",

View File

@@ -645,6 +645,8 @@
"root": "根目錄", "root": "根目錄",
"browseFolders": "瀏覽資料夾:", "browseFolders": "瀏覽資料夾:",
"downloadAndSaveRecipe": "下載並儲存配方", "downloadAndSaveRecipe": "下載並儲存配方",
"importRecipeOnly": "僅匯入配方",
"importAndDownload": "匯入並下載",
"downloadMissingLoras": "下載缺少的 LoRA", "downloadMissingLoras": "下載缺少的 LoRA",
"saveRecipe": "儲存配方", "saveRecipe": "儲存配方",
"loraCountInfo": "(庫存 {existing}/{total}", "loraCountInfo": "(庫存 {existing}/{total}",
@@ -732,61 +734,61 @@
} }
}, },
"batchImport": { "batchImport": {
"title": "[TODO: Translate] Batch Import Recipes", "title": "批量匯入配方",
"action": "[TODO: Translate] Batch Import", "action": "批量匯入",
"urlList": "[TODO: Translate] URL List", "urlList": "URL 列表",
"directory": "[TODO: Translate] Directory", "directory": "目錄",
"urlDescription": "[TODO: Translate] Enter image URLs or local file paths (one per line). Each will be imported as a recipe.", "urlDescription": "輸入圖像 URL 或本地檔案路徑(每行一個)。每個都將作為配方匯入。",
"directoryDescription": "[TODO: Translate] Enter a directory path to import all images from that folder.", "directoryDescription": "輸入目錄路徑以匯入該資料夾中的所有圖像。",
"urlsLabel": "[TODO: Translate] Image URLs or Local Paths", "urlsLabel": "圖像 URL 或本地路徑",
"urlsPlaceholder": "[TODO: Translate] https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...", "urlsPlaceholder": "https://civitai.com/images/...\nhttps://civitai.com/images/...\nC:/path/to/image.png\n...",
"urlsHint": "[TODO: Translate] Enter one URL or path per line", "urlsHint": "每行輸入一個 URL 或路徑",
"directoryPath": "[TODO: Translate] Directory Path", "directoryPath": "目錄路徑",
"directoryPlaceholder": "[TODO: Translate] /path/to/images/folder", "directoryPlaceholder": "/path/to/images/folder",
"browse": "[TODO: Translate] Browse", "browse": "瀏覽",
"recursive": "[TODO: Translate] Include subdirectories", "recursive": "包含子目錄",
"tagsOptional": "[TODO: Translate] Tags (optional, applied to all recipes)", "tagsOptional": "標籤(可選,應用於所有配方)",
"tagsPlaceholder": "[TODO: Translate] Enter tags separated by commas", "tagsPlaceholder": "輸入以逗號分隔的標籤",
"tagsHint": "[TODO: Translate] Tags will be added to all imported recipes", "tagsHint": "標籤將被添加到所有匯入的配方中",
"skipNoMetadata": "[TODO: Translate] Skip images without metadata", "skipNoMetadata": "跳過無元資料的圖像",
"skipNoMetadataHelp": "[TODO: Translate] Images without LoRA metadata will be skipped automatically.", "skipNoMetadataHelp": "沒有 LoRA 元資料的圖像將被自動跳過。",
"start": "[TODO: Translate] Start Import", "start": "開始匯入",
"startImport": "[TODO: Translate] Start Import", "startImport": "開始匯入",
"importing": "[TODO: Translate] Importing...", "importing": "匯入中...",
"progress": "[TODO: Translate] Progress", "progress": "進度",
"total": "[TODO: Translate] Total", "total": "總計",
"success": "[TODO: Translate] Success", "success": "成功",
"failed": "[TODO: Translate] Failed", "failed": "失敗",
"skipped": "[TODO: Translate] Skipped", "skipped": "跳過",
"current": "[TODO: Translate] Current", "current": "當前",
"currentItem": "[TODO: Translate] Current", "currentItem": "當前項目",
"preparing": "[TODO: Translate] Preparing...", "preparing": "準備中...",
"cancel": "[TODO: Translate] Cancel", "cancel": "取消",
"cancelImport": "[TODO: Translate] Cancel", "cancelImport": "取消匯入",
"cancelled": "[TODO: Translate] Import cancelled", "cancelled": "匯入已取消",
"completed": "[TODO: Translate] Import completed", "completed": "匯入完成",
"completedWithErrors": "[TODO: Translate] Completed with errors", "completedWithErrors": "匯入完成但有錯誤",
"completedSuccess": "[TODO: Translate] Successfully imported {count} recipe(s)", "completedSuccess": "成功匯入 {count} 個配方",
"successCount": "[TODO: Translate] Successful", "successCount": "成功",
"failedCount": "[TODO: Translate] Failed", "failedCount": "失敗",
"skippedCount": "[TODO: Translate] Skipped", "skippedCount": "跳過",
"totalProcessed": "[TODO: Translate] Total processed", "totalProcessed": "總計處理",
"viewDetails": "[TODO: Translate] View Details", "viewDetails": "查看詳情",
"newImport": "[TODO: Translate] New Import", "newImport": "新建匯入",
"manualPathEntry": "[TODO: Translate] Please enter the directory path manually. File browser is not available in this browser.", "manualPathEntry": "請手動輸入目錄路徑。此瀏覽器中檔案瀏覽器不可用。",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {name}. You may need to enter the full path manually.", "batchImportDirectorySelected": "已選擇目錄:{path}",
"batchImportManualEntryRequired": "[TODO: Translate] File browser not available. Please enter the directory path manually.", "batchImportManualEntryRequired": "檔案瀏覽器不可用。請手動輸入目錄路徑。",
"backToParent": "[TODO: Translate] Back to parent directory", "backToParent": "返回上級目錄",
"folders": "[TODO: Translate] Folders", "folders": "資料夾",
"folderCount": "[TODO: Translate] {count} folders", "folderCount": "{count} 個資料夾",
"imageFiles": "[TODO: Translate] Image Files", "imageFiles": "圖像檔案",
"images": "[TODO: Translate] images", "images": "圖像",
"imageCount": "[TODO: Translate] {count} images", "imageCount": "{count} 個圖像",
"selectFolder": "[TODO: Translate] Select This Folder", "selectFolder": "選擇此資料夾",
"errors": { "errors": {
"enterUrls": "[TODO: Translate] Please enter at least one URL or path", "enterUrls": "請輸入至少一個 URL 或路徑",
"enterDirectory": "[TODO: Translate] Please enter a directory path", "enterDirectory": "請輸入目錄路徑",
"startFailed": "[TODO: Translate] Failed to start import: {message}" "startFailed": "啟動匯入失敗:{message}"
} }
} }
}, },
@@ -1495,16 +1497,17 @@
"processingError": "處理錯誤:{message}", "processingError": "處理錯誤:{message}",
"folderBrowserError": "載入資料夾瀏覽器錯誤:{message}", "folderBrowserError": "載入資料夾瀏覽器錯誤:{message}",
"recipeSaveFailed": "儲存配方失敗:{error}", "recipeSaveFailed": "儲存配方失敗:{error}",
"recipeSaved": "配方儲存成功",
"importFailed": "匯入失敗:{message}", "importFailed": "匯入失敗:{message}",
"folderTreeFailed": "載入資料夾樹狀結構失敗", "folderTreeFailed": "載入資料夾樹狀結構失敗",
"folderTreeError": "載入資料夾樹狀結構錯誤", "folderTreeError": "載入資料夾樹狀結構錯誤",
"batchImportFailed": "[TODO: Translate] Failed to start batch import: {message}", "batchImportFailed": "啟動批量匯入失敗:{message}",
"batchImportCancelling": "[TODO: Translate] Cancelling batch import...", "batchImportCancelling": "正在取消批量匯入...",
"batchImportCancelFailed": "[TODO: Translate] Failed to cancel batch import: {message}", "batchImportCancelFailed": "取消批量匯入失敗:{message}",
"batchImportNoUrls": "[TODO: Translate] Please enter at least one URL or file path", "batchImportNoUrls": "請輸入至少一個 URL 或檔案路徑",
"batchImportNoDirectory": "[TODO: Translate] Please enter a directory path", "batchImportNoDirectory": "請輸入目錄路徑",
"batchImportBrowseFailed": "[TODO: Translate] Failed to browse directory: {message}", "batchImportBrowseFailed": "瀏覽目錄失敗:{message}",
"batchImportDirectorySelected": "[TODO: Translate] Directory selected: {path}" "batchImportDirectorySelected": "已選擇目錄:{path}"
}, },
"models": { "models": {
"noModelsSelected": "未選擇模型", "noModelsSelected": "未選擇模型",

3
package-lock.json generated
View File

@@ -114,7 +114,6 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=18" "node": ">=18"
}, },
@@ -138,7 +137,6 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"engines": { "engines": {
"node": ">=18" "node": ">=18"
} }
@@ -1613,7 +1611,6 @@
"integrity": "sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==", "integrity": "sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"cssstyle": "^4.0.1", "cssstyle": "^4.0.1",
"data-urls": "^5.0.0", "data-urls": "^5.0.0",

View File

@@ -148,10 +148,13 @@ class MetadataHook:
"""Install hooks for asynchronous execution model""" """Install hooks for asynchronous execution model"""
# Store the original _async_map_node_over_list function # Store the original _async_map_node_over_list function
original_map_node_over_list = getattr(execution, map_node_func_name) original_map_node_over_list = getattr(execution, map_node_func_name)
# Wrapped async function, compatible with both stable and nightly # Wrapped async function - signature must exactly match _async_map_node_over_list
async def async_map_node_over_list_with_metadata(prompt_id, unique_id, obj, input_data_all, func, allow_interrupt=False, execution_block_cb=None, pre_execute_cb=None, *args, **kwargs): async def async_map_node_over_list_with_metadata(
hidden_inputs = kwargs.get('hidden_inputs', None) prompt_id, unique_id, obj, input_data_all, func,
allow_interrupt=False, execution_block_cb=None,
pre_execute_cb=None, v3_data=None
):
# Only collect metadata when calling the main function of nodes # Only collect metadata when calling the main function of nodes
if func == obj.FUNCTION and hasattr(obj, '__class__'): if func == obj.FUNCTION and hasattr(obj, '__class__'):
try: try:
@@ -163,13 +166,13 @@ class MetadataHook:
registry.record_node_execution(node_id, class_type, input_data_all, None) registry.record_node_execution(node_id, class_type, input_data_all, None)
except Exception as e: except Exception as e:
logger.error(f"Error collecting metadata (pre-execution): {str(e)}") logger.error(f"Error collecting metadata (pre-execution): {str(e)}")
# Call original function with all args/kwargs # Call original function with exact parameters
results = await original_map_node_over_list( results = await original_map_node_over_list(
prompt_id, unique_id, obj, input_data_all, func, prompt_id, unique_id, obj, input_data_all, func,
allow_interrupt, execution_block_cb, pre_execute_cb, *args, **kwargs allow_interrupt, execution_block_cb, pre_execute_cb, v3_data=v3_data
) )
if func == obj.FUNCTION and hasattr(obj, '__class__'): if func == obj.FUNCTION and hasattr(obj, '__class__'):
try: try:
registry = MetadataRegistry() registry = MetadataRegistry()
@@ -180,28 +183,28 @@ class MetadataHook:
registry.update_node_execution(node_id, class_type, results) registry.update_node_execution(node_id, class_type, results)
except Exception as e: except Exception as e:
logger.error(f"Error collecting metadata (post-execution): {str(e)}") logger.error(f"Error collecting metadata (post-execution): {str(e)}")
return results return results
# Also hook the execute function to track the current prompt_id # Also hook the execute function to track the current prompt_id
original_execute = execution.execute original_execute = execution.execute
async def async_execute_with_prompt_tracking(*args, **kwargs): async def async_execute_with_prompt_tracking(*args, **kwargs):
if len(args) >= 7: # Check if we have enough arguments if len(args) >= 7: # Check if we have enough arguments
server, prompt, caches, node_id, extra_data, executed, prompt_id = args[:7] server, prompt, caches, node_id, extra_data, executed, prompt_id = args[:7]
registry = MetadataRegistry() registry = MetadataRegistry()
# Start collection if this is a new prompt # Start collection if this is a new prompt
if not registry.current_prompt_id or registry.current_prompt_id != prompt_id: if not registry.current_prompt_id or registry.current_prompt_id != prompt_id:
registry.start_collection(prompt_id) registry.start_collection(prompt_id)
# Store the dynprompt reference for node lookups # Store the dynprompt reference for node lookups
if hasattr(prompt, 'original_prompt'): if hasattr(prompt, 'original_prompt'):
registry.set_current_prompt(prompt) registry.set_current_prompt(prompt)
# Execute the original function # Execute the original function
return await original_execute(*args, **kwargs) return await original_execute(*args, **kwargs)
# Replace the functions with async versions # Replace the functions with async versions
setattr(execution, map_node_func_name, async_map_node_over_list_with_metadata) setattr(execution, map_node_func_name, async_map_node_over_list_with_metadata)
execution.execute = async_execute_with_prompt_tracking execution.execute = async_execute_with_prompt_tracking

View File

@@ -1,8 +1,7 @@
import logging import logging
import os
from typing import List, Tuple from typing import List, Tuple
import comfy.sd import comfy.sd # type: ignore
import folder_paths import folder_paths # type: ignore
from ..utils.utils import get_checkpoint_info_absolute, _format_model_name_for_comfyui from ..utils.utils import get_checkpoint_info_absolute, _format_model_name_for_comfyui
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@@ -82,6 +82,7 @@ class LoraPoolLM:
"folders": {"include": [], "exclude": []}, "folders": {"include": [], "exclude": []},
"favoritesOnly": False, "favoritesOnly": False,
"license": {"noCreditRequired": False, "allowSelling": False}, "license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": [], "exclude": [], "useRegex": False},
}, },
"preview": {"matchCount": 0, "lastUpdated": 0}, "preview": {"matchCount": 0, "lastUpdated": 0},
} }

View File

@@ -7,10 +7,8 @@ and tracks the last used combination for reuse.
""" """
import logging import logging
import random
import os import os
from ..utils.utils import get_lora_info from ..utils.utils import get_lora_info
from .utils import extract_lora_name
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

View File

@@ -1,8 +1,7 @@
import logging import logging
import os import os
from typing import List, Tuple from typing import List, Tuple
import torch import comfy.sd # type: ignore
import comfy.sd
from ..utils.utils import get_checkpoint_info_absolute, _format_model_name_for_comfyui from ..utils.utils import get_checkpoint_info_absolute, _format_model_name_for_comfyui
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -101,6 +100,8 @@ class UNETLoaderLM:
Returns: Returns:
Tuple of (MODEL,) Tuple of (MODEL,)
""" """
import torch
# Get absolute path from cache using ComfyUI-style name # Get absolute path from cache using ComfyUI-style name
unet_path, metadata = get_checkpoint_info_absolute(unet_name) unet_path, metadata = get_checkpoint_info_absolute(unet_name)
@@ -143,6 +144,7 @@ class UNETLoaderLM:
Returns: Returns:
Tuple of (MODEL,) Tuple of (MODEL,)
""" """
import torch
from .gguf_import_helper import get_gguf_modules from .gguf_import_helper import get_gguf_modules
# Get ComfyUI-GGUF modules using helper (handles various import scenarios) # Get ComfyUI-GGUF modules using helper (handles various import scenarios)

View File

@@ -7,6 +7,7 @@ from .parsers import (
MetaFormatParser, MetaFormatParser,
AutomaticMetadataParser, AutomaticMetadataParser,
CivitaiApiMetadataParser, CivitaiApiMetadataParser,
SuiImageParamsParser,
) )
from .base import RecipeMetadataParser from .base import RecipeMetadataParser
@@ -55,6 +56,13 @@ class RecipeParserFactory:
# If JSON parsing fails, move on to other parsers # If JSON parsing fails, move on to other parsers
pass pass
# Try SuiImageParamsParser for SuiImage metadata format
try:
if SuiImageParamsParser().is_metadata_matching(metadata_str):
return SuiImageParamsParser()
except Exception:
pass
# Check other parsers that expect string input # Check other parsers that expect string input
if RecipeFormatParser().is_metadata_matching(metadata_str): if RecipeFormatParser().is_metadata_matching(metadata_str):
return RecipeFormatParser() return RecipeFormatParser()

View File

@@ -5,6 +5,7 @@ from .comfy import ComfyMetadataParser
from .meta_format import MetaFormatParser from .meta_format import MetaFormatParser
from .automatic import AutomaticMetadataParser from .automatic import AutomaticMetadataParser
from .civitai_image import CivitaiApiMetadataParser from .civitai_image import CivitaiApiMetadataParser
from .sui_image_params import SuiImageParamsParser
__all__ = [ __all__ = [
'RecipeFormatParser', 'RecipeFormatParser',
@@ -12,4 +13,5 @@ __all__ = [
'MetaFormatParser', 'MetaFormatParser',
'AutomaticMetadataParser', 'AutomaticMetadataParser',
'CivitaiApiMetadataParser', 'CivitaiApiMetadataParser',
'SuiImageParamsParser',
] ]

View File

@@ -0,0 +1,188 @@
"""Parser for SuiImage (Stable Diffusion WebUI) metadata format."""
import json
import logging
from typing import Dict, Any, Optional, List
from ..base import RecipeMetadataParser
from ...services.metadata_service import get_default_metadata_provider
logger = logging.getLogger(__name__)
class SuiImageParamsParser(RecipeMetadataParser):
"""Parser for SuiImage metadata JSON format.
This format is used by some Stable Diffusion WebUI variants.
Structure:
{
"sui_image_params": {
"prompt": "...",
"negativeprompt": "...",
"model": "...",
"seed": ...,
"steps": ...,
...
},
"sui_models": [
{"name": "...", "param": "model", "hash": "..."},
...
],
"sui_extra_data": {...}
}
"""
def is_metadata_matching(self, user_comment: str) -> bool:
"""Check if the user comment matches the SuiImage metadata format"""
try:
data = json.loads(user_comment)
return isinstance(data, dict) and 'sui_image_params' in data
except (json.JSONDecodeError, TypeError):
return False
async def parse_metadata(self, user_comment: str, recipe_scanner=None, civitai_client=None) -> Dict[str, Any]:
"""Parse metadata from SuiImage metadata format"""
try:
metadata_provider = await get_default_metadata_provider()
data = json.loads(user_comment)
params = data.get('sui_image_params', {})
models = data.get('sui_models', [])
# Extract prompt and negative prompt
prompt = params.get('prompt', '')
negative_prompt = params.get('negativeprompt', '') or params.get('negative_prompt', '')
# Extract generation parameters
gen_params = {}
if prompt:
gen_params['prompt'] = prompt
if negative_prompt:
gen_params['negative_prompt'] = negative_prompt
# Map standard parameters
param_mapping = {
'steps': 'steps',
'seed': 'seed',
'cfgscale': 'cfg_scale',
'cfg_scale': 'cfg_scale',
'width': 'width',
'height': 'height',
'sampler': 'sampler',
'scheduler': 'scheduler',
'model': 'model',
'vae': 'vae',
}
for src_key, dest_key in param_mapping.items():
if src_key in params and params[src_key] is not None:
gen_params[dest_key] = params[src_key]
# Add size info if available
if 'width' in gen_params and 'height' in gen_params:
gen_params['size'] = f"{gen_params['width']}x{gen_params['height']}"
# Process models - extract checkpoint and loras
loras: List[Dict[str, Any]] = []
checkpoint: Optional[Dict[str, Any]] = None
for model in models:
model_name = model.get('name', '')
param_type = model.get('param', '')
model_hash = model.get('hash', '')
# Remove .safetensors extension for cleaner name
clean_name = model_name.replace('.safetensors', '') if model_name else ''
# Check if this is a LoRA by looking at the name or param type
is_lora = 'lora' in model_name.lower() or param_type.lower().startswith('lora')
if is_lora:
lora_entry = {
'id': 0,
'modelId': 0,
'name': clean_name,
'version': '',
'type': 'lora',
'weight': 1.0,
'existsLocally': False,
'localPath': None,
'file_name': model_name,
'hash': model_hash.replace('0x', '') if model_hash.startswith('0x') else model_hash,
'thumbnailUrl': '/loras_static/images/no-preview.png',
'baseModel': '',
'size': 0,
'downloadUrl': '',
'isDeleted': False
}
# Try to get additional info from metadata provider
if metadata_provider and model_hash:
try:
civitai_info = await metadata_provider.get_model_by_hash(
model_hash.replace('0x', '') if model_hash.startswith('0x') else model_hash
)
if civitai_info:
lora_entry = await self.populate_lora_from_civitai(
lora_entry, civitai_info, recipe_scanner
)
except Exception as e:
logger.debug(f"Error fetching info for LoRA {clean_name}: {e}")
if lora_entry:
loras.append(lora_entry)
elif param_type == 'model' or 'lora' not in model_name.lower():
# This is likely a checkpoint
checkpoint_entry = {
'id': 0,
'modelId': 0,
'name': clean_name,
'version': '',
'type': 'checkpoint',
'hash': model_hash.replace('0x', '') if model_hash.startswith('0x') else model_hash,
'existsLocally': False,
'localPath': None,
'file_name': model_name,
'thumbnailUrl': '/loras_static/images/no-preview.png',
'baseModel': '',
'size': 0,
'downloadUrl': '',
'isDeleted': False
}
# Try to get additional info from metadata provider
if metadata_provider and model_hash:
try:
civitai_info = await metadata_provider.get_model_by_hash(
model_hash.replace('0x', '') if model_hash.startswith('0x') else model_hash
)
if civitai_info:
checkpoint_entry = await self.populate_checkpoint_from_civitai(
checkpoint_entry, civitai_info
)
except Exception as e:
logger.debug(f"Error fetching info for checkpoint {clean_name}: {e}")
checkpoint = checkpoint_entry
# Determine base model from loras or checkpoint
base_model = None
if loras:
base_models = [lora.get('baseModel') for lora in loras if lora.get('baseModel')]
if base_models:
from collections import Counter
base_model_counts = Counter(base_models)
base_model = base_model_counts.most_common(1)[0][0]
elif checkpoint and checkpoint.get('baseModel'):
base_model = checkpoint['baseModel']
return {
'base_model': base_model,
'loras': loras,
'checkpoint': checkpoint,
'gen_params': gen_params,
'from_sui_image_params': True
}
except Exception as e:
logger.error(f"Error parsing SuiImage metadata: {e}", exc_info=True)
return {"error": str(e), "loras": []}

View File

@@ -309,6 +309,13 @@ class ModelListingHandler:
else: else:
allow_selling_generated_content = None # None means no filter applied allow_selling_generated_content = None # None means no filter applied
# Name pattern filters for LoRA Pool
name_pattern_include = request.query.getall("name_pattern_include", [])
name_pattern_exclude = request.query.getall("name_pattern_exclude", [])
name_pattern_use_regex = (
request.query.get("name_pattern_use_regex", "false").lower() == "true"
)
return { return {
"page": page, "page": page,
"page_size": page_size, "page_size": page_size,
@@ -328,6 +335,9 @@ class ModelListingHandler:
"credit_required": credit_required, "credit_required": credit_required,
"allow_selling_generated_content": allow_selling_generated_content, "allow_selling_generated_content": allow_selling_generated_content,
"model_types": model_types, "model_types": model_types,
"name_pattern_include": name_pattern_include,
"name_pattern_exclude": name_pattern_exclude,
"name_pattern_use_regex": name_pattern_use_regex,
**self._parse_specific_params(request), **self._parse_specific_params(request),
} }

View File

@@ -27,7 +27,7 @@ class LoraService(BaseModelService):
# Resolve sub_type using priority: sub_type > model_type > civitai.model.type > default # Resolve sub_type using priority: sub_type > model_type > civitai.model.type > default
# Normalize to lowercase for consistent API responses # Normalize to lowercase for consistent API responses
sub_type = resolve_sub_type(lora_data).lower() sub_type = resolve_sub_type(lora_data).lower()
return { return {
"model_name": lora_data["model_name"], "model_name": lora_data["model_name"],
"file_name": lora_data["file_name"], "file_name": lora_data["file_name"],
@@ -48,7 +48,9 @@ class LoraService(BaseModelService):
"notes": lora_data.get("notes", ""), "notes": lora_data.get("notes", ""),
"favorite": lora_data.get("favorite", False), "favorite": lora_data.get("favorite", False),
"update_available": bool(lora_data.get("update_available", False)), "update_available": bool(lora_data.get("update_available", False)),
"skip_metadata_refresh": bool(lora_data.get("skip_metadata_refresh", False)), "skip_metadata_refresh": bool(
lora_data.get("skip_metadata_refresh", False)
),
"sub_type": sub_type, "sub_type": sub_type,
"civitai": self.filter_civitai_data( "civitai": self.filter_civitai_data(
lora_data.get("civitai", {}), minimal=True lora_data.get("civitai", {}), minimal=True
@@ -62,6 +64,68 @@ class LoraService(BaseModelService):
if first_letter: if first_letter:
data = self._filter_by_first_letter(data, first_letter) data = self._filter_by_first_letter(data, first_letter)
# Handle name pattern filters
name_pattern_include = kwargs.get("name_pattern_include", [])
name_pattern_exclude = kwargs.get("name_pattern_exclude", [])
name_pattern_use_regex = kwargs.get("name_pattern_use_regex", False)
if name_pattern_include or name_pattern_exclude:
import re
def matches_pattern(name, pattern, use_regex):
"""Check if name matches pattern (regex or substring)"""
if not name:
return False
if use_regex:
try:
return bool(re.search(pattern, name, re.IGNORECASE))
except re.error:
# Invalid regex, fall back to substring match
return pattern.lower() in name.lower()
else:
return pattern.lower() in name.lower()
def matches_any_pattern(name, patterns, use_regex):
"""Check if name matches any of the patterns"""
if not patterns:
return True
return any(matches_pattern(name, p, use_regex) for p in patterns)
filtered = []
for lora in data:
model_name = lora.get("model_name", "")
file_name = lora.get("file_name", "")
names_to_check = [n for n in [model_name, file_name] if n]
# Check exclude patterns first
excluded = False
if name_pattern_exclude:
for name in names_to_check:
if matches_any_pattern(
name, name_pattern_exclude, name_pattern_use_regex
):
excluded = True
break
if excluded:
continue
# Check include patterns
if name_pattern_include:
included = False
for name in names_to_check:
if matches_any_pattern(
name, name_pattern_include, name_pattern_use_regex
):
included = True
break
if not included:
continue
filtered.append(lora)
data = filtered
return data return data
def _filter_by_first_letter(self, data: List[Dict], letter: str) -> List[Dict]: def _filter_by_first_letter(self, data: List[Dict], letter: str) -> List[Dict]:
@@ -368,9 +432,7 @@ class LoraService(BaseModelService):
rng.uniform(clip_strength_min, clip_strength_max), 2 rng.uniform(clip_strength_min, clip_strength_max), 2
) )
else: else:
clip_str = round( clip_str = round(rng.uniform(clip_strength_min, clip_strength_max), 2)
rng.uniform(clip_strength_min, clip_strength_max), 2
)
result_loras.append( result_loras.append(
{ {
@@ -485,12 +547,69 @@ class LoraService(BaseModelService):
if bool(lora.get("license_flags", 127) & (1 << 1)) if bool(lora.get("license_flags", 127) & (1 << 1))
] ]
# Apply name pattern filters
name_patterns = filter_section.get("namePatterns", {})
include_patterns = name_patterns.get("include", [])
exclude_patterns = name_patterns.get("exclude", [])
use_regex = name_patterns.get("useRegex", False)
if include_patterns or exclude_patterns:
import re
def matches_pattern(name, pattern, use_regex):
"""Check if name matches pattern (regex or substring)"""
if not name:
return False
if use_regex:
try:
return bool(re.search(pattern, name, re.IGNORECASE))
except re.error:
# Invalid regex, fall back to substring match
return pattern.lower() in name.lower()
else:
return pattern.lower() in name.lower()
def matches_any_pattern(name, patterns, use_regex):
"""Check if name matches any of the patterns"""
if not patterns:
return True
return any(matches_pattern(name, p, use_regex) for p in patterns)
filtered = []
for lora in available_loras:
model_name = lora.get("model_name", "")
file_name = lora.get("file_name", "")
names_to_check = [n for n in [model_name, file_name] if n]
# Check exclude patterns first
excluded = False
if exclude_patterns:
for name in names_to_check:
if matches_any_pattern(name, exclude_patterns, use_regex):
excluded = True
break
if excluded:
continue
# Check include patterns
if include_patterns:
included = False
for name in names_to_check:
if matches_any_pattern(name, include_patterns, use_regex):
included = True
break
if not included:
continue
filtered.append(lora)
available_loras = filtered
return available_loras return available_loras
async def get_cycler_list( async def get_cycler_list(
self, self, pool_config: Optional[Dict] = None, sort_by: str = "filename"
pool_config: Optional[Dict] = None,
sort_by: str = "filename"
) -> List[Dict]: ) -> List[Dict]:
""" """
Get filtered and sorted LoRA list for cycling. Get filtered and sorted LoRA list for cycling.
@@ -518,16 +637,16 @@ class LoraService(BaseModelService):
available_loras, available_loras,
key=lambda x: ( key=lambda x: (
(x.get("model_name") or x.get("file_name", "")).lower(), (x.get("model_name") or x.get("file_name", "")).lower(),
x.get("file_path", "").lower() x.get("file_path", "").lower(),
) ),
) )
else: # Default to filename else: # Default to filename
available_loras = sorted( available_loras = sorted(
available_loras, available_loras,
key=lambda x: ( key=lambda x: (
x.get("file_name", "").lower(), x.get("file_name", "").lower(),
x.get("file_path", "").lower() x.get("file_path", "").lower(),
) ),
) )
# Return minimal data needed for cycling # Return minimal data needed for cycling

View File

@@ -122,11 +122,25 @@ async def get_metadata_provider(provider_name: str = None):
provider_manager = await ModelMetadataProviderManager.get_instance() provider_manager = await ModelMetadataProviderManager.get_instance()
provider = ( try:
provider_manager._get_provider(provider_name) provider = (
if provider_name provider_manager._get_provider(provider_name)
else provider_manager._get_provider() if provider_name
) else provider_manager._get_provider()
)
except ValueError as e:
# Provider not initialized, attempt to initialize
if "No default provider set" in str(e) or "not registered" in str(e):
logger.warning(f"Metadata provider not initialized ({e}), initializing now...")
await initialize_metadata_providers()
provider_manager = await ModelMetadataProviderManager.get_instance()
provider = (
provider_manager._get_provider(provider_name)
if provider_name
else provider_manager._get_provider()
)
else:
raise
return _wrap_provider_with_rate_limit(provider_name, provider) return _wrap_provider_with_rate_limit(provider_name, provider)

View File

@@ -14,7 +14,6 @@ from ..utils.metadata_manager import MetadataManager
from ..utils.civitai_utils import resolve_license_info from ..utils.civitai_utils import resolve_license_info
from .model_cache import ModelCache from .model_cache import ModelCache
from .model_hash_index import ModelHashIndex from .model_hash_index import ModelHashIndex
from ..utils.constants import PREVIEW_EXTENSIONS
from .model_lifecycle_service import delete_model_artifacts from .model_lifecycle_service import delete_model_artifacts
from .service_registry import ServiceRegistry from .service_registry import ServiceRegistry
from .websocket_manager import ws_manager from .websocket_manager import ws_manager
@@ -1442,14 +1441,13 @@ class ModelScanner:
file_path = self._hash_index.get_path(sha256.lower()) file_path = self._hash_index.get_path(sha256.lower())
if not file_path: if not file_path:
return None return None
base_name = os.path.splitext(file_path)[0] dir_path = os.path.dirname(file_path)
base_name = os.path.splitext(os.path.basename(file_path))[0]
for ext in PREVIEW_EXTENSIONS: preview_path = find_preview_file(base_name, dir_path)
preview_path = f"{base_name}{ext}" if preview_path:
if os.path.exists(preview_path): return config.get_preview_static_url(preview_path)
return config.get_preview_static_url(preview_path)
return None return None
async def get_top_tags(self, limit: int = 20) -> List[Dict[str, any]]: async def get_top_tags(self, limit: int = 20) -> List[Dict[str, any]]:

View File

@@ -40,49 +40,39 @@ async def calculate_sha256(file_path: str) -> str:
return sha256_hash.hexdigest() return sha256_hash.hexdigest()
def find_preview_file(base_name: str, dir_path: str) -> str: def find_preview_file(base_name: str, dir_path: str) -> str:
"""Find preview file for given base name in directory""" """Find preview file for given base name in directory.
Performs an exact-case check first (fast path), then falls back to a
case-insensitive scan so that files like ``model.WEBP`` or ``model.Png``
are discovered on case-sensitive filesystems.
"""
temp_extensions = PREVIEW_EXTENSIONS.copy() temp_extensions = PREVIEW_EXTENSIONS.copy()
# Add example extension for compatibility # Add example extension for compatibility
# https://github.com/willmiao/ComfyUI-Lora-Manager/issues/225 # https://github.com/willmiao/ComfyUI-Lora-Manager/issues/225
# The preview image will be optimized to lora-name.webp, so it won't affect other logic # The preview image will be optimized to lora-name.webp, so it won't affect other logic
temp_extensions.append(".example.0.jpeg") temp_extensions.append(".example.0.jpeg")
# Fast path: exact-case match
for ext in temp_extensions: for ext in temp_extensions:
full_pattern = os.path.join(dir_path, f"{base_name}{ext}") full_pattern = os.path.join(dir_path, f"{base_name}{ext}")
if os.path.exists(full_pattern): if os.path.exists(full_pattern):
# Check if this is an image and not already webp
# TODO: disable the optimization for now, maybe add a config option later
# if ext.lower().endswith(('.jpg', '.jpeg', '.png')) and not ext.lower().endswith('.webp'):
# try:
# # Optimize the image to webp format
# webp_path = os.path.join(dir_path, f"{base_name}.webp")
# # Use ExifUtils to optimize the image
# with open(full_pattern, 'rb') as f:
# image_data = f.read()
# optimized_data, _ = ExifUtils.optimize_image(
# image_data=image_data,
# target_width=CARD_PREVIEW_WIDTH,
# format='webp',
# quality=85,
# preserve_metadata=False
# )
# # Save the optimized webp file
# with open(webp_path, 'wb') as f:
# f.write(optimized_data)
# logger.debug(f"Optimized preview image from {full_pattern} to {webp_path}")
# return webp_path.replace(os.sep, "/")
# except Exception as e:
# logger.error(f"Error optimizing preview image {full_pattern}: {e}")
# # Fall back to original file if optimization fails
# return full_pattern.replace(os.sep, "/")
# Return the original path for webp images or non-image files
return full_pattern.replace(os.sep, "/") return full_pattern.replace(os.sep, "/")
# Slow path: case-insensitive match for systems with mixed-case extensions
# (e.g. .WEBP, .Png, .JPG placed manually or by external tools)
try:
dir_entries = os.listdir(dir_path)
except OSError:
return ""
base_lower = base_name.lower()
for ext in temp_extensions:
target = f"{base_lower}{ext}" # ext is already lowercase
for entry in dir_entries:
if entry.lower() == target:
return os.path.join(dir_path, entry).replace(os.sep, "/")
return "" return ""
def get_preview_extension(preview_path: str) -> str: def get_preview_extension(preview_path: str) -> str:

View File

@@ -251,7 +251,7 @@ export class BaseModelApiClient {
replaceModelPreview(filePath) { replaceModelPreview(filePath) {
const input = document.createElement('input'); const input = document.createElement('input');
input.type = 'file'; input.type = 'file';
input.accept = 'image/*,video/mp4'; input.accept = 'image/*,image/webp,video/mp4';
input.onchange = async () => { input.onchange = async () => {
if (!input.files || !input.files[0]) return; if (!input.files || !input.files[0]) return;

View File

@@ -142,6 +142,28 @@ export class ImportManager {
// Reset duplicate related properties // Reset duplicate related properties
this.duplicateRecipes = []; this.duplicateRecipes = [];
// Reset button visibility in location step
this.resetLocationStepButtons();
}
resetLocationStepButtons() {
// Reset buttons to default state
const locationStep = document.getElementById('locationStep');
if (!locationStep) return;
const backBtn = locationStep.querySelector('.secondary-btn');
const primaryBtn = locationStep.querySelector('.primary-btn');
// Back button - show
if (backBtn) {
backBtn.style.display = 'inline-block';
}
// Primary button - reset text
if (primaryBtn) {
primaryBtn.textContent = translate('recipes.controls.import.downloadAndSaveRecipe', {}, 'Download & Save Recipe');
}
} }
toggleImportMode(mode) { toggleImportMode(mode) {
@@ -261,11 +283,57 @@ export class ImportManager {
this.loadDefaultPathSetting(); this.loadDefaultPathSetting();
this.updateTargetPath(); this.updateTargetPath();
// Update download button with missing LoRA count (if any)
if (this.missingLoras && this.missingLoras.length > 0) {
this.updateDownloadButtonCount();
this.updateImportButtonsVisibility(true);
} else {
this.updateImportButtonsVisibility(false);
}
} catch (error) { } catch (error) {
showToast('toast.recipes.importFailed', { message: error.message }, 'error'); showToast('toast.recipes.importFailed', { message: error.message }, 'error');
} }
} }
updateImportButtonsVisibility(hasMissingLoras) {
// Update primary button text based on whether there are missing LoRAs
const locationStep = document.getElementById('locationStep');
if (!locationStep) return;
const backBtn = locationStep.querySelector('.secondary-btn');
const primaryBtn = locationStep.querySelector('.primary-btn');
// Back button - always show
if (backBtn) {
backBtn.style.display = 'inline-block';
}
// Update primary button text
if (primaryBtn) {
const downloadCountSpan = locationStep.querySelector('#downloadLoraCount');
if (hasMissingLoras) {
// Rebuild button content to ensure proper structure
const buttonText = translate('recipes.controls.import.importAndDownload', {}, 'Import & Download');
primaryBtn.innerHTML = `${buttonText} <span id="downloadLoraCount"></span>`;
} else {
primaryBtn.textContent = translate('recipes.controls.import.downloadAndSaveRecipe', {}, 'Download & Save Recipe');
}
}
}
updateDownloadButtonCount() {
// Update the download count badge on the primary button
const locationStep = document.getElementById('locationStep');
if (!locationStep) return;
const downloadCountSpan = locationStep.querySelector('#downloadLoraCount');
if (downloadCountSpan) {
const missingCount = this.missingLoras?.length || 0;
downloadCountSpan.textContent = missingCount > 0 ? `(${missingCount})` : '';
}
}
backToUpload() { backToUpload() {
this.stepManager.showStep('uploadStep'); this.stepManager.showStep('uploadStep');
@@ -426,12 +494,54 @@ export class ImportManager {
const modalTitle = document.querySelector('#importModal h2'); const modalTitle = document.querySelector('#importModal h2');
if (modalTitle) modalTitle.textContent = translate('recipes.controls.import.downloadMissingLoras', {}, 'Download Missing LoRAs'); if (modalTitle) modalTitle.textContent = translate('recipes.controls.import.downloadMissingLoras', {}, 'Download Missing LoRAs');
// Update the save button text // Update button texts and show download count
const saveButton = document.querySelector('#locationStep .primary-btn'); const locationStep = document.getElementById('locationStep');
if (saveButton) saveButton.textContent = translate('recipes.controls.import.downloadMissingLoras', {}, 'Download Missing LoRAs'); if (!locationStep) return;
const primaryBtn = locationStep.querySelector('.primary-btn');
const backBtn = locationStep.querySelector('.secondary-btn');
// primaryBtn should be the "Import & Download" button
if (primaryBtn) {
const buttonText = translate('recipes.controls.import.importAndDownload', {}, 'Import & Download');
primaryBtn.innerHTML = `${buttonText} <span id="downloadLoraCount">(${recipeData.loras?.length || 0})</span>`;
}
// Hide the "Back" button in download-only mode
if (backBtn) {
backBtn.style.display = 'none';
}
}
// Hide the back button saveRecipeWithoutDownload() {
const backButton = document.querySelector('#locationStep .secondary-btn'); // Call save recipe with skip download flag
if (backButton) backButton.style.display = 'none'; return this.downloadManager.saveRecipe(true);
}
async saveRecipeOnlyFromDetails() {
// Validate recipe name first
if (!this.recipeName) {
showToast('toast.recipes.enterRecipeName', {}, 'error');
return;
}
// Mark deleted LoRAs as excluded
if (this.recipeData && this.recipeData.loras) {
this.recipeData.loras.forEach(lora => {
if (lora.isDeleted) {
lora.exclude = true;
}
});
}
// Update missing LoRAs list
this.missingLoras = this.recipeData.loras.filter(lora =>
!lora.existsLocally && !lora.isDeleted);
// For import only, we don't need downloadableLoRAs
this.downloadableLoRAs = [];
// Save recipe without downloading
await this.downloadManager.saveRecipe(true);
} }
} }

View File

@@ -9,7 +9,7 @@ export class DownloadManager {
this.importManager = importManager; this.importManager = importManager;
} }
async saveRecipe() { async saveRecipe(skipDownload = false) {
// Check if we're in download-only mode (for existing recipe) // Check if we're in download-only mode (for existing recipe)
const isDownloadOnly = !!this.importManager.recipeId; const isDownloadOnly = !!this.importManager.recipeId;
@@ -20,7 +20,10 @@ export class DownloadManager {
try { try {
// Show progress indicator // Show progress indicator
this.importManager.loadingManager.showSimpleLoading(isDownloadOnly ? translate('recipes.controls.import.downloadingLoras', {}, 'Downloading LoRAs...') : translate('recipes.controls.import.savingRecipe', {}, 'Saving recipe...')); const loadingMessage = skipDownload
? translate('recipes.controls.import.savingRecipe', {}, 'Saving recipe...')
: (isDownloadOnly ? translate('recipes.controls.import.downloadingLoras', {}, 'Downloading LoRAs...') : translate('recipes.controls.import.savingRecipe', {}, 'Saving recipe...'));
this.importManager.loadingManager.showSimpleLoading(loadingMessage);
// Only send the complete recipe to save if not in download-only mode // Only send the complete recipe to save if not in download-only mode
if (!isDownloadOnly) { if (!isDownloadOnly) {
@@ -98,15 +101,17 @@ export class DownloadManager {
} }
} }
// Check if we need to download LoRAs // Check if we need to download LoRAs (skip if skipDownload is true)
let failedDownloads = 0; let failedDownloads = 0;
if (this.importManager.downloadableLoRAs && this.importManager.downloadableLoRAs.length > 0) { if (!skipDownload && this.importManager.downloadableLoRAs && this.importManager.downloadableLoRAs.length > 0) {
await this.downloadMissingLoras(); await this.downloadMissingLoras();
} }
// Show success message // Show success message
if (isDownloadOnly) { if (isDownloadOnly) {
if (failedDownloads === 0) { if (skipDownload) {
showToast('toast.recipes.recipeSaved', {}, 'success');
} else if (failedDownloads === 0) {
showToast('toast.loras.downloadSuccessful', {}, 'success'); showToast('toast.loras.downloadSuccessful', {}, 'success');
} }
} else { } else {

View File

@@ -325,7 +325,8 @@ export class RecipeDataManager {
} }
updateNextButtonState() { updateNextButtonState() {
const nextButton = document.querySelector('#detailsStep .primary-btn'); const nextButton = document.getElementById('nextBtn');
const importOnlyBtn = document.getElementById('importOnlyBtn');
const actionsContainer = document.querySelector('#detailsStep .modal-actions'); const actionsContainer = document.querySelector('#detailsStep .modal-actions');
if (!nextButton || !actionsContainer) return; if (!nextButton || !actionsContainer) return;
@@ -365,7 +366,7 @@ export class RecipeDataManager {
buttonsContainer.parentNode.insertBefore(warningContainer, buttonsContainer); buttonsContainer.parentNode.insertBefore(warningContainer, buttonsContainer);
} }
// Check for duplicates but don't change button actions // Check for downloadable missing LoRAs
const missingNotDeleted = this.importManager.recipeData.loras.filter( const missingNotDeleted = this.importManager.recipeData.loras.filter(
lora => !lora.existsLocally && !lora.isDeleted lora => !lora.existsLocally && !lora.isDeleted
).length; ).length;
@@ -374,8 +375,16 @@ export class RecipeDataManager {
nextButton.classList.remove('warning-btn'); nextButton.classList.remove('warning-btn');
if (missingNotDeleted > 0) { if (missingNotDeleted > 0) {
nextButton.textContent = translate('recipes.controls.import.downloadMissingLoras', {}, 'Download Missing LoRAs'); // Show import only button and update primary button
if (importOnlyBtn) {
importOnlyBtn.style.display = 'inline-block';
}
nextButton.textContent = translate('recipes.controls.import.importAndDownload', {}, 'Import & Download') + ` (${missingNotDeleted})`;
} else { } else {
// Hide import only button and show save recipe
if (importOnlyBtn) {
importOnlyBtn.style.display = 'none';
}
nextButton.textContent = translate('recipes.controls.import.saveRecipe', {}, 'Save Recipe'); nextButton.textContent = translate('recipes.controls.import.saveRecipe', {}, 'Save Recipe');
} }
} }
@@ -440,8 +449,11 @@ export class RecipeDataManager {
// Store only downloadable LoRAs for the download step // Store only downloadable LoRAs for the download step
this.importManager.downloadableLoRAs = this.importManager.missingLoras; this.importManager.downloadableLoRAs = this.importManager.missingLoras;
this.importManager.proceedToLocation(); this.importManager.proceedToLocation();
} else if (this.importManager.missingLoras.length === 0 && this.importManager.recipeData.loras.some(l => !l.existsLocally)) {
// All missing LoRAs are deleted, save recipe without download
this.importManager.saveRecipe();
} else { } else {
// Otherwise, save the recipe directly // No missing LoRAs at all, save the recipe directly
this.importManager.saveRecipe(); this.importManager.saveRecipe();
} }
} }

View File

@@ -92,9 +92,10 @@
<!-- Duplicate recipes will be populated here --> <!-- Duplicate recipes will be populated here -->
</div> </div>
<div class="modal-actions"> <div class="modal-actions" id="detailsStepActions">
<button class="secondary-btn" onclick="importManager.backToUpload()">{{ t('common.actions.back') }}</button> <button class="secondary-btn" onclick="importManager.backToUpload()">{{ t('common.actions.back') }}</button>
<button class="primary-btn" onclick="importManager.proceedFromDetails()">{{ t('common.actions.next') }}</button> <button class="secondary-btn" id="importOnlyBtn" onclick="importManager.saveRecipeOnlyFromDetails()" style="display: none;">{{ t('recipes.controls.import.importRecipeOnly') }}</button>
<button class="primary-btn" id="nextBtn" onclick="importManager.proceedFromDetails()">{{ t('common.actions.next') }}</button>
</div> </div>
</div> </div>
@@ -159,7 +160,7 @@
<div class="modal-actions"> <div class="modal-actions">
<button class="secondary-btn" onclick="importManager.backToDetails()">{{ t('common.actions.back') }}</button> <button class="secondary-btn" onclick="importManager.backToDetails()">{{ t('common.actions.back') }}</button>
<button class="primary-btn" onclick="importManager.saveRecipe()">{{ t('recipes.controls.import.downloadAndSaveRecipe') }}</button> <button class="primary-btn" onclick="importManager.saveRecipe()">{{ t('recipes.controls.import.importAndDownload') }} <span id="downloadLoraCount"></span></button>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -369,3 +369,289 @@ async def test_pool_filter_combined_all_filters(lora_service):
# - tags: tag1 ✓ # - tags: tag1 ✓
assert len(filtered) == 1 assert len(filtered) == 1
assert filtered[0]["file_name"] == "match_all.safetensors" assert filtered[0]["file_name"] == "match_all.safetensors"
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_include_text(lora_service):
"""Test filtering by name patterns with text matching (useRegex=False)."""
sample_loras = [
{
"file_name": "character_anime_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "character_realistic_v1.safetensors",
"model_name": "Realistic Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "style_watercolor_v1.safetensors",
"model_name": "Watercolor Style",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Test include patterns with text matching
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": ["character"], "exclude": [], "useRegex": False},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 2
file_names = {lora["file_name"] for lora in filtered}
assert file_names == {
"character_anime_v1.safetensors",
"character_realistic_v1.safetensors",
}
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_exclude_text(lora_service):
"""Test excluding by name patterns with text matching (useRegex=False)."""
sample_loras = [
{
"file_name": "character_anime_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "character_realistic_v1.safetensors",
"model_name": "Realistic Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "style_watercolor_v1.safetensors",
"model_name": "Watercolor Style",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Test exclude patterns with text matching
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": [], "exclude": ["anime"], "useRegex": False},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 2
file_names = {lora["file_name"] for lora in filtered}
assert file_names == {
"character_realistic_v1.safetensors",
"style_watercolor_v1.safetensors",
}
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_include_regex(lora_service):
"""Test filtering by name patterns with regex matching (useRegex=True)."""
sample_loras = [
{
"file_name": "character_anime_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "character_realistic_v1.safetensors",
"model_name": "Realistic Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "style_watercolor_v1.safetensors",
"model_name": "Watercolor Style",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Test include patterns with regex matching - match files starting with "character_"
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": ["^character_"], "exclude": [], "useRegex": True},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 2
file_names = {lora["file_name"] for lora in filtered}
assert file_names == {
"character_anime_v1.safetensors",
"character_realistic_v1.safetensors",
}
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_exclude_regex(lora_service):
"""Test excluding by name patterns with regex matching (useRegex=True)."""
sample_loras = [
{
"file_name": "character_anime_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "character_realistic_v1.safetensors",
"model_name": "Realistic Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "style_watercolor_v1.safetensors",
"model_name": "Watercolor Style",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Test exclude patterns with regex matching - exclude files ending with "_v1.safetensors"
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {
"include": [],
"exclude": ["_v1\\.safetensors$"],
"useRegex": True,
},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 0 # All files match the exclude pattern
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_combined(lora_service):
"""Test combining include and exclude name patterns."""
sample_loras = [
{
"file_name": "character_anime_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "character_realistic_v1.safetensors",
"model_name": "Realistic Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "style_watercolor_v1.safetensors",
"model_name": "Watercolor Style",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Test include "character" but exclude "anime"
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {
"include": ["character"],
"exclude": ["anime"],
"useRegex": False,
},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 1
assert filtered[0]["file_name"] == "character_realistic_v1.safetensors"
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_model_name_fallback(lora_service):
"""Test that name pattern filtering falls back to model_name when file_name doesn't match."""
sample_loras = [
{
"file_name": "abc123.safetensors",
"model_name": "Super Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
{
"file_name": "def456.safetensors",
"model_name": "Realistic Portrait",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Should match model_name even if file_name doesn't contain the pattern
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": ["anime"], "exclude": [], "useRegex": False},
}
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 1
assert filtered[0]["file_name"] == "abc123.safetensors"
@pytest.mark.asyncio
async def test_pool_filter_name_patterns_invalid_regex(lora_service):
"""Test that invalid regex falls back to substring matching."""
sample_loras = [
{
"file_name": "character_anime[test]_v1.safetensors",
"model_name": "Anime Character",
"base_model": "Illustrious",
"folder": "",
"license_flags": build_license_flags(None),
},
]
# Invalid regex pattern (unclosed character class) should fall back to substring matching
# The pattern "anime[" is invalid regex but valid substring - it exists in the filename
pool_config = {
"baseModels": [],
"tags": {"include": [], "exclude": []},
"folders": {"include": [], "exclude": []},
"license": {"noCreditRequired": False, "allowSelling": False},
"namePatterns": {"include": ["anime["], "exclude": [], "useRegex": True},
}
# Should not crash and should match using substring fallback
filtered = await lora_service._apply_pool_filters(sample_loras, pool_config)
assert len(filtered) == 1 # Substring match works even with invalid regex

View File

@@ -492,7 +492,7 @@ async def test_analyze_remote_video(tmp_path):
class DummyFactory: class DummyFactory:
def create_parser(self, metadata): def create_parser(self, metadata):
async def parse_metadata(m, recipe_scanner): async def parse_metadata(m, recipe_scanner=None, civitai_client=None):
return {"loras": []} return {"loras": []}
return SimpleNamespace(parse_metadata=parse_metadata) return SimpleNamespace(parse_metadata=parse_metadata)

View File

@@ -0,0 +1,202 @@
"""Tests for SuiImageParamsParser."""
import pytest
import json
from py.recipes.parsers import SuiImageParamsParser
class TestSuiImageParamsParser:
"""Test cases for SuiImageParamsParser."""
def setup_method(self):
"""Set up test fixtures."""
self.parser = SuiImageParamsParser()
def test_is_metadata_matching_positive(self):
"""Test that parser correctly identifies SuiImage metadata format."""
metadata = {
"sui_image_params": {
"prompt": "test prompt",
"model": "test_model"
}
}
metadata_str = json.dumps(metadata)
assert self.parser.is_metadata_matching(metadata_str) is True
def test_is_metadata_matching_negative(self):
"""Test that parser rejects non-SuiImage metadata."""
# Missing sui_image_params key
metadata = {
"other_params": {
"prompt": "test prompt"
}
}
metadata_str = json.dumps(metadata)
assert self.parser.is_metadata_matching(metadata_str) is False
def test_is_metadata_matching_invalid_json(self):
"""Test that parser handles invalid JSON gracefully."""
metadata_str = "not valid json"
assert self.parser.is_metadata_matching(metadata_str) is False
@pytest.mark.asyncio
async def test_parse_metadata_extracts_basic_fields(self):
"""Test parsing basic fields from SuiImage metadata."""
metadata = {
"sui_image_params": {
"prompt": "beautiful landscape",
"negativeprompt": "ugly, blurry",
"steps": 30,
"seed": 12345,
"cfgscale": 7.5,
"width": 512,
"height": 768,
"sampler": "Euler a",
"scheduler": "normal"
},
"sui_models": [],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
assert result.get('gen_params', {}).get('prompt') == "beautiful landscape"
assert result.get('gen_params', {}).get('negative_prompt') == "ugly, blurry"
assert result.get('gen_params', {}).get('steps') == 30
assert result.get('gen_params', {}).get('seed') == 12345
assert result.get('gen_params', {}).get('cfg_scale') == 7.5
assert result.get('gen_params', {}).get('width') == 512
assert result.get('gen_params', {}).get('height') == 768
assert result.get('gen_params', {}).get('size') == "512x768"
assert result.get('loras') == []
@pytest.mark.asyncio
async def test_parse_metadata_extracts_checkpoint(self):
"""Test parsing checkpoint from sui_models."""
metadata = {
"sui_image_params": {
"prompt": "test prompt",
"model": "checkpoint_model"
},
"sui_models": [
{
"name": "test_checkpoint.safetensors",
"param": "model",
"hash": "0x1234567890abcdef"
}
],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
checkpoint = result.get('checkpoint')
assert checkpoint is not None
assert checkpoint['type'] == 'checkpoint'
assert checkpoint['name'] == 'test_checkpoint'
assert checkpoint['hash'] == '1234567890abcdef'
@pytest.mark.asyncio
async def test_parse_metadata_extracts_lora(self):
"""Test parsing LoRA from sui_models."""
metadata = {
"sui_image_params": {
"prompt": "test prompt"
},
"sui_models": [
{
"name": "test_lora.safetensors",
"param": "lora",
"hash": "0xabcdef1234567890"
}
],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
loras = result.get('loras')
assert len(loras) == 1
assert loras[0]['type'] == 'lora'
assert loras[0]['name'] == 'test_lora'
assert loras[0]['file_name'] == 'test_lora.safetensors'
assert loras[0]['hash'] == 'abcdef1234567890'
@pytest.mark.asyncio
async def test_parse_metadata_handles_lora_in_name(self):
"""Test that LoRA is detected by 'lora' in name."""
metadata = {
"sui_image_params": {
"prompt": "test prompt"
},
"sui_models": [
{
"name": "style_lora_v2.safetensors",
"param": "some_other_param",
"hash": "0x1111111111111111"
}
],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
loras = result.get('loras')
assert len(loras) == 1
assert loras[0]['type'] == 'lora'
@pytest.mark.asyncio
async def test_parse_metadata_empty_models(self):
"""Test parsing with empty sui_models array."""
metadata = {
"sui_image_params": {
"prompt": "test prompt",
"steps": 20
},
"sui_models": [],
"sui_extra_data": {
"date": "2024-01-01"
}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
assert result.get('loras') == []
assert result.get('checkpoint') is None
assert result.get('gen_params', {}).get('prompt') == "test prompt"
assert result.get('gen_params', {}).get('steps') == 20
@pytest.mark.asyncio
async def test_parse_metadata_alternative_field_names(self):
"""Test parsing with alternative field names."""
metadata = {
"sui_image_params": {
"prompt": "test prompt",
"negative_prompt": "bad quality", # Using underscore variant
"cfg_scale": 6.0 # Using underscore variant
},
"sui_models": [],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
assert result.get('gen_params', {}).get('negative_prompt') == "bad quality"
assert result.get('gen_params', {}).get('cfg_scale') == 6.0
@pytest.mark.asyncio
async def test_parse_metadata_error_handling(self):
"""Test that parser handles malformed data gracefully."""
# Missing required fields
metadata = {
"sui_image_params": {},
"sui_models": [],
"sui_extra_data": {}
}
metadata_str = json.dumps(metadata)
result = await self.parser.parse_metadata(metadata_str)
assert 'error' not in result
assert result.get('loras') == []
# Empty params result in empty gen_params dict
assert result.get('gen_params') == {}

View File

@@ -8,6 +8,9 @@
:exclude-tags="state.excludeTags.value" :exclude-tags="state.excludeTags.value"
:include-folders="state.includeFolders.value" :include-folders="state.includeFolders.value"
:exclude-folders="state.excludeFolders.value" :exclude-folders="state.excludeFolders.value"
:include-patterns="state.includePatterns.value"
:exclude-patterns="state.excludePatterns.value"
:use-regex="state.useRegex.value"
:no-credit-required="state.noCreditRequired.value" :no-credit-required="state.noCreditRequired.value"
:allow-selling="state.allowSelling.value" :allow-selling="state.allowSelling.value"
:preview-items="state.previewItems.value" :preview-items="state.previewItems.value"
@@ -16,6 +19,9 @@
@open-modal="openModal" @open-modal="openModal"
@update:include-folders="state.includeFolders.value = $event" @update:include-folders="state.includeFolders.value = $event"
@update:exclude-folders="state.excludeFolders.value = $event" @update:exclude-folders="state.excludeFolders.value = $event"
@update:include-patterns="state.includePatterns.value = $event"
@update:exclude-patterns="state.excludePatterns.value = $event"
@update:use-regex="state.useRegex.value = $event"
@update:no-credit-required="state.noCreditRequired.value = $event" @update:no-credit-required="state.noCreditRequired.value = $event"
@update:allow-selling="state.allowSelling.value = $event" @update:allow-selling="state.allowSelling.value = $event"
@refresh="state.refreshPreview" @refresh="state.refreshPreview"

View File

@@ -24,6 +24,15 @@
@edit-exclude="$emit('open-modal', 'excludeFolders')" @edit-exclude="$emit('open-modal', 'excludeFolders')"
/> />
<NamePatternsSection
:include-patterns="includePatterns"
:exclude-patterns="excludePatterns"
:use-regex="useRegex"
@update:include-patterns="$emit('update:includePatterns', $event)"
@update:exclude-patterns="$emit('update:excludePatterns', $event)"
@update:use-regex="$emit('update:useRegex', $event)"
/>
<LicenseSection <LicenseSection
:no-credit-required="noCreditRequired" :no-credit-required="noCreditRequired"
:allow-selling="allowSelling" :allow-selling="allowSelling"
@@ -46,6 +55,7 @@
import BaseModelSection from './sections/BaseModelSection.vue' import BaseModelSection from './sections/BaseModelSection.vue'
import TagsSection from './sections/TagsSection.vue' import TagsSection from './sections/TagsSection.vue'
import FoldersSection from './sections/FoldersSection.vue' import FoldersSection from './sections/FoldersSection.vue'
import NamePatternsSection from './sections/NamePatternsSection.vue'
import LicenseSection from './sections/LicenseSection.vue' import LicenseSection from './sections/LicenseSection.vue'
import LoraPoolPreview from './LoraPoolPreview.vue' import LoraPoolPreview from './LoraPoolPreview.vue'
import type { BaseModelOption, LoraItem } from '../../composables/types' import type { BaseModelOption, LoraItem } from '../../composables/types'
@@ -61,6 +71,10 @@ defineProps<{
// Folders // Folders
includeFolders: string[] includeFolders: string[]
excludeFolders: string[] excludeFolders: string[]
// Name patterns
includePatterns: string[]
excludePatterns: string[]
useRegex: boolean
// License // License
noCreditRequired: boolean noCreditRequired: boolean
allowSelling: boolean allowSelling: boolean
@@ -74,6 +88,9 @@ defineEmits<{
'open-modal': [modal: ModalType] 'open-modal': [modal: ModalType]
'update:includeFolders': [value: string[]] 'update:includeFolders': [value: string[]]
'update:excludeFolders': [value: string[]] 'update:excludeFolders': [value: string[]]
'update:includePatterns': [value: string[]]
'update:excludePatterns': [value: string[]]
'update:useRegex': [value: boolean]
'update:noCreditRequired': [value: boolean] 'update:noCreditRequired': [value: boolean]
'update:allowSelling': [value: boolean] 'update:allowSelling': [value: boolean]
refresh: [] refresh: []

View File

@@ -0,0 +1,255 @@
<template>
<div class="section">
<div class="section__header">
<span class="section__title">NAME PATTERNS</span>
<label class="section__toggle">
<input
type="checkbox"
:checked="useRegex"
@change="$emit('update:useRegex', ($event.target as HTMLInputElement).checked)"
/>
<span class="section__toggle-label">Use Regex</span>
</label>
</div>
<div class="section__columns">
<!-- Include column -->
<div class="section__column">
<div class="section__column-header">
<span class="section__column-title section__column-title--include">INCLUDE</span>
</div>
<div class="section__input-wrapper">
<input
type="text"
v-model="includeInput"
:placeholder="useRegex ? 'Add regex pattern...' : 'Add text pattern...'"
class="section__input"
@keydown.enter="addInclude"
/>
<button type="button" class="section__add-btn" @click="addInclude">+</button>
</div>
<div class="section__patterns">
<FilterChip
v-for="pattern in includePatterns"
:key="pattern"
:label="pattern"
variant="include"
removable
@remove="removeInclude(pattern)"
/>
<div v-if="includePatterns.length === 0" class="section__empty">
{{ useRegex ? 'No regex patterns' : 'No text patterns' }}
</div>
</div>
</div>
<!-- Exclude column -->
<div class="section__column">
<div class="section__column-header">
<span class="section__column-title section__column-title--exclude">EXCLUDE</span>
</div>
<div class="section__input-wrapper">
<input
type="text"
v-model="excludeInput"
:placeholder="useRegex ? 'Add regex pattern...' : 'Add text pattern...'"
class="section__input"
@keydown.enter="addExclude"
/>
<button type="button" class="section__add-btn" @click="addExclude">+</button>
</div>
<div class="section__patterns">
<FilterChip
v-for="pattern in excludePatterns"
:key="pattern"
:label="pattern"
variant="exclude"
removable
@remove="removeExclude(pattern)"
/>
<div v-if="excludePatterns.length === 0" class="section__empty">
{{ useRegex ? 'No regex patterns' : 'No text patterns' }}
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref } from 'vue'
import FilterChip from '../shared/FilterChip.vue'
const props = defineProps<{
includePatterns: string[]
excludePatterns: string[]
useRegex: boolean
}>()
const emit = defineEmits<{
'update:includePatterns': [value: string[]]
'update:excludePatterns': [value: string[]]
'update:useRegex': [value: boolean]
}>()
const includeInput = ref('')
const excludeInput = ref('')
const addInclude = () => {
const pattern = includeInput.value.trim()
if (pattern && !props.includePatterns.includes(pattern)) {
emit('update:includePatterns', [...props.includePatterns, pattern])
includeInput.value = ''
}
}
const addExclude = () => {
const pattern = excludeInput.value.trim()
if (pattern && !props.excludePatterns.includes(pattern)) {
emit('update:excludePatterns', [...props.excludePatterns, pattern])
excludeInput.value = ''
}
}
const removeInclude = (pattern: string) => {
emit('update:includePatterns', props.includePatterns.filter(p => p !== pattern))
}
const removeExclude = (pattern: string) => {
emit('update:excludePatterns', props.excludePatterns.filter(p => p !== pattern))
}
</script>
<style scoped>
.section {
margin-bottom: 16px;
}
.section__header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
}
.section__title {
font-size: 10px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.05em;
color: var(--fg-color, #fff);
opacity: 0.6;
}
.section__toggle {
display: flex;
align-items: center;
gap: 6px;
cursor: pointer;
font-size: 11px;
color: var(--fg-color, #fff);
opacity: 0.7;
}
.section__toggle input[type="checkbox"] {
margin: 0;
width: 14px;
height: 14px;
cursor: pointer;
}
.section__toggle-label {
font-weight: 500;
}
.section__columns {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
}
.section__column {
min-width: 0;
}
.section__column-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 6px;
}
.section__column-title {
font-size: 9px;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0.03em;
}
.section__column-title--include {
color: #4299e1;
}
.section__column-title--exclude {
color: #ef4444;
}
.section__input-wrapper {
display: flex;
gap: 4px;
margin-bottom: 8px;
}
.section__input {
flex: 1;
min-width: 0;
padding: 6px 8px;
background: var(--comfy-input-bg, #333);
border: 1px solid var(--comfy-input-border, #444);
border-radius: 4px;
color: var(--fg-color, #fff);
font-size: 12px;
outline: none;
}
.section__input:focus {
border-color: #4299e1;
}
.section__add-btn {
width: 28px;
height: 28px;
display: flex;
align-items: center;
justify-content: center;
background: var(--comfy-input-bg, #333);
border: 1px solid var(--comfy-input-border, #444);
border-radius: 4px;
color: var(--fg-color, #fff);
font-size: 16px;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
}
.section__add-btn:hover {
background: var(--comfy-input-bg-hover, #444);
border-color: #4299e1;
}
.section__patterns {
display: flex;
flex-wrap: wrap;
gap: 4px;
min-height: 22px;
}
.section__empty {
font-size: 10px;
color: var(--fg-color, #fff);
opacity: 0.3;
font-style: italic;
min-height: 22px;
display: flex;
align-items: center;
}
</style>

View File

@@ -10,6 +10,11 @@ export interface LoraPoolConfig {
noCreditRequired: boolean noCreditRequired: boolean
allowSelling: boolean allowSelling: boolean
} }
namePatterns: {
include: string[]
exclude: string[]
useRegex: boolean
}
includeEmptyLora?: boolean // Optional, deprecated (moved to Cycler) includeEmptyLora?: boolean // Optional, deprecated (moved to Cycler)
} }
preview: { matchCount: number; lastUpdated: number } preview: { matchCount: number; lastUpdated: number }

View File

@@ -62,6 +62,9 @@ export function useLoraPoolApi() {
foldersExclude?: string[] foldersExclude?: string[]
noCreditRequired?: boolean noCreditRequired?: boolean
allowSelling?: boolean allowSelling?: boolean
namePatternsInclude?: string[]
namePatternsExclude?: string[]
namePatternsUseRegex?: boolean
page?: number page?: number
pageSize?: number pageSize?: number
} }
@@ -92,6 +95,13 @@ export function useLoraPoolApi() {
urlParams.set('allow_selling_generated_content', String(params.allowSelling)) urlParams.set('allow_selling_generated_content', String(params.allowSelling))
} }
// Name pattern filters
params.namePatternsInclude?.forEach(pattern => urlParams.append('name_pattern_include', pattern))
params.namePatternsExclude?.forEach(pattern => urlParams.append('name_pattern_exclude', pattern))
if (params.namePatternsUseRegex !== undefined) {
urlParams.set('name_pattern_use_regex', String(params.namePatternsUseRegex))
}
const response = await fetch(`/api/lm/loras/list?${urlParams}`) const response = await fetch(`/api/lm/loras/list?${urlParams}`)
const data = await response.json() const data = await response.json()

View File

@@ -24,6 +24,9 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
const excludeFolders = ref<string[]>([]) const excludeFolders = ref<string[]>([])
const noCreditRequired = ref(false) const noCreditRequired = ref(false)
const allowSelling = ref(false) const allowSelling = ref(false)
const includePatterns = ref<string[]>([])
const excludePatterns = ref<string[]>([])
const useRegex = ref(false)
// Available options from API // Available options from API
const availableBaseModels = ref<BaseModelOption[]>([]) const availableBaseModels = ref<BaseModelOption[]>([])
@@ -52,6 +55,11 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
license: { license: {
noCreditRequired: noCreditRequired.value, noCreditRequired: noCreditRequired.value,
allowSelling: allowSelling.value allowSelling: allowSelling.value
},
namePatterns: {
include: includePatterns.value,
exclude: excludePatterns.value,
useRegex: useRegex.value
} }
}, },
preview: { preview: {
@@ -94,6 +102,9 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
updateIfChanged(excludeFolders, filters.folders?.exclude || []) updateIfChanged(excludeFolders, filters.folders?.exclude || [])
updateIfChanged(noCreditRequired, filters.license?.noCreditRequired ?? false) updateIfChanged(noCreditRequired, filters.license?.noCreditRequired ?? false)
updateIfChanged(allowSelling, filters.license?.allowSelling ?? false) updateIfChanged(allowSelling, filters.license?.allowSelling ?? false)
updateIfChanged(includePatterns, filters.namePatterns?.include || [])
updateIfChanged(excludePatterns, filters.namePatterns?.exclude || [])
updateIfChanged(useRegex, filters.namePatterns?.useRegex ?? false)
// matchCount doesn't trigger watchers, so direct assignment is fine // matchCount doesn't trigger watchers, so direct assignment is fine
matchCount.value = preview?.matchCount || 0 matchCount.value = preview?.matchCount || 0
@@ -125,6 +136,9 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
foldersExclude: excludeFolders.value, foldersExclude: excludeFolders.value,
noCreditRequired: noCreditRequired.value || undefined, noCreditRequired: noCreditRequired.value || undefined,
allowSelling: allowSelling.value || undefined, allowSelling: allowSelling.value || undefined,
namePatternsInclude: includePatterns.value,
namePatternsExclude: excludePatterns.value,
namePatternsUseRegex: useRegex.value,
pageSize: 6 pageSize: 6
}) })
@@ -150,7 +164,10 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
includeFolders, includeFolders,
excludeFolders, excludeFolders,
noCreditRequired, noCreditRequired,
allowSelling allowSelling,
includePatterns,
excludePatterns,
useRegex
], onFilterChange, { deep: true }) ], onFilterChange, { deep: true })
return { return {
@@ -162,6 +179,9 @@ export function useLoraPoolState(widget: ComponentWidget<LoraPoolConfig>) {
excludeFolders, excludeFolders,
noCreditRequired, noCreditRequired,
allowSelling, allowSelling,
includePatterns,
excludePatterns,
useRegex,
// Available options // Available options
availableBaseModels, availableBaseModels,

View File

@@ -13,7 +13,7 @@ import {
} from './mode-change-handler' } from './mode-change-handler'
const LORA_POOL_WIDGET_MIN_WIDTH = 500 const LORA_POOL_WIDGET_MIN_WIDTH = 500
const LORA_POOL_WIDGET_MIN_HEIGHT = 400 const LORA_POOL_WIDGET_MIN_HEIGHT = 520
const LORA_RANDOMIZER_WIDGET_MIN_WIDTH = 500 const LORA_RANDOMIZER_WIDGET_MIN_WIDTH = 500
const LORA_RANDOMIZER_WIDGET_MIN_HEIGHT = 448 const LORA_RANDOMIZER_WIDGET_MIN_HEIGHT = 448
const LORA_RANDOMIZER_WIDGET_MAX_HEIGHT = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT const LORA_RANDOMIZER_WIDGET_MAX_HEIGHT = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT

View File

@@ -14,6 +14,7 @@ import { initDrag, createContextMenu, initHeaderDrag, initReorderDrag, handleKey
import { forwardMiddleMouseToCanvas } from "./utils.js"; import { forwardMiddleMouseToCanvas } from "./utils.js";
import { PreviewTooltip } from "./preview_tooltip.js"; import { PreviewTooltip } from "./preview_tooltip.js";
import { ensureLmStyles } from "./lm_styles_loader.js"; import { ensureLmStyles } from "./lm_styles_loader.js";
import { getStrengthStepPreference } from "./settings.js";
export function addLorasWidget(node, name, opts, callback) { export function addLorasWidget(node, name, opts, callback) {
ensureLmStyles(); ensureLmStyles();
@@ -416,7 +417,7 @@ export function addLorasWidget(node, name, opts, callback) {
const loraIndex = lorasData.findIndex(l => l.name === name); const loraIndex = lorasData.findIndex(l => l.name === name);
if (loraIndex >= 0) { if (loraIndex >= 0) {
lorasData[loraIndex].strength = (parseFloat(lorasData[loraIndex].strength) - 0.05).toFixed(2); lorasData[loraIndex].strength = (parseFloat(lorasData[loraIndex].strength) - getStrengthStepPreference()).toFixed(2);
// Sync clipStrength if collapsed // Sync clipStrength if collapsed
syncClipStrengthIfCollapsed(lorasData[loraIndex]); syncClipStrengthIfCollapsed(lorasData[loraIndex]);
@@ -488,7 +489,7 @@ export function addLorasWidget(node, name, opts, callback) {
const loraIndex = lorasData.findIndex(l => l.name === name); const loraIndex = lorasData.findIndex(l => l.name === name);
if (loraIndex >= 0) { if (loraIndex >= 0) {
lorasData[loraIndex].strength = (parseFloat(lorasData[loraIndex].strength) + 0.05).toFixed(2); lorasData[loraIndex].strength = (parseFloat(lorasData[loraIndex].strength) + getStrengthStepPreference()).toFixed(2);
// Sync clipStrength if collapsed // Sync clipStrength if collapsed
syncClipStrengthIfCollapsed(lorasData[loraIndex]); syncClipStrengthIfCollapsed(lorasData[loraIndex]);
@@ -541,7 +542,7 @@ export function addLorasWidget(node, name, opts, callback) {
const loraIndex = lorasData.findIndex(l => l.name === name); const loraIndex = lorasData.findIndex(l => l.name === name);
if (loraIndex >= 0) { if (loraIndex >= 0) {
lorasData[loraIndex].clipStrength = (parseFloat(lorasData[loraIndex].clipStrength) - 0.05).toFixed(2); lorasData[loraIndex].clipStrength = (parseFloat(lorasData[loraIndex].clipStrength) - getStrengthStepPreference()).toFixed(2);
const newValue = formatLoraValue(lorasData); const newValue = formatLoraValue(lorasData);
updateWidgetValue(newValue); updateWidgetValue(newValue);
@@ -611,7 +612,7 @@ export function addLorasWidget(node, name, opts, callback) {
const loraIndex = lorasData.findIndex(l => l.name === name); const loraIndex = lorasData.findIndex(l => l.name === name);
if (loraIndex >= 0) { if (loraIndex >= 0) {
lorasData[loraIndex].clipStrength = (parseFloat(lorasData[loraIndex].clipStrength) + 0.05).toFixed(2); lorasData[loraIndex].clipStrength = (parseFloat(lorasData[loraIndex].clipStrength) + getStrengthStepPreference()).toFixed(2);
const newValue = formatLoraValue(lorasData); const newValue = formatLoraValue(lorasData);
updateWidgetValue(newValue); updateWidgetValue(newValue);

View File

@@ -24,6 +24,9 @@ const NEW_TAB_TEMPLATE_DEFAULT = "Default";
const NEW_TAB_ZOOM_LEVEL = 0.8; const NEW_TAB_ZOOM_LEVEL = 0.8;
const STRENGTH_STEP_SETTING_ID = "loramanager.strength_step";
const STRENGTH_STEP_DEFAULT = 0.05;
// ============================================================================ // ============================================================================
// Helper Functions // Helper Functions
// ============================================================================ // ============================================================================
@@ -232,6 +235,32 @@ const getNewTabTemplatePreference = (() => {
}; };
})(); })();
const getStrengthStepPreference = (() => {
let settingsUnavailableLogged = false;
return () => {
const settingManager = app?.extensionManager?.setting;
if (!settingManager || typeof settingManager.get !== "function") {
if (!settingsUnavailableLogged) {
console.warn("LoRA Manager: settings API unavailable, using default strength step.");
settingsUnavailableLogged = true;
}
return STRENGTH_STEP_DEFAULT;
}
try {
const value = settingManager.get(STRENGTH_STEP_SETTING_ID);
return value ?? STRENGTH_STEP_DEFAULT;
} catch (error) {
if (!settingsUnavailableLogged) {
console.warn("LoRA Manager: unable to read strength step setting, using default.", error);
settingsUnavailableLogged = true;
}
return STRENGTH_STEP_DEFAULT;
}
};
})();
// ============================================================================ // ============================================================================
// Register Extension with All Settings // Register Extension with All Settings
// ============================================================================ // ============================================================================
@@ -293,6 +322,19 @@ app.registerExtension({
tooltip: "Choose a template workflow to load when creating a new workflow tab. 'Default (Blank)' keeps ComfyUI's original blank workflow behavior.", tooltip: "Choose a template workflow to load when creating a new workflow tab. 'Default (Blank)' keeps ComfyUI's original blank workflow behavior.",
category: ["LoRA Manager", "Workflow", "New Tab Template"], category: ["LoRA Manager", "Workflow", "New Tab Template"],
}, },
{
id: STRENGTH_STEP_SETTING_ID,
name: "Strength Adjustment Step",
type: "slider",
attrs: {
min: 0.01,
max: 0.1,
step: 0.01,
},
defaultValue: STRENGTH_STEP_DEFAULT,
tooltip: "Step size for adjusting LoRA strength via arrow buttons or keyboard (default: 0.05)",
category: ["LoRA Manager", "LoRA Widget", "Strength Step"],
},
], ],
async setup() { async setup() {
await loadWorkflowOptions(); await loadWorkflowOptions();
@@ -375,4 +417,5 @@ export {
getTagSpaceReplacementPreference, getTagSpaceReplacementPreference,
getUsageStatisticsPreference, getUsageStatisticsPreference,
getNewTabTemplatePreference, getNewTabTemplatePreference,
getStrengthStepPreference,
}; };

View File

@@ -283,6 +283,121 @@
align-items: center; align-items: center;
} }
.section[data-v-9995b5ed] {
margin-bottom: 16px;
}
.section__header[data-v-9995b5ed] {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 8px;
}
.section__title[data-v-9995b5ed] {
font-size: 10px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.05em;
color: var(--fg-color, #fff);
opacity: 0.6;
}
.section__toggle[data-v-9995b5ed] {
display: flex;
align-items: center;
gap: 6px;
cursor: pointer;
font-size: 11px;
color: var(--fg-color, #fff);
opacity: 0.7;
}
.section__toggle input[type="checkbox"][data-v-9995b5ed] {
margin: 0;
width: 14px;
height: 14px;
cursor: pointer;
}
.section__toggle-label[data-v-9995b5ed] {
font-weight: 500;
}
.section__columns[data-v-9995b5ed] {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 12px;
}
.section__column[data-v-9995b5ed] {
min-width: 0;
}
.section__column-header[data-v-9995b5ed] {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 6px;
}
.section__column-title[data-v-9995b5ed] {
font-size: 9px;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0.03em;
}
.section__column-title--include[data-v-9995b5ed] {
color: #4299e1;
}
.section__column-title--exclude[data-v-9995b5ed] {
color: #ef4444;
}
.section__input-wrapper[data-v-9995b5ed] {
display: flex;
gap: 4px;
margin-bottom: 8px;
}
.section__input[data-v-9995b5ed] {
flex: 1;
min-width: 0;
padding: 6px 8px;
background: var(--comfy-input-bg, #333);
border: 1px solid var(--comfy-input-border, #444);
border-radius: 4px;
color: var(--fg-color, #fff);
font-size: 12px;
outline: none;
}
.section__input[data-v-9995b5ed]:focus {
border-color: #4299e1;
}
.section__add-btn[data-v-9995b5ed] {
width: 28px;
height: 28px;
display: flex;
align-items: center;
justify-content: center;
background: var(--comfy-input-bg, #333);
border: 1px solid var(--comfy-input-border, #444);
border-radius: 4px;
color: var(--fg-color, #fff);
font-size: 16px;
font-weight: 500;
cursor: pointer;
transition: all 0.15s;
}
.section__add-btn[data-v-9995b5ed]:hover {
background: var(--comfy-input-bg-hover, #444);
border-color: #4299e1;
}
.section__patterns[data-v-9995b5ed] {
display: flex;
flex-wrap: wrap;
gap: 4px;
min-height: 22px;
}
.section__empty[data-v-9995b5ed] {
font-size: 10px;
color: var(--fg-color, #fff);
opacity: 0.3;
font-style: italic;
min-height: 22px;
display: flex;
align-items: center;
}
.section[data-v-dea4adf6] { .section[data-v-dea4adf6] {
margin-bottom: 16px; margin-bottom: 16px;
} }
@@ -483,12 +598,12 @@ to { transform: rotate(360deg);
transform: translateY(4px); transform: translateY(4px);
} }
.summary-view[data-v-328e7526] { .summary-view[data-v-83235a00] {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
} }
.summary-view__filters[data-v-328e7526] { .summary-view__filters[data-v-83235a00] {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
padding-right: 4px; padding-right: 4px;
@@ -979,7 +1094,7 @@ to { transform: rotate(360deg);
font-size: 13px; font-size: 13px;
} }
.lora-pool-widget[data-v-4456abba] { .lora-pool-widget[data-v-0bbd50ea] {
padding: 12px; padding: 12px;
background: rgba(40, 44, 52, 0.6); background: rgba(40, 44, 52, 0.6);
border-radius: 4px; border-radius: 4px;
@@ -10505,12 +10620,12 @@ var PrimeVue = {
setup(app2, configOptions); setup(app2, configOptions);
} }
}; };
const _hoisted_1$m = { class: "filter-chip__text" }; const _hoisted_1$n = { class: "filter-chip__text" };
const _hoisted_2$i = { const _hoisted_2$j = {
key: 0, key: 0,
class: "filter-chip__count" class: "filter-chip__count"
}; };
const _sfc_main$n = /* @__PURE__ */ defineComponent({ const _sfc_main$o = /* @__PURE__ */ defineComponent({
__name: "FilterChip", __name: "FilterChip",
props: { props: {
label: {}, label: {},
@@ -10528,8 +10643,8 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
return openBlock(), createElementBlock("span", { return openBlock(), createElementBlock("span", {
class: normalizeClass(["filter-chip", variantClass.value]) class: normalizeClass(["filter-chip", variantClass.value])
}, [ }, [
createBaseVNode("span", _hoisted_1$m, toDisplayString(__props.label), 1), createBaseVNode("span", _hoisted_1$n, toDisplayString(__props.label), 1),
__props.count !== void 0 ? (openBlock(), createElementBlock("span", _hoisted_2$i, "(" + toDisplayString(__props.count) + ")", 1)) : createCommentVNode("", true), __props.count !== void 0 ? (openBlock(), createElementBlock("span", _hoisted_2$j, "(" + toDisplayString(__props.count) + ")", 1)) : createCommentVNode("", true),
__props.removable ? (openBlock(), createElementBlock("button", { __props.removable ? (openBlock(), createElementBlock("button", {
key: 1, key: 1,
class: "filter-chip__remove", class: "filter-chip__remove",
@@ -10547,8 +10662,8 @@ const _export_sfc = (sfc, props) => {
} }
return target; return target;
}; };
const FilterChip = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-7e36267d"]]); const FilterChip = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__scopeId", "data-v-7e36267d"]]);
const _sfc_main$m = /* @__PURE__ */ defineComponent({ const _sfc_main$n = /* @__PURE__ */ defineComponent({
__name: "EditButton", __name: "EditButton",
emits: ["click"], emits: ["click"],
setup(__props) { setup(__props) {
@@ -10570,19 +10685,19 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
}; };
} }
}); });
const EditButton = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-8da8aa4b"]]); const EditButton = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-8da8aa4b"]]);
const _hoisted_1$l = { class: "section" }; const _hoisted_1$m = { class: "section" };
const _hoisted_2$h = { class: "section__header" }; const _hoisted_2$i = { class: "section__header" };
const _hoisted_3$f = { class: "section__content" }; const _hoisted_3$g = { class: "section__content" };
const _hoisted_4$d = { const _hoisted_4$e = {
key: 0, key: 0,
class: "section__placeholder" class: "section__placeholder"
}; };
const _hoisted_5$b = { const _hoisted_5$c = {
key: 1, key: 1,
class: "section__chips" class: "section__chips"
}; };
const _sfc_main$l = /* @__PURE__ */ defineComponent({ const _sfc_main$m = /* @__PURE__ */ defineComponent({
__name: "BaseModelSection", __name: "BaseModelSection",
props: { props: {
selected: {}, selected: {},
@@ -10596,15 +10711,15 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
return model == null ? void 0 : model.count; return model == null ? void 0 : model.count;
}; };
return (_ctx, _cache) => { return (_ctx, _cache) => {
return openBlock(), createElementBlock("div", _hoisted_1$l, [ return openBlock(), createElementBlock("div", _hoisted_1$m, [
createBaseVNode("div", _hoisted_2$h, [ createBaseVNode("div", _hoisted_2$i, [
_cache[1] || (_cache[1] = createBaseVNode("span", { class: "section__title" }, "BASE MODEL", -1)), _cache[1] || (_cache[1] = createBaseVNode("span", { class: "section__title" }, "BASE MODEL", -1)),
createVNode(EditButton, { createVNode(EditButton, {
onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit")) onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit"))
}) })
]), ]),
createBaseVNode("div", _hoisted_3$f, [ createBaseVNode("div", _hoisted_3$g, [
__props.selected.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_4$d, " All models ")) : (openBlock(), createElementBlock("div", _hoisted_5$b, [ __props.selected.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_4$e, " All models ")) : (openBlock(), createElementBlock("div", _hoisted_5$c, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.selected, (name) => { (openBlock(true), createElementBlock(Fragment, null, renderList(__props.selected, (name) => {
return openBlock(), createBlock(FilterChip, { return openBlock(), createBlock(FilterChip, {
key: name, key: name,
@@ -10619,32 +10734,32 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
}; };
} }
}); });
const BaseModelSection = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-12f059e2"]]); const BaseModelSection = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-12f059e2"]]);
const _hoisted_1$k = { class: "section" }; const _hoisted_1$l = { class: "section" };
const _hoisted_2$g = { class: "section__columns" }; const _hoisted_2$h = { class: "section__columns" };
const _hoisted_3$e = { class: "section__column" }; const _hoisted_3$f = { class: "section__column" };
const _hoisted_4$c = { class: "section__column-header" }; const _hoisted_4$d = { class: "section__column-header" };
const _hoisted_5$a = { class: "section__column-content" }; const _hoisted_5$b = { class: "section__column-content" };
const _hoisted_6$a = { const _hoisted_6$b = {
key: 0, key: 0,
class: "section__empty" class: "section__empty"
}; };
const _hoisted_7$8 = { const _hoisted_7$9 = {
key: 1, key: 1,
class: "section__chips" class: "section__chips"
}; };
const _hoisted_8$6 = { class: "section__column" }; const _hoisted_8$7 = { class: "section__column" };
const _hoisted_9$4 = { class: "section__column-header" }; const _hoisted_9$5 = { class: "section__column-header" };
const _hoisted_10$4 = { class: "section__column-content" }; const _hoisted_10$5 = { class: "section__column-content" };
const _hoisted_11$3 = { const _hoisted_11$4 = {
key: 0, key: 0,
class: "section__empty" class: "section__empty"
}; };
const _hoisted_12$3 = { const _hoisted_12$4 = {
key: 1, key: 1,
class: "section__chips" class: "section__chips"
}; };
const _sfc_main$k = /* @__PURE__ */ defineComponent({ const _sfc_main$l = /* @__PURE__ */ defineComponent({
__name: "TagsSection", __name: "TagsSection",
props: { props: {
includeTags: {}, includeTags: {},
@@ -10653,20 +10768,20 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
emits: ["edit-include", "edit-exclude"], emits: ["edit-include", "edit-exclude"],
setup(__props) { setup(__props) {
return (_ctx, _cache) => { return (_ctx, _cache) => {
return openBlock(), createElementBlock("div", _hoisted_1$k, [ return openBlock(), createElementBlock("div", _hoisted_1$l, [
_cache[4] || (_cache[4] = createBaseVNode("div", { class: "section__header" }, [ _cache[4] || (_cache[4] = createBaseVNode("div", { class: "section__header" }, [
createBaseVNode("span", { class: "section__title" }, "TAGS") createBaseVNode("span", { class: "section__title" }, "TAGS")
], -1)), ], -1)),
createBaseVNode("div", _hoisted_2$g, [ createBaseVNode("div", _hoisted_2$h, [
createBaseVNode("div", _hoisted_3$e, [ createBaseVNode("div", _hoisted_3$f, [
createBaseVNode("div", _hoisted_4$c, [ createBaseVNode("div", _hoisted_4$d, [
_cache[2] || (_cache[2] = createBaseVNode("span", { class: "section__column-title section__column-title--include" }, "INCLUDE", -1)), _cache[2] || (_cache[2] = createBaseVNode("span", { class: "section__column-title section__column-title--include" }, "INCLUDE", -1)),
createVNode(EditButton, { createVNode(EditButton, {
onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit-include")) onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("edit-include"))
}) })
]), ]),
createBaseVNode("div", _hoisted_5$a, [ createBaseVNode("div", _hoisted_5$b, [
__props.includeTags.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_6$a, " None ")) : (openBlock(), createElementBlock("div", _hoisted_7$8, [ __props.includeTags.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_6$b, " None ")) : (openBlock(), createElementBlock("div", _hoisted_7$9, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.includeTags, (tag) => { (openBlock(true), createElementBlock(Fragment, null, renderList(__props.includeTags, (tag) => {
return openBlock(), createBlock(FilterChip, { return openBlock(), createBlock(FilterChip, {
key: tag, key: tag,
@@ -10677,15 +10792,15 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
])) ]))
]) ])
]), ]),
createBaseVNode("div", _hoisted_8$6, [ createBaseVNode("div", _hoisted_8$7, [
createBaseVNode("div", _hoisted_9$4, [ createBaseVNode("div", _hoisted_9$5, [
_cache[3] || (_cache[3] = createBaseVNode("span", { class: "section__column-title section__column-title--exclude" }, "EXCLUDE", -1)), _cache[3] || (_cache[3] = createBaseVNode("span", { class: "section__column-title section__column-title--exclude" }, "EXCLUDE", -1)),
createVNode(EditButton, { createVNode(EditButton, {
onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("edit-exclude")) onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("edit-exclude"))
}) })
]), ]),
createBaseVNode("div", _hoisted_10$4, [ createBaseVNode("div", _hoisted_10$5, [
__props.excludeTags.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_11$3, " None ")) : (openBlock(), createElementBlock("div", _hoisted_12$3, [ __props.excludeTags.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_11$4, " None ")) : (openBlock(), createElementBlock("div", _hoisted_12$4, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.excludeTags, (tag) => { (openBlock(true), createElementBlock(Fragment, null, renderList(__props.excludeTags, (tag) => {
return openBlock(), createBlock(FilterChip, { return openBlock(), createBlock(FilterChip, {
key: tag, key: tag,
@@ -10701,32 +10816,32 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
}; };
} }
}); });
const TagsSection = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-b869b780"]]); const TagsSection = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-b869b780"]]);
const _hoisted_1$j = { class: "section" }; const _hoisted_1$k = { class: "section" };
const _hoisted_2$f = { class: "section__columns" }; const _hoisted_2$g = { class: "section__columns" };
const _hoisted_3$d = { class: "section__column" }; const _hoisted_3$e = { class: "section__column" };
const _hoisted_4$b = { class: "section__column-header" }; const _hoisted_4$c = { class: "section__column-header" };
const _hoisted_5$9 = { class: "section__content" }; const _hoisted_5$a = { class: "section__content" };
const _hoisted_6$9 = { const _hoisted_6$a = {
key: 0, key: 0,
class: "section__paths" class: "section__paths"
}; };
const _hoisted_7$7 = { const _hoisted_7$8 = {
key: 1, key: 1,
class: "section__empty" class: "section__empty"
}; };
const _hoisted_8$5 = { class: "section__column" }; const _hoisted_8$6 = { class: "section__column" };
const _hoisted_9$3 = { class: "section__column-header" }; const _hoisted_9$4 = { class: "section__column-header" };
const _hoisted_10$3 = { class: "section__content" }; const _hoisted_10$4 = { class: "section__content" };
const _hoisted_11$2 = { const _hoisted_11$3 = {
key: 0, key: 0,
class: "section__paths" class: "section__paths"
}; };
const _hoisted_12$2 = { const _hoisted_12$3 = {
key: 1, key: 1,
class: "section__empty" class: "section__empty"
}; };
const _sfc_main$j = /* @__PURE__ */ defineComponent({ const _sfc_main$k = /* @__PURE__ */ defineComponent({
__name: "FoldersSection", __name: "FoldersSection",
props: { props: {
includeFolders: {}, includeFolders: {},
@@ -10747,13 +10862,13 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
emit2("update:excludeFolders", props.excludeFolders.filter((p2) => p2 !== path)); emit2("update:excludeFolders", props.excludeFolders.filter((p2) => p2 !== path));
}; };
return (_ctx, _cache) => { return (_ctx, _cache) => {
return openBlock(), createElementBlock("div", _hoisted_1$j, [ return openBlock(), createElementBlock("div", _hoisted_1$k, [
_cache[6] || (_cache[6] = createBaseVNode("div", { class: "section__header" }, [ _cache[6] || (_cache[6] = createBaseVNode("div", { class: "section__header" }, [
createBaseVNode("span", { class: "section__title" }, "FOLDERS") createBaseVNode("span", { class: "section__title" }, "FOLDERS")
], -1)), ], -1)),
createBaseVNode("div", _hoisted_2$f, [ createBaseVNode("div", _hoisted_2$g, [
createBaseVNode("div", _hoisted_3$d, [ createBaseVNode("div", _hoisted_3$e, [
createBaseVNode("div", _hoisted_4$b, [ createBaseVNode("div", _hoisted_4$c, [
_cache[3] || (_cache[3] = createBaseVNode("span", { class: "section__column-title section__column-title--include" }, "INCLUDE", -1)), _cache[3] || (_cache[3] = createBaseVNode("span", { class: "section__column-title section__column-title--include" }, "INCLUDE", -1)),
createBaseVNode("button", { createBaseVNode("button", {
type: "button", type: "button",
@@ -10768,8 +10883,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
], -1) ], -1)
])]) ])])
]), ]),
createBaseVNode("div", _hoisted_5$9, [ createBaseVNode("div", _hoisted_5$a, [
__props.includeFolders.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_6$9, [ __props.includeFolders.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_6$a, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.includeFolders, (path) => { (openBlock(true), createElementBlock(Fragment, null, renderList(__props.includeFolders, (path) => {
return openBlock(), createBlock(FilterChip, { return openBlock(), createBlock(FilterChip, {
key: path, key: path,
@@ -10779,11 +10894,11 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
onRemove: ($event) => removeInclude(path) onRemove: ($event) => removeInclude(path)
}, null, 8, ["label", "onRemove"]); }, null, 8, ["label", "onRemove"]);
}), 128)) }), 128))
])) : (openBlock(), createElementBlock("div", _hoisted_7$7, " No folders selected ")) ])) : (openBlock(), createElementBlock("div", _hoisted_7$8, " No folders selected "))
]) ])
]), ]),
createBaseVNode("div", _hoisted_8$5, [ createBaseVNode("div", _hoisted_8$6, [
createBaseVNode("div", _hoisted_9$3, [ createBaseVNode("div", _hoisted_9$4, [
_cache[5] || (_cache[5] = createBaseVNode("span", { class: "section__column-title section__column-title--exclude" }, "EXCLUDE", -1)), _cache[5] || (_cache[5] = createBaseVNode("span", { class: "section__column-title section__column-title--exclude" }, "EXCLUDE", -1)),
createBaseVNode("button", { createBaseVNode("button", {
type: "button", type: "button",
@@ -10798,8 +10913,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
], -1) ], -1)
])]) ])])
]), ]),
createBaseVNode("div", _hoisted_10$3, [ createBaseVNode("div", _hoisted_10$4, [
__props.excludeFolders.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_11$2, [ __props.excludeFolders.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_11$3, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.excludeFolders, (path) => { (openBlock(true), createElementBlock(Fragment, null, renderList(__props.excludeFolders, (path) => {
return openBlock(), createBlock(FilterChip, { return openBlock(), createBlock(FilterChip, {
key: path, key: path,
@@ -10809,7 +10924,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
onRemove: ($event) => removeExclude(path) onRemove: ($event) => removeExclude(path)
}, null, 8, ["label", "onRemove"]); }, null, 8, ["label", "onRemove"]);
}), 128)) }), 128))
])) : (openBlock(), createElementBlock("div", _hoisted_12$2, " No folders selected ")) ])) : (openBlock(), createElementBlock("div", _hoisted_12$3, " No folders selected "))
]) ])
]) ])
]) ])
@@ -10817,7 +10932,147 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
}; };
} }
}); });
const FoldersSection = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-af9caf84"]]); const FoldersSection = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-af9caf84"]]);
const _hoisted_1$j = { class: "section" };
const _hoisted_2$f = { class: "section__header" };
const _hoisted_3$d = { class: "section__toggle" };
const _hoisted_4$b = ["checked"];
const _hoisted_5$9 = { class: "section__columns" };
const _hoisted_6$9 = { class: "section__column" };
const _hoisted_7$7 = { class: "section__input-wrapper" };
const _hoisted_8$5 = ["placeholder"];
const _hoisted_9$3 = { class: "section__patterns" };
const _hoisted_10$3 = {
key: 0,
class: "section__empty"
};
const _hoisted_11$2 = { class: "section__column" };
const _hoisted_12$2 = { class: "section__input-wrapper" };
const _hoisted_13$2 = ["placeholder"];
const _hoisted_14$2 = { class: "section__patterns" };
const _hoisted_15$2 = {
key: 0,
class: "section__empty"
};
const _sfc_main$j = /* @__PURE__ */ defineComponent({
__name: "NamePatternsSection",
props: {
includePatterns: {},
excludePatterns: {},
useRegex: { type: Boolean }
},
emits: ["update:includePatterns", "update:excludePatterns", "update:useRegex"],
setup(__props, { emit: __emit }) {
const props = __props;
const emit2 = __emit;
const includeInput = ref("");
const excludeInput = ref("");
const addInclude = () => {
const pattern = includeInput.value.trim();
if (pattern && !props.includePatterns.includes(pattern)) {
emit2("update:includePatterns", [...props.includePatterns, pattern]);
includeInput.value = "";
}
};
const addExclude = () => {
const pattern = excludeInput.value.trim();
if (pattern && !props.excludePatterns.includes(pattern)) {
emit2("update:excludePatterns", [...props.excludePatterns, pattern]);
excludeInput.value = "";
}
};
const removeInclude = (pattern) => {
emit2("update:includePatterns", props.includePatterns.filter((p2) => p2 !== pattern));
};
const removeExclude = (pattern) => {
emit2("update:excludePatterns", props.excludePatterns.filter((p2) => p2 !== pattern));
};
return (_ctx, _cache) => {
return openBlock(), createElementBlock("div", _hoisted_1$j, [
createBaseVNode("div", _hoisted_2$f, [
_cache[4] || (_cache[4] = createBaseVNode("span", { class: "section__title" }, "NAME PATTERNS", -1)),
createBaseVNode("label", _hoisted_3$d, [
createBaseVNode("input", {
type: "checkbox",
checked: __props.useRegex,
onChange: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("update:useRegex", $event.target.checked))
}, null, 40, _hoisted_4$b),
_cache[3] || (_cache[3] = createBaseVNode("span", { class: "section__toggle-label" }, "Use Regex", -1))
])
]),
createBaseVNode("div", _hoisted_5$9, [
createBaseVNode("div", _hoisted_6$9, [
_cache[5] || (_cache[5] = createBaseVNode("div", { class: "section__column-header" }, [
createBaseVNode("span", { class: "section__column-title section__column-title--include" }, "INCLUDE")
], -1)),
createBaseVNode("div", _hoisted_7$7, [
withDirectives(createBaseVNode("input", {
type: "text",
"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => includeInput.value = $event),
placeholder: __props.useRegex ? "Add regex pattern..." : "Add text pattern...",
class: "section__input",
onKeydown: withKeys(addInclude, ["enter"])
}, null, 40, _hoisted_8$5), [
[vModelText, includeInput.value]
]),
createBaseVNode("button", {
type: "button",
class: "section__add-btn",
onClick: addInclude
}, "+")
]),
createBaseVNode("div", _hoisted_9$3, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.includePatterns, (pattern) => {
return openBlock(), createBlock(FilterChip, {
key: pattern,
label: pattern,
variant: "include",
removable: "",
onRemove: ($event) => removeInclude(pattern)
}, null, 8, ["label", "onRemove"]);
}), 128)),
__props.includePatterns.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_10$3, toDisplayString(__props.useRegex ? "No regex patterns" : "No text patterns"), 1)) : createCommentVNode("", true)
])
]),
createBaseVNode("div", _hoisted_11$2, [
_cache[6] || (_cache[6] = createBaseVNode("div", { class: "section__column-header" }, [
createBaseVNode("span", { class: "section__column-title section__column-title--exclude" }, "EXCLUDE")
], -1)),
createBaseVNode("div", _hoisted_12$2, [
withDirectives(createBaseVNode("input", {
type: "text",
"onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => excludeInput.value = $event),
placeholder: __props.useRegex ? "Add regex pattern..." : "Add text pattern...",
class: "section__input",
onKeydown: withKeys(addExclude, ["enter"])
}, null, 40, _hoisted_13$2), [
[vModelText, excludeInput.value]
]),
createBaseVNode("button", {
type: "button",
class: "section__add-btn",
onClick: addExclude
}, "+")
]),
createBaseVNode("div", _hoisted_14$2, [
(openBlock(true), createElementBlock(Fragment, null, renderList(__props.excludePatterns, (pattern) => {
return openBlock(), createBlock(FilterChip, {
key: pattern,
label: pattern,
variant: "exclude",
removable: "",
onRemove: ($event) => removeExclude(pattern)
}, null, 8, ["label", "onRemove"]);
}), 128)),
__props.excludePatterns.length === 0 ? (openBlock(), createElementBlock("div", _hoisted_15$2, toDisplayString(__props.useRegex ? "No regex patterns" : "No text patterns"), 1)) : createCommentVNode("", true)
])
])
])
]);
};
}
});
const NamePatternsSection = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-9995b5ed"]]);
const _hoisted_1$i = { class: "section" }; const _hoisted_1$i = { class: "section" };
const _hoisted_2$e = { class: "section__toggles" }; const _hoisted_2$e = { class: "section__toggles" };
const _hoisted_3$c = { class: "toggle-item" }; const _hoisted_3$c = { class: "toggle-item" };
@@ -10982,13 +11237,16 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
excludeTags: {}, excludeTags: {},
includeFolders: {}, includeFolders: {},
excludeFolders: {}, excludeFolders: {},
includePatterns: {},
excludePatterns: {},
useRegex: { type: Boolean },
noCreditRequired: { type: Boolean }, noCreditRequired: { type: Boolean },
allowSelling: { type: Boolean }, allowSelling: { type: Boolean },
previewItems: {}, previewItems: {},
matchCount: {}, matchCount: {},
isLoading: { type: Boolean } isLoading: { type: Boolean }
}, },
emits: ["open-modal", "update:includeFolders", "update:excludeFolders", "update:noCreditRequired", "update:allowSelling", "refresh"], emits: ["open-modal", "update:includeFolders", "update:excludeFolders", "update:includePatterns", "update:excludePatterns", "update:useRegex", "update:noCreditRequired", "update:allowSelling", "refresh"],
setup(__props) { setup(__props) {
return (_ctx, _cache) => { return (_ctx, _cache) => {
return openBlock(), createElementBlock("div", _hoisted_1$g, [ return openBlock(), createElementBlock("div", _hoisted_1$g, [
@@ -11012,24 +11270,32 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
onEditInclude: _cache[5] || (_cache[5] = ($event) => _ctx.$emit("open-modal", "includeFolders")), onEditInclude: _cache[5] || (_cache[5] = ($event) => _ctx.$emit("open-modal", "includeFolders")),
onEditExclude: _cache[6] || (_cache[6] = ($event) => _ctx.$emit("open-modal", "excludeFolders")) onEditExclude: _cache[6] || (_cache[6] = ($event) => _ctx.$emit("open-modal", "excludeFolders"))
}, null, 8, ["include-folders", "exclude-folders"]), }, null, 8, ["include-folders", "exclude-folders"]),
createVNode(NamePatternsSection, {
"include-patterns": __props.includePatterns,
"exclude-patterns": __props.excludePatterns,
"use-regex": __props.useRegex,
"onUpdate:includePatterns": _cache[7] || (_cache[7] = ($event) => _ctx.$emit("update:includePatterns", $event)),
"onUpdate:excludePatterns": _cache[8] || (_cache[8] = ($event) => _ctx.$emit("update:excludePatterns", $event)),
"onUpdate:useRegex": _cache[9] || (_cache[9] = ($event) => _ctx.$emit("update:useRegex", $event))
}, null, 8, ["include-patterns", "exclude-patterns", "use-regex"]),
createVNode(LicenseSection, { createVNode(LicenseSection, {
"no-credit-required": __props.noCreditRequired, "no-credit-required": __props.noCreditRequired,
"allow-selling": __props.allowSelling, "allow-selling": __props.allowSelling,
"onUpdate:noCreditRequired": _cache[7] || (_cache[7] = ($event) => _ctx.$emit("update:noCreditRequired", $event)), "onUpdate:noCreditRequired": _cache[10] || (_cache[10] = ($event) => _ctx.$emit("update:noCreditRequired", $event)),
"onUpdate:allowSelling": _cache[8] || (_cache[8] = ($event) => _ctx.$emit("update:allowSelling", $event)) "onUpdate:allowSelling": _cache[11] || (_cache[11] = ($event) => _ctx.$emit("update:allowSelling", $event))
}, null, 8, ["no-credit-required", "allow-selling"]) }, null, 8, ["no-credit-required", "allow-selling"])
]), ]),
createVNode(LoraPoolPreview, { createVNode(LoraPoolPreview, {
items: __props.previewItems, items: __props.previewItems,
"match-count": __props.matchCount, "match-count": __props.matchCount,
"is-loading": __props.isLoading, "is-loading": __props.isLoading,
onRefresh: _cache[9] || (_cache[9] = ($event) => _ctx.$emit("refresh")) onRefresh: _cache[12] || (_cache[12] = ($event) => _ctx.$emit("refresh"))
}, null, 8, ["items", "match-count", "is-loading"]) }, null, 8, ["items", "match-count", "is-loading"])
]); ]);
}; };
} }
}); });
const LoraPoolSummaryView = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-328e7526"]]); const LoraPoolSummaryView = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-83235a00"]]);
const _hoisted_1$f = { class: "lora-pool-modal__header" }; const _hoisted_1$f = { class: "lora-pool-modal__header" };
const _hoisted_2$b = { class: "lora-pool-modal__title-container" }; const _hoisted_2$b = { class: "lora-pool-modal__title-container" };
const _hoisted_3$a = { class: "lora-pool-modal__title" }; const _hoisted_3$a = { class: "lora-pool-modal__title" };
@@ -11672,7 +11938,7 @@ function useLoraPoolApi() {
}); });
}; };
const fetchLoras = async (params) => { const fetchLoras = async (params) => {
var _a2, _b, _c, _d; var _a2, _b, _c, _d, _e2, _f;
isLoading.value = true; isLoading.value = true;
try { try {
const urlParams = new URLSearchParams(); const urlParams = new URLSearchParams();
@@ -11692,6 +11958,11 @@ function useLoraPoolApi() {
if (params.allowSelling !== void 0) { if (params.allowSelling !== void 0) {
urlParams.set("allow_selling_generated_content", String(params.allowSelling)); urlParams.set("allow_selling_generated_content", String(params.allowSelling));
} }
(_e2 = params.namePatternsInclude) == null ? void 0 : _e2.forEach((pattern) => urlParams.append("name_pattern_include", pattern));
(_f = params.namePatternsExclude) == null ? void 0 : _f.forEach((pattern) => urlParams.append("name_pattern_exclude", pattern));
if (params.namePatternsUseRegex !== void 0) {
urlParams.set("name_pattern_use_regex", String(params.namePatternsUseRegex));
}
const response = await fetch(`/api/lm/loras/list?${urlParams}`); const response = await fetch(`/api/lm/loras/list?${urlParams}`);
const data = await response.json(); const data = await response.json();
return { return {
@@ -11723,6 +11994,9 @@ function useLoraPoolState(widget) {
const excludeFolders = ref([]); const excludeFolders = ref([]);
const noCreditRequired = ref(false); const noCreditRequired = ref(false);
const allowSelling = ref(false); const allowSelling = ref(false);
const includePatterns = ref([]);
const excludePatterns = ref([]);
const useRegex = ref(false);
const availableBaseModels = ref([]); const availableBaseModels = ref([]);
const availableTags = ref([]); const availableTags = ref([]);
const folderTree = ref([]); const folderTree = ref([]);
@@ -11745,6 +12019,11 @@ function useLoraPoolState(widget) {
license: { license: {
noCreditRequired: noCreditRequired.value, noCreditRequired: noCreditRequired.value,
allowSelling: allowSelling.value allowSelling: allowSelling.value
},
namePatterns: {
include: includePatterns.value,
exclude: excludePatterns.value,
useRegex: useRegex.value
} }
}, },
preview: { preview: {
@@ -11758,7 +12037,7 @@ function useLoraPoolState(widget) {
return config; return config;
}; };
const restoreFromConfig = (config) => { const restoreFromConfig = (config) => {
var _a2, _b, _c, _d, _e2, _f; var _a2, _b, _c, _d, _e2, _f, _g, _h, _i;
isRestoring = true; isRestoring = true;
try { try {
if (!(config == null ? void 0 : config.filters)) return; if (!(config == null ? void 0 : config.filters)) return;
@@ -11775,6 +12054,9 @@ function useLoraPoolState(widget) {
updateIfChanged(excludeFolders, ((_d = filters.folders) == null ? void 0 : _d.exclude) || []); updateIfChanged(excludeFolders, ((_d = filters.folders) == null ? void 0 : _d.exclude) || []);
updateIfChanged(noCreditRequired, ((_e2 = filters.license) == null ? void 0 : _e2.noCreditRequired) ?? false); updateIfChanged(noCreditRequired, ((_e2 = filters.license) == null ? void 0 : _e2.noCreditRequired) ?? false);
updateIfChanged(allowSelling, ((_f = filters.license) == null ? void 0 : _f.allowSelling) ?? false); updateIfChanged(allowSelling, ((_f = filters.license) == null ? void 0 : _f.allowSelling) ?? false);
updateIfChanged(includePatterns, ((_g = filters.namePatterns) == null ? void 0 : _g.include) || []);
updateIfChanged(excludePatterns, ((_h = filters.namePatterns) == null ? void 0 : _h.exclude) || []);
updateIfChanged(useRegex, ((_i = filters.namePatterns) == null ? void 0 : _i.useRegex) ?? false);
matchCount.value = (preview == null ? void 0 : preview.matchCount) || 0; matchCount.value = (preview == null ? void 0 : preview.matchCount) || 0;
} finally { } finally {
isRestoring = false; isRestoring = false;
@@ -11799,6 +12081,9 @@ function useLoraPoolState(widget) {
foldersExclude: excludeFolders.value, foldersExclude: excludeFolders.value,
noCreditRequired: noCreditRequired.value || void 0, noCreditRequired: noCreditRequired.value || void 0,
allowSelling: allowSelling.value || void 0, allowSelling: allowSelling.value || void 0,
namePatternsInclude: includePatterns.value,
namePatternsExclude: excludePatterns.value,
namePatternsUseRegex: useRegex.value,
pageSize: 6 pageSize: 6
}); });
previewItems.value = result.items; previewItems.value = result.items;
@@ -11819,7 +12104,10 @@ function useLoraPoolState(widget) {
includeFolders, includeFolders,
excludeFolders, excludeFolders,
noCreditRequired, noCreditRequired,
allowSelling allowSelling,
includePatterns,
excludePatterns,
useRegex
], onFilterChange, { deep: true }); ], onFilterChange, { deep: true });
return { return {
// Filter state // Filter state
@@ -11830,6 +12118,9 @@ function useLoraPoolState(widget) {
excludeFolders, excludeFolders,
noCreditRequired, noCreditRequired,
allowSelling, allowSelling,
includePatterns,
excludePatterns,
useRegex,
// Available options // Available options
availableBaseModels, availableBaseModels,
availableTags, availableTags,
@@ -11902,6 +12193,9 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
"exclude-tags": unref(state).excludeTags.value, "exclude-tags": unref(state).excludeTags.value,
"include-folders": unref(state).includeFolders.value, "include-folders": unref(state).includeFolders.value,
"exclude-folders": unref(state).excludeFolders.value, "exclude-folders": unref(state).excludeFolders.value,
"include-patterns": unref(state).includePatterns.value,
"exclude-patterns": unref(state).excludePatterns.value,
"use-regex": unref(state).useRegex.value,
"no-credit-required": unref(state).noCreditRequired.value, "no-credit-required": unref(state).noCreditRequired.value,
"allow-selling": unref(state).allowSelling.value, "allow-selling": unref(state).allowSelling.value,
"preview-items": unref(state).previewItems.value, "preview-items": unref(state).previewItems.value,
@@ -11910,16 +12204,19 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
onOpenModal: openModal, onOpenModal: openModal,
"onUpdate:includeFolders": _cache[0] || (_cache[0] = ($event) => unref(state).includeFolders.value = $event), "onUpdate:includeFolders": _cache[0] || (_cache[0] = ($event) => unref(state).includeFolders.value = $event),
"onUpdate:excludeFolders": _cache[1] || (_cache[1] = ($event) => unref(state).excludeFolders.value = $event), "onUpdate:excludeFolders": _cache[1] || (_cache[1] = ($event) => unref(state).excludeFolders.value = $event),
"onUpdate:noCreditRequired": _cache[2] || (_cache[2] = ($event) => unref(state).noCreditRequired.value = $event), "onUpdate:includePatterns": _cache[2] || (_cache[2] = ($event) => unref(state).includePatterns.value = $event),
"onUpdate:allowSelling": _cache[3] || (_cache[3] = ($event) => unref(state).allowSelling.value = $event), "onUpdate:excludePatterns": _cache[3] || (_cache[3] = ($event) => unref(state).excludePatterns.value = $event),
"onUpdate:useRegex": _cache[4] || (_cache[4] = ($event) => unref(state).useRegex.value = $event),
"onUpdate:noCreditRequired": _cache[5] || (_cache[5] = ($event) => unref(state).noCreditRequired.value = $event),
"onUpdate:allowSelling": _cache[6] || (_cache[6] = ($event) => unref(state).allowSelling.value = $event),
onRefresh: unref(state).refreshPreview onRefresh: unref(state).refreshPreview
}, null, 8, ["selected-base-models", "available-base-models", "include-tags", "exclude-tags", "include-folders", "exclude-folders", "no-credit-required", "allow-selling", "preview-items", "match-count", "is-loading", "onRefresh"]), }, null, 8, ["selected-base-models", "available-base-models", "include-tags", "exclude-tags", "include-folders", "exclude-folders", "include-patterns", "exclude-patterns", "use-regex", "no-credit-required", "allow-selling", "preview-items", "match-count", "is-loading", "onRefresh"]),
createVNode(BaseModelModal, { createVNode(BaseModelModal, {
visible: unref(modalState).isModalOpen("baseModels"), visible: unref(modalState).isModalOpen("baseModels"),
models: unref(state).availableBaseModels.value, models: unref(state).availableBaseModels.value,
selected: unref(state).selectedBaseModels.value, selected: unref(state).selectedBaseModels.value,
onClose: unref(modalState).closeModal, onClose: unref(modalState).closeModal,
"onUpdate:selected": _cache[4] || (_cache[4] = ($event) => unref(state).selectedBaseModels.value = $event) "onUpdate:selected": _cache[7] || (_cache[7] = ($event) => unref(state).selectedBaseModels.value = $event)
}, null, 8, ["visible", "models", "selected", "onClose"]), }, null, 8, ["visible", "models", "selected", "onClose"]),
createVNode(TagsModal, { createVNode(TagsModal, {
visible: unref(modalState).isModalOpen("includeTags"), visible: unref(modalState).isModalOpen("includeTags"),
@@ -11927,7 +12224,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
selected: unref(state).includeTags.value, selected: unref(state).includeTags.value,
variant: "include", variant: "include",
onClose: unref(modalState).closeModal, onClose: unref(modalState).closeModal,
"onUpdate:selected": _cache[5] || (_cache[5] = ($event) => unref(state).includeTags.value = $event) "onUpdate:selected": _cache[8] || (_cache[8] = ($event) => unref(state).includeTags.value = $event)
}, null, 8, ["visible", "tags", "selected", "onClose"]), }, null, 8, ["visible", "tags", "selected", "onClose"]),
createVNode(TagsModal, { createVNode(TagsModal, {
visible: unref(modalState).isModalOpen("excludeTags"), visible: unref(modalState).isModalOpen("excludeTags"),
@@ -11935,7 +12232,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
selected: unref(state).excludeTags.value, selected: unref(state).excludeTags.value,
variant: "exclude", variant: "exclude",
onClose: unref(modalState).closeModal, onClose: unref(modalState).closeModal,
"onUpdate:selected": _cache[6] || (_cache[6] = ($event) => unref(state).excludeTags.value = $event) "onUpdate:selected": _cache[9] || (_cache[9] = ($event) => unref(state).excludeTags.value = $event)
}, null, 8, ["visible", "tags", "selected", "onClose"]), }, null, 8, ["visible", "tags", "selected", "onClose"]),
createVNode(FoldersModal, { createVNode(FoldersModal, {
visible: unref(modalState).isModalOpen("includeFolders"), visible: unref(modalState).isModalOpen("includeFolders"),
@@ -11943,7 +12240,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
selected: unref(state).includeFolders.value, selected: unref(state).includeFolders.value,
variant: "include", variant: "include",
onClose: unref(modalState).closeModal, onClose: unref(modalState).closeModal,
"onUpdate:selected": _cache[7] || (_cache[7] = ($event) => unref(state).includeFolders.value = $event) "onUpdate:selected": _cache[10] || (_cache[10] = ($event) => unref(state).includeFolders.value = $event)
}, null, 8, ["visible", "folders", "selected", "onClose"]), }, null, 8, ["visible", "folders", "selected", "onClose"]),
createVNode(FoldersModal, { createVNode(FoldersModal, {
visible: unref(modalState).isModalOpen("excludeFolders"), visible: unref(modalState).isModalOpen("excludeFolders"),
@@ -11951,13 +12248,13 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
selected: unref(state).excludeFolders.value, selected: unref(state).excludeFolders.value,
variant: "exclude", variant: "exclude",
onClose: unref(modalState).closeModal, onClose: unref(modalState).closeModal,
"onUpdate:selected": _cache[8] || (_cache[8] = ($event) => unref(state).excludeFolders.value = $event) "onUpdate:selected": _cache[11] || (_cache[11] = ($event) => unref(state).excludeFolders.value = $event)
}, null, 8, ["visible", "folders", "selected", "onClose"]) }, null, 8, ["visible", "folders", "selected", "onClose"])
]); ]);
}; };
} }
}); });
const LoraPoolWidget = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-4456abba"]]); const LoraPoolWidget = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-0bbd50ea"]]);
const _hoisted_1$9 = { class: "last-used-preview" }; const _hoisted_1$9 = { class: "last-used-preview" };
const _hoisted_2$6 = { class: "last-used-preview__content" }; const _hoisted_2$6 = { class: "last-used-preview__content" };
const _hoisted_3$5 = ["src", "onError"]; const _hoisted_3$5 = ["src", "onError"];
@@ -14720,7 +15017,7 @@ function updateDownstreamLoaders(startNode, visited = /* @__PURE__ */ new Set())
} }
} }
const LORA_POOL_WIDGET_MIN_WIDTH = 500; const LORA_POOL_WIDGET_MIN_WIDTH = 500;
const LORA_POOL_WIDGET_MIN_HEIGHT = 400; const LORA_POOL_WIDGET_MIN_HEIGHT = 520;
const LORA_RANDOMIZER_WIDGET_MIN_WIDTH = 500; const LORA_RANDOMIZER_WIDGET_MIN_WIDTH = 500;
const LORA_RANDOMIZER_WIDGET_MIN_HEIGHT = 448; const LORA_RANDOMIZER_WIDGET_MIN_HEIGHT = 448;
const LORA_RANDOMIZER_WIDGET_MAX_HEIGHT = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT; const LORA_RANDOMIZER_WIDGET_MAX_HEIGHT = LORA_RANDOMIZER_WIDGET_MIN_HEIGHT;

File diff suppressed because one or more lines are too long