fixes related to merge

1 files changed, 3 insertions, 12 deletions

diff --git a/webui.py b/webui.py
index 7c200551..ba2156c8 100644
--- a/webui.py
+++ b/webui.py
@@ -29,6 +29,7 @@ from modules import devices
 from modules import modelloader

 from modules.paths import script_path

 from modules.shared import cmd_opts

+import modules.hypernetwork.hypernetwork

 

 modelloader.cleanup_models()

 modules.sd_models.setup_model()

@@ -77,22 +78,12 @@ def wrap_gradio_gpu_call(func, extra_outputs=None):
     return modules.ui.wrap_gradio_call(f, extra_outputs=extra_outputs)

 

 

-def set_hypernetwork():

-    shared.hypernetwork = shared.hypernetworks.get(shared.opts.sd_hypernetwork, None)

-

-

-shared.reload_hypernetworks()

-shared.opts.onchange("sd_hypernetwork", set_hypernetwork)

-set_hypernetwork()

-

-

 modules.scripts.load_scripts(os.path.join(script_path, "scripts"))

 

 shared.sd_model = modules.sd_models.load_model()

 shared.opts.onchange("sd_model_checkpoint", wrap_queued_call(lambda: modules.sd_models.reload_model_weights(shared.sd_model)))

 

-loaded_hypernetwork = modules.hypernetwork.load_hypernetwork(shared.opts.sd_hypernetwork)

-shared.opts.onchange("sd_hypernetwork", wrap_queued_call(lambda: modules.hypernetwork.load_hypernetwork(shared.opts.sd_hypernetwork)))

+shared.opts.onchange("sd_hypernetwork", wrap_queued_call(lambda: modules.hypernetwork.hypernetwork.load_hypernetwork(shared.opts.sd_hypernetwork)))

 

 

 def webui():

@@ -117,7 +108,7 @@ def webui():
             prevent_thread_lock=True

         )

         

-        app.add_middleware(GZipMiddleware,minimum_size=1000)

+        app.add_middleware(GZipMiddleware, minimum_size=1000)

 

         while 1:

             time.sleep(0.5)