Merge branch 'dev' into npu_support

1 files changed, 96 insertions, 36 deletions

diff --git a/modules/ui_common.py b/modules/ui_common.py
index 032ec4af..29fe7d0e 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -1,3 +1,5 @@
+import csv

+import dataclasses

 import json

 import html

 import os

@@ -8,10 +10,10 @@ import gradio as gr
 import subprocess as sp

 

 from modules import call_queue, shared

-from modules.generation_parameters_copypaste import image_from_url_text

+from modules.infotext_utils import image_from_url_text

 import modules.images

 from modules.ui_components import ToolButton

-import modules.generation_parameters_copypaste as parameters_copypaste

+import modules.infotext_utils as parameters_copypaste

 

 folder_symbol = '\U0001f4c2'  # 📂

 refresh_symbol = '\U0001f504'  # 🔄

@@ -35,12 +37,38 @@ def plaintext_to_html(text, classname=None):
     return f"<p class='{classname}'>{content}</p>" if classname else f"<p>{content}</p>"

 

 

+def update_logfile(logfile_path, fields):

+    """Update a logfile from old format to new format to maintain CSV integrity."""

+    with open(logfile_path, "r", encoding="utf8", newline="") as file:

+        reader = csv.reader(file)

+        rows = list(reader)

+

+    # blank file: leave it as is

+    if not rows:

+        return

+

+    # file is already synced, do nothing

+    if len(rows[0]) == len(fields):

+        return

+

+    rows[0] = fields

+

+    # append new fields to each row as empty values

+    for row in rows[1:]:

+        while len(row) < len(fields):

+            row.append("")

+

+    with open(logfile_path, "w", encoding="utf8", newline="") as file:

+        writer = csv.writer(file)

+        writer.writerows(rows)

+

+

 def save_files(js_data, images, do_make_zip, index):

-    import csv

     filenames = []

     fullfns = []

+    parsed_infotexts = []

 

-    #quick dictionary to class object conversion. Its necessary due apply_filename_pattern requiring it

+    # quick dictionary to class object conversion. Its necessary due apply_filename_pattern requiring it

     class MyObject:

         def __init__(self, d=None):

             if d is not None:

@@ -48,35 +76,55 @@ def save_files(js_data, images, do_make_zip, index):
                     setattr(self, key, value)

 

     data = json.loads(js_data)

-

     p = MyObject(data)

+

     path = shared.opts.outdir_save

     save_to_dirs = shared.opts.use_save_to_dirs_for_ui

     extension: str = shared.opts.samples_format

     start_index = 0

-    only_one = False

 

     if index > -1 and shared.opts.save_selected_only and (index >= data["index_of_first_image"]):  # ensures we are looking at a specific non-grid picture, and we have save_selected_only

-        only_one = True

         images = [images[index]]

         start_index = index

 

     os.makedirs(shared.opts.outdir_save, exist_ok=True)

 

-    with open(os.path.join(shared.opts.outdir_save, "log.csv"), "a", encoding="utf8", newline='') as file:

+    fields = [

+        "prompt",

+        "seed",

+        "width",

+        "height",

+        "sampler",

+        "cfgs",

+        "steps",

+        "filename",

+        "negative_prompt",

+        "sd_model_name",

+        "sd_model_hash",

+    ]

+    logfile_path = os.path.join(shared.opts.outdir_save, "log.csv")

+

+    # NOTE: ensure csv integrity when fields are added by

+    # updating headers and padding with delimeters where needed

+    if os.path.exists(logfile_path):

+        update_logfile(logfile_path, fields)

+

+    with open(logfile_path, "a", encoding="utf8", newline='') as file:

         at_start = file.tell() == 0

         writer = csv.writer(file)

         if at_start:

-            writer.writerow(["prompt", "seed", "width", "height", "sampler", "cfgs", "steps", "filename", "negative_prompt"])

+            writer.writerow(fields)

 

         for image_index, filedata in enumerate(images, start_index):

             image = image_from_url_text(filedata)

 

             is_grid = image_index < p.index_of_first_image

-            i = 0 if is_grid else (image_index - p.index_of_first_image)

 

             p.batch_index = image_index-1

-            fullfn, txt_fullfn = modules.images.save_image(image, path, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)

+

+            parameters = parameters_copypaste.parse_generation_parameters(data["infotexts"][image_index], [])

+            parsed_infotexts.append(parameters)

+            fullfn, txt_fullfn = modules.images.save_image(image, path, "", seed=parameters['Seed'], prompt=parameters['Prompt'], extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)

 

             filename = os.path.relpath(fullfn, path)

             filenames.append(filename)

@@ -85,12 +133,12 @@ def save_files(js_data, images, do_make_zip, index):
                 filenames.append(os.path.basename(txt_fullfn))

                 fullfns.append(txt_fullfn)

 

-        writer.writerow([data["prompt"], data["seed"], data["width"], data["height"], data["sampler_name"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])

+        writer.writerow([parsed_infotexts[0]['Prompt'], parsed_infotexts[0]['Seed'], data["width"], data["height"], data["sampler_name"], data["cfg_scale"], data["steps"], filenames[0], parsed_infotexts[0]['Negative prompt'], data["sd_model_name"], data["sd_model_hash"]])

 

     # Make Zip

     if do_make_zip:

-        zip_fileseed = p.all_seeds[index-1] if only_one else p.all_seeds[0]

-        namegen = modules.images.FilenameGenerator(p, zip_fileseed, p.all_prompts[0], image, True)

+        p.all_seeds = [parameters['Seed'] for parameters in parsed_infotexts]

+        namegen = modules.images.FilenameGenerator(p, parsed_infotexts[0]['Seed'], parsed_infotexts[0]['Prompt'], image, True)

         zip_filename = namegen.apply(shared.opts.grid_zip_filename_pattern or "[datetime]_[[model_name]]_[seed]-[seed_last]")

         zip_filepath = os.path.join(path, f"{zip_filename}.zip")

 

@@ -104,7 +152,17 @@ def save_files(js_data, images, do_make_zip, index):
     return gr.File.update(value=fullfns, visible=True), plaintext_to_html(f"Saved: {filenames[0]}")

 

 

+@dataclasses.dataclass

+class OutputPanel:

+    gallery = None

+    generation_info = None

+    infotext = None

+    html_log = None

+    button_upscale = None

+

+

 def create_output_panel(tabname, outdir, toprow=None):

+    res = OutputPanel()

 

     def open_folder(f):

         if not os.path.exists(f):

@@ -136,9 +194,8 @@ Requested path was: {f}
 

         with gr.Column(variant='panel', elem_id=f"{tabname}_results_panel"):

             with gr.Group(elem_id=f"{tabname}_gallery_container"):

-                result_gallery = gr.Gallery(label='Output', show_label=False, elem_id=f"{tabname}_gallery", columns=4, preview=True, height=shared.opts.gallery_height or None)

+                res.gallery = gr.Gallery(label='Output', show_label=False, elem_id=f"{tabname}_gallery", columns=4, preview=True, height=shared.opts.gallery_height or None)

 

-            generation_info = None

             with gr.Row(elem_id=f"image_buttons_{tabname}", elem_classes="image-buttons"):

                 open_folder_button = ToolButton(folder_symbol, elem_id=f'{tabname}_open_folder', visible=not shared.cmd_opts.hide_ui_dir_config, tooltip="Open images output directory.")

 

@@ -152,6 +209,9 @@ Requested path was: {f}
                     'extras': ToolButton('📐', elem_id=f'{tabname}_send_to_extras', tooltip="Send image and generation parameters to extras tab.")

                 }

 

+                if tabname == 'txt2img':

+                    res.button_upscale = ToolButton('✨', elem_id=f'{tabname}_upscale', tooltip="Create an upscaled version of the current image using hires fix settings.")

+

             open_folder_button.click(

                 fn=lambda: open_folder(shared.opts.outdir_samples or outdir),

                 inputs=[],

@@ -162,17 +222,17 @@ Requested path was: {f}
                 download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False, elem_id=f'download_files_{tabname}')

 

                 with gr.Group():

-                    html_info = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext")

-                    html_log = gr.HTML(elem_id=f'html_log_{tabname}', elem_classes="html-log")

+                    res.infotext = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext")

+                    res.html_log = gr.HTML(elem_id=f'html_log_{tabname}', elem_classes="html-log")

 

-                    generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}')

+                    res.generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}')

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

                         generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")

                         generation_info_button.click(

                             fn=update_generation_info,

                             _js="function(x, y, z){ return [x, y, selected_gallery_index()] }",

-                            inputs=[generation_info, html_info, html_info],

-                            outputs=[html_info, html_info],

+                            inputs=[res.generation_info, res.infotext, res.infotext],

+                            outputs=[res.infotext, res.infotext],

                             show_progress=False,

                         )

 

@@ -180,14 +240,14 @@ Requested path was: {f}
                         fn=call_queue.wrap_gradio_call(save_files),

                         _js="(x, y, z, w) => [x, y, false, selected_gallery_index()]",

                         inputs=[

-                            generation_info,

-                            result_gallery,

-                            html_info,

-                            html_info,

+                            res.generation_info,

+                            res.gallery,

+                            res.infotext,

+                            res.infotext,

                         ],

                         outputs=[

                             download_files,

-                            html_log,

+                            res.html_log,

                         ],

                         show_progress=False,

                     )

@@ -196,21 +256,21 @@ Requested path was: {f}
                         fn=call_queue.wrap_gradio_call(save_files),

                         _js="(x, y, z, w) => [x, y, true, selected_gallery_index()]",

                         inputs=[

-                            generation_info,

-                            result_gallery,

-                            html_info,

-                            html_info,

+                            res.generation_info,

+                            res.gallery,

+                            res.infotext,

+                            res.infotext,

                         ],

                         outputs=[

                             download_files,

-                            html_log,

+                            res.html_log,

                         ]

                     )

 

             else:

-                html_info_x = gr.HTML(elem_id=f'html_info_x_{tabname}')

-                html_info = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext")

-                html_log = gr.HTML(elem_id=f'html_log_{tabname}')

+                res.generation_info = gr.HTML(elem_id=f'html_info_x_{tabname}')

+                res.infotext = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext")

+                res.html_log = gr.HTML(elem_id=f'html_log_{tabname}')

 

             paste_field_names = []

             if tabname == "txt2img":

@@ -220,11 +280,11 @@ Requested path was: {f}
 

             for paste_tabname, paste_button in buttons.items():

                 parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(

-                    paste_button=paste_button, tabname=paste_tabname, source_tabname="txt2img" if tabname == "txt2img" else None, source_image_component=result_gallery,

+                    paste_button=paste_button, tabname=paste_tabname, source_tabname="txt2img" if tabname == "txt2img" else None, source_image_component=res.gallery,

                     paste_field_names=paste_field_names

                 ))

 

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

+    return res

 

 

 def create_refresh_button(refresh_component, refresh_method, refreshed_args, elem_id):