From 070b034cd5b49eb5056a18b43f88aa223fec9e0b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 10 Aug 2023 16:42:26 +0300
Subject: put infotext label for setting into OptionInfo definition rather than
 in a separate list

---
 modules/generation_parameters_copypaste.py | 39 +++++++++---------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'modules/generation_parameters_copypaste.py')

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 6ace29cf..386517ac 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -316,37 +316,18 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
 
 
 infotext_to_setting_name_mapping = [
-    ('Clip skip', 'CLIP_stop_at_last_layers', ),
+
+]
+"""Mapping of infotext labels to setting names. Only left for backwards compatibility - use OptionInfo(..., infotext='...') instead.
+Example content:
+
+infotext_to_setting_name_mapping = [
     ('Conditional mask weight', 'inpainting_mask_weight'),
     ('Model hash', 'sd_model_checkpoint'),
     ('ENSD', 'eta_noise_seed_delta'),
     ('Schedule type', 'k_sched_type'),
-    ('Schedule max sigma', 'sigma_max'),
-    ('Schedule min sigma', 'sigma_min'),
-    ('Schedule rho', 'rho'),
-    ('Noise multiplier', 'initial_noise_multiplier'),
-    ('Eta', 'eta_ancestral'),
-    ('Eta DDIM', 'eta_ddim'),
-    ('Sigma churn', 's_churn'),
-    ('Sigma tmin', 's_tmin'),
-    ('Sigma tmax', 's_tmax'),
-    ('Sigma noise', 's_noise'),
-    ('Discard penultimate sigma', 'always_discard_next_to_last_sigma'),
-    ('UniPC variant', 'uni_pc_variant'),
-    ('UniPC skip type', 'uni_pc_skip_type'),
-    ('UniPC order', 'uni_pc_order'),
-    ('UniPC lower order final', 'uni_pc_lower_order_final'),
-    ('Token merging ratio', 'token_merging_ratio'),
-    ('Token merging ratio hr', 'token_merging_ratio_hr'),
-    ('RNG', 'randn_source'),
-    ('NGMS', 's_min_uncond'),
-    ('Pad conds', 'pad_cond_uncond'),
-    ('VAE', 'sd_vae'),
-    ('VAE Encoder', 'sd_vae_encode_method'),
-    ('VAE Decoder', 'sd_vae_decode_method'),
-    ('Tiling', 'tiling'),
-    ('Face restoration', 'face_restoration'),
 ]
+"""
 
 
 def create_override_settings_dict(text_pairs):
@@ -367,7 +348,8 @@ def create_override_settings_dict(text_pairs):
 
         params[k] = v.strip()
 
-    for param_name, setting_name in infotext_to_setting_name_mapping:
+    mapping = [(info.infotext, k) for k, info in shared.opts.data_labels.items() if info.infotext]
+    for param_name, setting_name in mapping + infotext_to_setting_name_mapping:
         value = params.get(param_name, None)
 
         if value is None:
@@ -421,7 +403,8 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
         def paste_settings(params):
             vals = {}
 
-            for param_name, setting_name in infotext_to_setting_name_mapping:
+            mapping = [(info.infotext, k) for k, info in shared.opts.data_labels.items() if info.infotext]
+            for param_name, setting_name in mapping + infotext_to_setting_name_mapping:
                 if param_name in already_handled_fields:
                     continue
 
-- 
cgit v1.2.3