diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/prompt_matrix.py | 49 | ||||
| -rw-r--r-- | scripts/xyz_grid.py | 21 |
2 files changed, 51 insertions, 19 deletions
diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py index dd95e588..de921ea8 100644 --- a/scripts/prompt_matrix.py +++ b/scripts/prompt_matrix.py @@ -44,16 +44,40 @@ class Script(scripts.Script): def title(self):
return "Prompt matrix"
- def ui(self, is_img2img):
- put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))
- different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))
-
- return [put_at_start, different_seeds]
-
- def run(self, p, put_at_start, different_seeds):
+ def ui(self, is_img2img):
+ gr.HTML('<br />')
+ with gr.Row():
+ with gr.Column():
+ put_at_start = gr.Checkbox(label='Put variable parts at start of prompt',
+ value=False, elem_id=self.elem_id("put_at_start"))
+ with gr.Column():
+ # Radio buttons for selecting the prompt between positive and negative
+ prompt_type = gr.Radio(["positive", "negative"], label="Select prompt",
+ elem_id=self.elem_id("prompt_type"), value="positive")
+ with gr.Row():
+ with gr.Column():
+ different_seeds = gr.Checkbox(
+ label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))
+ with gr.Column():
+ # Radio buttons for selecting the delimiter to use in the resulting prompt
+ variations_delimiter = gr.Radio(["comma", "space"], label="Select delimiter", elem_id=self.elem_id(
+ "variations_delimiter"), value="comma")
+ return [put_at_start, different_seeds, prompt_type, variations_delimiter]
+
+ def run(self, p, put_at_start, different_seeds, prompt_type, variations_delimiter):
modules.processing.fix_seed(p)
+ # Raise error if promp type is not positive or negative
+ if prompt_type not in ["positive", "negative"]:
+ raise ValueError(f"Unknown prompt type {prompt_type}")
+ # Raise error if variations delimiter is not comma or space
+ if variations_delimiter not in ["comma", "space"]:
+ raise ValueError(f"Unknown variations delimiter {variations_delimiter}")
+
+ prompt = p.prompt if prompt_type == "positive" else p.negative_prompt
+ original_prompt = prompt[0] if type(prompt) == list else prompt
+ positive_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt
- original_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt
+ delimiter = ", " if variations_delimiter == "comma" else " "
all_prompts = []
prompt_matrix_parts = original_prompt.split("|")
@@ -66,16 +90,19 @@ class Script(scripts.Script): else:
selected_prompts = [prompt_matrix_parts[0]] + selected_prompts
- all_prompts.append(", ".join(selected_prompts))
+ all_prompts.append(delimiter.join(selected_prompts))
p.n_iter = math.ceil(len(all_prompts) / p.batch_size)
p.do_not_save_grid = True
print(f"Prompt matrix will create {len(all_prompts)} images using a total of {p.n_iter} batches.")
- p.prompt = all_prompts
+ if prompt_type == "positive":
+ p.prompt = all_prompts
+ else:
+ p.negative_prompt = all_prompts
p.seed = [p.seed + (i if different_seeds else 0) for i in range(len(all_prompts))]
- p.prompt_for_display = original_prompt
+ p.prompt_for_display = positive_prompt
processed = process_images(p)
grid = images.image_grid(processed.images, p.batch_size, rows=1 << ((len(prompt_matrix_parts) - 1) // 2))
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py index 3df40483..3122f6f6 100644 --- a/scripts/xyz_grid.py +++ b/scripts/xyz_grid.py @@ -286,23 +286,24 @@ def draw_xyz_grid(p, xs, ys, zs, x_labels, y_labels, z_labels, cell, draw_legend print("Unexpected error: draw_xyz_grid failed to return even a single processed image")
return Processed(p, [])
- grids = [None] * len(zs)
+ sub_grids = [None] * len(zs)
for i in range(len(zs)):
start_index = i * len(xs) * len(ys)
end_index = start_index + len(xs) * len(ys)
grid = images.image_grid(image_cache[start_index:end_index], rows=len(ys))
if draw_legend:
grid = images.draw_grid_annotations(grid, cell_size[0], cell_size[1], hor_texts, ver_texts)
-
- grids[i] = grid
+ sub_grids[i] = grid
if include_sub_grids and len(zs) > 1:
processed_result.images.insert(i+1, grid)
- original_grid_size = grids[0].size
- grids = images.image_grid(grids, rows=1)
- processed_result.images[0] = images.draw_grid_annotations(grids, original_grid_size[0], original_grid_size[1], title_texts, [[images.GridAnnotation()]])
+ sub_grid_size = sub_grids[0].size
+ z_grid = images.image_grid(sub_grids, rows=1)
+ if draw_legend:
+ z_grid = images.draw_grid_annotations(z_grid, sub_grid_size[0], sub_grid_size[1], title_texts, [[images.GridAnnotation()]])
+ processed_result.images[0] = z_grid
- return processed_result
+ return processed_result, sub_grids
class SharedSettingsStackHelper(object):
@@ -576,7 +577,7 @@ class Script(scripts.Script): return res
with SharedSettingsStackHelper():
- processed = draw_xyz_grid(
+ processed, sub_grids = draw_xyz_grid(
p,
xs=xs,
ys=ys,
@@ -592,6 +593,10 @@ class Script(scripts.Script): second_axes_processed=second_axes_processed
)
+ if opts.grid_save and len(sub_grids) > 1:
+ for sub_grid in sub_grids:
+ images.save_image(sub_grid, p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)
+
if opts.grid_save:
images.save_image(processed.images[0], p.outpath_grids, "xyz_grid", info=grid_infotext[0], extension=opts.grid_format, prompt=p.prompt, seed=processed.seed, grid=True, p=p)
|