Merge branch 'AUTOMATIC1111:master' into master

Author: discus0434

modules/prompt_parser.py

@@ -275,7 +275,7 @@ def reconstruct_multicond_batch(c: MulticondLearnedConditioning, current_step):
 
 def parse_prompt_attention(text):
     """
-    Parses a string with attention tokens and returns a list of pairs: text and its assoicated weight.
+    Parses a string with attention tokens and returns a list of pairs: text and its associated weight.
     Accepted tokens are:
       (abc) - increases attention to abc by a multiplier of 1.1
       (abc:3.12) - increases attention to abc by a multiplier of 3.12

modules/sd_hijack_optimizations.py

@@ -181,7 +181,7 @@ def einsum_op_cuda(q, k, v):
     mem_free_torch = mem_reserved - mem_active
     mem_free_total = mem_free_cuda + mem_free_torch
     # Divide factor of safety as there's copying and fragmentation
-    return self.einsum_op_tensor_mem(q, k, v, mem_free_total / 3.3 / (1 << 20))
+    return einsum_op_tensor_mem(q, k, v, mem_free_total / 3.3 / (1 << 20))
 
 def einsum_op(q, k, v):
     if q.device.type == 'cuda':

modules/sd_models.py

@@ -148,7 +148,10 @@ def get_state_dict_from_checkpoint(pl_sd):
         if new_key is not None:
             sd[new_key] = v
 
-    return sd
+    pl_sd.clear()
+    pl_sd.update(sd)
+
+    return pl_sd
 
 
 def load_model_weights(model, checkpoint_info):

modules/ui.py

@@ -12,7 +12,7 @@
 import traceback
 import platform
 import subprocess as sp
-from functools import reduce
+from functools import partial, reduce
 
 import numpy as np
 import torch
@@ -261,6 +261,19 @@ def f(*args, extra_outputs_array=extra_outputs, **kwargs):
     return f
 
 
+def calc_time_left(progress, threshold, label, force_display):
+    if progress == 0:
+        return ""
+    else:
+        time_since_start = time.time() - shared.state.time_start
+        eta = (time_since_start/progress)
+        eta_relative = eta-time_since_start
+        if (eta_relative > threshold and progress > 0.02) or force_display:           
+            return label + time.strftime('%H:%M:%S', time.gmtime(eta_relative))        
+        else:
+            return ""
+
+
 def check_progress_call(id_part):
     if shared.state.job_count == 0:
         return "", gr_show(False), gr_show(False), gr_show(False)
@@ -272,11 +285,15 @@ def check_progress_call(id_part):
     if shared.state.sampling_steps > 0:
         progress += 1 / shared.state.job_count * shared.state.sampling_step / shared.state.sampling_steps
 
+    time_left = calc_time_left( progress, 60, " ETA:", shared.state.time_left_force_display )
+    if time_left != "":
+        shared.state.time_left_force_display = True
+
     progress = min(progress, 1)
 
     progressbar = ""
     if opts.show_progressbar:
-        progressbar = f"""{progress * 100}%">{str(int(progress*100))+"%" if progress > 0.01 else ""}"""
+        progressbar = f"""overflow:hidden;width:{progress * 100}%">{str(int(progress*100))+"%"+time_left if progress > 0.01 else ""}"""
 
     image = gr_show(False)
     preview_visibility = gr_show(False)
@@ -308,6 +325,8 @@ def check_progress_call_initial(id_part):
     shared.state.current_latent = None
     shared.state.current_image = None
     shared.state.textinfo = None
+    shared.state.time_start = time.time()
+    shared.state.time_left_force_display = False
 
     return check_progress_call(id_part)
 
@@ -1543,6 +1562,7 @@ def run_settings_single(value, key):
 
         def reload_scripts():
             modules.scripts.reload_script_body_only()
+            reload_javascript() # need to refresh the html page
 
         reload_script_bodies.click(
             fn=reload_scripts,
@@ -1801,26 +1821,30 @@ def apply_field(obj, field, condition=None, init_field=None):
     return demo
 
 
-with open(os.path.join(script_path, "script.js"), "r", encoding="utf8") as jsfile:
-    javascript = f'<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">jsfile</span>.<span class="pl-c1">read</span>()<span class="pl-kos">}</span></span>'
+def load_javascript(raw_response):
+    with open(os.path.join(script_path, "script.js"), "r", encoding="utf8") as jsfile:
+        javascript = f'<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">jsfile</span>.<span class="pl-c1">read</span>()<span class="pl-kos">}</span></span>'
 
-jsdir = os.path.join(script_path, "javascript")
-for filename in sorted(os.listdir(jsdir)):
-    with open(os.path.join(jsdir, filename), "r", encoding="utf8") as jsfile:
-        javascript += f"\n<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">jsfile</span>.<span class="pl-c1">read</span>()<span class="pl-kos">}</span></span>"
+    jsdir = os.path.join(script_path, "javascript")
+    for filename in sorted(os.listdir(jsdir)):
+        with open(os.path.join(jsdir, filename), "r", encoding="utf8") as jsfile:
+            javascript += f"\n<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">jsfile</span>.<span class="pl-c1">read</span>()<span class="pl-kos">}</span></span>"
 
-if cmd_opts.theme is not None:
-    javascript += f"\nset_theme('<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">cmd_opts</span>.<span class="pl-c1">theme</span><span class="pl-kos">}</span></span>');\n"
+    if cmd_opts.theme is not None:
+        javascript += f"\nset_theme('<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">cmd_opts</span>.<span class="pl-c1">theme</span><span class="pl-kos">}</span></span>');\n"
 
-javascript += f"\n<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">localization</span>.<span class="pl-c1">localization_js</span>(<span class="pl-s1">shared</span>.<span class="pl-c1">opts</span>.<span class="pl-c1">localization</span>)<span class="pl-kos">}</span></span>"
+    javascript += f"\n<span class="pl-s1"><span class="pl-kos">{</span><span class="pl-s1">localization</span>.<span class="pl-c1">localization_js</span>(<span class="pl-s1">shared</span>.<span class="pl-c1">opts</span>.<span class="pl-c1">localization</span>)<span class="pl-kos">}</span></span>"
 
-if 'gradio_routes_templates_response' not in globals():
     def template_response(*args, **kwargs):
-        res = gradio_routes_templates_response(*args, **kwargs)
-        res.body = res.body.replace(b'', f'{javascript}'.encode("utf8"))
+        res = raw_response(*args, **kwargs)
+        res.body = res.body.replace(
+            b'', f'{javascript}'.encode("utf8"))
         res.init_headers()
         return res
 
-    gradio_routes_templates_response = gradio.routes.templates.TemplateResponse
     gradio.routes.templates.TemplateResponse = template_response
 
+
+reload_javascript = partial(load_javascript,
+                            gradio.routes.templates.TemplateResponse)
+reload_javascript()

style.css

@@ -34,18 +34,17 @@
 .performance {
     font-size: 0.85em;
     color: #444;
-    display: flex;
-    justify-content: space-between;
-    white-space: nowrap;
+}
+
+.performance p{
+    display: inline-block;
 }
 
 .performance .time {
     margin-right: 0;
 }
 
 .performance .vram {
-    margin-left: 0;
-    text-align: right;
 }
 
 #txt2img_generate, #img2img_generate {