Merge branch 'master' into master

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/shared.py b/modules/shared.py
index f9509a70..38d24fae 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -13,8 +13,6 @@ from modules.devices import get_optimal_device
 import modules.styles

 import modules.interrogate

 

-config_filename = "config.json"

-

 sd_model_file = os.path.join(script_path, 'model.ckpt')

 if not os.path.exists(sd_model_file):

     sd_model_file = "models/ldm/stable-diffusion-v1/model.ckpt"

@@ -43,6 +41,8 @@ parser.add_argument("--port", type=int, help="launch gradio with given server po
 parser.add_argument("--show-negative-prompt", action='store_true', help="does not do anything", default=False)

 parser.add_argument("--ui-config-file", type=str, help="filename to use for ui configuration", default=os.path.join(script_path, 'ui-config.json'))

 parser.add_argument("--hide-ui-dir-config", action='store_true', help="hide directory configuration from webui", default=False)

+parser.add_argument("--ui-settings-file", type=str, help="filename to use for ui settings", default=os.path.join(script_path, 'config.json'))

+parser.add_argument("--gradio-debug",  action='store_true', help="launch gradio with --debug option")

 

 cmd_opts = parser.parse_args()

 

@@ -51,6 +51,7 @@ device = get_optimal_device()
 batch_cond_uncond = cmd_opts.always_batch_cond_uncond or not (cmd_opts.lowvram or cmd_opts.medvram)

 parallel_processing_allowed = not cmd_opts.lowvram and not cmd_opts.medvram

 

+config_filename = cmd_opts.ui_settings_file

 

 class State:

     interrupted = False

@@ -129,11 +130,12 @@ class Options:
         "multiple_tqdm": OptionInfo(True, "Add a second progress bar to the console that shows progress for an entire job. Broken in PyCharm console."),

         "face_restoration_model": OptionInfo(None, "Face restoration model", gr.Radio, lambda: {"choices": [x.name() for x in face_restorers]}),

         "code_former_weight": OptionInfo(0.5, "CodeFormer weight parameter; 0 = maximum effect; 1 = minimum effect", gr.Slider, {"minimum": 0, "maximum": 1, "step": 0.01}),

-        "interrogate_keep_models_in_memory": OptionInfo(True, "Interrogate: keep models in VRAM"),

+        "interrogate_keep_models_in_memory": OptionInfo(False, "Interrogate: keep models in VRAM"),

         "interrogate_use_builtin_artists": OptionInfo(True, "Interrogate: use artists from artists.csv"),

         "interrogate_clip_num_beams": OptionInfo(1, "Interrogate: num_beams for BLIP", gr.Slider, {"minimum": 1, "maximum": 16, "step": 1}),

         "interrogate_clip_min_length": OptionInfo(24, "Interrogate: minimum descripton length (excluding artists, etc..)", gr.Slider, {"minimum": 1, "maximum": 128, "step": 1}),

         "interrogate_clip_max_length": OptionInfo(48, "Interrogate: maximum descripton length", gr.Slider, {"minimum": 1, "maximum": 256, "step": 1}),

+        "interrogate_clip_dict_limit": OptionInfo(1500, "Interrogate: maximum number of lines in text file (0 = No limit)"),

     }

 

     def __init__(self):