Merge branch 'dev' into release_candidate

1 files changed, 26 insertions, 21 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index a3448be9..386517ac 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -6,7 +6,7 @@ import re
 

 import gradio as gr

 from modules.paths import data_path

-from modules import shared, ui_tempdir, script_callbacks

+from modules import shared, ui_tempdir, script_callbacks, processing

 from PIL import Image

 

 re_param_code = r'\s*([\w ]+):\s*("(?:\\"[^,]|\\"|\\|[^\"])+"|[^,]*)(?:,|$)'

@@ -198,7 +198,6 @@ def restore_old_hires_fix_params(res):
     height = int(res.get("Size-2", 512))

 

     if firstpass_width == 0 or firstpass_height == 0:

-        from modules import processing

         firstpass_width, firstpass_height = processing.old_hires_fix_first_pass_dimensions(width, height)

 

     res['Size-1'] = firstpass_width

@@ -280,6 +279,9 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     if "Hires sampler" not in res:

         res["Hires sampler"] = "Use same sampler"

 

+    if "Hires checkpoint" not in res:

+        res["Hires checkpoint"] = "Use same checkpoint"

+

     if "Hires prompt" not in res:

         res["Hires prompt"] = ""

 

@@ -304,32 +306,28 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     if "Schedule rho" not in res:

         res["Schedule rho"] = 0

 

+    if "VAE Encoder" not in res:

+        res["VAE Encoder"] = "Full"

+

+    if "VAE Decoder" not in res:

+        res["VAE Decoder"] = "Full"

+

     return res

 

 

 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'),

-    ('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'),

 ]

+"""

 

 

 def create_override_settings_dict(text_pairs):

@@ -350,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:

@@ -399,10 +398,16 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
         return res

 

     if override_settings_component is not None:

+        already_handled_fields = {key: 1 for _, key in paste_fields}

+

         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

+

                 v = params.get(param_name, None)

                 if v is None:

                     continue