aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilly <milly.ca@gmail.com>2022-10-05 02:13:09 +0900
committerAUTOMATIC1111 <16777216c@gmail.com>2022-10-06 20:41:23 +0300
commit070b7d60cf5dac6387b3bfc8f3b3977b620e4fd5 (patch)
tree3838702a2759cfd42323cf326832fbbee680ae8d
parenta5a08b0bee531f4402525cae81cdca0013141dfa (diff)
Added styles to Processed
So `[styles]` pattern can use in saving image UI.
-rw-r--r--modules/images.py7
-rw-r--r--modules/processing.py2
2 files changed, 3 insertions, 6 deletions
diff --git a/modules/images.py b/modules/images.py
index 810f1446..fa0714fd 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -292,12 +292,7 @@ def apply_filename_pattern(x, p, seed, prompt):
x = x.replace("[cfg]", str(p.cfg_scale))
x = x.replace("[width]", str(p.width))
x = x.replace("[height]", str(p.height))
-
- #currently disabled if using the save button, will work otherwise
- # if enabled it will cause a bug because styles is not included in the save_files data dictionary
- if hasattr(p, "styles"):
- x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]) or "None", replace_spaces=False))
-
+ x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]) or "None", replace_spaces=False))
x = x.replace("[sampler]", sanitize_filename_part(sd_samplers.samplers[p.sampler_index].name, replace_spaces=False))
x = x.replace("[model_hash]", shared.sd_model.sd_model_hash)
diff --git a/modules/processing.py b/modules/processing.py
index 8faf9095..706dbfa8 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -121,6 +121,7 @@ class Processed:
self.denoising_strength = getattr(p, 'denoising_strength', None)
self.extra_generation_params = p.extra_generation_params
self.index_of_first_image = index_of_first_image
+ self.styles = p.styles
self.eta = p.eta
self.ddim_discretize = p.ddim_discretize
@@ -165,6 +166,7 @@ class Processed:
"extra_generation_params": self.extra_generation_params,
"index_of_first_image": self.index_of_first_image,
"infotexts": self.infotexts,
+ "styles": self.styles,
}
return json.dumps(obj)