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

Merge pull request #7371 from hoblin/master

[Prompt Matrix] Support for negative prompt + delimiter selector
parents 814600f2 1e2b10d2
Loading
Loading
Loading
Loading
+38 −11
Original line number Diff line number Diff line
@@ -45,15 +45,39 @@ class Script(scripts.Script):
        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):
        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}")

        original_prompt = p.prompt[0] if type(p.prompt) == list else p.prompt
        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

        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.")

        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))