diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-09-30 05:49:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-30 05:49:26 +0000 |
commit | 34055f9d0cf7ec9431c6cb1ed0853a2ac1d5a42e (patch) | |
tree | 1ef46d435500eeea3653c16778edc41c6b2780a3 /scripts/prompts_from_file.py | |
parent | 9b17416580413df0b5ea46a58113e69fa08866a7 (diff) | |
parent | 701feabf496b7ce0327ccdb1ef1dc942deab25ea (diff) | |
download | stable-diffusion-webui-gfx803-34055f9d0cf7ec9431c6cb1ed0853a2ac1d5a42e.tar.gz stable-diffusion-webui-gfx803-34055f9d0cf7ec9431c6cb1ed0853a2ac1d5a42e.tar.bz2 stable-diffusion-webui-gfx803-34055f9d0cf7ec9431c6cb1ed0853a2ac1d5a42e.zip |
Merge pull request #13302 from Zolxys/patch-1
Fix: --sd_model in "Prompts from file or textbox" script is not working
Diffstat (limited to 'scripts/prompts_from_file.py')
-rw-r--r-- | scripts/prompts_from_file.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py index 50320d55..ca73b2a5 100644 --- a/scripts/prompts_from_file.py +++ b/scripts/prompts_from_file.py @@ -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,7 +162,10 @@ class Script(scripts.Script): copy_p = copy.copy(p)
for k, v in args.items():
- setattr(copy_p, k, v)
+ if k == "sd_model":
+ copy_p.override_settings['sd_model_checkpoint'] = v
+ else:
+ setattr(copy_p, k, v)
proc = process_images(copy_p)
images += proc.images
|