Merge branch 'dev' into sdxl

8 files changed, 39 insertions, 35 deletions

diff --git a/modules/api/api.py b/modules/api/api.py
index 1804a383..11045292 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -719,7 +719,7 @@ class Api:
 
     def launch(self, server_name, port):
         self.app.include_router(self.router)
-        uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=0)
+        uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=shared.cmd_opts.timeout_keep_alive)
 
     def kill_webui(self):
         restart.stop_program()
@@ -732,3 +732,4 @@ class Api:
     def stop_webui(request):
         shared.state.server_command = "stop"
         return Response("Stopping.")
+
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 278a605e..ae78f469 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -106,4 +106,6 @@ parser.add_argument("--skip-version-check", action='store_true', help="Do not ch
 parser.add_argument("--no-hashing", action='store_true', help="disable sha256 hashing of checkpoints to help loading performance", default=False)

 parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False)

 parser.add_argument('--subpath', type=str, help='customize the subpath for gradio, use with reverse proxy')

+parser.add_argument('--add-stop-route', action='store_true', help='add /_stop route to stop server')

 parser.add_argument('--api-server-stop', action='store_true', help='enable server stop/restart/kill via api')

+parser.add_argument('--timeout-keep-alive', type=int, default=30, help='set timeout_keep_alive for uvicorn')

diff --git a/modules/hashes.py b/modules/hashes.py
index 8b7ea0ac..ec1187fe 100644
--- a/modules/hashes.py
+++ b/modules/hashes.py
@@ -5,7 +5,7 @@ import os.path
 import filelock

 

 from modules import shared

-from modules.paths import data_path

+from modules.paths import data_path, script_path

 

 

 cache_filename = os.path.join(data_path, "cache.json")

@@ -26,8 +26,13 @@ def cache(subsection):
             if not os.path.isfile(cache_filename):

                 cache_data = {}

             else:

-                with open(cache_filename, "r", encoding="utf8") as file:

-                    cache_data = json.load(file)

+                try:

+                    with open(cache_filename, "r", encoding="utf8") as file:

+                        cache_data = json.load(file)

+                except Exception:

+                    os.replace(cache_filename, os.path.join(script_path, "tmp", "cache.json"))

+                    print('[ERROR] issue occurred while trying to read cache.json, move current cache to tmp/cache.json and create new cache')

+                    cache_data = {}

 

     s = cache_data.get(subsection, {})

     cache_data[subsection] = s

diff --git a/modules/images.py b/modules/images.py
index b5412548..4bdedb7f 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -306,12 +306,14 @@ def resize_image(resize_mode, im, width, height, upscaler_name=None):
 

         if ratio < src_ratio:

             fill_height = height // 2 - src_h // 2

-            res.paste(resized.resize((width, fill_height), box=(0, 0, width, 0)), box=(0, 0))

-            res.paste(resized.resize((width, fill_height), box=(0, resized.height, width, resized.height)), box=(0, fill_height + src_h))

+            if fill_height > 0:

+                res.paste(resized.resize((width, fill_height), box=(0, 0, width, 0)), box=(0, 0))

+                res.paste(resized.resize((width, fill_height), box=(0, resized.height, width, resized.height)), box=(0, fill_height + src_h))

         elif ratio > src_ratio:

             fill_width = width // 2 - src_w // 2

-            res.paste(resized.resize((fill_width, height), box=(0, 0, 0, height)), box=(0, 0))

-            res.paste(resized.resize((fill_width, height), box=(resized.width, 0, resized.width, height)), box=(fill_width + src_w, 0))

+            if fill_width > 0:

+                res.paste(resized.resize((fill_width, height), box=(0, 0, 0, height)), box=(0, 0))

+                res.paste(resized.resize((fill_width, height), box=(resized.width, 0, resized.width, height)), box=(fill_width + src_w, 0))

 

     return res

 

diff --git a/modules/img2img.py b/modules/img2img.py
index 4d9a02cc..664e2688 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -10,6 +10,7 @@ from modules import sd_samplers, images as imgutil
 from modules.generation_parameters_copypaste import create_override_settings_dict, parse_generation_parameters

 from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images

 from modules.shared import opts, state

+from modules.images import save_image

 import modules.shared as shared

 import modules.processing as processing

 from modules.ui import plaintext_to_html

@@ -113,18 +114,18 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
             proc = process_images(p)

 

         for n, processed_image in enumerate(proc.images):

-            filename = image_path.name

+            filename = image_path.stem

+            infotext = proc.infotext(p, n)

             relpath = os.path.dirname(os.path.relpath(image, input_dir))

 

             if n > 0:

-                left, right = os.path.splitext(filename)

-                filename = f"{left}-{n}{right}"

+                filename += f"-{n}"

 

             if not save_normally:

                 os.makedirs(os.path.join(output_dir, relpath), exist_ok=True)

                 if processed_image.mode == 'RGBA':

                     processed_image = processed_image.convert("RGB")

-                processed_image.save(os.path.join(output_dir, relpath, filename))

+                save_image(processed_image, os.path.join(output_dir, relpath), None, extension=opts.samples_format, info=infotext, forced_filename=filename, save_to_dirs=False)

 

 

 def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_index: int, mask_blur: int, mask_alpha: float, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *args):

diff --git a/modules/shared.py b/modules/shared.py
index 89b7132e..b28933a0 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -391,7 +391,6 @@ options_templates.update(options_section(('system', "System"), {
     "print_hypernet_extra": OptionInfo(False, "Print extra hypernetwork information to console."),

     "list_hidden_files": OptionInfo(True, "Load models/files in hidden directories").info("directory is hidden if its name starts with \".\""),

     "disable_mmap_load_safetensors": OptionInfo(False, "Disable memmapping for loading .safetensors files.").info("fixes very slow loading speed in some cases"),

-    "github_proxy": OptionInfo("None", "Github proxy", ui_components.DropdownEditable, lambda: {"choices": ["None", "ghproxy.com", "hub.yzuu.cf", "hub.njuu.cf", "hub.nuaa.cf"]}).info("for custom inputs will just replace github.com with the input"),

 }))

 

 options_templates.update(options_section(('training', "Training"), {

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index a208012d..dff522ef 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -325,17 +325,6 @@ def normalize_git_url(url):
     return url

 

 

-def github_proxy(url):

-    proxy = shared.opts.github_proxy

-

-    if proxy == 'None':

-        return url

-    if proxy == 'ghproxy.com':

-        return "https://ghproxy.com/" + url

-

-    return url.replace('github.com', proxy)

-

-

 def install_extension_from_url(dirname, url, branch_name=None):

     check_access()

 

@@ -346,8 +335,6 @@ def install_extension_from_url(dirname, url, branch_name=None):
 

     assert url, 'No URL specified'

 

-    url = github_proxy(url)

-

     if dirname is None or dirname == "":

         *parts, last_part = url.split('/')

         last_part = normalize_git_url(last_part)

@@ -367,12 +354,12 @@ def install_extension_from_url(dirname, url, branch_name=None):
         shutil.rmtree(tmpdir, True)

         if not branch_name:

             # if no branch is specified, use the default branch

-            with git.Repo.clone_from(url, tmpdir, filter=['blob:none'], verbose=False) as repo:

+            with git.Repo.clone_from(url, tmpdir, filter=['blob:none']) as repo:

                 repo.remote().fetch()

                 for submodule in repo.submodules:

                     submodule.update()

         else:

-            with git.Repo.clone_from(url, tmpdir, filter=['blob:none'], branch=branch_name, verbose=False) as repo:

+            with git.Repo.clone_from(url, tmpdir, filter=['blob:none'], branch=branch_name) as repo:

                 repo.remote().fetch()

                 for submodule in repo.submodules:

                     submodule.update()

diff --git a/modules/ui_settings.py b/modules/ui_settings.py
index 0c560b30..a6076bf3 100644
--- a/modules/ui_settings.py
+++ b/modules/ui_settings.py
@@ -260,13 +260,20 @@ class UiSettings:
             component = self.component_dict[k]

             info = opts.data_labels[k]

 

-            change_handler = component.release if hasattr(component, 'release') else component.change

-            change_handler(

-                fn=lambda value, k=k: self.run_settings_single(value, key=k),

-                inputs=[component],

-                outputs=[component, self.text_settings],

-                show_progress=info.refresh is not None,

-            )

+            if isinstance(component, gr.Textbox):

+                methods = [component.submit, component.blur]

+            elif hasattr(component, 'release'):

+                methods = [component.release]

+            else:

+                methods = [component.change]

+

+            for method in methods:

+                method(

+                    fn=lambda value, k=k: self.run_settings_single(value, key=k),

+                    inputs=[component],

+                    outputs=[component, self.text_settings],

+                    show_progress=info.refresh is not None,

+                )

 

         button_set_checkpoint = gr.Button('Change checkpoint', elem_id='change_checkpoint', visible=False)

         button_set_checkpoint.click(