hires button, opt insert gallery

add option to insert the resulting images into Gallery as opposed to replace original when using high button to perform upscale

modules/initialize.py

@@ -14,7 +14,6 @@ def imports():
 
     import torch  # noqa: F401
     startup_timer.record("import torch")
-    from modules import patch_hf_hub_download  # noqa: F401
     import pytorch_lightning  # noqa: F401
     startup_timer.record("import torch")
     warnings.filterwarnings(action="ignore", category=DeprecationWarning, module="pytorch_lightning")

modules/patch_hf_hub_download.py

@@ -1,41 +0,0 @@
-from modules.patches import patch
-from modules.errors import report
-from inspect import signature
-from functools import wraps
-
-try:
-    from huggingface_hub.utils import LocalEntryNotFoundError
-    from huggingface_hub import file_download
-
-    def try_local_files_only(func):
-        if (param := signature(func).parameters.get('local_files_only', None)) and not param.kind == param.KEYWORD_ONLY:
-            raise ValueError(f'{func.__name__} does not have keyword-only parameter "local_files_only"')
-
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            try:
-                from modules.shared import opts
-                try_offline_mode = not kwargs.get('local_files_only') and opts.hd_dl_local_first
-            except Exception:
-                report('Error in try_local_files_only - skip try_local_files_only', exc_info=True)
-                try_offline_mode = False
-
-            if try_offline_mode:
-                try:
-                    return func(*args, **{**kwargs, 'local_files_only': True})
-                except LocalEntryNotFoundError:
-                    pass
-                except Exception:
-                    report('Unexpected exception in try_local_files_only - retry without patch', exc_info=True)
-
-            return func(*args, **kwargs)
-
-        return wrapper
-
-    try:
-        patch(__name__, file_download, 'hf_hub_download', try_local_files_only(file_download.hf_hub_download))
-    except RuntimeError:
-        pass  # already patched
-
-except Exception:
-    report('Error patching hf_hub_download', exc_info=True)

modules/shared_options.py

@@ -128,7 +128,6 @@ options_templates.update(options_section(('system', "System", "system"), {
     "disable_mmap_load_safetensors": OptionInfo(False, "Disable memmapping for loading .safetensors files.").info("fixes very slow loading speed in some cases"),
     "hide_ldm_prints": OptionInfo(True, "Prevent Stability-AI's ldm/sgm modules from printing noise to console."),
     "dump_stacks_on_signal": OptionInfo(False, "Print stack traces before exiting the program with ctrl+c."),
-    "hd_dl_local_first": OptionInfo(False, "Prevent connecting to huggingface for assets if cache is available").info('this will also prevent assets from being updated'),
 }))
 
 options_templates.update(options_section(('profiler', "Profiler", "system"), {
@@ -315,6 +314,7 @@ options_templates.update(options_section(('ui_gallery', "Gallery", "ui"), {
     "sd_webui_modal_lightbox_toolbar_opacity": OptionInfo(0.9, "Full page image viewer: tool bar opacity", gr.Slider, {"minimum": 0.0, "maximum": 1, "step": 0.01}, onchange=shared.reload_gradio_theme).info('for mouse only').needs_reload_ui(),
     "gallery_height": OptionInfo("", "Gallery height", gr.Textbox).info("can be any valid CSS value, for example 768px or 20em").needs_reload_ui(),
     "open_dir_button_choice": OptionInfo("Subdirectory", "What directory the [📂] button opens", gr.Radio, {"choices": ["Output Root", "Subdirectory", "Subdirectory (even temp dir)"]}),
+    "hires_button_gallery_inset": OptionInfo(False, "Insert [✨] hires button results to gallery").info("when False the original first pass image is replaced by the results"),
 }))
 
 options_templates.update(options_section(('ui_alternatives', "UI alternatives", "ui"), {

modules/txt2img.py

@@ -87,15 +87,19 @@ def txt2img_upscale(id_task: str, request: gr.Request, gallery, gallery_index, g
     new_gallery = []
     for i, image in enumerate(gallery):
         if i == gallery_index:
-            geninfo["infotexts"][gallery_index: gallery_index+1] = processed.infotexts
+            if shared.opts.hires_button_gallery_inset:
+                fake_image = Image.new(mode="RGB", size=(1, 1))
+                fake_image.already_saved_as = image["name"].rsplit('?', 1)[0]
+                new_gallery.append(fake_image)
+                geninfo["infotexts"][gallery_index+1: gallery_index+1] = processed.infotexts
+            else:
+                geninfo["infotexts"][gallery_index: gallery_index+1] = processed.infotexts
             new_gallery.extend(processed.images)
         else:
             fake_image = Image.new(mode="RGB", size=(1, 1))
             fake_image.already_saved_as = image["name"].rsplit('?', 1)[0]
             new_gallery.append(fake_image)
 
-    geninfo["infotexts"][gallery_index] = processed.info
-
     return new_gallery, json.dumps(geninfo), plaintext_to_html(processed.info), plaintext_to_html(processed.comments, classname="comments")