Merge branch 'master' into gradient-clipping

1 files changed, 8 insertions, 3 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 030d4144..67d787a7 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1272,6 +1272,10 @@ def create_ui(wrap_gradio_gpu_call):
                         train_hypernetwork = gr.Button(value="Train Hypernetwork", variant='primary')

                         train_embedding = gr.Button(value="Train Embedding", variant='primary')

 

+                params = script_callbacks.UiTrainTabParams(txt2img_preview_params)

+

+                script_callbacks.ui_train_tabs_callback(params)

+

             with gr.Column():

                 progressbar = gr.HTML(elem_id="ti_progressbar")

                 ti_output = gr.Text(elem_id="ti_output", value="", show_label=False)

@@ -1758,7 +1762,7 @@ def create_ui(wrap_gradio_gpu_call):
     return demo

 

 

-def load_javascript(raw_response):

+def reload_javascript():

     with open(os.path.join(script_path, "script.js"), "r", encoding="utf8") as jsfile:

         javascript = f'<script>{jsfile.read()}</script>'

 

@@ -1774,7 +1778,7 @@ def load_javascript(raw_response):
     javascript += f"\n<script>{localization.localization_js(shared.opts.localization)}</script>"

 

     def template_response(*args, **kwargs):

-        res = raw_response(*args, **kwargs)

+        res = shared.GradioTemplateResponseOriginal(*args, **kwargs)

         res.body = res.body.replace(

             b'</head>', f'{javascript}</head>'.encode("utf8"))

         res.init_headers()

@@ -1783,4 +1787,5 @@ def load_javascript(raw_response):
     gradio.routes.templates.TemplateResponse = template_response

 

 

-reload_javascript = partial(load_javascript, gradio.routes.templates.TemplateResponse)

+if not hasattr(shared, 'GradioTemplateResponseOriginal'):

+    shared.GradioTemplateResponseOriginal = gradio.routes.templates.TemplateResponse