serve images from where they are saved instead of a temporary directory

add an option to choose a different temporary directory in the UI
add an option to cleanup the selected temporary directory at startup

1 files changed, 11 insertions, 5 deletions

diff --git a/webui.py b/webui.py
index 23215d1e..6b79dc55 100644
--- a/webui.py
+++ b/webui.py
@@ -10,7 +10,7 @@ from fastapi.middleware.gzip import GZipMiddleware
 

 from modules.paths import script_path

 

-from modules import shared, devices, sd_samplers, upscaler, extensions, localization

+from modules import shared, devices, sd_samplers, upscaler, extensions, localization, ui_tempdir

 import modules.codeformer_model as codeformer

 import modules.extras

 import modules.face_restoration

@@ -31,12 +31,14 @@ from modules import modelloader
 from modules.shared import cmd_opts

 import modules.hypernetworks.hypernetwork

 

+

 queue_lock = threading.Lock()

 if cmd_opts.server_name:

     server_name = cmd_opts.server_name

 else:

     server_name = "0.0.0.0" if cmd_opts.listen else None

 

+

 def wrap_queued_call(func):

     def f(*args, **kwargs):

         with queue_lock:

@@ -87,6 +89,7 @@ def initialize():
     shared.opts.onchange("sd_vae_as_default", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False)

     shared.opts.onchange("sd_hypernetwork", wrap_queued_call(lambda: shared.reload_hypernetworks()))

     shared.opts.onchange("sd_hypernetwork_strength", modules.hypernetworks.hypernetwork.apply_strength)

+    shared.opts.onchange("temp_dir", ui_tempdir.on_tmpdir_changed)

 

     if cmd_opts.tls_keyfile is not None and cmd_opts.tls_keyfile is not None:

 

@@ -149,9 +152,12 @@ def webui():
     initialize()

 

     while 1:

-        demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)

+        if shared.opts.clean_temp_dir_at_start:

+            ui_tempdir.cleanup_tmpdr()

+

+        shared.demo = modules.ui.create_ui(wrap_gradio_gpu_call=wrap_gradio_gpu_call)

 

-        app, local_url, share_url = demo.launch(

+        app, local_url, share_url = shared.demo.launch(

             share=cmd_opts.share,

             server_name=server_name,

             server_port=cmd_opts.port,

@@ -178,9 +184,9 @@ def webui():
         if launch_api:

             create_api(app)

 

-        modules.script_callbacks.app_started_callback(demo, app)

+        modules.script_callbacks.app_started_callback(shared.demo, app)

 

-        wait_on_server(demo)

+        wait_on_server(shared.demo)

 

         sd_samplers.set_samplers()