major refactor: remove backend original

Signed-off-by: Vladimir Mandic <mandic00@live.com>

scripts/allegrovideo.py

@@ -24,7 +24,7 @@ class Script(scripts_manager.Script):
         return 'Video: Allegro (Legacy)'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/animatediff.py

@@ -43,9 +43,6 @@ orig_pipe = None # original sd_model pipeline
 def set_adapter(adapter_name: str = 'None'):
     if not shared.sd_loaded:
         return
-    if not shared.native:
-        shared.log.warning('AnimateDiff: not in diffusers mode')
-        return
     global motion_adapter, loaded_adapter, orig_pipe # pylint: disable=global-statement
     # adapter_name = name if name is not None and isinstance(name, str) else loaded_adapter
     if adapter_name is None or adapter_name == 'None' or not shared.sd_loaded:
@@ -194,7 +191,6 @@ class Script(scripts_manager.Script):
         return 'Video: AnimateDiff'
 
     def show(self, is_img2img):
-        # return scripts_manager.AlwaysVisible if shared.native else False
         return not is_img2img
 
 

scripts/apg.py

@@ -15,7 +15,7 @@ class Script(scripts_manager.Script):
         return 'APG: Adaptive Projected Guidance'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/automatic_color_inpaint.py

@@ -33,9 +33,7 @@ class Script(scripts_manager.Script):
         return title
 
     def show(self, is_img2img):
-        if shared.native:
-            return img2img if is_img2img else txt2img
-        return False
+        return img2img if is_img2img else txt2img
 
     # Define UI for pipeline
     def ui(self, _is_img2img):

scripts/blipdiffusion.py

@@ -7,7 +7,7 @@ class Script(scripts_manager.Script):
         return 'BLIP Diffusion: Controllable Generation and Editing'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/cogvideo.py

@@ -25,7 +25,7 @@ class Script(scripts_manager.Script):
         return 'Video: CogVideoX (Legacy)'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
 
     def ui(self, is_img2img):

scripts/consistory_ext.py

@@ -25,7 +25,7 @@ class Script(scripts_manager.Script):
         return 'ConsiStory: Consistent Image Generation'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     def reset(self):
         self.anchor_cache_first_stage = None

scripts/ctrlx_ext.py

@@ -10,7 +10,7 @@ class Script(scripts_manager.Script):
         return 'Ctrl-X: Controlling Structure and Appearance'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/demofusion.py

@@ -1224,7 +1224,7 @@ class Script(scripts_manager.Script):
         return 'DemoFusion: High-Resolution Image Generation'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/differential_diffusion.py

@@ -1861,7 +1861,7 @@ class Script(scripts_manager.Script):
         return 'Differential diffusion: Individual Pixel Strength'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/example.py

@@ -67,9 +67,7 @@ class Script(scripts_manager.Script):
         return title
 
     def show(self, is_img2img):
-        if shared.native:
-            return img2img if is_img2img else txt2img
-        return False
+        return img2img if is_img2img else txt2img
 
     # Define UI for pipeline
     def ui(self, _is_img2img):

scripts/flux_enhance.py

@@ -30,7 +30,7 @@ class Script(scripts_manager.Script):
         return 'Flux Prompt enhance (Legacy)'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     def load(self):
         with load_lock:

scripts/flux_tools.py

@@ -19,7 +19,7 @@ class Script(scripts_manager.Script):
         return f'{title}'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/freescale_ext.py

@@ -18,7 +18,7 @@ class Script(scripts_manager.Script):
 
     def show(self, is_img2img):
         self.is_img2img = is_img2img
-        return shared.native
+        return True
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/hunyuanvideo.py

@@ -53,7 +53,7 @@ class Script(scripts_manager.Script):
         return 'Video: Hunyuan Video (Legacy)'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/image2video.py

@@ -16,7 +16,7 @@ class Script(scripts_manager.Script):
         return 'Video: VGen Image-to-Video'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
         # return False
 
     # return signature is array of gradio components

scripts/infiniteyou_ext.py

@@ -36,7 +36,7 @@ class Script(scripts_manager.Script):
         return f'{prefix}: Flexible Photo Recrafting'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/init_latents.py

@@ -8,7 +8,7 @@ class Script(scripts_manager.Script):
         return 'Init Latents'
 
     def show(self, is_img2img):
-        return scripts_manager.AlwaysVisible if shared.native else False
+        return scripts_manager.AlwaysVisible
 
     @staticmethod
     def get_latents(p):
@@ -29,7 +29,7 @@ class Script(scripts_manager.Script):
         p.generator = generator if p.subseed_strength <= 0.5 else var_generator
 
     def process_batch(self, p: processing.StableDiffusionProcessing, *args, **kwargs): # pylint: disable=arguments-differ
-        if not shared.native or not shared.sd_loaded or not hasattr(shared.sd_model, 'unet'):
+        if not shared.sd_loaded or not hasattr(shared.sd_model, 'unet'):
             return
         from modules.processing_helpers import create_random_tensors
         args = list(args)

scripts/instantir_ext.py

@@ -15,7 +15,7 @@ class Script(scripts_manager.Script):
         return 'InstantIR: Image Restoration'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/ipadapter.py

@@ -14,7 +14,7 @@ class Script(scripts_manager.Script):
         return 'IP Adapters'
 
     def show(self, is_img2img):
-        return scripts_manager.AlwaysVisible if shared.native else False
+        return scripts_manager.AlwaysVisible
 
     def load_images(self, files):
         init_images = []
@@ -89,8 +89,6 @@ class Script(scripts_manager.Script):
         return [num_adapters] + [unload_adapter] + adapters + scales + files + crops + starts + ends + masks + [layers_active] + [layers]
 
     def process(self, p: processing.StableDiffusionProcessing, *args): # pylint: disable=arguments-differ
-        if not shared.native:
-            return
         args = list(args) if args is not None else []
         if len(args) == 0:
             return

scripts/ipinstruct.py

@@ -27,7 +27,7 @@ class Script(scripts_manager.Script):
 
     def show(self, is_img2img):
         if shared.cmd_opts.experimental:
-            return not is_img2img if shared.native else False
+            return not is_img2img
         else:
             return False
 

scripts/k_diff.py

@@ -1,76 +0,0 @@
-import inspect
-import gradio as gr
-from modules import scripts_manager, processing, shared, sd_models, ui_common
-
-
-class Script(scripts_manager.Script):
-    supported_models = ['sd', 'sdxl']
-    orig_pipe = None
-
-    def title(self):
-        return 'K-Diffusion Samplers'
-
-    def show(self, is_img2img):
-        return not is_img2img if shared.native else False
-
-    def ui(self, _is_img2img): # ui elements
-        with gr.Row():
-            gr.HTML('<a href="https://github.com/crowsonkb/k-diffusion">&nbsp K-Diffusion Samplers</a><br>')
-        with gr.Row():
-            sampler = gr.Dropdown(label="Sampler", choices=[])
-            _refresh = ui_common.create_refresh_button(sampler, self.samplers, lambda: {"choices": self.samplers()})
-        return [sampler]
-
-    def samplers(self):
-        samplers = []
-        from modules import sd_samplers_kdiffusion
-        for s in dir(sd_samplers_kdiffusion.k_sampling):
-            if s.startswith('sample_'):
-                samplers.append(s.replace('sample_', ''))
-        return samplers
-
-    def callback(self, d):
-        _step = d['i']
-
-    def run(self, p: processing.StableDiffusionProcessing, sampler: str): # pylint: disable=arguments-differ
-        if sampler is None or len(sampler) == 0:
-            return None
-        if shared.sd_model_type not in self.supported_models:
-            shared.log.warning(f'K-Diffusion: class={shared.sd_model.__class__.__name__} model={shared.sd_model_type} required={self.supported_models}')
-            return None
-        import diffusers
-        cls = None
-        if shared.sd_model_type == "sd":
-            cls = diffusers.pipelines.StableDiffusionKDiffusionPipeline
-        if shared.sd_model_type == "sdxl":
-            cls = diffusers.pipelines.StableDiffusionXLKDiffusionPipeline
-        if cls is None:
-            return None
-        from modules import sd_samplers_kdiffusion
-
-        sampler_fn = getattr(sd_samplers_kdiffusion.k_sampling, f'sample_{sampler}', None)
-        if sampler_fn is None:
-            shared.log.warning(f'K-Diffusion: sampler={sampler} not found')
-            return None
-
-        self.orig_pipe = shared.sd_model
-        shared.sd_model = sd_models.switch_pipe(cls, shared.sd_model)
-        shared.sd_model.sampler = sampler_fn
-
-        params = inspect.signature(shared.sd_model.sampler).parameters.values()
-        params = {param.name: param.default for param in params if param.default != inspect.Parameter.empty}
-        # if 'callback' in list(params):
-        #     params['callback'] = self.callback
-        # if 'disable' in list(params):
-        #     params['disable'] = False
-        shared.log.info(f'K-diffusion apply: class={shared.sd_model.__class__.__name__} sampler={sampler} params={params}')
-        p.extra_generation_params["Sampler"] = sampler
-        return None
-
-    def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, sampler): # pylint: disable=arguments-differ, unused-argument
-        if self.orig_pipe is None:
-            return processed
-        if shared.sd_model_type == "sdxl" or shared.sd_model_type == "sd":
-            shared.sd_model = self.orig_pipe
-        self.orig_pipe = None
-        return processed

scripts/kohya_hires_fix.py

@@ -8,7 +8,7 @@ class Script(scripts_manager.Script):
         return 'Kohya HiRes Fix'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/layerdiffuse/__init__.py

@@ -41,8 +41,6 @@ def apply_layerdiffuse_sdxl_conv(pipeline):
 
 
 def apply_layerdiffuse():
-    if not shared.native:
-        return
     try:
         if shared.sd_model_type == 'sd':
             shared.log.info(f'LayerDiffuse: class={shared.sd_model.__class__.__name__}')

scripts/layerdiffuse_ext.py

@@ -8,7 +8,7 @@ class Script(scripts_manager.Script):
         return 'LayerDiffuse: Transparent Image'
 
     def show(self, is_img2img):
-        return True if shared.native else False
+        return True
 
     def apply(self):
         from scripts import layerdiffuse # pylint: disable=no-name-in-module

scripts/lbm_ext.py

@@ -34,7 +34,7 @@ class Script(scripts_manager.Script):
         return 'LBM: Latent Bridge Matching'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/ledits.py

@@ -8,7 +8,7 @@ class Script(scripts_manager.Script):
         return 'LEdits: Limitless Image Editing'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/legacy_allegrovideo.py

@@ -24,7 +24,7 @@ class Script(scripts_manager.Script):
         return 'Video: Allegro (Legacy)'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/loopback.py

@@ -21,11 +21,10 @@ class Script(scripts_manager.Script):
             final_denoising_strength = gr.Slider(minimum=0, maximum=1, step=0.01, label='Final denoising strength', value=0.5, elem_id=self.elem_id("final_denoising_strength"))
         with gr.Row():
             denoising_curve = gr.Dropdown(label="Denoising strength curve", choices=["Aggressive", "Linear", "Lazy"], value="Linear")
-            append_interrogation = gr.Dropdown(label="Append interrogated prompt at each iteration", choices=["None", "CLIP", "DeepBooru"], value="None")
 
-        return [loops, final_denoising_strength, denoising_curve, append_interrogation]
+        return [loops, final_denoising_strength, denoising_curve]
 
-    def run(self, p, loops, final_denoising_strength, denoising_curve, append_interrogation): # pylint: disable=arguments-differ
+    def run(self, p, loops, final_denoising_strength, denoising_curve): # pylint: disable=arguments-differ
         processing.fix_seed(p)
         batch_count = p.n_iter
         p.extra_generation_params = {
@@ -44,7 +43,6 @@ class Script(scripts_manager.Script):
         grids = []
         all_images = []
         original_init_image = p.init_images
-        original_prompt = p.prompt
         original_inpainting_fill = p.inpainting_fill
         state.job_count = loops * batch_count
 
@@ -86,15 +84,6 @@ class Script(scripts_manager.Script):
                 if opts.img2img_color_correction:
                     p.color_corrections = initial_color_corrections
 
-                if append_interrogation != "None":
-                    p.prompt = f"{original_prompt}, " if original_prompt else ""
-                    if append_interrogation == "CLIP":
-                        from modules.interrogate import openclip
-                        p.prompt += openclip.interrogator.interrogate(p.init_images[0])
-                    elif append_interrogation == "DeepBooru":
-                        from modules.interrogate import deepbooru
-                        p.prompt += deepbooru.model.tag(p.init_images[0])
-
                 state.job = f"loopback iteration {i+1}/{loops} batch {n+1}/{batch_count}"
 
                 processed = processing.process_images(p)

scripts/ltxvideo.py

@@ -44,7 +44,7 @@ class Script(scripts_manager.Script):
         return 'Video: LTX Video (Legacy)'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/lut.py

@@ -13,7 +13,7 @@ class Script(scripts_manager.Script):
         return 'LUT Color grading'
 
     def show(self, is_img2img): # pylint: disable=unused-argument
-        return shared.native
+        return True
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/mixture_of_diffusers.py

@@ -17,7 +17,7 @@ class Script(scripts_manager.Script):
         return 'Mixture-of-Diffusers: Tile Control'
 
     def show(self, is_img2img): # pylint: disable=unused-argument
-        return shared.native
+        return True
 
     def update_ui(self, x_tiles, y_tiles):
         updates = []

scripts/mixture_tiling.py

@@ -29,7 +29,7 @@ class Script(scripts_manager.Script):
         return 'Mixture Tiling: Scene Composition'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/mochivideo.py

@@ -13,7 +13,7 @@ class Script(scripts_manager.Script):
         return 'Video: Mochi.1 Video (Legacy)'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/mulan.py

@@ -49,7 +49,7 @@ class Script(scripts_manager.Script):
         return 'MuLan: Multi Language Prompts'
 
     def show(self, is_img2img):
-        return True if shared.native else False
+        return True
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/pixelsmith_ext.py

@@ -14,7 +14,7 @@ class Script(scripts_manager.Script):
         return 'PixelSmith'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/pulid_ext.py

@@ -25,7 +25,7 @@ class Script(scripts_manager.Script):
         return 'PuLID: ID Customization'
 
     def show(self, _is_img2img):
-        return shared.native
+        return True
 
     def dependencies(self):
         from installer import install, installed, reload

scripts/regional_prompting.py

@@ -26,7 +26,7 @@ class Script(scripts_manager.Script):
         return 'Regional prompting'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     def change(self, mode):
         return [gr.update(visible='Col' in mode or 'Row' in mode), gr.update(visible='Prompt' in mode)]

scripts/resadapter.py

@@ -22,7 +22,7 @@ class Script(scripts_manager.Script):
         return 'ResAdapter: Domain Consistent Resolution'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):
@@ -34,7 +34,7 @@ class Script(scripts_manager.Script):
         return [model, weight]
 
     def run(self, p: processing.StableDiffusionProcessing, model, weight): # pylint: disable=arguments-differ
-        if not shared.native or model == 'None':
+        if model == 'None':
             return None
         if shared.sd_model_type == 'sd':
             if not model.startswith('SD15'):

scripts/skip_layer_guidance.py

@@ -15,7 +15,7 @@ class Script(scripts_manager.Script):
         return 'SLG: Skip Layer Guidance'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/softfill.py

@@ -1614,7 +1614,7 @@ class Script(scripts_manager.Script):
         return 'SoftFill: Inpaint with Differential diffusion'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/stablevideodiffusion.py

@@ -19,7 +19,7 @@ class Script(scripts_manager.Script):
         return 'Video: Stable Video Diffusion'
 
     def show(self, is_img2img):
-        return is_img2img if shared.native else False
+        return is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/style_aligned_ext.py

@@ -16,7 +16,7 @@ class Script(scripts_manager.Script):
         return 'Style Aligned Image Generation'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     def reset(self):
         global handler, zts # pylint: disable=global-statement

scripts/t_gate.py

@@ -8,7 +8,7 @@ class Script(scripts_manager.Script):
         return 'T-Gate: Accelerate via Gating Attention'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, _is_img2img):

scripts/text2video.py

@@ -26,7 +26,7 @@ class Script(scripts_manager.Script):
         return 'Video: ModelScope'
 
     def show(self, is_img2img):
-        return not is_img2img if shared.native else False
+        return not is_img2img
 
     # return signature is array of gradio components
     def ui(self, is_img2img):

scripts/tiling.py

@@ -32,7 +32,7 @@ class Script(scripts_manager.Script):
         return 'Asymmetric Tiling'
 
     def show(self, is_img2img):
-        return shared.native
+        return True
 
     def ui(self, _is_img2img): # ui elements
         with gr.Row():

scripts/xadapter_ext.py

@@ -16,7 +16,6 @@ class Script(scripts_manager.Script):
 
     def show(self, is_img2img):
         return False
-        # return True if shared.native else False
 
     def ui(self, _is_img2img):
         with gr.Row():

scripts/xyz_grid.py

@@ -13,7 +13,7 @@ import gradio as gr
 from scripts.xyz_grid_shared import str_permutations, list_to_csv_string, re_range # pylint: disable=no-name-in-module
 from scripts.xyz_grid_classes import axis_options, AxisOption, SharedSettingsStackHelper # pylint: disable=no-name-in-module
 from scripts.xyz_grid_draw import draw_xyz_grid # pylint: disable=no-name-in-module
-from scripts.xyz_grid_shared import apply_field, apply_task_args, apply_setting, apply_prompt, apply_order, apply_sampler, apply_hr_sampler_name, confirm_samplers, apply_checkpoint, apply_refiner, apply_unet, apply_dict, apply_clip_skip, apply_vae, list_lora, apply_lora, apply_lora_strength, apply_te, apply_styles, apply_upscaler, apply_context, apply_detailer, apply_override, apply_processing, apply_options, apply_seed, format_value_add_label, format_value, format_value_join_list, do_nothing, format_nothing # pylint: disable=no-name-in-module, unused-import
+from scripts.xyz_grid_shared import apply_field, apply_task_args, apply_setting, apply_prompt, apply_order, apply_sampler, apply_hr_sampler_name, confirm_samplers, apply_checkpoint, apply_refiner, apply_unet, apply_clip_skip, apply_vae, list_lora, apply_lora, apply_lora_strength, apply_te, apply_styles, apply_upscaler, apply_context, apply_detailer, apply_override, apply_processing, apply_options, apply_seed, format_value_add_label, format_value, format_value_join_list, do_nothing, format_nothing # pylint: disable=no-name-in-module, unused-import
 from modules import shared, errors, scripts_manager, images, processing
 from modules.ui_components import ToolButton
 from modules.ui_sections import create_video_inputs

scripts/xyz_grid_classes.py

@@ -1,4 +1,4 @@
-from scripts.xyz_grid_shared import apply_field, apply_task_arg, apply_task_args, apply_setting, apply_prompt_primary, apply_prompt_refine, apply_prompt_detailer, apply_prompt_all, apply_order, apply_sampler, apply_hr_sampler_name, confirm_samplers, apply_checkpoint, apply_refiner, apply_unet, apply_dict, apply_clip_skip, apply_vae, list_lora, apply_lora, apply_lora_strength, apply_te, apply_styles, apply_upscaler, apply_context, apply_detailer, apply_override, apply_processing, apply_options, apply_seed, apply_sdnq_quant,  apply_sdnq_quant_te, format_value_add_label, format_bool, format_value, format_value_join_list, do_nothing, format_nothing, str_permutations # pylint: disable=no-name-in-module, unused-import
+from scripts.xyz_grid_shared import apply_field, apply_task_arg, apply_task_args, apply_setting, apply_prompt_primary, apply_prompt_refine, apply_prompt_detailer, apply_prompt_all, apply_order, apply_sampler, apply_hr_sampler_name, confirm_samplers, apply_checkpoint, apply_refiner, apply_unet, apply_clip_skip, apply_vae, list_lora, apply_lora, apply_lora_strength, apply_te, apply_styles, apply_upscaler, apply_context, apply_detailer, apply_override, apply_processing, apply_options, apply_seed, apply_sdnq_quant,  apply_sdnq_quant_te, format_value_add_label, format_bool, format_value, format_value_join_list, do_nothing, format_nothing, str_permutations # pylint: disable=no-name-in-module, unused-import
 from modules import shared, shared_items, sd_samplers, ipadapter, sd_models, sd_vae, sd_unet
 
 
@@ -27,7 +27,6 @@ class AxisOptionTxt2Img(AxisOption):
 class SharedSettingsStackHelper():
     sd_model_checkpoint = None
     sd_model_refiner = None
-    sd_model_dict = None
     sd_vae = None
     sd_unet = None
     sd_text_encoder = None
@@ -82,7 +81,6 @@ class SharedSettingsStackHelper():
         self.cfgzero_enabled = shared.opts.cfgzero_enabled
         self.sd_model_checkpoint = shared.opts.sd_model_checkpoint
         self.sd_model_refiner = shared.opts.sd_model_refiner
-        self.sd_model_dict = shared.opts.sd_model_dict
         self.sd_vae = shared.opts.sd_vae
         self.sd_unet = shared.opts.sd_unet
         self.sd_text_encoder = shared.opts.sd_text_encoder
@@ -126,9 +124,6 @@ class SharedSettingsStackHelper():
         if self.sd_model_refiner != shared.opts.sd_model_refiner:
             shared.opts.data["sd_model_refiner"] = self.sd_model_refiner
             sd_models.reload_model_weights(op='refiner')
-        if self.sd_model_dict != shared.opts.sd_model_dict:
-            shared.opts.data["sd_model_dict"] = self.sd_model_dict
-            sd_models.reload_model_weights(op='dict')
         if self.sd_vae != shared.opts.sd_vae:
             shared.opts.data["sd_vae"] = self.sd_vae
             sd_vae.reload_vae_weights()
@@ -150,7 +145,6 @@ axis_options = [
     AxisOption("[Model] VAE", str, apply_vae, cost=0.6, choices=lambda: ['None'] + list(sd_vae.vae_dict)),
     AxisOption("[Model] Refiner", str, apply_refiner, cost=0.8, fmt=format_value_add_label, choices=lambda: ['None'] + sorted(sd_models.checkpoints_list)),
     AxisOption("[Model] Text encoder", str, apply_te, cost=0.7, choices=shared_items.sd_te_items),
-    AxisOption("[Model] Dictionary", str, apply_dict, fmt=format_value_add_label, cost=0.9, choices=lambda: ['None'] + list(sd_models.checkpoints_list)),
     AxisOption("[Prompt] Search & replace", str, apply_prompt_primary, fmt=format_value_add_label),
     AxisOption("[Prompt] Search & replace refine", str, apply_prompt_refine, fmt=format_value_add_label),
     AxisOption("[Prompt] Search & replace detailer", str, apply_prompt_detailer, fmt=format_value_add_label),

scripts/xyz_grid_shared.py

@@ -198,20 +198,6 @@ def apply_unet(p, x, xs):
     shared.log.debug(f'XYZ grid apply unet: "{x}"')
 
 
-def apply_dict(p, x, xs):
-    if x == shared.opts.sd_model_dict:
-        return
-    info_dict = sd_models.get_closet_checkpoint_match(x)
-    info_ckpt = sd_models.get_closet_checkpoint_match(shared.opts.sd_model_checkpoint)
-    if info_dict is None or info_ckpt is None:
-        shared.log.warning(f"XYZ grid: apply dict unknown checkpoint: {x}")
-    else:
-        shared.opts.sd_model_dict = info_dict.name # this will trigger reload_model_weights via onchange handler
-        p.override_settings['sd_model_checkpoint'] = info_ckpt.name
-        p.override_settings['sd_model_dict'] = info_dict.name
-    shared.log.debug(f'XYZ grid apply model dict: "{x}"')
-
-
 def apply_clip_skip(p, x, xs):
     p.clip_skip = x
     shared.log.debug(f'XYZ grid apply clip-skip: "{x}"')