From 16f9c61b5f0a755bda90d987f259f10d8b459a95 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sat, 1 Nov 2025 13:57:55 -0500 Subject: [PATCH 01/12] v1, using bespoke UI within the Edit Metadata dialog --- src/Pages/_Generate/GenTabModals.cshtml | 6 + src/Text2Image/T2IModel.cs | 1 + src/Text2Image/T2IModelHandler.cs | 3 + src/WebAPI/ModelsAPI.cs | 19 ++- src/wwwroot/css/genpage.css | 22 +++ src/wwwroot/js/genpage/gentab/models.js | 209 ++++++++++++++++++++++++ 6 files changed, 259 insertions(+), 1 deletion(-) diff --git a/src/Pages/_Generate/GenTabModals.cshtml b/src/Pages/_Generate/GenTabModals.cshtml index d6875a0d0..72fe0522e 100644 --- a/src/Pages/_Generate/GenTabModals.cshtml +++ b/src/Pages/_Generate/GenTabModals.cshtml @@ -156,6 +156,12 @@ Description:
+
+
+
Parameter Overrides
+ Each of these is optional. If set, they will be applied automatically, overriding your current values, when you select this model. +
+
diff --git a/src/Text2Image/T2IModel.cs b/src/Text2Image/T2IModel.cs index f6e0f6d3f..05b127418 100644 --- a/src/Text2Image/T2IModel.cs +++ b/src/Text2Image/T2IModel.cs @@ -328,6 +328,7 @@ public JObject ToNetObject(string prefix = "", bool dataImgs = true) [$"{prefix}is_negative_embedding"] = Metadata?.IsNegativeEmbedding ?? false, [$"{prefix}lora_default_weight"] = Metadata?.LoraDefaultWeight ?? "", [$"{prefix}lora_default_confinement"] = Metadata?.LoraDefaultConfinement ?? "", + [$"{prefix}parameter_overrides"] = Metadata?.ParameterOverrides?.Count > 0 ? JObject.FromObject(Metadata.ParameterOverrides) : null, [$"{prefix}local"] = true, [$"{prefix}time_created"] = Metadata?.TimeCreated ?? 0, [$"{prefix}time_modified"] = Metadata?.TimeModified ?? 0, diff --git a/src/Text2Image/T2IModelHandler.cs b/src/Text2Image/T2IModelHandler.cs index 08b74d1ff..a9059a946 100644 --- a/src/Text2Image/T2IModelHandler.cs +++ b/src/Text2Image/T2IModelHandler.cs @@ -144,6 +144,9 @@ public class ModelMetadataStore /// Special format indicators, such as "bnb_nf4". public string SpecialFormat { get; set; } + + /// Model-specific parameter overrides, mapping parameter names to override values. Keys can be "steps", "cfgscale", etc. + public Dictionary ParameterOverrides { get; set; } } public T2IModelHandler() diff --git a/src/WebAPI/ModelsAPI.cs b/src/WebAPI/ModelsAPI.cs index 9dd73bef9..32b30e714 100644 --- a/src/WebAPI/ModelsAPI.cs +++ b/src/WebAPI/ModelsAPI.cs @@ -481,6 +481,7 @@ public static async Task EditModelMetadata(Session session, [API.APIParameter("New model `is_negative_embedding` metadata value.")] bool is_negative_embedding = false, [API.APIParameter("New model `lora_default_weight` metadata value.")] string lora_default_weight = "", [API.APIParameter("New model `lora_default_confinement` metadata value.")] string lora_default_confinement = "", + [API.APIParameter("Parameter overrides as sparse JSON dictionary, eg {\"steps\": \"30\", \"cfgscale\": \"7.5\"}. Use null/empty to clear all overrides.")] string parameter_overrides = null, [API.APIParameter("The model's sub-type, eg `Stable-Diffusion`, `LoRA`, etc.")] string subtype = "Stable-Diffusion") { using ManyReadOneWriteLock.ReadClaim claim = Program.RefreshLock.LockRead(); @@ -540,8 +541,24 @@ public static async Task EditModelMetadata(Session session, actualModel.Metadata.LoraDefaultWeight = lora_default_weight; actualModel.Metadata.LoraDefaultConfinement = lora_default_confinement; actualModel.Metadata.PredictionType = string.IsNullOrWhiteSpace(prediction_type) ? null : prediction_type; + // Handle parameter overrides + actualModel.Metadata.ParameterOverrides = null; + if (!string.IsNullOrWhiteSpace(parameter_overrides)) + { + try + { + JObject overridesObj = JObject.Parse(parameter_overrides); + actualModel.Metadata.ParameterOverrides = (overridesObj.ToObject>() ?? []) + .Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value)) + .ToDictionary(kvp => kvp.Key, kvp => kvp.Value); + } + catch (Exception ex) + { + Logs.Warning($"Failed to parse parameter overrides for model {model}: {ex.Message}"); + } + } + handler.ResetMetadataFrom(actualModel); } - handler.ResetMetadataFrom(actualModel); _ = Utilities.RunCheckedTask(() => actualModel.ResaveModel(), "model resave"); Interlocked.Increment(ref ModelEditID); return new JObject() { ["success"] = true }; diff --git a/src/wwwroot/css/genpage.css b/src/wwwroot/css/genpage.css index 28072ac07..9cbe121df 100644 --- a/src/wwwroot/css/genpage.css +++ b/src/wwwroot/css/genpage.css @@ -1660,3 +1660,25 @@ body { height: 1lh; padding-top: 0 !important; } +#edit_model_override_inputs { + flex-wrap: wrap; + width: 100%; +} +#edit_model_override_inputs > div { + min-width: 100%; + flex: 0 0 100%; +} +#edit_model_override_block small { + flex: 0 0 100%; +} +#edit_model_override_inputs select { + flex: 1; + width: 100%; + max-width: 100%; + box-sizing: border-box; +} +#edit_model_override_inputs button.disabled-dim { + opacity: 0.5; + cursor: not-allowed; +} + diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 6b2d8d7e6..1283c498d 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -13,6 +13,12 @@ class ModelsHelpers { /** Collection of helper functions and data related to models, just an instance of {@link ModelsHelpers}. */ let modelsHelpers = new ModelsHelpers(); +/** Model Parameter Overrides Configuration */ +// Currently-supported parameters for overrides +const MODEL_OVERRIDE_PARAMS = ['steps', 'cfgscale', 'sampler', 'scheduler', 'clipskip', 'width', 'height']; +// Parameters where 0 means "unset" rather than a valid value (0 is only unset for numeric params with Min > 0) +const TREAT_ZERO_AS_UNSET_PARAMS = ['steps', 'cfgscale', 'width', 'height']; + //////////// TODO: Merge all the below into the class above (or multiple separate classes) let models = {}; @@ -176,6 +182,11 @@ function editModel(model, browser) { getRequiredElementById('edit_model_lora_default_confinement').value = model.lora_default_confinement || ''; getRequiredElementById('edit_model_lora_default_confinement_div').style.display = model.architecture && model.architecture.endsWith('/lora') ? 'block' : 'none'; let run = () => { + buildModelOverrideInputs(); + for (let paramId of MODEL_OVERRIDE_PARAMS) { + let value = model.parameter_overrides?.[paramId] ?? ''; + setOverrideValue(paramId, value); + } triggerChangeFor(modelsHelpers.enableImageElem); $('#edit_model_modal').modal('show'); }; @@ -265,6 +276,15 @@ function save_edit_model() { data['lora_default_weight'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_weight').value : ''; data['lora_default_confinement'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_confinement').value : ''; data.subtype = curModelMenuBrowser.subType; + // Gather parameter overrides + let overrides = {}; + for (let paramId of MODEL_OVERRIDE_PARAMS) { + let input = document.getElementById(`edit_model_override_${paramId}`); + if (input?.value) { + overrides[paramId] = input.value; + } + } + data['parameter_overrides'] = Object.keys(overrides).length > 0 ? JSON.stringify(overrides) : ''; function complete() { genericRequest('EditModelMetadata', data, data => { curModelMenuBrowser.browser.lightRefresh(); @@ -896,6 +916,26 @@ function directSetModel(model) { curModelSpecialFormat = specialFormat; } reviseBackendFeatureSet(); + + if (model?.parameter_overrides) { + for (let paramId of MODEL_OVERRIDE_PARAMS) { + let overrideValue = model.parameter_overrides[paramId]; + if (overrideValue !== undefined && overrideValue !== '') { + let param = rawGenParamTypesFromServer?.find(p => p.id === paramId); + if (param) { + let value = overrideValue; + // Convert to appropriate type based on parameter definition + if (param.type === 'integer') { + value = parseInt(value); + } else if (param.type === 'decimal') { + value = parseFloat(value); + } + setDirectParamValue(param, value); + } + } + } + } + getRequiredElementById('input_model').dispatchEvent(new Event('change')); let aspect = document.getElementById('input_aspectratio'); if (aspect) { @@ -1024,4 +1064,173 @@ function doModelInstallRequiredCheck() { return false; } +function setOverrideFromCurrent(paramName) { + let paramId = 'input_' + paramName; + let elem = document.getElementById(paramId); + if (elem) { + let currentValue = elem.value; + if (currentValue !== undefined && currentValue !== '') { + let overrideInput = document.getElementById(`edit_model_override_${paramName}`); + overrideInput.value = currentValue; + overrideInput.dispatchEvent(new Event('input', { bubbles: true })); + updateOverrideClearButtonState(paramName); + } + } +} + +function clearOverride(paramName) { + setOverrideValue(paramName, ''); +} + +function setOverrideValue(paramName, value) { + let input = document.getElementById(`edit_model_override_${paramName}`); + if (!input) return; + input.value = value ? value : (TREAT_ZERO_AS_UNSET_PARAMS.includes(paramName) ? '0' : '') + input.dispatchEvent(new Event('input', { bubbles: true })); + updateOverrideClearButtonState(paramName); +} + +function updateOverrideClearButtonState(paramName) { + let input = document.getElementById(`edit_model_override_${paramName}`); + if (!input) return; + // Find the Clear button (it's a btn-danger in the same row) + let row = input.closest('.row'); + if (!row) return; + let clearBtn = row.querySelector('button.btn-danger'); + if (clearBtn) { + if (input.value === '') { + clearBtn.classList.add('disabled-dim'); + } else { + clearBtn.classList.remove('disabled-dim'); + } + } +} + +function buildModelOverrideInputs() { + let container = getRequiredElementById('edit_model_override_inputs'); + let html = ''; + + for (let paramId of MODEL_OVERRIDE_PARAMS) { + // Look up parameter from server + let param = rawGenParamTypesFromServer?.find(p => p.id === paramId); + if (!param) { + continue; + } + + let label = param.name || paramId; + let treatAsUnset = TREAT_ZERO_AS_UNSET_PARAMS.includes(paramId); + let fieldHtml = ''; + + if (param.type === 'integer' || param.type === 'decimal') { + // Numeric parameter - use slider matching main UI layout + let min = param.min !== undefined ? param.min : 0; + let max = param.max !== undefined ? param.max : 999; + let step = param.step || 1; + let view_min = param.view_min || min; + let view_max = param.view_max || max; + + let sliderHtml = makeSliderInput(null, `edit_model_override_${paramId}`, paramId, label, '', '0', min, max, view_min, view_max, step, false, false, false); + fieldHtml = ` +
+
+
${sliderHtml}
+
+ + +
+
+
`; + } else if (param.type === 'dropdown' && param.values) { + // Dropdown parameter + let fullDropdownHtml = makeDropdownInput(null, `edit_model_override_${paramId}`, paramId, label, '', param.values, '', false, false, param.value_names); + // Extract just the select element's HTML + let selectMatch = fullDropdownHtml.match(/]*>[\s\S]*?<\/select>/); + let selectHtml = selectMatch ? selectMatch[0] : ''; + fieldHtml = ` +
+ +
+
+ ${selectHtml} +
+
+ + +
+
+
`; + } else { + // Text input parameter + fieldHtml = ` +
+
+
+
+ + +
+
+
+ + +
+
+
`; + } + + html += fieldHtml; + } + + container.innerHTML = html; + + // Sliders need to be enabled after being added to DOM + for (let elem of container.querySelectorAll('.auto-slider-box')) { + let numberInput = elem.querySelector('input[type="number"]'); + if (numberInput) { + enableSliderForBox(elem); + // Attach zero-as-unset behavior for applicable numeric params + let paramId = numberInput.id.replace('edit_model_override_', ''); + if (TREAT_ZERO_AS_UNSET_PARAMS.includes(paramId)) { + numberInput.dataset.treatZeroAsUnset = 'true'; + numberInput.addEventListener('change', function() { + if ((this.value === '0' || this.value === '')) { + this.value = ''; + } + }); + let sliderRange = elem.querySelector('input[type="range"]'); + sliderRange?.addEventListener('change', function() { + if (this.value === '0') { + numberInput.value = ''; + numberInput.dispatchEvent(new Event('change')); + } + }); + } + } + } + + // Apply autoSelectWidth for dropdowns after DOM is ready + for (let selectElem of container.querySelectorAll('select')) { + setTimeout(() => { + autoSelectWidth(selectElem); + }, 0); + } + + // Initialize Clear button states and attach change listeners + for (let paramId of MODEL_OVERRIDE_PARAMS) { + let input = document.getElementById(`edit_model_override_${paramId}`); + if (input) { + updateOverrideClearButtonState(paramId); + // Attach listener for state changes + input.addEventListener('change', function() { + updateOverrideClearButtonState(paramId); + }); + input.addEventListener('input', function() { + updateOverrideClearButtonState(paramId); + }); + } + } +} + getRequiredElementById('current_model').addEventListener('change', currentModelChanged); From 7bfe77be59c0bbe457da51d8dc193c7c0b84cf93 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sat, 1 Nov 2025 18:24:34 -0500 Subject: [PATCH 02/12] Model only preset, saved with model --- src/Core/Settings.cs | 3 + src/Pages/_Generate/GenTabModals.cshtml | 17 +- src/Text2Image/T2IModel.cs | 2 +- src/Text2Image/T2IModelHandler.cs | 4 +- src/WebAPI/ModelsAPI.cs | 19 +- src/wwwroot/css/genpage.css | 19 +- src/wwwroot/js/genpage/gentab/models.js | 304 ++++++++++-------------- 7 files changed, 146 insertions(+), 222 deletions(-) diff --git a/src/Core/Settings.cs b/src/Core/Settings.cs index 7fba6a087..91d8d25c7 100644 --- a/src/Core/Settings.cs +++ b/src/Core/Settings.cs @@ -391,6 +391,9 @@ public class UserUIData : AutoConfiguration [ConfigComment("If enabled, shifting to next/previous image (eg with arrow keys) in history or batch view,\ncycles at the ends (jumps from the start to the end or vice versa).\nIf disabled, shifting will simply stop at the ends.\nIf 'only arrow keys', cycling happens when you press the arrow keys, but not other actions (eg deleting an image will not cycle).")] [ManualSettingsOptions(Vals = ["true", "false", "only_arrows"], ManualNames = ["Enabled", "Disabled", "Only Arrow Keys"])] public string ImageShiftingCycles = "true"; + + [ConfigComment("When a model with a linked preset is selected, should the preset parameters be applied immediately? By default, the preset is just selected for review.")] + public bool AutoApplyModelPresets = false; } [ConfigComment("Settings related to the user interface, entirely contained to the frontend.")] diff --git a/src/Pages/_Generate/GenTabModals.cshtml b/src/Pages/_Generate/GenTabModals.cshtml index 72fe0522e..b0d83c2aa 100644 --- a/src/Pages/_Generate/GenTabModals.cshtml +++ b/src/Pages/_Generate/GenTabModals.cshtml @@ -156,11 +156,18 @@
Description:
-
-
-
Parameter Overrides
- Each of these is optional. If set, they will be applied automatically, overriding your current values, when you select this model. -
+
+
+
+
Linked Preset
+ @WebUtil.TextPopoverButton("linkedpreset", "If set, this preset will be selected when you choose this model. Enable auto-apply in settings to instead apply it automatically.") +
+
+
+ + +
+
diff --git a/src/Text2Image/T2IModel.cs b/src/Text2Image/T2IModel.cs index 05b127418..e96c30b14 100644 --- a/src/Text2Image/T2IModel.cs +++ b/src/Text2Image/T2IModel.cs @@ -328,7 +328,7 @@ public JObject ToNetObject(string prefix = "", bool dataImgs = true) [$"{prefix}is_negative_embedding"] = Metadata?.IsNegativeEmbedding ?? false, [$"{prefix}lora_default_weight"] = Metadata?.LoraDefaultWeight ?? "", [$"{prefix}lora_default_confinement"] = Metadata?.LoraDefaultConfinement ?? "", - [$"{prefix}parameter_overrides"] = Metadata?.ParameterOverrides?.Count > 0 ? JObject.FromObject(Metadata.ParameterOverrides) : null, + [$"{prefix}parameter_override_preset_id"] = Metadata?.ParameterOverridePresetId, [$"{prefix}local"] = true, [$"{prefix}time_created"] = Metadata?.TimeCreated ?? 0, [$"{prefix}time_modified"] = Metadata?.TimeModified ?? 0, diff --git a/src/Text2Image/T2IModelHandler.cs b/src/Text2Image/T2IModelHandler.cs index a9059a946..d85873eca 100644 --- a/src/Text2Image/T2IModelHandler.cs +++ b/src/Text2Image/T2IModelHandler.cs @@ -145,8 +145,8 @@ public class ModelMetadataStore /// Special format indicators, such as "bnb_nf4". public string SpecialFormat { get; set; } - /// Model-specific parameter overrides, mapping parameter names to override values. Keys can be "steps", "cfgscale", etc. - public Dictionary ParameterOverrides { get; set; } + /// ID of the Preset to use for parameter overrides. + public string ParameterOverridePresetId { get; set; } } public T2IModelHandler() diff --git a/src/WebAPI/ModelsAPI.cs b/src/WebAPI/ModelsAPI.cs index 32b30e714..964e28ef1 100644 --- a/src/WebAPI/ModelsAPI.cs +++ b/src/WebAPI/ModelsAPI.cs @@ -481,7 +481,7 @@ public static async Task EditModelMetadata(Session session, [API.APIParameter("New model `is_negative_embedding` metadata value.")] bool is_negative_embedding = false, [API.APIParameter("New model `lora_default_weight` metadata value.")] string lora_default_weight = "", [API.APIParameter("New model `lora_default_confinement` metadata value.")] string lora_default_confinement = "", - [API.APIParameter("Parameter overrides as sparse JSON dictionary, eg {\"steps\": \"30\", \"cfgscale\": \"7.5\"}. Use null/empty to clear all overrides.")] string parameter_overrides = null, + [API.APIParameter("Preset to use for parameter overrides, or null/empty to clear.")] string parameter_override_preset_id = null, [API.APIParameter("The model's sub-type, eg `Stable-Diffusion`, `LoRA`, etc.")] string subtype = "Stable-Diffusion") { using ManyReadOneWriteLock.ReadClaim claim = Program.RefreshLock.LockRead(); @@ -541,22 +541,7 @@ public static async Task EditModelMetadata(Session session, actualModel.Metadata.LoraDefaultWeight = lora_default_weight; actualModel.Metadata.LoraDefaultConfinement = lora_default_confinement; actualModel.Metadata.PredictionType = string.IsNullOrWhiteSpace(prediction_type) ? null : prediction_type; - // Handle parameter overrides - actualModel.Metadata.ParameterOverrides = null; - if (!string.IsNullOrWhiteSpace(parameter_overrides)) - { - try - { - JObject overridesObj = JObject.Parse(parameter_overrides); - actualModel.Metadata.ParameterOverrides = (overridesObj.ToObject>() ?? []) - .Where(kvp => !string.IsNullOrWhiteSpace(kvp.Value)) - .ToDictionary(kvp => kvp.Key, kvp => kvp.Value); - } - catch (Exception ex) - { - Logs.Warning($"Failed to parse parameter overrides for model {model}: {ex.Message}"); - } - } + actualModel.Metadata.ParameterOverridePresetId = string.IsNullOrWhiteSpace(parameter_override_preset_id) ? null : parameter_override_preset_id; handler.ResetMetadataFrom(actualModel); } _ = Utilities.RunCheckedTask(() => actualModel.ResaveModel(), "model resave"); diff --git a/src/wwwroot/css/genpage.css b/src/wwwroot/css/genpage.css index 9cbe121df..adb10974c 100644 --- a/src/wwwroot/css/genpage.css +++ b/src/wwwroot/css/genpage.css @@ -1660,24 +1660,7 @@ body { height: 1lh; padding-top: 0 !important; } -#edit_model_override_inputs { - flex-wrap: wrap; - width: 100%; -} -#edit_model_override_inputs > div { - min-width: 100%; - flex: 0 0 100%; -} -#edit_model_override_block small { - flex: 0 0 100%; -} -#edit_model_override_inputs select { - flex: 1; - width: 100%; - max-width: 100%; - box-sizing: border-box; -} -#edit_model_override_inputs button.disabled-dim { +#edit_model_override_preset button.disabled-dim { opacity: 0.5; cursor: not-allowed; } diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 1283c498d..2678b9793 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -182,11 +182,24 @@ function editModel(model, browser) { getRequiredElementById('edit_model_lora_default_confinement').value = model.lora_default_confinement || ''; getRequiredElementById('edit_model_lora_default_confinement_div').style.display = model.architecture && model.architecture.endsWith('/lora') ? 'block' : 'none'; let run = () => { - buildModelOverrideInputs(); - for (let paramId of MODEL_OVERRIDE_PARAMS) { - let value = model.parameter_overrides?.[paramId] ?? ''; - setOverrideValue(paramId, value); + buildModelOverridePresetInput(); + if (model.parameter_override_preset_id) { + let presetSelect = document.getElementById('edit_model_override_preset_id'); + if (presetSelect) { + presetSelect.value = model.parameter_override_preset_id; + presetSelect.dispatchEvent(new Event('change')); + // Check if auto-apply is enabled + try { + let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + if (autoApply) { + applyPresetOverride(); + } + } catch (e) { + // Setting may not exist yet, continue without auto-apply + } + } } + updatePresetClearButtonState(); triggerChangeFor(modelsHelpers.enableImageElem); $('#edit_model_modal').modal('show'); }; @@ -276,15 +289,9 @@ function save_edit_model() { data['lora_default_weight'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_weight').value : ''; data['lora_default_confinement'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_confinement').value : ''; data.subtype = curModelMenuBrowser.subType; - // Gather parameter overrides - let overrides = {}; - for (let paramId of MODEL_OVERRIDE_PARAMS) { - let input = document.getElementById(`edit_model_override_${paramId}`); - if (input?.value) { - overrides[paramId] = input.value; - } - } - data['parameter_overrides'] = Object.keys(overrides).length > 0 ? JSON.stringify(overrides) : ''; + // Gather preset override ID + let presetSelect = document.getElementById('edit_model_override_preset_id'); + data['parameter_override_preset_id'] = presetSelect?.value || ''; function complete() { genericRequest('EditModelMetadata', data, data => { curModelMenuBrowser.browser.lightRefresh(); @@ -917,21 +924,51 @@ function directSetModel(model) { } reviseBackendFeatureSet(); - if (model?.parameter_overrides) { - for (let paramId of MODEL_OVERRIDE_PARAMS) { - let overrideValue = model.parameter_overrides[paramId]; - if (overrideValue !== undefined && overrideValue !== '') { - let param = rawGenParamTypesFromServer?.find(p => p.id === paramId); - if (param) { - let value = overrideValue; - // Convert to appropriate type based on parameter definition - if (param.type === 'integer') { - value = parseInt(value); - } else if (param.type === 'decimal') { - value = parseFloat(value); + if (model?.parameter_override_preset_id) { + // Look up the preset by title from the presets list + let presetData = allPresetsUnsorted?.find(p => p.title === model.parameter_override_preset_id); + if (presetData) { + try { + let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + + // If auto-apply is OFF, remove other model-linked presets to avoid stacking them. + if (!autoApply && sdModelBrowser?.models) { + let modelLinkedPresetTitles = new Set(); + let thisPresetId = model.parameter_override_preset_id; + for (let modelName in sdModelBrowser.models) { + let m = sdModelBrowser.models[modelName]; + let modelPresetId = m.data.parameter_override_preset_id; + if (modelPresetId && modelPresetId !== thisPresetId) { + modelLinkedPresetTitles.add(modelPresetId); + } + } + currentPresets = currentPresets.filter(p => !modelLinkedPresetTitles.has(p.title)); + updatePresetList(); + } + + // Select the preset if it's not already selected + if (!currentPresets.some(p => p.title === presetData.title)) { + // Add it directly instead of using selectPreset (which toggles) + currentPresets.push(presetData); + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); + } + } + + if (autoApply) { + console.info('[Model Preset] Auto-applying preset ' + presetData.title + ' for model ' + model.name); + applyOnePreset(presetData); + // After auto-applying, remove the preset from currentPresets so user can edit those params + currentPresets = currentPresets.filter(p => p.title !== presetData.title); + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); } - setDirectParamValue(param, value); } + } catch (e) { + // Setting may not exist yet, continue without auto-apply + console.warn('[Model Preset] Auto-apply setting error:', e.message); } } } @@ -1064,173 +1101,82 @@ function doModelInstallRequiredCheck() { return false; } -function setOverrideFromCurrent(paramName) { - let paramId = 'input_' + paramName; - let elem = document.getElementById(paramId); - if (elem) { - let currentValue = elem.value; - if (currentValue !== undefined && currentValue !== '') { - let overrideInput = document.getElementById(`edit_model_override_${paramName}`); - overrideInput.value = currentValue; - overrideInput.dispatchEvent(new Event('input', { bubbles: true })); - updateOverrideClearButtonState(paramName); - } - } -} - -function clearOverride(paramName) { - setOverrideValue(paramName, ''); -} - -function setOverrideValue(paramName, value) { - let input = document.getElementById(`edit_model_override_${paramName}`); - if (!input) return; - input.value = value ? value : (TREAT_ZERO_AS_UNSET_PARAMS.includes(paramName) ? '0' : '') - input.dispatchEvent(new Event('input', { bubbles: true })); - updateOverrideClearButtonState(paramName); -} - -function updateOverrideClearButtonState(paramName) { - let input = document.getElementById(`edit_model_override_${paramName}`); - if (!input) return; - // Find the Clear button (it's a btn-danger in the same row) - let row = input.closest('.row'); - if (!row) return; - let clearBtn = row.querySelector('button.btn-danger'); +function updatePresetClearButtonState() { + let presetSelect = document.getElementById('edit_model_override_preset_id'); + if (!presetSelect) return; + let clearBtn = document.getElementById('edit_model_preset_clear_btn'); + let setBtn = document.getElementById('edit_model_preset_set_btn'); if (clearBtn) { - if (input.value === '') { + if (presetSelect.value === '') { clearBtn.classList.add('disabled-dim'); } else { clearBtn.classList.remove('disabled-dim'); } } -} - -function buildModelOverrideInputs() { - let container = getRequiredElementById('edit_model_override_inputs'); - let html = ''; - - for (let paramId of MODEL_OVERRIDE_PARAMS) { - // Look up parameter from server - let param = rawGenParamTypesFromServer?.find(p => p.id === paramId); - if (!param) { - continue; - } - - let label = param.name || paramId; - let treatAsUnset = TREAT_ZERO_AS_UNSET_PARAMS.includes(paramId); - let fieldHtml = ''; - - if (param.type === 'integer' || param.type === 'decimal') { - // Numeric parameter - use slider matching main UI layout - let min = param.min !== undefined ? param.min : 0; - let max = param.max !== undefined ? param.max : 999; - let step = param.step || 1; - let view_min = param.view_min || min; - let view_max = param.view_max || max; - - let sliderHtml = makeSliderInput(null, `edit_model_override_${paramId}`, paramId, label, '', '0', min, max, view_min, view_max, step, false, false, false); - fieldHtml = ` -
-
-
${sliderHtml}
-
- - -
-
-
`; - } else if (param.type === 'dropdown' && param.values) { - // Dropdown parameter - let fullDropdownHtml = makeDropdownInput(null, `edit_model_override_${paramId}`, paramId, label, '', param.values, '', false, false, param.value_names); - // Extract just the select element's HTML - let selectMatch = fullDropdownHtml.match(/]*>[\s\S]*?<\/select>/); - let selectHtml = selectMatch ? selectMatch[0] : ''; - fieldHtml = ` -
- -
-
- ${selectHtml} -
-
- - -
-
-
`; + if (setBtn) { + // Dim Set button if no presets are currently selected + if (!currentPresets || currentPresets.length === 0) { + setBtn.classList.add('disabled-dim'); } else { - // Text input parameter - fieldHtml = ` -
-
-
-
- - -
-
-
- - -
-
-
`; + setBtn.classList.remove('disabled-dim'); } - - html += fieldHtml; } - - container.innerHTML = html; - - // Sliders need to be enabled after being added to DOM - for (let elem of container.querySelectorAll('.auto-slider-box')) { - let numberInput = elem.querySelector('input[type="number"]'); - if (numberInput) { - enableSliderForBox(elem); - // Attach zero-as-unset behavior for applicable numeric params - let paramId = numberInput.id.replace('edit_model_override_', ''); - if (TREAT_ZERO_AS_UNSET_PARAMS.includes(paramId)) { - numberInput.dataset.treatZeroAsUnset = 'true'; - numberInput.addEventListener('change', function() { - if ((this.value === '0' || this.value === '')) { - this.value = ''; - } - }); - let sliderRange = elem.querySelector('input[type="range"]'); - sliderRange?.addEventListener('change', function() { - if (this.value === '0') { - numberInput.value = ''; - numberInput.dispatchEvent(new Event('change')); - } - }); - } +} + +function applyPresetOverride() { + // Set the dropdown to the first currently-selected preset + if (currentPresets?.length) { + let presetSelect = document.getElementById('edit_model_override_preset_id'); + if (presetSelect) { + presetSelect.value = currentPresets[0].title; + presetSelect.dispatchEvent(new Event('change')); } } - - // Apply autoSelectWidth for dropdowns after DOM is ready - for (let selectElem of container.querySelectorAll('select')) { - setTimeout(() => { - autoSelectWidth(selectElem); - }, 0); + updatePresetClearButtonState(); +} + +function clearPresetOverride() { + let presetSelect = document.getElementById('edit_model_override_preset_id'); + if (presetSelect) { + presetSelect.value = ''; + presetSelect.dispatchEvent(new Event('change')); } - - // Initialize Clear button states and attach change listeners - for (let paramId of MODEL_OVERRIDE_PARAMS) { - let input = document.getElementById(`edit_model_override_${paramId}`); - if (input) { - updateOverrideClearButtonState(paramId); - // Attach listener for state changes - input.addEventListener('change', function() { - updateOverrideClearButtonState(paramId); - }); - input.addEventListener('input', function() { - updateOverrideClearButtonState(paramId); - }); + updatePresetClearButtonState(); +} + + +function buildModelOverridePresetInput() { + let container = getRequiredElementById('edit_model_override_preset'); + container.innerHTML = ''; + // Build filtered list of presets - show all for now + let compatiblePresets = []; + console.log('buildModelOverridePresetInput: allPresetsUnsorted =', allPresetsUnsorted); + if (allPresetsUnsorted && allPresetsUnsorted.length > 0) { + for (let preset of allPresetsUnsorted) { + let presetData = preset.data || preset; + if (presetData && presetData.title) { + compatiblePresets.push(presetData); + } } } + // Create a native select that UIImprovementHandler will automatically convert to a popover + let select = document.createElement('select'); + select.id = 'edit_model_override_preset_id'; + select.className = 'modal_text_extra'; + let option = document.createElement('option'); + option.value = ''; + option.innerText = '-- Select a Preset --'; + select.appendChild(option); + for (let preset of compatiblePresets) { + option = document.createElement('option'); + option.value = preset.title; + option.innerText = preset.title; + select.appendChild(option); + } + select.addEventListener('change', updatePresetClearButtonState); + select.addEventListener('input', updatePresetClearButtonState); + container.appendChild(select); + updatePresetClearButtonState(); } getRequiredElementById('current_model').addEventListener('change', currentModelChanged); From 5d4911212c03c32e18bb80fb75ca8674d1511f3e Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sat, 1 Nov 2025 22:51:24 -0500 Subject: [PATCH 03/12] Move model preset to user setting (hidden, bespoke load/save API endpoint); Add lora preset capability; --- src/Text2Image/T2IModel.cs | 1 - src/Text2Image/T2IModelHandler.cs | 3 - src/WebAPI/AdminAPI.cs | 8 +- src/WebAPI/BasicAPIFeatures.cs | 17 +- src/WebAPI/ModelsAPI.cs | 58 ++++- src/wwwroot/js/genpage/gentab/loras.js | 2 + src/wwwroot/js/genpage/gentab/models.js | 216 ++++++++++------- src/wwwroot/js/genpage/gentab/presets.js | 291 ++++++++++++++++++++++- src/wwwroot/js/genpage/main.js | 4 + 9 files changed, 495 insertions(+), 105 deletions(-) diff --git a/src/Text2Image/T2IModel.cs b/src/Text2Image/T2IModel.cs index e96c30b14..f6e0f6d3f 100644 --- a/src/Text2Image/T2IModel.cs +++ b/src/Text2Image/T2IModel.cs @@ -328,7 +328,6 @@ public JObject ToNetObject(string prefix = "", bool dataImgs = true) [$"{prefix}is_negative_embedding"] = Metadata?.IsNegativeEmbedding ?? false, [$"{prefix}lora_default_weight"] = Metadata?.LoraDefaultWeight ?? "", [$"{prefix}lora_default_confinement"] = Metadata?.LoraDefaultConfinement ?? "", - [$"{prefix}parameter_override_preset_id"] = Metadata?.ParameterOverridePresetId, [$"{prefix}local"] = true, [$"{prefix}time_created"] = Metadata?.TimeCreated ?? 0, [$"{prefix}time_modified"] = Metadata?.TimeModified ?? 0, diff --git a/src/Text2Image/T2IModelHandler.cs b/src/Text2Image/T2IModelHandler.cs index d85873eca..08b74d1ff 100644 --- a/src/Text2Image/T2IModelHandler.cs +++ b/src/Text2Image/T2IModelHandler.cs @@ -144,9 +144,6 @@ public class ModelMetadataStore /// Special format indicators, such as "bnb_nf4". public string SpecialFormat { get; set; } - - /// ID of the Preset to use for parameter overrides. - public string ParameterOverridePresetId { get; set; } } public T2IModelHandler() diff --git a/src/WebAPI/AdminAPI.cs b/src/WebAPI/AdminAPI.cs index 418e5fcde..7ae296334 100644 --- a/src/WebAPI/AdminAPI.cs +++ b/src/WebAPI/AdminAPI.cs @@ -55,6 +55,10 @@ public static JObject AutoConfigToParamData(AutoConfiguration config, bool hideR JObject output = []; foreach ((string key, AutoConfiguration.Internal.SingleFieldData data) in config.InternalData.SharedData.Fields) { + if (data.Field.GetCustomAttribute() is not null) + { + continue; + } bool isSecret = data.Field.GetCustomAttribute() is not null; string typeName = data.IsSection ? "group" : T2IParamTypes.SharpTypeToDataType(data.Field.FieldType, false).ToString(); if (typeName is null || typeName == T2IParamDataType.UNSET.ToString()) @@ -66,10 +70,6 @@ public static JObject AutoConfigToParamData(AutoConfiguration config, bool hideR { val = AutoConfigToParamData(subConf); } - if (data.Field.GetCustomAttribute() is not null) - { - continue; - } if (hideRestricted && data.Field.GetCustomAttribute() is not null) { continue; diff --git a/src/WebAPI/BasicAPIFeatures.cs b/src/WebAPI/BasicAPIFeatures.cs index 75ab8f16b..3cd201ac8 100644 --- a/src/WebAPI/BasicAPIFeatures.cs +++ b/src/WebAPI/BasicAPIFeatures.cs @@ -226,6 +226,20 @@ public static async Task InstallConfirmWS(Session session, WebSocket so public static async Task GetMyUserData(Session session) { Settings.User.AutoCompleteData settings = session.User.Settings.AutoComplete; + JObject itemPresetLinks = new JObject(); + try + { + string rawJson = session.User.GetGenericData("itempresetlinks", "data"); + if (!string.IsNullOrWhiteSpace(rawJson)) + { + itemPresetLinks = JObject.Parse(rawJson); + } + } + catch + { + // If JSON parsing fails, just return empty object + itemPresetLinks = new JObject(); + } return new JObject() { ["user_name"] = session.User.UserID, @@ -233,7 +247,8 @@ public static async Task GetMyUserData(Session session) ["language"] = session.User.Settings.Language, ["permissions"] = JArray.FromObject(session.User.GetPermissions()), ["starred_models"] = JObject.Parse(session.User.GetGenericData("starred_models", "full") ?? "{}"), - ["autocompletions"] = string.IsNullOrWhiteSpace(settings.Source) ? null : new JArray(AutoCompleteListHelper.GetData(settings.Source, settings.EscapeParens, settings.Suffix, settings.SpacingMode)) + ["autocompletions"] = string.IsNullOrWhiteSpace(settings.Source) ? null : new JArray(AutoCompleteListHelper.GetData(settings.Source, settings.EscapeParens, settings.Suffix, settings.SpacingMode)), + ["itemPresetLinks"] = itemPresetLinks }; } diff --git a/src/WebAPI/ModelsAPI.cs b/src/WebAPI/ModelsAPI.cs index 964e28ef1..69a26374e 100644 --- a/src/WebAPI/ModelsAPI.cs +++ b/src/WebAPI/ModelsAPI.cs @@ -29,7 +29,9 @@ public static void Register() API.RegisterAPICall(TestPromptFill, false, Permissions.FundamentalModelAccess); API.RegisterAPICall(EditWildcard, true, Permissions.EditWildcards); API.RegisterAPICall(EditModelMetadata, true, Permissions.EditModelMetadata); - API.RegisterAPICall(DoModelDownloadWS, true, Permissions.DownloadModels); + API.RegisterAPICall(SaveItemPresetLink, true, Permissions.ManagePresets); + API.RegisterAPICall(ClearItemPresetLink, true, Permissions.ManagePresets); + API.RegisterAPICall(DoModelDownloadWS, true, Permissions.LoadModelsNow); API.RegisterAPICall(GetModelHash, true, Permissions.EditModelMetadata); API.RegisterAPICall(ForwardMetadataRequest, false, Permissions.EditModelMetadata); API.RegisterAPICall(DeleteModel, false, Permissions.DeleteModels); @@ -481,7 +483,6 @@ public static async Task EditModelMetadata(Session session, [API.APIParameter("New model `is_negative_embedding` metadata value.")] bool is_negative_embedding = false, [API.APIParameter("New model `lora_default_weight` metadata value.")] string lora_default_weight = "", [API.APIParameter("New model `lora_default_confinement` metadata value.")] string lora_default_confinement = "", - [API.APIParameter("Preset to use for parameter overrides, or null/empty to clear.")] string parameter_override_preset_id = null, [API.APIParameter("The model's sub-type, eg `Stable-Diffusion`, `LoRA`, etc.")] string subtype = "Stable-Diffusion") { using ManyReadOneWriteLock.ReadClaim claim = Program.RefreshLock.LockRead(); @@ -541,7 +542,6 @@ public static async Task EditModelMetadata(Session session, actualModel.Metadata.LoraDefaultWeight = lora_default_weight; actualModel.Metadata.LoraDefaultConfinement = lora_default_confinement; actualModel.Metadata.PredictionType = string.IsNullOrWhiteSpace(prediction_type) ? null : prediction_type; - actualModel.Metadata.ParameterOverridePresetId = string.IsNullOrWhiteSpace(parameter_override_preset_id) ? null : parameter_override_preset_id; handler.ResetMetadataFrom(actualModel); } _ = Utilities.RunCheckedTask(() => actualModel.ResaveModel(), "model resave"); @@ -891,4 +891,56 @@ void doMoveNow(string oldPath) Interlocked.Increment(ref ModelEditID); return new JObject() { ["success"] = true }; } + + public static async Task SaveItemPresetLink(Session session, string itemType, string itemName, string presetTitle) + { + Logs.Debug($"[SaveItemPresetLink] Received: itemType='{itemType}' (type: {itemType?.GetType()?.Name}), itemName='{itemName}', presetTitle='{presetTitle}'"); + string key = $"{itemType}:{itemName}"; + Logs.Debug($"[SaveItemPresetLink] Constructed key: '{key}'"); + try + { + string rawJson = session.User.GetGenericData("itempresetlinks", "data") ?? "{}"; + JObject links = JObject.Parse(rawJson); + if (!string.IsNullOrWhiteSpace(presetTitle)) + { + links[key] = presetTitle; + } + else if (links.ContainsKey(key)) + { + links.Remove(key); + } + string newJson = links.ToString(Newtonsoft.Json.Formatting.None); + session.User.SaveGenericData("itempresetlinks", "data", newJson); + Logs.Debug($"[SaveItemPresetLink] Saved successfully with key '{key}'"); + return new JObject() { ["success"] = true, ["key"] = key, ["preset"] = presetTitle }; + } + catch (Exception ex) + { + Logs.Error($"Error saving preset link: {ex.Message}"); + return new JObject() { ["success"] = false, ["error"] = ex.Message }; + } + } + + public static async Task ClearItemPresetLink(Session session, string itemType, string itemName) + { + string key = $"{itemType}:{itemName}"; + try + { + string rawJson = session.User.GetGenericData("itempresetlinks", "data") ?? "{}"; + JObject links = JObject.Parse(rawJson); + if (links.ContainsKey(key)) + { + links.Remove(key); + string newJson = links.ToString(Newtonsoft.Json.Formatting.None); + session.User.SaveGenericData("itempresetlinks", "data", newJson); + Logs.Debug($"[Preset Link] Cleared {key}, new JSON: {newJson}"); + } + return new JObject() { ["success"] = true, ["key"] = key }; + } + catch (Exception ex) + { + Logs.Error($"Error clearing preset link: {ex.Message}"); + return new JObject() { ["success"] = false, ["error"] = ex.Message }; + } + } } diff --git a/src/wwwroot/js/genpage/gentab/loras.js b/src/wwwroot/js/genpage/gentab/loras.js index 845c2e76c..0519511e0 100644 --- a/src/wwwroot/js/genpage/gentab/loras.js +++ b/src/wwwroot/js/genpage/gentab/loras.js @@ -275,6 +275,8 @@ class LoraHelper { } else { this.selected.push(new SelectedLora(name, null, null, data)); + // Handle LoRA preset selection/application when adding a LoRA + handleLoraPresetOnSelection(name); } this.rebuildParams(); this.rebuildUI(); diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 2678b9793..3b2a98b9c 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -183,22 +183,6 @@ function editModel(model, browser) { getRequiredElementById('edit_model_lora_default_confinement_div').style.display = model.architecture && model.architecture.endsWith('/lora') ? 'block' : 'none'; let run = () => { buildModelOverridePresetInput(); - if (model.parameter_override_preset_id) { - let presetSelect = document.getElementById('edit_model_override_preset_id'); - if (presetSelect) { - presetSelect.value = model.parameter_override_preset_id; - presetSelect.dispatchEvent(new Event('change')); - // Check if auto-apply is enabled - try { - let autoApply = getUserSetting('ui.autoapplymodelpresets', false); - if (autoApply) { - applyPresetOverride(); - } - } catch (e) { - // Setting may not exist yet, continue without auto-apply - } - } - } updatePresetClearButtonState(); triggerChangeFor(modelsHelpers.enableImageElem); $('#edit_model_modal').modal('show'); @@ -289,13 +273,17 @@ function save_edit_model() { data['lora_default_weight'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_weight').value : ''; data['lora_default_confinement'] = (model.architecture || '').endsWith('/lora') ? getRequiredElementById('edit_model_lora_default_confinement').value : ''; data.subtype = curModelMenuBrowser.subType; - // Gather preset override ID - let presetSelect = document.getElementById('edit_model_override_preset_id'); - data['parameter_override_preset_id'] = presetSelect?.value || ''; + function complete() { genericRequest('EditModelMetadata', data, data => { curModelMenuBrowser.browser.lightRefresh(); }); + // Save preset link using centralized function + let presetSelect = document.getElementById('edit_model_override_preset_id'); + let presetTitle = presetSelect?.value || ''; + // Determine item type based on browser subType (LoRA, Embedding, etc) or model architecture + let itemType = curModelMenuBrowser.subType === 'LoRA' ? 'lora' : 'model'; + saveItemPresetLink(itemType, model.name, presetTitle); $('#edit_model_modal').modal('hide'); } if (modelsHelpers.enableImageElem.checked) { @@ -900,6 +888,7 @@ function directSetModel(model) { if (!model) { return; } + let modelName = null; if (model.name) { let clean = cleanModelName(model.name); forceSetDropdownValue('input_model', clean); @@ -910,6 +899,7 @@ function directSetModel(model) { curModelArch = model.architecture; curModelCompatClass = model.compat_class; curModelSpecialFormat = model.special_format; + modelName = clean; } else if (model.includes(',')) { let [name, width, height, arch, compatClass, specialFormat] = model.split(','); @@ -921,56 +911,68 @@ function directSetModel(model) { curModelArch = arch; curModelCompatClass = compatClass; curModelSpecialFormat = specialFormat; + modelName = name; } reviseBackendFeatureSet(); - if (model?.parameter_override_preset_id) { - // Look up the preset by title from the presets list - let presetData = allPresetsUnsorted?.find(p => p.title === model.parameter_override_preset_id); - if (presetData) { - try { - let autoApply = getUserSetting('ui.autoapplymodelpresets', false); - - // If auto-apply is OFF, remove other model-linked presets to avoid stacking them. - if (!autoApply && sdModelBrowser?.models) { - let modelLinkedPresetTitles = new Set(); - let thisPresetId = model.parameter_override_preset_id; - for (let modelName in sdModelBrowser.models) { - let m = sdModelBrowser.models[modelName]; - let modelPresetId = m.data.parameter_override_preset_id; - if (modelPresetId && modelPresetId !== thisPresetId) { - modelLinkedPresetTitles.add(modelPresetId); - } + // Look up preset link using the full model name (getItemPresetLink handles extraction) + let presetTitle = getItemPresetLink('model', model.name || modelName); + try { + let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + if (presetTitle) { + // Only remove other model-linked presets if THIS model has a preset to apply + if (sdModelBrowser?.models) { + let modelLinkedPresetTitles = new Set(); + for (let otherModelName in sdModelBrowser.models) { + // Only remove presets from OTHER models, not the current one + let otherPresetTitle = getItemPresetLink('model', otherModelName); + // Only add to removal set if it has a preset linked + if (otherPresetTitle && extractItemKeyName(otherModelName) !== extractItemKeyName(model.name || modelName)) { + modelLinkedPresetTitles.add(otherPresetTitle); } - currentPresets = currentPresets.filter(p => !modelLinkedPresetTitles.has(p.title)); - updatePresetList(); } - - // Select the preset if it's not already selected - if (!currentPresets.some(p => p.title === presetData.title)) { - // Add it directly instead of using selectPreset (which toggles) - currentPresets.push(presetData); - updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); - } + if (modelLinkedPresetTitles.size > 0) { + currentPresets = currentPresets.filter(p => !modelLinkedPresetTitles.has(p.title)); } - + } + let presetData = allPresetsUnsorted?.find(p => p.title == presetTitle); + if (presetData) { if (autoApply) { - console.info('[Model Preset] Auto-applying preset ' + presetData.title + ' for model ' + model.name); - applyOnePreset(presetData); + applyOnePreset(presetData, false); // false = not nested, allow LoRA preset triggering // After auto-applying, remove the preset from currentPresets so user can edit those params - currentPresets = currentPresets.filter(p => p.title !== presetData.title); - updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); + currentPresets = currentPresets.filter(p => p.title != presetData.title); + } else { + // Select the preset if it's not already selected + if (!currentPresets.some(p => p.title == presetData.title)) { + // Add it directly instead of using selectPreset (which toggles) + currentPresets.push(presetData); + } + // Still need to handle LoRA presets for selection (not auto-apply, just selection) + if (presetData.param_map.loras && presetData.param_map.loraweights) { + // Ensure item preset links are loaded before trying to find LoRA preset links + genericRequest('GetMyUserData', {}, data => { + if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + itemPresetLinkManager.loadFromServer(data.itemPresetLinks); + } + handleLoraPresetsFromLoraList(presetData.param_map.loras, presetData.param_map.loraweights); + }); } } - } catch (e) { - // Setting may not exist yet, continue without auto-apply - console.warn('[Model Preset] Auto-apply setting error:', e.message); + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); + } + } + } else { + // No preset linked to this model, but we may have removed other presets above + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); } } + } catch (e) { + // Setting may not exist yet, continue without auto-apply + console.warn('[Model Preset] Auto-apply setting error:', e.message); } getRequiredElementById('input_model').dispatchEvent(new Event('change')); @@ -1101,6 +1103,73 @@ function doModelInstallRequiredCheck() { return false; } +/** + * Extract the base filename from a full model/LoRA path. + * This is used as the key for preset linking to ensure links don't break if the user reorganizes + * their files. + * + * Examples: + * - 'SDXL/models/my_model.safetensors' -> 'my_model' + * - 'loras/my_lora.safetensors' -> 'my_lora' + * - 'my_model' -> 'my_model' + * + * @param {string} itemName - The full model/LoRA name (path or filename) + * @returns {string} The base filename without path or extension + */ +function extractItemKeyName(itemName) { + if (!itemName) { + return ''; + } + // Remove directory path + let lastSlash = itemName.lastIndexOf('/'); + let name = lastSlash !== -1 ? itemName.substring(lastSlash + 1) : itemName; + // Remove .safetensors extension + if (name.endsWith('.safetensors')) { + name = name.substring(0, name.length - '.safetensors'.length); + } + return name; +} + +/** + * Get a preset link for a model or LoRA using the base filename as the key. + * + * @param {string} itemType - Either 'model' or 'lora' + * @param {string} itemName - The full model/LoRA name (path or filename) + * @returns {string|null} The linked preset title, or null if no link exists + */ +function getItemPresetLink(itemType, itemName) { + if (!itemName) { + return null; + } + let keyName = extractItemKeyName(itemName); + return itemPresetLinkManager.getLink(itemType, keyName); +} + +/** + * Save or clear a preset link for a model or LoRA using the base filename as the key. + * This centralizes all preset link saving logic to ensure consistency. + * + * @param {string} itemType - Either 'model' or 'lora' + * @param {string} itemName - The full model/LoRA name (path or filename) + * @param {string} presetTitle - The preset to link (or empty string to clear) + */ +function saveItemPresetLink(itemType, itemName, presetTitle) { + if (!itemName) { + return; + } + let keyName = extractItemKeyName(itemName); + + if (presetTitle && presetTitle.trim()) { + genericRequest('SaveItemPresetLink', { 'itemType': itemType, 'itemName': keyName, 'presetTitle': presetTitle }, data => { + itemPresetLinkManager.setLink(itemType, keyName, presetTitle); + }); + } else { + genericRequest('ClearItemPresetLink', { 'itemType': itemType, 'itemName': keyName }, data => { + itemPresetLinkManager.clearLink(itemType, keyName); + }); + } +} + function updatePresetClearButtonState() { let presetSelect = document.getElementById('edit_model_override_preset_id'); if (!presetSelect) return; @@ -1146,37 +1215,8 @@ function clearPresetOverride() { function buildModelOverridePresetInput() { - let container = getRequiredElementById('edit_model_override_preset'); - container.innerHTML = ''; - // Build filtered list of presets - show all for now - let compatiblePresets = []; - console.log('buildModelOverridePresetInput: allPresetsUnsorted =', allPresetsUnsorted); - if (allPresetsUnsorted && allPresetsUnsorted.length > 0) { - for (let preset of allPresetsUnsorted) { - let presetData = preset.data || preset; - if (presetData && presetData.title) { - compatiblePresets.push(presetData); - } - } - } - // Create a native select that UIImprovementHandler will automatically convert to a popover - let select = document.createElement('select'); - select.id = 'edit_model_override_preset_id'; - select.className = 'modal_text_extra'; - let option = document.createElement('option'); - option.value = ''; - option.innerText = '-- Select a Preset --'; - select.appendChild(option); - for (let preset of compatiblePresets) { - option = document.createElement('option'); - option.value = preset.title; - option.innerText = preset.title; - select.appendChild(option); - } - select.addEventListener('change', updatePresetClearButtonState); - select.addEventListener('input', updatePresetClearButtonState); - container.appendChild(select); - updatePresetClearButtonState(); + // Pass the full model name; buildItemPresetLinkInput will handle key extraction + buildItemPresetLinkInput('model', curModelMenuModel.name, 'edit_model_override_preset', 'edit_model_override_preset_id'); } getRequiredElementById('current_model').addEventListener('change', currentModelChanged); diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index 3c65c0adf..581b525a0 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -10,6 +10,45 @@ class PresetHelpers { } } +/** Manages preset links for models and LoRAs. User-scoped storage in User.UserUIData.ItemPresetLinks */ +class ItemPresetLinkManager { + constructor() { + this.links = {}; // { 'model:name': 'preset_title', 'lora:name': 'preset_title', ... } + } + + getLink(itemType, itemName) { + let key = `${itemType}:${itemName}`; + return this.links[key] || null; + } + + setLink(itemType, itemName, presetTitle) { + let key = `${itemType}:${itemName}`; + if (presetTitle && presetTitle.trim()) { + this.links[key] = presetTitle; + } else { + delete this.links[key]; + } + } + + clearLink(itemType, itemName) { + let key = `${itemType}:${itemName}`; + delete this.links[key]; + } + + hasLink(itemType, itemName) { + return this.getLink(itemType, itemName) !== null; + } + + loadFromServer(data) { + if (data && typeof data === 'object') { + this.links = { ...data }; + } + } +} + +/** Instance of ItemPresetLinkManager for managing model and LoRA preset links */ +let itemPresetLinkManager = new ItemPresetLinkManager(); + /** Collection of helper functions and data related to presets, just an instance of {@link PresetHelpers}. */ let presetHelpers = new PresetHelpers(); @@ -250,7 +289,17 @@ function selectInitialPresetList() { } } -function applyOnePreset(preset) { +function applyOnePreset(preset, isNestedPreset = false) { + // Collect LoRA updates before applying to handle merging + let presetLoras = preset.param_map.loras ? preset.param_map.loras.split(',').map(l => l.trim()).filter(l => l.length > 0) : []; + let presetWeights = preset.param_map.loraweights ? preset.param_map.loraweights.split(',').map(w => { + let parsed = parseFloat(w.trim()); + return isNaN(parsed) ? 0 : parsed; + }) : []; + + // Track if we've handled loraweights through loras processing + let loraweightsHandled = false; + for (let key of Object.keys(preset.param_map)) { let param = gen_param_types.filter(p => p.id == key)[0]; if (param) { @@ -267,11 +316,44 @@ function applyOnePreset(preset) { val = val.replace("{value}", elem.value); } } - else if (key == 'loras' && rawVal) { - val = rawVal + "," + val; + else if (key == 'loras') { + if (rawVal) { + // Merge LoRA lists: update weights for existing LoRAs, add new ones + let currentLoras = rawVal.split(',').map(l => l.trim()).filter(l => l.length > 0); + let weightsParam = gen_param_types.find(p => p.id == 'loraweights'); + let weightsVal = weightsParam ? getInputVal(weightsParam) : ''; + let currentWeights = (weightsVal || '').split(',').map(w => { + let parsed = parseFloat(w.trim()); + return isNaN(parsed) ? 0 : parsed; + }); + // Update weights for LoRAs that are already present + for (let i = 0; i < presetLoras.length; i++) { + let idx = currentLoras.indexOf(presetLoras[i]); + if (idx >= 0) { + // LoRA already exists, update its weight + currentWeights[idx] = presetWeights[i] !== undefined ? presetWeights[i] : 0; + } else { + // New LoRA, add it + currentLoras.push(presetLoras[i]); + currentWeights.push(presetWeights[i] !== undefined ? presetWeights[i] : 0); + } + } + val = currentLoras.join(','); + // Also update the weights value + if (weightsParam) { + setDirectParamValue(weightsParam, currentWeights.join(',')); + } + loraweightsHandled = true; + } else { + // No existing LoRAs, just use the preset's LoRAs + val = preset.param_map.loras; + } } - else if (key == 'loraweights' && rawVal) { - val = rawVal + "," + val; + else if (key == 'loraweights') { + // Skip - weights are handled in loras section + if (loraweightsHandled) { + continue; + } } setDirectParamValue(param, val); if (param.group && param.group.toggles) { @@ -280,6 +362,113 @@ function applyOnePreset(preset) { doToggleGroup(`input_group_content_${param.group.id}`); } } + } + // Handle LoRA preset selection/application (only if not already a nested preset to prevent recursion) + if (!isNestedPreset && preset.param_map.loras) { + handleLoraPresetsFromLoraList(preset.param_map.loras, preset.param_map.loraweights); + } +} + +/** + * Common helper to apply or select a preset with proper UI updates. + * @param {string} source - Human-readable source for logging (e.g., 'LoRA', 'Model') + * @param {string} itemName - Name of the item triggering the preset + * @param {object} presetData - The preset data object + * @param {boolean} isNested - Whether this is a nested call (prevent recursion) + * @param {boolean} shouldUpdateUI - Whether to update UI after selection + */ +function applyOrSelectPreset(source, itemName, presetData, isNested, shouldUpdateUI = false) { + let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + if (autoApply) { + console.info(`[${source} Preset] Auto-applying preset ${presetData.title} for ${itemName}`); + applyOnePreset(presetData, isNested); + } else if (!currentPresets.some(p => p.title == presetData.title)) { + // Select the preset if it's not already selected + currentPresets.push(presetData); + if (shouldUpdateUI) { + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); + } + } + } +} + +/** + * Handle LoRA preset selection/application for LoRAs loaded by a preset. + * Parses the loras and loraweights strings to find non-zero weight LoRAs and select/apply their presets. + * @param {string} lorasStr - Comma-separated list of LoRA names + * @param {string} weightsStr - Comma-separated list of LoRA weights + */ +function handleLoraPresetsFromLoraList(lorasStr, weightsStr) { + if (!lorasStr) { + return; + } + if (!weightsStr) { + return; + } + try { + let loras = lorasStr.split(',').map(l => l.trim()).filter(l => l.length > 0); + let weights = weightsStr.split(',').map(w => { + let parsed = parseFloat(w.trim()); + return isNaN(parsed) ? 0 : parsed; + }); + let hasAnyPresets = false; + let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + for (let i = 0; i < loras.length; i++) { + let loraName = loras[i]; + let weight = weights[i] !== undefined ? weights[i] : 1; + // Only process LoRAs with non-zero weight + if (weight == 0) { + continue; + } + // Use the centralized function to get preset links (handles key extraction) + let presetTitle = getItemPresetLink('lora', loraName); + if (!presetTitle) { + continue; + } + let presetData = allPresetsUnsorted?.find(p => p.title == presetTitle); + if (!presetData) { + continue; + } + hasAnyPresets = true; + if (autoApply) { + // Directly apply the LoRA preset (pass true for isNested to prevent recursion) + applyOnePreset(presetData, true); + } else { + // In non-auto-apply mode, just select the preset + if (!currentPresets.some(p => p.title == presetData.title)) { + currentPresets.push(presetData); + } + } + } + // Update UI once if we processed any presets + if (hasAnyPresets) { + updatePresetList(); + if (typeof presetBrowser !== 'undefined') { + presetBrowser.rerender(); + } + } + } catch (e) { + console.warn('[LoRA Preset] Error handling LoRA presets:', e.message); + } +} + +/** + * Handle LoRA preset selection/application when a LoRA is manually selected. + * @param {string} loraName - The name of the LoRA being selected + */ +function handleLoraPresetOnSelection(loraName) { + try { + let presetTitle = getItemPresetLink('lora', loraName); + if (presetTitle) { + let presetData = allPresetsUnsorted?.find(p => p.title == presetTitle); + if (presetData) { + applyOrSelectPreset('LoRA', loraName, presetData, true, true); + } + } + } catch (e) { + console.warn('[LoRA Preset] Error handling LoRA preset on selection:', e.message); } } @@ -410,6 +599,10 @@ function listPresetFolderAndFiles(path, isRefresh, callback, depth) { if (isRefresh) { genericRequest('GetMyUserData', {}, data => { allPresetsUnsorted = data.presets; + // Load user's item preset links from server into the manager + if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + itemPresetLinkManager.loadFromServer(data.itemPresetLinks); + } proc(); }); } @@ -784,3 +977,91 @@ function closeExportPresetViewer() { function closeImportPresetViewer() { $('#import_presets_modal').modal('hide'); } + +/** + * Generic function to build a preset link selector for both models and LoRAs. + * @param {string} itemType - 'model' or 'lora' + * @param {string} itemName - The name of the model or LoRA + * @param {string} containerId - The ID of the container element to populate + * @param {string} selectId - The ID to assign to the select element (e.g., 'edit_model_override_preset_id') + */ +function buildItemPresetLinkInput(itemType, itemName, containerId, selectId) { + let container = getRequiredElementById(containerId); + container.innerHTML = ''; + + // Build list of all presets + let compatiblePresets = []; + if (allPresetsUnsorted && allPresetsUnsorted.length > 0) { + for (let preset of allPresetsUnsorted) { + let presetData = preset.data || preset; + if (presetData && presetData.title) { + compatiblePresets.push(presetData); + } + } + } + + // Create select element that UIImprovementHandler will convert to a popover + let select = document.createElement('select'); + select.id = selectId; + select.className = 'modal_text_extra'; + + let option = document.createElement('option'); + option.value = ''; + option.innerText = '-- Select a Preset --'; + select.appendChild(option); + + for (let preset of compatiblePresets) { + option = document.createElement('option'); + option.value = preset.title; + option.innerText = preset.title; + select.appendChild(option); + } + + // Set current value from itemPresetLinkManager using centralized key extraction + let currentLink = getItemPresetLink(itemType, itemName); + if (currentLink) { + select.value = currentLink; + } + + select.addEventListener('change', () => { + // Update button state when selection changes + updateItemPresetLinkButtonState(selectId); + }); + select.addEventListener('input', () => { + updateItemPresetLinkButtonState(selectId); + }); + + container.appendChild(select); + updateItemPresetLinkButtonState(selectId); +} + +/** + * Update the enabled state of Set/Clear buttons based on preset selector state. + * @param {string} selectId - The ID of the select element + */ +function updateItemPresetLinkButtonState(selectId) { + let select = document.getElementById(selectId); + if (!select) return; + + // Determine button IDs based on select element ID + let baseId = select.id.replace('_id', ''); + let clearBtn = document.getElementById(`${baseId}_clear_btn`); + let setBtn = document.getElementById(`${baseId}_set_btn`); + + if (clearBtn) { + if (select.value == '') { + clearBtn.classList.add('disabled-dim'); + } else { + clearBtn.classList.remove('disabled-dim'); + } + } + + if (setBtn) { + // Dim Set button if no presets are currently selected + if (!currentPresets || currentPresets.length == 0) { + setBtn.classList.add('disabled-dim'); + } else { + setBtn.classList.remove('disabled-dim'); + } + } +} diff --git a/src/wwwroot/js/genpage/main.js b/src/wwwroot/js/genpage/main.js index c0eb5c4ca..f82ec8d6d 100644 --- a/src/wwwroot/js/genpage/main.js +++ b/src/wwwroot/js/genpage/main.js @@ -373,6 +373,10 @@ function loadUserData(callback) { language = data.language; } allPresetsUnsorted = data.presets; + // Load user's item preset links from server into the manager + if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + itemPresetLinkManager.loadFromServer(data.itemPresetLinks); + } sortPresets(); presetBrowser.lightRefresh(); if (shouldApplyDefault) { From 6ad221eb245450ae2eefbbb41e8f5b7f940252c6 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 00:18:54 -0500 Subject: [PATCH 04/12] Make ignoreModelPresetZeroWeightLoraPresets logic optional --- src/Core/Settings.cs | 3 +++ src/wwwroot/js/genpage/gentab/presets.js | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Core/Settings.cs b/src/Core/Settings.cs index 91d8d25c7..c821a0d10 100644 --- a/src/Core/Settings.cs +++ b/src/Core/Settings.cs @@ -394,6 +394,9 @@ public class UserUIData : AutoConfiguration [ConfigComment("When a model with a linked preset is selected, should the preset parameters be applied immediately? By default, the preset is just selected for review.")] public bool AutoApplyModelPresets = false; + + [ConfigComment("If enabled, when applying the model's preset that includes a LoRA with a weight of 0, the LoRA's own preset is ignored.\nFor example, it may be useful on a DMD model to preset an LCM LoRA to 0, effectively disabling it if it was already selected (because you can't set a preset to remove a LoRA, only to include it). In that situation, you would not want the LCM LoRA's own preset settings to be applied.")] + public bool IgnoreModelPresetZeroWeightLoraPresets = false; } [ConfigComment("Settings related to the user interface, entirely contained to the frontend.")] diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index 581b525a0..05df6d58b 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -415,11 +415,12 @@ function handleLoraPresetsFromLoraList(lorasStr, weightsStr) { }); let hasAnyPresets = false; let autoApply = getUserSetting('ui.autoapplymodelpresets', false); + let ignoreZeroWeightLoraPresets = getUserSetting('ui.ignoreModelPresetZeroWeightLoraPresets', false); for (let i = 0; i < loras.length; i++) { let loraName = loras[i]; let weight = weights[i] !== undefined ? weights[i] : 1; - // Only process LoRAs with non-zero weight - if (weight == 0) { + // Only process LoRAs with non-zero weight (if setting is enabled) + if (ignoreZeroWeightLoraPresets && weight == 0) { continue; } // Use the centralized function to get preset links (handles key extraction) From c3a60740ce537713464ee066576da45eadfcdad7 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 00:56:28 -0500 Subject: [PATCH 05/12] documentation of new feature --- docs/Features/Presets.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/Features/Presets.md b/docs/Features/Presets.md index d59be0fdd..769267caf 100644 --- a/docs/Features/Presets.md +++ b/docs/Features/Presets.md @@ -2,6 +2,10 @@ (TODO: Info about how presets work and all that) +Presets allow you to save and reuse sets of generation parameters across different workflows. When you create a new preset, you choose the parameters to be applied by that preset when you select it later. You can choose multiple presets, they "overlay" their settings. + +When you have presets selected, the parameters they include are locked from editing until you either unselect the presets or "apply" them to your prompt. + # Official SDXL Preset Pack These are the presets that were used on DreamStudio (Stability AI's web generation platform) around the time that SDXL was launched to the public in 2023. @@ -17,3 +21,32 @@ These are the presets that were used on DreamStudio (Stability AI's web generati - You can click on any preset to use it, or unclick it to disable it. - (Note: if it behaves weird, refresh the page. Alpha projects do silly things sometimes!) + +## Linking Models and LoRA to a Preset + +It is common for certain models and LoRA to have specific recommended values for CFG scale, steps, resolution, sampler, etc. Or, you may just have a default preference for getting the "look" you want from them. + +If you create a Preset with a particular set of parameter values you would like to use by default, you can go to the *Edit Metadata* dialog for a model or LoRA and "link" it to the desired preset. Then, by default, whenever you select that model or LoRA, the linked preset is also selected and can be applied. + +Some nuances of this feature: + +1. Presets linked to *models* are considered *mutually exclusive* when selecting models. So, if you select a model, its preset is selected, and if you click another model that has its own preset, the first model's preset is unselected and the new model's preset is selected. This avoids accidentally "stacking" incompatible presets for different models. (LoRA presets don't work this way -- they are just selected with the LoRA.) + +2. You *can* have a single Preset linked to multiple models or LoRA, but you can only link one preset at a time to each model or LoRA. + +3. These links are *user-level* setting, not global. + +4. If a model's linked preset specifies that a given LoRA be included at a certain weight, and that LoRA *also* has a preset, that preset will also be selected. (This only nests one level -- LoRA presets can load other LoRA, but it won't select those other LoRAs' presets.) + +5. If you enable the User Setting `AutoApplyModelPresets`, rather than *selecting* the appropriate preset for the model and downstream LoRA, it will immediately *apply* those settings. This is very convenient if you just want to flip between models and have your preferred weights, steps, CFG scale, etc. be set instantly. + +6. If you enable the User Setting `IgnoreNestedZeroWeightLoraPresets`, the logic in (3) above is slightly adjusted, so any LoRA in the model's preset that has a weight of `0` will *not* have its own preset loaded. The reasoning for this option is as follows: + + - There are many situations where a LoRA is on the same platform as a model, but is incompatible with the model. For example, you shouldn't use an LCM LoRA with a model that already has LCM or DMD "built in." + - When flipping between models, it can be a chore to remember to add or remove these "process" LoRA that apply to some models but not others. + - Presets don't support allowing you to *remove* a LoRA. + - However, you *can add* a LoRA with a weight of `0`. The LoRA still takes up VRAM, but has no impact on the generation. + - So, if you keep accidentally leaving an LCM model active when you switch to a DMD model, you can set the DMD model's preset to "include" the LCM model, but with a weight of `0`. + - It's also likely you'd want to set a preset for the LCM LoRA, because when you *normally* add it, you want to override the usual step count, etc. + - But in this situation with the DMD model, you want the LCM LoRA to be effectively disabled *and* you wouldn't want its preset to override your DMD model's preset. + - If this is not a situation you regularly have to deal with, you can leave this option disabled; it's primarily for users who have lower-end devices who prefer to stick with low-step configurations regardless which model they are using. From a31e1e5510dce4c7182f0206a5bc5e885df1770b Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 01:18:01 -0500 Subject: [PATCH 06/12] Final cleanup for clarity --- src/WebAPI/ModelsAPI.cs | 13 +++- src/wwwroot/js/genpage/gentab/loras.js | 2 +- src/wwwroot/js/genpage/gentab/models.js | 82 ++++++++++-------------- src/wwwroot/js/genpage/gentab/presets.js | 31 ++++----- 4 files changed, 61 insertions(+), 67 deletions(-) diff --git a/src/WebAPI/ModelsAPI.cs b/src/WebAPI/ModelsAPI.cs index 69a26374e..2d213fe6c 100644 --- a/src/WebAPI/ModelsAPI.cs +++ b/src/WebAPI/ModelsAPI.cs @@ -31,7 +31,7 @@ public static void Register() API.RegisterAPICall(EditModelMetadata, true, Permissions.EditModelMetadata); API.RegisterAPICall(SaveItemPresetLink, true, Permissions.ManagePresets); API.RegisterAPICall(ClearItemPresetLink, true, Permissions.ManagePresets); - API.RegisterAPICall(DoModelDownloadWS, true, Permissions.LoadModelsNow); + API.RegisterAPICall(DoModelDownloadWS, true, Permissions.DownloadModels); API.RegisterAPICall(GetModelHash, true, Permissions.EditModelMetadata); API.RegisterAPICall(ForwardMetadataRequest, false, Permissions.EditModelMetadata); API.RegisterAPICall(DeleteModel, false, Permissions.DeleteModels); @@ -892,6 +892,12 @@ void doMoveNow(string oldPath) return new JObject() { ["success"] = true }; } + /// Saves a reference to a preset for a model or LoRA to the user's data. + /// The user session context. + /// The type of item: 'model' or 'lora'. + /// The name/identifier of the model or LoRA. + /// The title of the preset to link, or empty string to clear the link. + /// A JSON object containing the success status, the key that was saved/cleared, and the preset title. public static async Task SaveItemPresetLink(Session session, string itemType, string itemName, string presetTitle) { Logs.Debug($"[SaveItemPresetLink] Received: itemType='{itemType}' (type: {itemType?.GetType()?.Name}), itemName='{itemName}', presetTitle='{presetTitle}'"); @@ -921,6 +927,11 @@ public static async Task SaveItemPresetLink(Session session, string ite } } + /// Clears a reference to a preset for a model or LoRA from the user's data. + /// The user session context. + /// The type of item: 'model' or 'lora'. + /// The name/identifier of the model or LoRA. + /// A JSON object containing the success status and the key that was cleared. public static async Task ClearItemPresetLink(Session session, string itemType, string itemName) { string key = $"{itemType}:{itemName}"; diff --git a/src/wwwroot/js/genpage/gentab/loras.js b/src/wwwroot/js/genpage/gentab/loras.js index 0519511e0..0fb8be90d 100644 --- a/src/wwwroot/js/genpage/gentab/loras.js +++ b/src/wwwroot/js/genpage/gentab/loras.js @@ -276,7 +276,7 @@ class LoraHelper { else { this.selected.push(new SelectedLora(name, null, null, data)); // Handle LoRA preset selection/application when adding a LoRA - handleLoraPresetOnSelection(name); + selectOrApplyLoraPresetOnSelection(name); } this.rebuildParams(); this.rebuildUI(); diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 3b2a98b9c..1401306fc 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -183,7 +183,7 @@ function editModel(model, browser) { getRequiredElementById('edit_model_lora_default_confinement_div').style.display = model.architecture && model.architecture.endsWith('/lora') ? 'block' : 'none'; let run = () => { buildModelOverridePresetInput(); - updatePresetClearButtonState(); + updatePresetLinkButtonState('edit_model_override_preset_id'); triggerChangeFor(modelsHelpers.enableImageElem); $('#edit_model_modal').modal('show'); }; @@ -920,21 +920,8 @@ function directSetModel(model) { try { let autoApply = getUserSetting('ui.autoapplymodelpresets', false); if (presetTitle) { - // Only remove other model-linked presets if THIS model has a preset to apply - if (sdModelBrowser?.models) { - let modelLinkedPresetTitles = new Set(); - for (let otherModelName in sdModelBrowser.models) { - // Only remove presets from OTHER models, not the current one - let otherPresetTitle = getItemPresetLink('model', otherModelName); - // Only add to removal set if it has a preset linked - if (otherPresetTitle && extractItemKeyName(otherModelName) !== extractItemKeyName(model.name || modelName)) { - modelLinkedPresetTitles.add(otherPresetTitle); - } - } - if (modelLinkedPresetTitles.size > 0) { - currentPresets = currentPresets.filter(p => !modelLinkedPresetTitles.has(p.title)); - } - } + // Enforce mutual exclusivity - remove other models' presets + currentPresets = removeOtherModelPresets(model.name || modelName); let presetData = allPresetsUnsorted?.find(p => p.title == presetTitle); if (presetData) { if (autoApply) { @@ -954,7 +941,7 @@ function directSetModel(model) { if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { itemPresetLinkManager.loadFromServer(data.itemPresetLinks); } - handleLoraPresetsFromLoraList(presetData.param_map.loras, presetData.param_map.loraweights); + selectOrApplyLoraPresetsFromList(presetData.param_map.loras, presetData.param_map.loraweights); }); } } @@ -1103,6 +1090,30 @@ function doModelInstallRequiredCheck() { return false; } +/** + * Removes preset links from other models when a model with its own preset is selected. + * This enforces mutual exclusivity of model presets - only one model's preset should be active. + * @param {string} currentModelName - The full path/name of the currently-selected model + * @returns {array} Updated currentPresets array with other models' presets removed + */ +function removeOtherModelPresets(currentModelName) { + if (!sdModelBrowser?.models || !currentModelName) { + return currentPresets; + } + let otherModelPresets = new Set(); + for (let otherModelName in sdModelBrowser.models) { + let otherPresetTitle = getItemPresetLink('model', otherModelName); + // Skip presets from the current model and models without presets + if (otherPresetTitle && extractItemKeyNameFromPath(otherModelName) !== extractItemKeyNameFromPath(currentModelName)) { + otherModelPresets.add(otherPresetTitle); + } + } + // Return filtered presets if there are any to remove, otherwise return unchanged + return otherModelPresets.size > 0 + ? currentPresets.filter(p => !otherModelPresets.has(p.title)) + : currentPresets; +} + /** * Extract the base filename from a full model/LoRA path. * This is used as the key for preset linking to ensure links don't break if the user reorganizes @@ -1116,7 +1127,7 @@ function doModelInstallRequiredCheck() { * @param {string} itemName - The full model/LoRA name (path or filename) * @returns {string} The base filename without path or extension */ -function extractItemKeyName(itemName) { +function extractItemKeyNameFromPath(itemName) { if (!itemName) { return ''; } @@ -1141,7 +1152,7 @@ function getItemPresetLink(itemType, itemName) { if (!itemName) { return null; } - let keyName = extractItemKeyName(itemName); + let keyName = extractItemKeyNameFromPath(itemName); return itemPresetLinkManager.getLink(itemType, keyName); } @@ -1157,8 +1168,7 @@ function saveItemPresetLink(itemType, itemName, presetTitle) { if (!itemName) { return; } - let keyName = extractItemKeyName(itemName); - + let keyName = extractItemKeyNameFromPath(itemName); if (presetTitle && presetTitle.trim()) { genericRequest('SaveItemPresetLink', { 'itemType': itemType, 'itemName': keyName, 'presetTitle': presetTitle }, data => { itemPresetLinkManager.setLink(itemType, keyName, presetTitle); @@ -1170,28 +1180,6 @@ function saveItemPresetLink(itemType, itemName, presetTitle) { } } -function updatePresetClearButtonState() { - let presetSelect = document.getElementById('edit_model_override_preset_id'); - if (!presetSelect) return; - let clearBtn = document.getElementById('edit_model_preset_clear_btn'); - let setBtn = document.getElementById('edit_model_preset_set_btn'); - if (clearBtn) { - if (presetSelect.value === '') { - clearBtn.classList.add('disabled-dim'); - } else { - clearBtn.classList.remove('disabled-dim'); - } - } - if (setBtn) { - // Dim Set button if no presets are currently selected - if (!currentPresets || currentPresets.length === 0) { - setBtn.classList.add('disabled-dim'); - } else { - setBtn.classList.remove('disabled-dim'); - } - } -} - function applyPresetOverride() { // Set the dropdown to the first currently-selected preset if (currentPresets?.length) { @@ -1201,7 +1189,7 @@ function applyPresetOverride() { presetSelect.dispatchEvent(new Event('change')); } } - updatePresetClearButtonState(); + updatePresetLinkButtonState('edit_model_override_preset_id'); } function clearPresetOverride() { @@ -1210,13 +1198,13 @@ function clearPresetOverride() { presetSelect.value = ''; presetSelect.dispatchEvent(new Event('change')); } - updatePresetClearButtonState(); + updatePresetLinkButtonState('edit_model_override_preset_id'); } function buildModelOverridePresetInput() { - // Pass the full model name; buildItemPresetLinkInput will handle key extraction - buildItemPresetLinkInput('model', curModelMenuModel.name, 'edit_model_override_preset', 'edit_model_override_preset_id'); + // Pass the full model name; buildPresetLinkSelectorForItem will handle key extraction + buildPresetLinkSelectorForItem('model', curModelMenuModel.name, 'edit_model_override_preset', 'edit_model_override_preset_id'); } getRequiredElementById('current_model').addEventListener('change', currentModelChanged); diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index 05df6d58b..b26b1d4a9 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -321,6 +321,9 @@ function applyOnePreset(preset, isNestedPreset = false) { // Merge LoRA lists: update weights for existing LoRAs, add new ones let currentLoras = rawVal.split(',').map(l => l.trim()).filter(l => l.length > 0); let weightsParam = gen_param_types.find(p => p.id == 'loraweights'); + if (!weightsParam) { + console.warn('[Preset] Warning: loraweights parameter not found when merging LoRA lists'); + } let weightsVal = weightsParam ? getInputVal(weightsParam) : ''; let currentWeights = (weightsVal || '').split(',').map(w => { let parsed = parseFloat(w.trim()); @@ -365,7 +368,7 @@ function applyOnePreset(preset, isNestedPreset = false) { } // Handle LoRA preset selection/application (only if not already a nested preset to prevent recursion) if (!isNestedPreset && preset.param_map.loras) { - handleLoraPresetsFromLoraList(preset.param_map.loras, preset.param_map.loraweights); + selectOrApplyLoraPresetsFromList(preset.param_map.loras, preset.param_map.loraweights); } } @@ -400,7 +403,7 @@ function applyOrSelectPreset(source, itemName, presetData, isNested, shouldUpdat * @param {string} lorasStr - Comma-separated list of LoRA names * @param {string} weightsStr - Comma-separated list of LoRA weights */ -function handleLoraPresetsFromLoraList(lorasStr, weightsStr) { +function selectOrApplyLoraPresetsFromList(lorasStr, weightsStr) { if (!lorasStr) { return; } @@ -459,7 +462,7 @@ function handleLoraPresetsFromLoraList(lorasStr, weightsStr) { * Handle LoRA preset selection/application when a LoRA is manually selected. * @param {string} loraName - The name of the LoRA being selected */ -function handleLoraPresetOnSelection(loraName) { +function selectOrApplyLoraPresetOnSelection(loraName) { try { let presetTitle = getItemPresetLink('lora', loraName); if (presetTitle) { @@ -986,7 +989,7 @@ function closeImportPresetViewer() { * @param {string} containerId - The ID of the container element to populate * @param {string} selectId - The ID to assign to the select element (e.g., 'edit_model_override_preset_id') */ -function buildItemPresetLinkInput(itemType, itemName, containerId, selectId) { +function buildPresetLinkSelectorForItem(itemType, itemName, containerId, selectId) { let container = getRequiredElementById(containerId); container.innerHTML = ''; @@ -1026,21 +1029,21 @@ function buildItemPresetLinkInput(itemType, itemName, containerId, selectId) { select.addEventListener('change', () => { // Update button state when selection changes - updateItemPresetLinkButtonState(selectId); + updatePresetLinkButtonState(selectId); }); select.addEventListener('input', () => { - updateItemPresetLinkButtonState(selectId); + updatePresetLinkButtonState(selectId); }); container.appendChild(select); - updateItemPresetLinkButtonState(selectId); + updatePresetLinkButtonState(selectId); } /** * Update the enabled state of Set/Clear buttons based on preset selector state. * @param {string} selectId - The ID of the select element */ -function updateItemPresetLinkButtonState(selectId) { +function updatePresetLinkButtonState(selectId) { let select = document.getElementById(selectId); if (!select) return; @@ -1050,19 +1053,11 @@ function updateItemPresetLinkButtonState(selectId) { let setBtn = document.getElementById(`${baseId}_set_btn`); if (clearBtn) { - if (select.value == '') { - clearBtn.classList.add('disabled-dim'); - } else { - clearBtn.classList.remove('disabled-dim'); - } + clearBtn.classList.toggle('disabled-dim', select.value == ''); } if (setBtn) { // Dim Set button if no presets are currently selected - if (!currentPresets || currentPresets.length == 0) { - setBtn.classList.add('disabled-dim'); - } else { - setBtn.classList.remove('disabled-dim'); - } + setBtn.classList.toggle('disabled-dim', !currentPresets?.length); } } From 0835728543bf91d0199317853eeb77eb2918f29c Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 01:40:31 -0500 Subject: [PATCH 07/12] More final cleanup --- src/WebAPI/ModelsAPI.cs | 4 ---- src/wwwroot/js/genpage/gentab/models.js | 16 +++------------- src/wwwroot/js/genpage/gentab/presets.js | 10 +++------- src/wwwroot/js/genpage/main.js | 2 +- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/WebAPI/ModelsAPI.cs b/src/WebAPI/ModelsAPI.cs index 2d213fe6c..94c57f9bc 100644 --- a/src/WebAPI/ModelsAPI.cs +++ b/src/WebAPI/ModelsAPI.cs @@ -900,9 +900,7 @@ void doMoveNow(string oldPath) /// A JSON object containing the success status, the key that was saved/cleared, and the preset title. public static async Task SaveItemPresetLink(Session session, string itemType, string itemName, string presetTitle) { - Logs.Debug($"[SaveItemPresetLink] Received: itemType='{itemType}' (type: {itemType?.GetType()?.Name}), itemName='{itemName}', presetTitle='{presetTitle}'"); string key = $"{itemType}:{itemName}"; - Logs.Debug($"[SaveItemPresetLink] Constructed key: '{key}'"); try { string rawJson = session.User.GetGenericData("itempresetlinks", "data") ?? "{}"; @@ -917,7 +915,6 @@ public static async Task SaveItemPresetLink(Session session, string ite } string newJson = links.ToString(Newtonsoft.Json.Formatting.None); session.User.SaveGenericData("itempresetlinks", "data", newJson); - Logs.Debug($"[SaveItemPresetLink] Saved successfully with key '{key}'"); return new JObject() { ["success"] = true, ["key"] = key, ["preset"] = presetTitle }; } catch (Exception ex) @@ -944,7 +941,6 @@ public static async Task ClearItemPresetLink(Session session, string it links.Remove(key); string newJson = links.ToString(Newtonsoft.Json.Formatting.None); session.User.SaveGenericData("itempresetlinks", "data", newJson); - Logs.Debug($"[Preset Link] Cleared {key}, new JSON: {newJson}"); } return new JObject() { ["success"] = true, ["key"] = key }; } diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 1401306fc..fd80e40fc 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -13,12 +13,6 @@ class ModelsHelpers { /** Collection of helper functions and data related to models, just an instance of {@link ModelsHelpers}. */ let modelsHelpers = new ModelsHelpers(); -/** Model Parameter Overrides Configuration */ -// Currently-supported parameters for overrides -const MODEL_OVERRIDE_PARAMS = ['steps', 'cfgscale', 'sampler', 'scheduler', 'clipskip', 'width', 'height']; -// Parameters where 0 means "unset" rather than a valid value (0 is only unset for numeric params with Min > 0) -const TREAT_ZERO_AS_UNSET_PARAMS = ['steps', 'cfgscale', 'width', 'height']; - //////////// TODO: Merge all the below into the class above (or multiple separate classes) let models = {}; @@ -938,7 +932,7 @@ function directSetModel(model) { if (presetData.param_map.loras && presetData.param_map.loraweights) { // Ensure item preset links are loaded before trying to find LoRA preset links genericRequest('GetMyUserData', {}, data => { - if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + if (data.itemPresetLinks && itemPresetLinkManager) { itemPresetLinkManager.loadFromServer(data.itemPresetLinks); } selectOrApplyLoraPresetsFromList(presetData.param_map.loras, presetData.param_map.loraweights); @@ -946,16 +940,12 @@ function directSetModel(model) { } } updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); - } + presetBrowser?.rerender(); } } else { // No preset linked to this model, but we may have removed other presets above updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); - } + presetBrowser?.rerender(); } } catch (e) { // Setting may not exist yet, continue without auto-apply diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index b26b1d4a9..bc4e6deb2 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -390,9 +390,7 @@ function applyOrSelectPreset(source, itemName, presetData, isNested, shouldUpdat currentPresets.push(presetData); if (shouldUpdateUI) { updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); - } + presetBrowser?.rerender(); } } } @@ -449,9 +447,7 @@ function selectOrApplyLoraPresetsFromList(lorasStr, weightsStr) { // Update UI once if we processed any presets if (hasAnyPresets) { updatePresetList(); - if (typeof presetBrowser !== 'undefined') { - presetBrowser.rerender(); - } + presetBrowser?.rerender(); } } catch (e) { console.warn('[LoRA Preset] Error handling LoRA presets:', e.message); @@ -604,7 +600,7 @@ function listPresetFolderAndFiles(path, isRefresh, callback, depth) { genericRequest('GetMyUserData', {}, data => { allPresetsUnsorted = data.presets; // Load user's item preset links from server into the manager - if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + if (data.itemPresetLinks && itemPresetLinkManager) { itemPresetLinkManager.loadFromServer(data.itemPresetLinks); } proc(); diff --git a/src/wwwroot/js/genpage/main.js b/src/wwwroot/js/genpage/main.js index f82ec8d6d..d3107ece6 100644 --- a/src/wwwroot/js/genpage/main.js +++ b/src/wwwroot/js/genpage/main.js @@ -374,7 +374,7 @@ function loadUserData(callback) { } allPresetsUnsorted = data.presets; // Load user's item preset links from server into the manager - if (data.itemPresetLinks && typeof itemPresetLinkManager !== 'undefined') { + if (data.itemPresetLinks && itemPresetLinkManager) { itemPresetLinkManager.loadFromServer(data.itemPresetLinks); } sortPresets(); From 777a1170dbf18994bc4c23519edbcc248b638292 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 01:42:29 -0500 Subject: [PATCH 08/12] Ensure compatibility with Windows paths --- src/wwwroot/js/genpage/gentab/models.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index fd80e40fc..89b6c447b 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -1121,8 +1121,8 @@ function extractItemKeyNameFromPath(itemName) { if (!itemName) { return ''; } - // Remove directory path - let lastSlash = itemName.lastIndexOf('/'); + // Remove directory path (handles both / and \ separators) + let lastSlash = Math.max(itemName.lastIndexOf('/'), itemName.lastIndexOf('\\')); let name = lastSlash !== -1 ? itemName.substring(lastSlash + 1) : itemName; // Remove .safetensors extension if (name.endsWith('.safetensors')) { From 3fb64e0a60f00e2bcdb237b4a1c265132bad1ab6 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 17:12:55 -0600 Subject: [PATCH 09/12] Less commentary on new flag, see docs --- src/Core/Settings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Settings.cs b/src/Core/Settings.cs index c821a0d10..eb41f9933 100644 --- a/src/Core/Settings.cs +++ b/src/Core/Settings.cs @@ -395,7 +395,7 @@ public class UserUIData : AutoConfiguration [ConfigComment("When a model with a linked preset is selected, should the preset parameters be applied immediately? By default, the preset is just selected for review.")] public bool AutoApplyModelPresets = false; - [ConfigComment("If enabled, when applying the model's preset that includes a LoRA with a weight of 0, the LoRA's own preset is ignored.\nFor example, it may be useful on a DMD model to preset an LCM LoRA to 0, effectively disabling it if it was already selected (because you can't set a preset to remove a LoRA, only to include it). In that situation, you would not want the LCM LoRA's own preset settings to be applied.")] + [ConfigComment("If enabled, when applying the model's preset that includes a LoRA with a weight of 0, the LoRA's own preset is ignored.")] public bool IgnoreModelPresetZeroWeightLoraPresets = false; } From 8af0e19852e2b9290c6d6f955ca0a656160d1f07 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 17:42:59 -0600 Subject: [PATCH 10/12] Clean up preset docs a bit; Fix where preset without a description leads to substantial whitespace between the preset title and settings --- docs/Features/Presets.md | 6 +++--- src/wwwroot/js/genpage/gentab/presets.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Features/Presets.md b/docs/Features/Presets.md index 769267caf..6fb45b50e 100644 --- a/docs/Features/Presets.md +++ b/docs/Features/Presets.md @@ -24,13 +24,13 @@ These are the presets that were used on DreamStudio (Stability AI's web generati ## Linking Models and LoRA to a Preset -It is common for certain models and LoRA to have specific recommended values for CFG scale, steps, resolution, sampler, etc. Or, you may just have a default preference for getting the "look" you want from them. +It's common for models and LoRA to have specific recommended values for CFG scale, steps, resolution, sampler, etc. Or, you may just have your own preferences for getting the "look" you want from them. -If you create a Preset with a particular set of parameter values you would like to use by default, you can go to the *Edit Metadata* dialog for a model or LoRA and "link" it to the desired preset. Then, by default, whenever you select that model or LoRA, the linked preset is also selected and can be applied. +To do this, create a preset with your preferred settings. Then, go to the *Edit Metadata* dialog for the model or LoRA and pick the preset from the dropdown and save. After that, any time you select that model or LoRA, the linked preset is also selected and can be applied. Some nuances of this feature: -1. Presets linked to *models* are considered *mutually exclusive* when selecting models. So, if you select a model, its preset is selected, and if you click another model that has its own preset, the first model's preset is unselected and the new model's preset is selected. This avoids accidentally "stacking" incompatible presets for different models. (LoRA presets don't work this way -- they are just selected with the LoRA.) +1. Presets linked to *models* are considered *mutually exclusive* to one another. So, if you select a model, its preset is selected, and if you click another model that has its own preset, the first model's preset is unselected and the new model's preset is selected. This avoids accidentally "stacking" incompatible presets for different models. (LoRA presets don't work this way -- they are just selected with the LoRA and are *not* automatically de-selected if you disable the LoRA.) 2. You *can* have a single Preset linked to multiple models or LoRA, but you can only link one preset at a time to each model or LoRA. diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index bc4e6deb2..4144ff1c0 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -627,7 +627,7 @@ function describePreset(preset) { } } ]; let paramText = Object.keys(preset.data.param_map).map(key => `${key}: ${preset.data.param_map[key]}`); - let description = `${preset.data.title}:\n${preset.data.description}\n\n${paramText.join('\n')}`; + let description = `${preset.data.title}:\n${preset.data.description ? '\n' + preset.data.description : ''}\n\n${paramText.join('\n')}`; let className = currentPresets.some(p => p.title == preset.data.title) ? 'preset-block-selected preset-block' : 'preset-block'; let name = preset.data.title; let index = name.lastIndexOf('/'); From 5ba7dea2066a77c524f966911240c93c18bb3c77 Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 17:46:33 -0600 Subject: [PATCH 11/12] Fix extra spacing between preset title/settings when there is no description --- src/wwwroot/js/genpage/gentab/presets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wwwroot/js/genpage/gentab/presets.js b/src/wwwroot/js/genpage/gentab/presets.js index 4144ff1c0..dae6370c5 100644 --- a/src/wwwroot/js/genpage/gentab/presets.js +++ b/src/wwwroot/js/genpage/gentab/presets.js @@ -627,7 +627,7 @@ function describePreset(preset) { } } ]; let paramText = Object.keys(preset.data.param_map).map(key => `${key}: ${preset.data.param_map[key]}`); - let description = `${preset.data.title}:\n${preset.data.description ? '\n' + preset.data.description : ''}\n\n${paramText.join('\n')}`; + let description = `${preset.data.title}:\n${preset.data.description ? preset.data.description + '\n' : ''}\n${paramText.join('\n')}`; let className = currentPresets.some(p => p.title == preset.data.title) ? 'preset-block-selected preset-block' : 'preset-block'; let name = preset.data.title; let index = name.lastIndexOf('/'); From 2c308a70fdf203af3c2534fcdae2962005368f2f Mon Sep 17 00:00:00 2001 From: Richard Tallent Date: Sun, 2 Nov 2025 18:00:44 -0600 Subject: [PATCH 12/12] Add user preset name (if any) to model/LoRA card --- src/wwwroot/css/genpage.css | 4 ++++ src/wwwroot/js/genpage/gentab/models.js | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/wwwroot/css/genpage.css b/src/wwwroot/css/genpage.css index adb10974c..27ad00a37 100644 --- a/src/wwwroot/css/genpage.css +++ b/src/wwwroot/css/genpage.css @@ -559,6 +559,10 @@ body { font-size: 80%; color: var(--text-soft); } +.model_preset { + color: var(--text-soft); +} + .refresh-button { margin: 0.5rem; background-color: var(--button-background); diff --git a/src/wwwroot/js/genpage/gentab/models.js b/src/wwwroot/js/genpage/gentab/models.js index 89b6c447b..8f19786e9 100644 --- a/src/wwwroot/js/genpage/gentab/models.js +++ b/src/wwwroot/js/genpage/gentab/models.js @@ -654,7 +654,17 @@ class ModelBrowserWrapper { interject += `${getOptLine("Default LoRA Weight", model.data.lora_default_weight)}${getOptLine("Default LoRA Confinement", confinementName)}`; searchableAdded += `, Default LoRA Weight: ${model.data.lora_default_weight}, Default LoRA Confinement: ${confinementName}`; } - description = `${isStarred ? 'Starred: ' : ''}${escapeHtml(display)}
${getLine("Title", model.data.title)}${getOptLine("Author", model.data.author)}${getLine("Type", model.data.class)}${interject}${getOptLine('Trigger Phrase', model.data.trigger_phrase)}${getOptLine('Usage Hint', model.data.usage_hint)}${getLine("Description", model.data.description)}
`; + // Add linked preset info if available + let presetItemType = this.subType === 'Stable-Diffusion' ? 'model' : (this.subType === 'LoRA' ? 'lora' : null); + let presetLine = ''; + if (presetItemType) { + let linkedPreset = getItemPresetLink(presetItemType, model.data.name); + if (linkedPreset) { + presetLine = `${getLine("Preset", linkedPreset)}`; + searchableAdded += `, Preset: ${linkedPreset}`; + } + } + description = `${isStarred ? 'Starred: ' : ''}${escapeHtml(display)}
${getLine("Title", model.data.title)}${presetLine}${getOptLine("Author", model.data.author)}${getLine("Type", model.data.class)}${interject}${getOptLine('Trigger Phrase', model.data.trigger_phrase)}${getOptLine('Usage Hint', model.data.usage_hint)}${getLine("Description", model.data.description)}
`; let cleanForDetails = (val) => val == null ? '(Unset)' : safeHtmlOnly(val).replaceAll('
', ' '); detail_list.push(cleanForDetails(model.data.title), cleanForDetails(model.data.class), cleanForDetails(model.data.usage_hint ?? model.data.trigger_phrase), cleanForDetails(model.data.description)); if (model.data.local && permissions.hasPermission('edit_model_metadata')) {