Merge branch 'dev' into test-fp8

4 files changed, 24 insertions, 10 deletions

diff --git a/modules/gfpgan_model.py b/modules/gfpgan_model.py
index 8e0f13bd..01d668ec 100644
--- a/modules/gfpgan_model.py
+++ b/modules/gfpgan_model.py
@@ -9,6 +9,7 @@ from modules import paths, shared, devices, modelloader, errors
 model_dir = "GFPGAN"

 user_path = None

 model_path = os.path.join(paths.models_path, model_dir)

+model_file_path = None

 model_url = "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth"

 have_gfpgan = False

 loaded_gfpgan_model = None

@@ -17,6 +18,7 @@ loaded_gfpgan_model = None
 def gfpgann():

     global loaded_gfpgan_model

     global model_path

+    global model_file_path

     if loaded_gfpgan_model is not None:

         loaded_gfpgan_model.gfpgan.to(devices.device_gfpgan)

         return loaded_gfpgan_model

@@ -24,17 +26,24 @@ def gfpgann():
     if gfpgan_constructor is None:

         return None

 

-    models = modelloader.load_models(model_path, model_url, user_path, ext_filter="GFPGAN")

+    models = modelloader.load_models(model_path, model_url, user_path, ext_filter=['.pth'])

+

     if len(models) == 1 and models[0].startswith("http"):

         model_file = models[0]

     elif len(models) != 0:

-        latest_file = max(models, key=os.path.getctime)

+        gfp_models = []

+        for item in models:

+            if 'GFPGAN' in os.path.basename(item):

+                gfp_models.append(item)

+        latest_file = max(gfp_models, key=os.path.getctime)

         model_file = latest_file

     else:

         print("Unable to load gfpgan model!")

         return None

+

     if hasattr(facexlib.detection.retinaface, 'device'):

         facexlib.detection.retinaface.device = devices.device_gfpgan

+    model_file_path = model_file

     model = gfpgan_constructor(model_path=model_file, upscale=1, arch='clean', channel_multiplier=2, bg_upsampler=None, device=devices.device_gfpgan)

     loaded_gfpgan_model = model

 

@@ -77,19 +86,25 @@ def setup_model(dirname):
         global user_path

         global have_gfpgan

         global gfpgan_constructor

+        global model_file_path

+

+        facexlib_path = model_path

+

+        if dirname is not None:

+            facexlib_path = dirname

 

         load_file_from_url_orig = gfpgan.utils.load_file_from_url

         facex_load_file_from_url_orig = facexlib.detection.load_file_from_url

         facex_load_file_from_url_orig2 = facexlib.parsing.load_file_from_url

 

         def my_load_file_from_url(**kwargs):

-            return load_file_from_url_orig(**dict(kwargs, model_dir=model_path))

+            return load_file_from_url_orig(**dict(kwargs, model_dir=model_file_path))

 

         def facex_load_file_from_url(**kwargs):

-            return facex_load_file_from_url_orig(**dict(kwargs, save_dir=model_path, model_dir=None))

+            return facex_load_file_from_url_orig(**dict(kwargs, save_dir=facexlib_path, model_dir=None))

 

         def facex_load_file_from_url2(**kwargs):

-            return facex_load_file_from_url_orig2(**dict(kwargs, save_dir=model_path, model_dir=None))

+            return facex_load_file_from_url_orig2(**dict(kwargs, save_dir=facexlib_path, model_dir=None))

 

         gfpgan.utils.load_file_from_url = my_load_file_from_url

         facexlib.detection.load_file_from_url = facex_load_file_from_url

diff --git a/modules/processing.py b/modules/processing.py
index 40598f5c..70ad1ebe 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -886,6 +886,8 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
 

             devices.torch_gc()

 

+            state.nextjob()

+

             if p.scripts is not None:

                 p.scripts.postprocess_batch(p, x_samples_ddim, batch_number=n)

 

@@ -958,8 +960,6 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
 

             devices.torch_gc()

 

-            state.nextjob()

-

         if not infotexts:

             infotexts.append(Processed(p, []).infotext(p, 0))

 

diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py
index ddf4d2dd..cba13455 100644
--- a/modules/prompt_parser.py
+++ b/modules/prompt_parser.py
@@ -4,7 +4,7 @@ import re
 from collections import namedtuple

 import lark

 

-# a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][ in background:0.25] [shoddy:masterful:0.5]"

+# a prompt like this: "fantasy landscape with a [mountain:lake:0.25] and [an oak:a christmas tree:0.75][ in foreground::0.6][: in background:0.25] [shoddy:masterful:0.5]"

 # will be represented with prompt_schedule like this (assuming steps=100):

 # [25, 'fantasy landscape with a mountain and an oak in foreground shoddy']

 # [50, 'fantasy landscape with a lake and an oak in foreground in background shoddy']

diff --git a/modules/shared_options.py b/modules/shared_options.py
index 32bf7353..0a82216f 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -259,9 +259,8 @@ options_templates.update(options_section(('ui', "User interface"), {
     "dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row").needs_reload_ui(),

     "keyedit_precision_attention": OptionInfo(0.1, "Ctrl+up/down precision when editing (attention:1.1)", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),

     "keyedit_precision_extra": OptionInfo(0.05, "Ctrl+up/down precision when editing <extra networks:0.9>", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),

-    "keyedit_delimiters": OptionInfo(r".,\/!?%^*;:{}=`~()[]<>| ", "Ctrl+up/down word delimiters"),

+    "keyedit_delimiters": OptionInfo(r".,\/!?%^*;:{}=`~() ", "Ctrl+up/down word delimiters"),

     "keyedit_delimiters_whitespace": OptionInfo(["Tab", "Carriage Return", "Line Feed"], "Ctrl+up/down whitespace delimiters", gr.CheckboxGroup, lambda: {"choices": ["Tab", "Carriage Return", "Line Feed"]}),

-    "keyedit_convert": OptionInfo(True, "Convert (attention) to (attention:1.1)"),

     "keyedit_move": OptionInfo(True, "Alt+left/right moves prompt elements"),

     "quicksettings_list": OptionInfo(["sd_model_checkpoint"], "Quicksettings list", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that appear at the top of page rather than in settings tab").needs_reload_ui(),

     "ui_tab_order": OptionInfo([], "UI tab order", ui_components.DropdownMulti, lambda: {"choices": list(shared.tab_names)}).needs_reload_ui(),