Merge branch 'master' into fix-vram

1 files changed, 19 insertions, 6 deletions

diff --git a/modules/ui.py b/modules/ui.py
index d9d02ece..de6342a4 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -69,7 +69,7 @@ random_symbol = '\U0001f3b2\ufe0f'  # 🎲️
 reuse_symbol = '\u267b\ufe0f'  # ♻️

 art_symbol = '\U0001f3a8'  # 🎨

 paste_symbol = '\u2199\ufe0f'  # ↙

-folder_symbol = '\uD83D\uDCC2'

+folder_symbol = '\U0001f4c2'  # 📂

 

 def plaintext_to_html(text):

     text = "<p>" + "<br>\n".join([f"{html.escape(x)}" for x in text.split('\n')]) + "</p>"

@@ -196,6 +196,11 @@ def wrap_gradio_call(func, extra_outputs=None):
             res = extra_outputs_array + [f"<div class='error'>{plaintext_to_html(type(e).__name__+': '+str(e))}</div>"]

 

         elapsed = time.perf_counter() - t

+        elapsed_m = int(elapsed // 60)

+        elapsed_s = elapsed % 60

+        elapsed_text = f"{elapsed_s:.2f}s"

+        if (elapsed_m > 0):

+            elapsed_text = f"{elapsed_m}m "+elapsed_text

 

         if run_memmon:

             mem_stats = {k: -(v//-(1024*1024)) for k, v in shared.mem_mon.stop().items()}

@@ -210,7 +215,7 @@ def wrap_gradio_call(func, extra_outputs=None):
             vram_html = ''

 

         # last item is always HTML

-        res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed:.2f}s</p>{vram_html}</div>"

+        res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed_text}</p>{vram_html}</div>"

 

         shared.state.interrupted = False

         shared.state.job_count = 0

@@ -386,14 +391,22 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info:
         outputs=[seed, dummy_component]

     )

 

+

 def update_token_counter(text, steps):

-    prompt_schedules = get_learned_conditioning_prompt_schedules([text], steps)

+    try:

+        prompt_schedules = get_learned_conditioning_prompt_schedules([text], steps)

+    except Exception:

+        # a parsing error can happen here during typing, and we don't want to bother the user with

+        # messages related to it in console

+        prompt_schedules = [[[steps, text]]]

+

     flat_prompts = reduce(lambda list1, list2: list1+list2, prompt_schedules)

-    prompts = [prompt_text for step,prompt_text in flat_prompts]

+    prompts = [prompt_text for step, prompt_text in flat_prompts]

     tokens, token_count, max_length = max([model_hijack.tokenize(prompt) for prompt in prompts], key=lambda args: args[1])

     style_class = ' class="red"' if (token_count > max_length) else ""

     return f"<span {style_class}>{token_count}/{max_length}</span>"

 

+

 def create_toprow(is_img2img):

     id_part = "img2img" if is_img2img else "txt2img"

 

@@ -636,7 +649,7 @@ def create_ui(wrap_gradio_gpu_call):
 

                 with gr.Tabs(elem_id="mode_img2img") as tabs_img2img_mode:

                     with gr.TabItem('img2img', id='img2img'):

-                        init_img = gr.Image(label="Image for img2img", show_label=False, source="upload", interactive=True, type="pil")

+                        init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool=cmd_opts.gradio_img2img_tool)

 

                     with gr.TabItem('Inpaint', id='inpaint'):

                         init_img_with_mask = gr.Image(label="Image for inpainting with mask",  show_label=False, elem_id="img2maskimg", source="upload", interactive=True, type="pil", tool="sketch", image_mode="RGBA")

@@ -658,7 +671,7 @@ def create_ui(wrap_gradio_gpu_call):
 

                     with gr.TabItem('Batch img2img', id='batch'):

                         hidden = '<br>Disabled when launched with --hide-ui-dir-config.' if shared.cmd_opts.hide_ui_dir_config else ''

-                        gr.HTML(f"<p class=\"text-gray-500\">Process images in a directory on the same machine where the server is running.{hidden}</p>")

+                        gr.HTML(f"<p class=\"text-gray-500\">Process images in a directory on the same machine where the server is running.<br>Use an empty output directory to save pictures normally instead of writing to the output directory.{hidden}</p>")

                         img2img_batch_input_dir = gr.Textbox(label="Input directory", **shared.hide_dirs)

                         img2img_batch_output_dir = gr.Textbox(label="Output directory", **shared.hide_dirs)