Unverified Commit 34055f9d authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #13302 from Zolxys/patch-1

Fix: --sd_model in "Prompts from file or textbox" script is not working
parents 9b174165 701feabf
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -5,11 +5,17 @@ import shlex
import modules.scripts as scripts
import gradio as gr

from modules import sd_samplers, errors
from modules import sd_samplers, errors, sd_models
from modules.processing import Processed, process_images
from modules.shared import state


def process_model_tag(tag):
    info = sd_models.get_closet_checkpoint_match(tag)
    assert info is not None, f'Unknown checkpoint: {tag}'
    return info.name


def process_string_tag(tag):
    return tag

@@ -27,7 +33,7 @@ def process_boolean_tag(tag):


prompt_tags = {
    "sd_model": None,
    "sd_model": process_model_tag,
    "outpath_samples": process_string_tag,
    "outpath_grids": process_string_tag,
    "prompt_for_display": process_string_tag,
@@ -156,6 +162,9 @@ class Script(scripts.Script):

            copy_p = copy.copy(p)
            for k, v in args.items():
                if k == "sd_model":
                    copy_p.override_settings['sd_model_checkpoint'] = v
                else:
                    setattr(copy_p, k, v)

            proc = process_images(copy_p)