Commit f4535f6e authored by AUTOMATIC's avatar AUTOMATIC
Browse files

make it so that memory/embeddings info is displayed in a separate UI element... 

make it so that memory/embeddings info is displayed in a separate UI element from generation parameters, and is preserved when you change the displayed infotext by clicking on gallery images
parent bdbe0982

modules/img2img.py

+1 −1
Original line number Diff line number Diff line
@@ -162,4 +162,4 @@ def img2img(mode: int, prompt: str, negative_prompt: str, prompt_style: str, pro 
    if opts.do_not_show_images:

        processed.images = []



    return processed.images, generation_info_js, plaintext_to_html(processed.info)
 
    return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments)

modules/processing.py

+3 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ class StableDiffusionProcessing(): 




class Processed:

    def __init__(self, p: StableDiffusionProcessing, images_list, seed=-1, info="", subseed=None, all_prompts=None, all_negative_prompts=None, all_seeds=None, all_subseeds=None, index_of_first_image=0, infotexts=None):

    def __init__(self, p: StableDiffusionProcessing, images_list, seed=-1, info="", subseed=None, all_prompts=None, all_negative_prompts=None, all_seeds=None, all_subseeds=None, index_of_first_image=0, infotexts=None, comments=""):

        self.images = images_list

        self.prompt = p.prompt

        self.negative_prompt = p.negative_prompt
@@ -247,6 +247,7 @@ class Processed: 
        self.subseed = subseed

        self.subseed_strength = p.subseed_strength

        self.info = info

        self.comments = comments

        self.width = p.width

        self.height = p.height

        self.sampler_name = p.sampler_name
@@ -646,7 +647,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: 


    devices.torch_gc()



    res = Processed(p, output_images, p.all_seeds[0], infotext() + "".join(["\n\n" + x for x in comments]), subseed=p.all_subseeds[0], index_of_first_image=index_of_first_image, infotexts=infotexts)

    res = Processed(p, output_images, p.all_seeds[0], infotext(), comments="".join(["\n\n" + x for x in comments]), subseed=p.all_subseeds[0], index_of_first_image=index_of_first_image, infotexts=infotexts)



    if p.scripts is not None:

        p.scripts.postprocess(p, res)

modules/txt2img.py

+1 −1
Original line number Diff line number Diff line
@@ -59,4 +59,4 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: 
    if opts.do_not_show_images:

        processed.images = []



    return processed.images, generation_info_js, plaintext_to_html(processed.info)
 
    return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments)

modules/ui.py

+17 −14
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ def save_files(js_data, images, do_make_zip, index): 
                    zip_file.writestr(filenames[i], f.read())

        fullfns.insert(0, zip_filepath)



    return gr.File.update(value=fullfns, visible=True), '', '', plaintext_to_html(f"Saved: {filenames[0]}")

    return gr.File.update(value=fullfns, visible=True), plaintext_to_html(f"Saved: {filenames[0]}")
@@ -593,6 +593,8 @@ Requested path was: {f} 


                    with gr.Group():

                        html_info = gr.HTML()

                        html_log = gr.HTML()



                        generation_info = gr.Textbox(visible=False)

                        if tabname == 'txt2img' or tabname == 'img2img':

                            generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")
@@ -615,16 +617,16 @@ Requested path was: {f} 
                            ],

                            outputs=[

                                download_files,

                                html_info,

                                html_info,

                                html_info,

                                html_log,

                            ]

                        )

                else:

                    html_info_x = gr.HTML()

                    html_info = gr.HTML()

                    html_log = gr.HTML()



                parameters_copypaste.bind_buttons(buttons, result_gallery, "txt2img" if tabname == "txt2img" else None)

                return result_gallery, generation_info if tabname != "extras" else html_info_x, html_info

                return result_gallery, generation_info if tabname != "extras" else html_info_x, html_info, html_log





def create_ui():
@@ -686,14 +688,14 @@ def create_ui(): 
                with gr.Group():

                    custom_inputs = modules.scripts.scripts_txt2img.setup_ui()



            txt2img_gallery, generation_info, html_info = create_output_panel("txt2img", opts.outdir_txt2img_samples)

            txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples)

            parameters_copypaste.bind_buttons({"txt2img": txt2img_paste}, None, txt2img_prompt)



            connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)

            connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)



            txt2img_args = dict(

                fn=wrap_gradio_gpu_call(modules.txt2img.txt2img),

                fn=wrap_gradio_gpu_call(modules.txt2img.txt2img, extra_outputs=[None, '', '']),

                _js="submit",

                inputs=[

                    txt2img_prompt,
@@ -720,7 +722,8 @@ def create_ui(): 
                outputs=[

                    txt2img_gallery,

                    generation_info,

                    html_info

                    html_info,

                    html_log,

                ],

                show_progress=False,

            )
@@ -799,7 +802,6 @@ def create_ui(): 
    with gr.Blocks(analytics_enabled=False) as img2img_interface:

        img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_deepbooru, img2img_prompt_style_apply, img2img_save_style, img2img_paste,token_counter, token_button = create_toprow(is_img2img=True)





        with gr.Row(elem_id='img2img_progress_row'):

            img2img_prompt_img = gr.File(label="", elem_id="img2img_prompt_image", file_count="single", type="bytes", visible=False)
@@ -883,7 +885,7 @@ def create_ui(): 
                with gr.Group():

                    custom_inputs = modules.scripts.scripts_img2img.setup_ui()



            img2img_gallery, generation_info, html_info = create_output_panel("img2img", opts.outdir_img2img_samples)

            img2img_gallery, generation_info, html_info, html_log = create_output_panel("img2img", opts.outdir_img2img_samples)

            parameters_copypaste.bind_buttons({"img2img": img2img_paste}, None, img2img_prompt)



            connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
@@ -915,7 +917,7 @@ def create_ui(): 
            )



            img2img_args = dict(

                fn=wrap_gradio_gpu_call(modules.img2img.img2img),

                fn=wrap_gradio_gpu_call(modules.img2img.img2img, extra_outputs=[None, '', '']),

                _js="submit_img2img",

                inputs=[

                    dummy_component,
@@ -954,7 +956,8 @@ def create_ui(): 
                outputs=[

                    img2img_gallery,

                    generation_info,

                    html_info

                    html_info,

                    html_log,

                ],

                show_progress=False,

            )
@@ -1078,10 +1081,10 @@ def create_ui(): 
                with gr.Group():

                    upscale_before_face_fix = gr.Checkbox(label='Upscale Before Restoring Faces', value=False)



            result_images, html_info_x, html_info = create_output_panel("extras", opts.outdir_extras_samples)

            result_images, html_info_x, html_info, html_log = create_output_panel("extras", opts.outdir_extras_samples)



        submit.click(

            fn=wrap_gradio_gpu_call(modules.extras.run_extras),

            fn=wrap_gradio_gpu_call(modules.extras.run_extras, extra_outputs=[None, '']),

            _js="get_extras_tab_index",

            inputs=[

                dummy_component,

CRA Git | Maintained and supported by SUSTech CRA and CCSE