diff --git a/automatic.sh b/automatic.sh index 47eacbc00..616260659 100755 --- a/automatic.sh +++ b/automatic.sh @@ -67,8 +67,8 @@ if [ "$MODE" == install ]; then "$PYTHON" -m pip install --disable-pip-version-check --quiet --no-warn-conflicts --requirement requirements_versions.txt echo "Updating submodules" - git submodule update --init --recursive - git submodule update --rebase --remote + git submodule --quiet update --init --recursive + git submodule --quiet update --rebase --remote echo "Submodules:" git submodule foreach --quiet 'VER=$(git log -1 --pretty=format:"%h %ad"); URL=$(git remote get-url origin); echo "- $VER $URL"' diff --git a/config.json b/config.json index f2cb596bf..e2f760038 100644 --- a/config.json +++ b/config.json @@ -20,7 +20,6 @@ "directories_max_prompt_words": 8, "disable_weights_auto_swap": false, "disabled_extensions": [ - "openOutpaint-webUI-extension", "ScuNET" ], "do_not_add_watermark": true, @@ -192,5 +191,7 @@ "image_browser_pages_perload": 20.0, "image_browser_mod_shift": false, "image_browser_mod_ctrl_shift": false, - "hidden_tabs": "custom diffusion utils" + "hidden_tabs": [ + "Custom Diffusion Utils" + ] } \ No newline at end of file diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index b5d8e6a2e..d0eaf08c9 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit b5d8e6a2e2dd1eafef8cf101786c243feefd3ced +Subproject commit d0eaf08c949199fb619e469155ac5ba583895168 diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 7e6a684e5..883ac1d85 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 7e6a684e599ac62031d8e0f69a64b65375ab8b29 +Subproject commit 883ac1d85978e83c61ab155bab6336f1aadf6621 diff --git a/modules/lora b/modules/lora index 14d7b2461..08ae46b16 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 14d7b2461973932fffc18d8c71f1fb876875d871 +Subproject commit 08ae46b16345274b52b07615b93d75fb1ffed6c6 diff --git a/modules/shared.py b/modules/shared.py index d2e9913b7..e26edd157 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -156,6 +156,7 @@ os.makedirs(cmd_opts.hypernetwork_dir, exist_ok=True) hypernetworks = {} loaded_hypernetworks = [] +tab_names = [] def reload_hypernetworks(): from modules.hypernetworks import hypernetwork @@ -455,7 +456,8 @@ options_templates.update(options_section(('ui', "User interface"), { "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 ", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}), "quicksettings": OptionInfo("sd_model_checkpoint", "Quicksettings list"), - "hidden_tabs": OptionInfo("", "Hidden UI tabs"), + # "hidden_tabs": OptionInfo("", "Hidden UI tabs"), + "hidden_tabs": OptionInfo([], "Hidden UI tabs (requires restart)", ui_components.DropdownMulti, lambda: {"choices": [x for x in tab_names]}), "ui_reorder": OptionInfo(", ".join(ui_reorder_categories), "txt2img/img2img UI item order"), "ui_extra_networks_tab_reorder": OptionInfo("", "Extra networks tab order"), "localization": OptionInfo("None", "Localization (requires restart)", gr.Dropdown, lambda: {"choices": ["None"] + list(localization.localizations.keys())}, refresh=lambda: localization.list_localizations(cmd_opts.localizations_dir)), @@ -658,7 +660,6 @@ clip_model = None progress_print_out = sys.stdout - class TotalTQDM: def __init__(self): self._tqdm = None diff --git a/modules/ui.py b/modules/ui.py index 23e9e470d..dfcc2dc3d 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1566,6 +1566,10 @@ def create_ui(): extensions_interface = ui_extensions.create_ui() interfaces += [(extensions_interface, "Extensions", "extensions")] + shared.tab_names = [] + for _interface, label, _ifid in interfaces: + shared.tab_names.append(label) + with gr.Blocks(css=css, analytics_enabled=False, title="Stable Diffusion") as demo: with gr.Row(elem_id="quicksettings", variant="compact"): for i, k, item in sorted(quicksettings_list, key=lambda x: quicksettings_names.get(x[1], x[0])): @@ -1575,9 +1579,8 @@ def create_ui(): parameters_copypaste.connect_paste_params_buttons() with gr.Tabs(elem_id="tabs") as tabs: - hidden_tabs = [x.lower().strip() for x in shared.opts.hidden_tabs.split(",")] for interface, label, ifid in interfaces: - if label.lower() in hidden_tabs: + if label in shared.opts.hidden_tabs: continue with gr.TabItem(label, id=ifid, elem_id='tab_' + ifid): interface.render() @@ -1789,10 +1792,15 @@ def versions_html(): else: xformers_version = "N/A" + try: + torch_version = torch.__long_version__ + except: + torch_version = torch.__version__ + return f""" python: {python_version}  •  -torch: {torch.__version__} +torch: {torch_version}  •  xformers: {xformers_version}  •  diff --git a/webui.py b/webui.py index 88f9074ae..356fce774 100644 --- a/webui.py +++ b/webui.py @@ -20,6 +20,7 @@ import torch # Truncate version number of nightly/local build of PyTorch to not cause exceptions with CodeFormer or Safetensors if ".dev" in torch.__version__ or "+git" in torch.__version__: + torch.__long_version__ = torch.__version__ torch.__version__ = re.search(r'[\d.]+[\d]', torch.__version__).group(0) from modules import shared, devices, sd_samplers, upscaler, extensions, localization, ui_tempdir, ui_extra_networks