diff options
| author | MalumaDev <piano.lu92@gmail.com> | 2022-10-16 21:06:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-16 21:06:21 +0200 |
| commit | 589215df22d24d560101ba2b1fd7aaf3233f466e (patch) | |
| tree | fb253871ea958aeffb6a7b73a8e945090cfb799f /modules | |
| parent | ae0fdad64a7a61a18b4ec09f66bc81405b96c0bd (diff) | |
| parent | c8045c5ad4f99deb3a19add06e0457de1df62b05 (diff) | |
Merge branch 'master' into test_resolve_conflicts
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/shared.py | 10 | ||||
| -rw-r--r-- | modules/ui.py | 9 |
2 files changed, 18 insertions, 1 deletions
diff --git a/modules/shared.py b/modules/shared.py index 7946d603..63fb4cec 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -80,6 +80,16 @@ parser.add_argument("--disable-safe-unpickle", action='store_true', help="disabl cmd_opts = parser.parse_args()
+restricted_opts = [
+ "samples_filename_pattern",
+ "outdir_samples",
+ "outdir_txt2img_samples",
+ "outdir_img2img_samples",
+ "outdir_extras_samples",
+ "outdir_grids",
+ "outdir_txt2img_grids",
+ "outdir_save",
+]
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_bsrgan, devices.device_esrgan, devices.device_scunet, devices.device_codeformer = \
(devices.cpu if any(y in cmd_opts.use_cpu for y in [x, 'all']) else devices.get_optimal_device() for x in ['sd', 'interrogate', 'gfpgan', 'bsrgan', 'esrgan', 'scunet', 'codeformer'])
diff --git a/modules/ui.py b/modules/ui.py index 32536b2d..7c095cb4 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -25,7 +25,8 @@ import gradio.routes from modules import sd_hijack, sd_models
from modules.paths import script_path
-from modules.shared import opts, cmd_opts,aesthetic_embeddings
+
+from modules.shared import opts, cmd_opts, restricted_opts, aesthetic_embeddings
if cmd_opts.deepdanbooru:
from modules.deepbooru import get_deepbooru_tags
@@ -1505,6 +1506,9 @@ Requested path was: {f} if comp_args and isinstance(comp_args, dict) and comp_args.get('visible') is False:
continue
+ if cmd_opts.hide_ui_dir_config and key in restricted_opts:
+ continue
+
oldval = opts.data.get(key, None)
opts.data[key] = value
@@ -1522,6 +1526,9 @@ Requested path was: {f} if not opts.same_type(value, opts.data_labels[key].default):
return gr.update(visible=True), opts.dumpjson()
+ if cmd_opts.hide_ui_dir_config and key in restricted_opts:
+ return gr.update(value=oldval), opts.dumpjson()
+
oldval = opts.data.get(key, None)
opts.data[key] = value
|