Merge branch 'master' into master

1 files changed, 15 insertions, 6 deletions

diff --git a/modules/ui.py b/modules/ui.py
index a1d18be9..baf4c397 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -433,7 +433,10 @@ def create_toprow(is_img2img):
             with gr.Row():

                 with gr.Column(scale=80):

                     with gr.Row():

-                        prompt = gr.Textbox(label="Prompt", elem_id=f"{id_part}_prompt", show_label=False, placeholder="Prompt", lines=2)

+                        prompt = gr.Textbox(label="Prompt", elem_id=f"{id_part}_prompt", show_label=False, lines=2, 

+                            placeholder="Prompt (press Ctrl+Enter or Alt+Enter to generate)"

+                        )

+

                 with gr.Column(scale=1, elem_id="roll_col"):

                     roll = gr.Button(value=art_symbol, elem_id="roll", visible=len(shared.artist_db.artists) > 0)

                     paste = gr.Button(value=paste_symbol, elem_id="paste")

@@ -446,7 +449,10 @@ def create_toprow(is_img2img):
             with gr.Row():

                 with gr.Column(scale=8):

                     with gr.Row():

-                        negative_prompt = gr.Textbox(label="Negative prompt", elem_id="negative_prompt", show_label=False, placeholder="Negative prompt", lines=2)

+                        negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{id_part}_neg_prompt", show_label=False, lines=2, 

+                            placeholder="Negative prompt (press Ctrl+Enter or Alt+Enter to generate)"

+                        )

+

                 with gr.Column(scale=1, elem_id="roll_col"):

                     sh = gr.Button(elem_id="sh", visible=True)                           

 

@@ -567,8 +573,8 @@ def create_ui(wrap_gradio_gpu_call):
                     enable_hr = gr.Checkbox(label='Highres. fix', value=False)

 

                 with gr.Row(visible=False) as hr_options:

-                    firstphase_width = gr.Slider(minimum=0, maximum=1024, step=64, label="First pass width", value=0)

-                    firstphase_height = gr.Slider(minimum=0, maximum=1024, step=64, label="First pass height", value=0)

+                    firstphase_width = gr.Slider(minimum=0, maximum=1024, step=64, label="Firstpass width", value=0)

+                    firstphase_height = gr.Slider(minimum=0, maximum=1024, step=64, label="Firstpass height", value=0)

                     denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7)

 

                 with gr.Row(equal_height=True):

@@ -1090,7 +1096,7 @@ def create_ui(wrap_gradio_gpu_call):
         "i2i":img2img_paste_fields

     }

 

-    #images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)

+    images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)

 

     with gr.Blocks() as modelmerger_interface:

         with gr.Row().style(equal_height=False):

@@ -1166,6 +1172,7 @@ def create_ui(wrap_gradio_gpu_call):
                     train_embedding_name = gr.Dropdown(label='Embedding', choices=sorted(sd_hijack.model_hijack.embedding_db.word_embeddings.keys()))

                     train_hypernetwork_name = gr.Dropdown(label='Hypernetwork', choices=[x for x in shared.hypernetworks.keys()])

                     learn_rate = gr.Textbox(label='Learning rate', placeholder="Learning rate", value="0.005")

+                    batch_size = gr.Number(label='Batch size', value=1, precision=0)

                     dataset_directory = gr.Textbox(label='Dataset directory', placeholder="Path to directory with input images")

                     log_directory = gr.Textbox(label='Log directory', placeholder="Path to directory where to write outputs", value="textual_inversion")

                     template_file = gr.Textbox(label='Prompt template file', value=os.path.join(script_path, "textual_inversion_templates", "style_filewords.txt"))

@@ -1244,6 +1251,7 @@ def create_ui(wrap_gradio_gpu_call):
             inputs=[

                 train_embedding_name,

                 learn_rate,

+                batch_size,

                 dataset_directory,

                 log_directory,

                 training_width,

@@ -1268,6 +1276,7 @@ def create_ui(wrap_gradio_gpu_call):
             inputs=[

                 train_hypernetwork_name,

                 learn_rate,

+                batch_size,

                 dataset_directory,

                 log_directory,

                 steps,

@@ -1487,7 +1496,7 @@ Requested path was: {f}
         (img2img_interface, "img2img", "img2img"),

         (extras_interface, "Extras", "extras"),

         (pnginfo_interface, "PNG Info", "pnginfo"),

-        #(images_history, "History", "images_history"),

+        (images_history, "History", "images_history"),

         (modelmerger_interface, "Checkpoint Merger", "modelmerger"),

         (train_interface, "Train", "ti"),

         (settings_interface, "Settings", "settings"),