From 3d83683a2809fb680bd0b756c9cb4f98f4dee1d9 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 08:41:26 +0300
Subject: [PATCH 01/43] fix error that causes some extra networks to be
 disabled if both <lora:> and <lyco:> are present in the prompt

---
 modules/extra_networks.py | 60 ++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/modules/extra_networks.py b/modules/extra_networks.py
index fa28ac752..b95336778 100644
--- a/modules/extra_networks.py
+++ b/modules/extra_networks.py
@@ -1,6 +1,7 @@
 import json
 import os
 import re
+import logging
 from collections import defaultdict
 
 from modules import errors
@@ -86,27 +87,55 @@ class ExtraNetwork:
         raise NotImplementedError
 
 
+def lookup_extra_networks(extra_network_data):
+    """returns a dict mapping ExtraNetwork objects to lists of arguments for those extra networks.
+
+    Example input:
+    {
+        'lora': [<modules.extra_networks.ExtraNetworkParams object at 0x0000020690D58310>],
+        'lyco': [<modules.extra_networks.ExtraNetworkParams object at 0x0000020690D58F70>],
+        'hypernet': [<modules.extra_networks.ExtraNetworkParams object at 0x0000020690D5A800>]
+    }
+
+    Example output:
+
+    {
+        <extra_networks_lora.ExtraNetworkLora object at 0x0000020581BEECE0>: [<modules.extra_networks.ExtraNetworkParams object at 0x0000020690D58310>, <modules.extra_networks.ExtraNetworkParams object at 0x0000020690D58F70>],
+        <modules.extra_networks_hypernet.ExtraNetworkHypernet object at 0x0000020581BEEE60>: [<modules.extra_networks.ExtraNetworkParams object at 0x0000020690D5A800>]
+    }
+    """
+
+    res = {}
+
+    for extra_network_name, extra_network_args in list(extra_network_data.items()):
+        extra_network = extra_network_registry.get(extra_network_name, None)
+        alias = extra_network_aliases.get(extra_network_name, None)
+
+        if alias is not None and extra_network is None:
+            extra_network = alias
+
+        if extra_network is None:
+            logging.info(f"Skipping unknown extra network: {extra_network_name}")
+            continue
+
+        res.setdefault(extra_network, []).extend(extra_network_args)
+
+    return res
+
+
 def activate(p, extra_network_data):
     """call activate for extra networks in extra_network_data in specified order, then call
     activate for all remaining registered networks with an empty argument list"""
 
     activated = []
 
-    for extra_network_name, extra_network_args in extra_network_data.items():
-        extra_network = extra_network_registry.get(extra_network_name, None)
-
-        if extra_network is None:
-            extra_network = extra_network_aliases.get(extra_network_name, None)
-
-        if extra_network is None:
-            print(f"Skipping unknown extra network: {extra_network_name}")
-            continue
+    for extra_network, extra_network_args in lookup_extra_networks(extra_network_data).items():
 
         try:
             extra_network.activate(p, extra_network_args)
             activated.append(extra_network)
         except Exception as e:
-            errors.display(e, f"activating extra network {extra_network_name} with arguments {extra_network_args}")
+            errors.display(e, f"activating extra network {extra_network.name} with arguments {extra_network_args}")
 
     for extra_network_name, extra_network in extra_network_registry.items():
         if extra_network in activated:
@@ -125,19 +154,16 @@ def deactivate(p, extra_network_data):
     """call deactivate for extra networks in extra_network_data in specified order, then call
     deactivate for all remaining registered networks"""
 
-    for extra_network_name in extra_network_data:
-        extra_network = extra_network_registry.get(extra_network_name, None)
-        if extra_network is None:
-            continue
+    data = lookup_extra_networks(extra_network_data)
 
+    for extra_network in data:
         try:
             extra_network.deactivate(p)
         except Exception as e:
-            errors.display(e, f"deactivating extra network {extra_network_name}")
+            errors.display(e, f"deactivating extra network {extra_network.name}")
 
     for extra_network_name, extra_network in extra_network_registry.items():
-        args = extra_network_data.get(extra_network_name, None)
-        if args is not None:
+        if extra_network in data:
             continue
 
         try:

From 1b46863f2418f7316ea844748d5d2f4efbf78e3a Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 08:45:16 +0300
Subject: [PATCH 02/43] update gradio to 3.41.2

---
 modules/errors.py         | 2 +-
 requirements.txt          | 2 +-
 requirements_versions.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/errors.py b/modules/errors.py
index a56fd30ca..8c339464d 100644
--- a/modules/errors.py
+++ b/modules/errors.py
@@ -95,7 +95,7 @@ def check_versions():
 
     expected_torch_version = "2.0.0"
     expected_xformers_version = "0.0.20"
-    expected_gradio_version = "3.41.0"
+    expected_gradio_version = "3.41.2"
 
     if version.parse(torch.__version__) < version.parse(expected_torch_version):
         print_error_explanation(f"""
diff --git a/requirements.txt b/requirements.txt
index 960fa0bd7..80b438455 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ clean-fid
 einops
 fastapi>=0.90.1
 gfpgan
-gradio==3.41.0
+gradio==3.41.2
 inflection
 jsonmerge
 kornia
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 6c679e242..f8ae1f385 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -7,7 +7,7 @@ clean-fid==0.1.35
 einops==0.4.1
 fastapi==0.94.0
 gfpgan==1.3.8
-gradio==3.41.0
+gradio==3.41.2
 httpcore==0.15
 inflection==0.5.1
 jsonmerge==1.8.0

From 9dd0c4add57bada7c90f55fd77e674db831fc45c Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 08:45:25 +0300
Subject: [PATCH 03/43] update changelog

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c5e0f119..5e78b3d2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,7 +67,7 @@
  * make it possible to localize tooltips and placeholders
 
 ### Extensions and API:
- * gradio 3.41.0
+ * gradio 3.41.2
  * also bump versions for packages: transformers, GitPython, accelerate, scikit-image, timm, tomesd
  * support tooltip kwarg for gradio elements: gr.Textbox(label='hello', tooltip='world')
  * properly clear the total console progressbar when using txt2img and img2img from API
@@ -127,6 +127,9 @@
  * set devices.dtype_unet correctly
  * run RealESRGAN on GPU for non-CUDA devices ([#12737](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
  * prevent extra network buttons being obscured by description for very small card sizes ([#12745](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12745))
+ * fix error that causes some extra networks to be disabled if both <lora:> and <lyco:> are present in the prompt
+ * fix defaults settings page breaking when any of main UI tabs are hidden
+ * fix incorrect save/display of new values in Defaults page in settings
 
 
 ## 1.5.2

From 5e30f737b0a4e1c7ec450bc01c7d05f5c8a98433 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:19:02 +0300
Subject: [PATCH 04/43] fix for Reload UI function: if you reload UI on one
 tab, other opened tabs will no longer stop working

---
 CHANGELOG.md                               | 1 +
 modules/generation_parameters_copypaste.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e78b3d2d..1bbde2348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -130,6 +130,7 @@
  * fix error that causes some extra networks to be disabled if both <lora:> and <lyco:> are present in the prompt
  * fix defaults settings page breaking when any of main UI tabs are hidden
  * fix incorrect save/display of new values in Defaults page in settings
+ * fix for Reload UI function: if you reload UI on one tab, other opened tabs will no longer stop working
 
 
 ## 1.5.2
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 386517aca..2ca160554 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -32,6 +32,7 @@ class ParamBinding:
 
 def reset():
     paste_fields.clear()
+    registered_param_bindings.clear()
 
 
 def quote(text):

From 783a5754d5b53f21bb0e20c670b9379a635c09d1 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:24:42 +0300
Subject: [PATCH 05/43] Merge pull request #12795 from
 catboxanon/prevent-duplicate-resize-handler-mk2

Prevent duplicate resize handler
---
 javascript/resizeHandle.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/javascript/resizeHandle.js b/javascript/resizeHandle.js
index 2fd3c4d29..8c5c51692 100644
--- a/javascript/resizeHandle.js
+++ b/javascript/resizeHandle.js
@@ -134,6 +134,8 @@
 
 onUiLoaded(function() {
     for (var elem of gradioApp().querySelectorAll('.resize-handle-row')) {
-        setupResizeHandle(elem);
+        if (!elem.querySelector('.resize-handle')) {
+            setupResizeHandle(elem);
+        }
     }
 });

From 7989765faad6d3456eacfb774c9498b20e457b35 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:26:18 +0300
Subject: [PATCH 06/43] Merge pull request #12797 from Madrawn/vae_resolve_bug

Small typo: vae resolve bug
---
 modules/sd_vae.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sd_vae.py b/modules/sd_vae.py
index 669097daa..31306d8ba 100644
--- a/modules/sd_vae.py
+++ b/modules/sd_vae.py
@@ -159,7 +159,7 @@ def resolve_vae_from_user_metadata(checkpoint_file) -> VaeResolution:
 
 def resolve_vae_near_checkpoint(checkpoint_file) -> VaeResolution:
     vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
-    if vae_near_checkpoint is not None and (not shared.opts.sd_vae_overrides_per_model_preferences or is_automatic):
+    if vae_near_checkpoint is not None and (not shared.opts.sd_vae_overrides_per_model_preferences or is_automatic()):
         return VaeResolution(vae_near_checkpoint, 'found near the checkpoint')
 
     return VaeResolution(resolved=False)

From 5359dc0a103171d830f5c8a3106ef2e6a0a41366 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:26:50 +0300
Subject: [PATCH 07/43] Merge pull request #12792 from
 catboxanon/image-cropper-hide

Hide broken image crop tool
---
 style.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/style.css b/style.css
index d67b63363..e336e79df 100644
--- a/style.css
+++ b/style.css
@@ -2,6 +2,14 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600&display=swap');
 
+
+/* temporary fix to hide gradio crop tool until it's fixed https://github.com/gradio-app/gradio/issues/3810 */
+
+div.gradio-image button[aria-label="Edit"] {
+    display: none;
+}
+
+
 /* general gradio fixes */
 
 :root, .dark{

From f331821b2711772aeac124b355628943c9c0c423 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:28:12 +0300
Subject: [PATCH 08/43] Merge pull request #12780 from
 catboxanon/xyz-hide-samplers

Don't show hidden samplers in dropdown for XYZ script
---
 scripts/xyz_grid.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index daaf761f1..517d6332e 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -238,9 +238,9 @@ axis_options = [
     AxisOptionImg2Img("Image CFG Scale", float, apply_field("image_cfg_scale")),
     AxisOption("Prompt S/R", str, apply_prompt, format_value=format_value),
     AxisOption("Prompt order", str_permutations, apply_order, format_value=format_value_join_list),
-    AxisOptionTxt2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers]),
-    AxisOptionTxt2Img("Hires sampler", str, apply_field("hr_sampler_name"), confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img]),
-    AxisOptionImg2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img]),
+    AxisOptionTxt2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers if x.name not in opts.hide_samplers]),
+    AxisOptionTxt2Img("Hires sampler", str, apply_field("hr_sampler_name"), confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img if x.name not in opts.hide_samplers]),
+    AxisOptionImg2Img("Sampler", str, apply_field("sampler_name"), format_value=format_value, confirm=confirm_samplers, choices=lambda: [x.name for x in sd_samplers.samplers_for_img2img if x.name not in opts.hide_samplers]),
     AxisOption("Checkpoint name", str, apply_checkpoint, format_value=format_remove_path, confirm=confirm_checkpoints, cost=1.0, choices=lambda: sorted(sd_models.checkpoints_list, key=str.casefold)),
     AxisOption("Negative Guidance minimum sigma", float, apply_field("s_min_uncond")),
     AxisOption("Sigma Churn", float, apply_field("s_churn")),

From 6139b145f0039b1f428c763f0cd85cd2a96d0d52 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:39:37 +0300
Subject: [PATCH 09/43] fix style editing dialog breaking if it's opened in
 both img2img and txt2img tabs

---
 javascript/extraNetworks.js | 9 +++++++++
 modules/ui_common.py        | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 3bc723d37..ad1a4e000 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -249,6 +249,15 @@ function popup(contents) {
     globalPopup.style.display = "flex";
 }
 
+var storedPopupIds = {};
+function popupId(id) {
+    if(! storedPopupIds[id]){
+        storedPopupIds[id] = gradioApp().getElementById(id);
+    }
+
+    popup(storedPopupIds[id]);
+}
+
 function extraNetworksShowMetadata(text) {
     var elem = document.createElement('pre');
     elem.classList.add('popup-metadata');
diff --git a/modules/ui_common.py b/modules/ui_common.py
index eddc4bc88..84a7d7f27 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -261,7 +261,7 @@ def setup_dialog(button_show, dialog, *, button_close=None):
         fn=lambda: gr.update(visible=True),
         inputs=[],
         outputs=[dialog],
-    ).then(fn=None, _js="function(){ popup(gradioApp().getElementById('" + dialog.elem_id + "')); }")
+    ).then(fn=None, _js="function(){ popupId('" + dialog.elem_id + "'); }")
 
     if button_close:
         button_close.click(fn=None, _js="closePopup")

From cb81087b592b2a371ee9ee2e53d045f3c0f4921f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 09:44:13 +0300
Subject: [PATCH 10/43] update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bbde2348..07798b5a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -131,6 +131,10 @@
  * fix defaults settings page breaking when any of main UI tabs are hidden
  * fix incorrect save/display of new values in Defaults page in settings
  * fix for Reload UI function: if you reload UI on one tab, other opened tabs will no longer stop working
+ * fix an error that prevents VAE being reloaded after an option change if a VAE near the checkpoint exists ([#12797](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * hide broken image crop tool ([#12792](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * don't show hidden samplers in dropdown for XYZ script ([#12780](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
+ * fix style editing dialog breaking if it's opened in both img2img and txt2img tabs
 
 
 ## 1.5.2

From 66d76307051776509cc03ed368b7b8c3eae0133b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 10:11:14 +0300
Subject: [PATCH 11/43] lint

---
 javascript/extraNetworks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index ad1a4e000..493f31af2 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -251,7 +251,7 @@ function popup(contents) {
 
 var storedPopupIds = {};
 function popupId(id) {
-    if(! storedPopupIds[id]){
+    if (!storedPopupIds[id]) {
         storedPopupIds[id] = gradioApp().getElementById(id);
     }
 

From d63117ace54330266dd4775c9ae85b1fc9ce9aa3 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 20:16:50 +0300
Subject: [PATCH 12/43] hide --gradio-auth and --api-auth values from
 /internal/sysinfo report

---
 modules/sysinfo.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/modules/sysinfo.py b/modules/sysinfo.py
index 058e66ce4..2db7551dc 100644
--- a/modules/sysinfo.py
+++ b/modules/sysinfo.py
@@ -82,7 +82,7 @@ def get_dict():
         "Data path": paths_internal.data_path,
         "Extensions dir": paths_internal.extensions_dir,
         "Checksum": checksum_token,
-        "Commandline": sys.argv,
+        "Commandline": get_argv(),
         "Torch env info": get_torch_sysinfo(),
         "Exceptions": get_exceptions(),
         "CPU": {
@@ -123,6 +123,22 @@ def get_environment():
     return {k: os.environ[k] for k in sorted(os.environ) if k in environment_whitelist}
 
 
+def get_argv():
+    res = []
+
+    for v in sys.argv:
+        if shared.cmd_opts.gradio_auth and shared.cmd_opts.gradio_auth == v:
+            res.append("<hidden>")
+            continue
+
+        if shared.cmd_opts.api_auth and shared.cmd_opts.api_auth == v:
+            res.append("<hidden>")
+            continue
+
+        res.append(v)
+
+    return res
+
 re_newline = re.compile(r"\r*\n")
 
 

From d0d5075914efaf06ae60df28171579d8cf3bb30a Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 20:24:25 +0300
Subject: [PATCH 13/43] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07798b5a3..0a2a874ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -135,6 +135,7 @@
  * hide broken image crop tool ([#12792](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
  * don't show hidden samplers in dropdown for XYZ script ([#12780](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
  * fix style editing dialog breaking if it's opened in both img2img and txt2img tabs
+ * fix a bug allowing users to bypass gradio and API authentication (reported by vysecurity) 
 
 
 ## 1.5.2

From bfc5c0810979545003f3854e86c35fdcaa8b3672 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 27 Aug 2023 21:29:48 +0300
Subject: [PATCH 14/43] Merge pull request #12814 from
 AUTOMATIC1111/non-local-condition

non-local condition
---
 modules/shared_cmd_options.py | 2 +-
 webui.py                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/shared_cmd_options.py b/modules/shared_cmd_options.py
index af24938b0..dd93f5206 100644
--- a/modules/shared_cmd_options.py
+++ b/modules/shared_cmd_options.py
@@ -15,4 +15,4 @@ else:
     cmd_opts, _ = parser.parse_known_args()
 
 
-cmd_opts.disable_extension_access = (cmd_opts.share or cmd_opts.listen or cmd_opts.server_name) and not cmd_opts.enable_insecure_extension_access
+cmd_opts.disable_extension_access = any([cmd_opts.share, cmd_opts.listen, cmd_opts.ngrok, cmd_opts.server_name]) and not cmd_opts.enable_insecure_extension_access
diff --git a/webui.py b/webui.py
index 5c827dae8..12328423d 100644
--- a/webui.py
+++ b/webui.py
@@ -74,7 +74,7 @@ def webui():
             if shared.opts.auto_launch_browser == "Remote" or cmd_opts.autolaunch:
                 auto_launch_browser = True
             elif shared.opts.auto_launch_browser == "Local":
-                auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok])
+                auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok, cmd_opts.server_name])
 
         app, local_url, share_url = shared.demo.launch(
             share=cmd_opts.share,

From 86708463f1767222262d4b970e01311fe54eb243 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 28 Aug 2023 07:20:33 +0300
Subject: [PATCH 15/43] Merge pull request #12819 from
 catboxanon/fix/rng-infotext

Add missing infotext for RNG in options
---
 modules/shared_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/shared_options.py b/modules/shared_options.py
index 83f563149..0f054f472 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -144,7 +144,7 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
     "comma_padding_backtrack": OptionInfo(20, "Prompt word wrap length limit", gr.Slider, {"minimum": 0, "maximum": 74, "step": 1}).info("in tokens - for texts shorter than specified, if they don't fit into 75 token limit, move them to the next 75 token chunk"),
     "CLIP_stop_at_last_layers": OptionInfo(1, "Clip skip", gr.Slider, {"minimum": 1, "maximum": 12, "step": 1}, infotext="Clip skip").link("wiki", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#clip-skip").info("ignore last layers of CLIP network; 1 ignores none, 2 ignores one layer"),
     "upcast_attn": OptionInfo(False, "Upcast cross attention layer to float32"),
-    "randn_source": OptionInfo("GPU", "Random number generator source.", gr.Radio, {"choices": ["GPU", "CPU", "NV"]}).info("changes seeds drastically; use CPU to produce the same picture across different videocard vendors; use NV to produce same picture as on NVidia videocards"),
+    "randn_source": OptionInfo("GPU", "Random number generator source.", gr.Radio, {"choices": ["GPU", "CPU", "NV"]}, infotext="RNG").info("changes seeds drastically; use CPU to produce the same picture across different videocard vendors; use NV to produce same picture as on NVidia videocards"),
     "tiling": OptionInfo(False, "Tiling", infotext='Tiling').info("produce a tileable picture"),
 }))
 

From c0f9821c35d54e00e3c193650f1fe5266299325d Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 28 Aug 2023 22:22:35 +0300
Subject: [PATCH 16/43] always show NV as RNG source in infotext

---
 modules/processing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/processing.py b/modules/processing.py
index 7dc931ba5..0138e5ac9 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -689,7 +689,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Token merging ratio": None if token_merging_ratio == 0 else token_merging_ratio,
         "Token merging ratio hr": None if not enable_hr or token_merging_ratio_hr == 0 else token_merging_ratio_hr,
         "Init image hash": getattr(p, 'init_img_hash', None),
-        "RNG": opts.randn_source if opts.randn_source != "GPU" and opts.randn_source != "NV" else None,
+        "RNG": opts.randn_source if opts.randn_source != "GPU" else None,
         "NGMS": None if p.s_min_uncond == 0 else p.s_min_uncond,
         "Tiling": "True" if p.tiling else None,
         **p.extra_generation_params,

From 8a7a4275a83f428582648a6872b5491e56ebae7b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:32:48 +0300
Subject: [PATCH 17/43] Merge pull request #12842 from dhwz/dev

remove xformers Python version check
---
 modules/launch_utils.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 7e4d5a613..14252c3a6 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -366,17 +366,7 @@ def prepare_environment():
         startup_timer.record("install open_clip")
 
     if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:
-        if platform.system() == "Windows":
-            if platform.python_version().startswith("3.10"):
-                run_pip(f"install -U -I --no-deps {xformers_package}", "xformers", live=True)
-            else:
-                print("Installation of xformers is not supported in this version of Python.")
-                print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")
-                if not is_installed("xformers"):
-                    exit(0)
-        elif platform.system() == "Linux":
-            run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
-
+        run_pip(f"install -U -I --no-deps {xformers_package}", "xformers")
         startup_timer.record("install xformers")
 
     if not is_installed("ngrok") and args.ngrok:

From 6558716018c8e2ebe4cef5d4951d43f391151227 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:52:58 +0300
Subject: [PATCH 18/43] Merge pull request #12837 from
 bluelovers/pr/file-metadata-break-001

style: file-metadata word-break
---
 style.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/style.css b/style.css
index e336e79df..bbfb7d395 100644
--- a/style.css
+++ b/style.css
@@ -1009,6 +1009,8 @@ div.block.gradio-box.edit-user-metadata {
 
 .edit-user-metadata .file-metadata th, .edit-user-metadata .file-metadata td{
     padding: 0.3em 1em;
+    overflow-wrap: anywhere;
+    word-break: break-word;
 }
 
 .edit-user-metadata .wrap.translucent{

From 738e133b24e27ac8d7babeb4714053204636d2c8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:54:09 +0300
Subject: [PATCH 19/43] Merge pull request #12818 from catboxanon/sgm

Add option to align with sgm repo's sampling implementation
---
 modules/sd_samplers_kdiffusion.py | 14 ++++++++++++--
 modules/shared_options.py         |  1 +
 scripts/xyz_grid.py               |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
index b9e0d5776..a8a2735f4 100644
--- a/modules/sd_samplers_kdiffusion.py
+++ b/modules/sd_samplers_kdiffusion.py
@@ -144,7 +144,13 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
         sigmas = self.get_sigmas(p, steps)
         sigma_sched = sigmas[steps - t_enc - 1:]
 
-        xi = x + noise * sigma_sched[0]
+        if opts.sgm_noise_multiplier:
+            p.extra_generation_params["SGM noise multiplier"] = True
+            noise_multiplier = torch.sqrt(1.0 + sigma_sched[0] ** 2.0)
+        else:
+            noise_multiplier = sigma_sched[0]
+
+        xi = x + noise * noise_multiplier
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
@@ -197,7 +203,11 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
 
         sigmas = self.get_sigmas(p, steps)
 
-        x = x * sigmas[0]
+        if opts.sgm_noise_multiplier:
+            p.extra_generation_params["SGM noise multiplier"] = True
+            x = x * torch.sqrt(1.0 + sigmas[0] ** 2.0)
+        else:
+            x = x * sigmas[0]
 
         extra_params_kwargs = self.initialize(p)
         parameters = inspect.signature(self.func).parameters
diff --git a/modules/shared_options.py b/modules/shared_options.py
index 0f054f472..78652ea27 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -309,6 +309,7 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters"
     'rho':  OptionInfo(0.0, "rho", gr.Number, infotext='Schedule rho').info("0 = default (7 for karras, 1 for polyexponential); higher values result in a steeper noise schedule (decreases faster)"),
     'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}, infotext='ENSD').info("ENSD; does not improve anything, just produces different results for ancestral samplers - only useful for reproducing images"),
     'always_discard_next_to_last_sigma': OptionInfo(False, "Always discard next-to-last sigma", infotext='Discard penultimate sigma').link("PR", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/6044"),
+    'sgm_noise_multiplier': OptionInfo(False, "SGM noise multiplier", infotext='SGM noise multplier').link("PR", "https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12818").info("Match initial noise to official SDXL implementation - only useful for reproducing images"),
     'uni_pc_variant': OptionInfo("bh1", "UniPC variant", gr.Radio, {"choices": ["bh1", "bh2", "vary_coeff"]}, infotext='UniPC variant'),
     'uni_pc_skip_type': OptionInfo("time_uniform", "UniPC skip type", gr.Radio, {"choices": ["time_uniform", "time_quadratic", "logSNR"]}, infotext='UniPC skip type'),
     'uni_pc_order': OptionInfo(3, "UniPC order", gr.Slider, {"minimum": 1, "maximum": 50, "step": 1}, infotext='UniPC order').info("must be < sampling steps"),
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 517d6332e..939d86053 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -265,6 +265,7 @@ axis_options = [
     AxisOption("Token merging ratio", float, apply_override('token_merging_ratio')),
     AxisOption("Token merging ratio high-res", float, apply_override('token_merging_ratio_hr')),
     AxisOption("Always discard next-to-last sigma", str, apply_override('always_discard_next_to_last_sigma', boolean=True), choices=boolean_choice(reverse=True)),
+    AxisOption("SGM noise multiplier", str, apply_override('sgm_noise_multiplier', boolean=True), choices=boolean_choice(reverse=True)),
     AxisOption("Refiner checkpoint", str, apply_field('refiner_checkpoint'), format_value=format_remove_path, confirm=confirm_checkpoints_or_none, cost=1.0, choices=lambda: ['None'] + sorted(sd_models.checkpoints_list, key=str.casefold)),
     AxisOption("Refiner switch at", float, apply_field('refiner_switch_at')),
     AxisOption("RNG source", str, apply_override("randn_source"), choices=lambda: ["GPU", "CPU", "NV"]),

From 444f10296417f6074f5b2abb705d3ec792eaecdf Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:55:45 +0300
Subject: [PATCH 20/43] Merge pull request #12834 from
 catboxanon/fix/notification-tab-switch

Fix notification not playing when built-in webui tab is inactive
---
 javascript/notification.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascript/notification.js b/javascript/notification.js
index 76c5715da..6d7995612 100644
--- a/javascript/notification.js
+++ b/javascript/notification.js
@@ -15,7 +15,7 @@ onAfterUiUpdate(function() {
         }
     }
 
-    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"][style*="display: block"] div[id$="_results"] .thumbnail-item > img');
+    const galleryPreviews = gradioApp().querySelectorAll('div[id^="tab_"] div[id$="_results"] .thumbnail-item > img');
 
     if (galleryPreviews == null) return;
 

From 0c9282b84d68a9b01528a663d90c7acbb0c5e266 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 08:58:01 +0300
Subject: [PATCH 21/43] Merge pull request #12832 from
 catboxanon/fix/skip-install-extensions

Honor `--skip-install` for extension installers
---
 modules/launch_utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 14252c3a6..090be3280 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -394,7 +394,8 @@ def prepare_environment():
         run_pip(f"install -r \"{requirements_file}\"", "requirements")
         startup_timer.record("install requirements")
 
-    run_extensions_installers(settings_file=args.ui_settings_file)
+    if not args.skip_install:
+        run_extensions_installers(settings_file=args.ui_settings_file)
 
     if args.update_check:
         version_check(commit)

From 00e393ce10901e7c7c8bcf85d641382c7fe2efb4 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 09:00:34 +0300
Subject: [PATCH 22/43] Merge pull request #12833 from
 catboxanon/fix/dont-print-blank-stdout

Don't print blank stdout in extension installers
---
 modules/launch_utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 090be3280..9aa0f071f 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -228,7 +228,9 @@ def run_extension_installer(extension_dir):
         env = os.environ.copy()
         env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"
 
-        print(run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env))
+        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env)
+        if stdout:
+            print(stdout)
     except Exception as e:
         errors.report(str(e))
 

From a0af2852b67859b427b662789d0b42f592e78dec Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 29 Aug 2023 15:38:05 +0300
Subject: [PATCH 23/43] revert SGM noise multiplier change for img2img because
 it breaks hires fix

---
 modules/sd_samplers_kdiffusion.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
index a8a2735f4..72c352a6e 100644
--- a/modules/sd_samplers_kdiffusion.py
+++ b/modules/sd_samplers_kdiffusion.py
@@ -144,13 +144,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
         sigmas = self.get_sigmas(p, steps)
         sigma_sched = sigmas[steps - t_enc - 1:]
 
-        if opts.sgm_noise_multiplier:
-            p.extra_generation_params["SGM noise multiplier"] = True
-            noise_multiplier = torch.sqrt(1.0 + sigma_sched[0] ** 2.0)
-        else:
-            noise_multiplier = sigma_sched[0]
-
-        xi = x + noise * noise_multiplier
+        xi = x + noise * sigma_sched[0]
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise

From 642faa1f6555b6522ee45a0275b87c61a34813f8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 07:27:13 +0300
Subject: [PATCH 24/43] Merge pull request #12856 from
 catboxanon/extra-noise-noisy-latent

Add noisy latent to `ExtraNoiseParams` for callback
---
 modules/script_callbacks.py       | 7 +++++--
 modules/sd_samplers_kdiffusion.py | 2 +-
 modules/sd_samplers_timesteps.py  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py
index fab23551a..c99695eb3 100644
--- a/modules/script_callbacks.py
+++ b/modules/script_callbacks.py
@@ -29,12 +29,15 @@ class ImageSaveParams:
 
 
 class ExtraNoiseParams:
-    def __init__(self, noise, x):
+    def __init__(self, noise, x, xi):
         self.noise = noise
         """Random noise generated by the seed"""
 
         self.x = x
-        """Latent image representation of the image"""
+        """Latent representation of the image"""
+
+        self.xi = xi
+        """Noisy latent representation of the image"""
 
 
 class CFGDenoiserParams:
diff --git a/modules/sd_samplers_kdiffusion.py b/modules/sd_samplers_kdiffusion.py
index 72c352a6e..8a8c87e0d 100644
--- a/modules/sd_samplers_kdiffusion.py
+++ b/modules/sd_samplers_kdiffusion.py
@@ -148,7 +148,7 @@ class KDiffusionSampler(sd_samplers_common.Sampler):
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
-            extra_noise_params = ExtraNoiseParams(noise, x)
+            extra_noise_params = ExtraNoiseParams(noise, x, xi)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise
diff --git a/modules/sd_samplers_timesteps.py b/modules/sd_samplers_timesteps.py
index 7a6cbd46d..b17a8f93c 100644
--- a/modules/sd_samplers_timesteps.py
+++ b/modules/sd_samplers_timesteps.py
@@ -107,7 +107,7 @@ class CompVisSampler(sd_samplers_common.Sampler):
 
         if opts.img2img_extra_noise > 0:
             p.extra_generation_params["Extra noise"] = opts.img2img_extra_noise
-            extra_noise_params = ExtraNoiseParams(noise, x)
+            extra_noise_params = ExtraNoiseParams(noise, x, xi)
             extra_noise_callback(extra_noise_params)
             noise = extra_noise_params.noise
             xi += noise * opts.img2img_extra_noise * sqrt_alpha_cumprod

From 323dcadea2a04387449159e56586a247efbca56c Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 07:27:45 +0300
Subject: [PATCH 25/43] Merge pull request #12855 from dhwz/dev

don't print empty lines
---
 modules/launch_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 9aa0f071f..05488fe63 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -228,7 +228,7 @@ def run_extension_installer(extension_dir):
         env = os.environ.copy()
         env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"
 
-        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env)
+        stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env).strip()
         if stdout:
             print(stdout)
     except Exception as e:

From 46f3ee9594703afc1de16d6be372cae86c26b632 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 07:41:46 +0300
Subject: [PATCH 26/43] Merge pull request #12854 from
 catboxanon/fix/quicksettings-dropdown-unfocus

Do not change quicksettings dropdown option when value returned is `None`
---
 modules/ui_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui_settings.py b/modules/ui_settings.py
index 6dde4b6aa..8ff9c0747 100644
--- a/modules/ui_settings.py
+++ b/modules/ui_settings.py
@@ -87,7 +87,7 @@ class UiSettings:
         if not opts.same_type(value, opts.data_labels[key].default):
             return gr.update(visible=True), opts.dumpjson()
 
-        if not opts.set(key, value):
+        if value is None or not opts.set(key, value):
             return gr.update(value=getattr(opts, key)), opts.dumpjson()
 
         opts.save(shared.config_filename)

From 965c72891486107340d3ab4b000871b96775fb00 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 07:43:38 +0300
Subject: [PATCH 27/43] Merge pull request #12839 from ibrainventures/patch-1

[RC 1.6.0 - zoom is partly hidden] Update style.css
---
 style.css | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/style.css b/style.css
index bbfb7d395..92d3030e5 100644
--- a/style.css
+++ b/style.css
@@ -621,6 +621,9 @@ table.popup-table .link{
 
 .modalControls {
     display: flex;
+    position: absolute;
+    right: 0px;
+    left: 0px;
     gap: 1em;
     padding: 1em;
     background-color:rgba(0,0,0,0);
@@ -660,13 +663,6 @@ table.popup-table .link{
     min-height: 0;
 }
 
-#modalImage{
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%) translateY(-50%);
-}
-
 .modalPrev,
 .modalNext {
   cursor: pointer;

From afea99a72b48fd88b101b1b2cea45fd527c3bc6f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:05:18 +0300
Subject: [PATCH 28/43] get progressbar to display correctly in extensions tab

---
 javascript/extensions.js | 2 +-
 modules/ui_extensions.py | 8 ++++++--
 style.css                | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/javascript/extensions.js b/javascript/extensions.js
index 1f7254c5d..312131b76 100644
--- a/javascript/extensions.js
+++ b/javascript/extensions.js
@@ -33,7 +33,7 @@ function extensions_check() {
 
 
     var id = randomId();
-    requestProgress(id, gradioApp().getElementById('extensions_installed_top'), null, function() {
+    requestProgress(id, gradioApp().getElementById('extensions_installed_html'), null, function() {
 
     });
 
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index e01382676..67a243c35 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -557,8 +557,12 @@ def create_ui():
                         msg = '"--disable-extra-extensions" was used, remove it to load all extensions again'
                     html = f'<span style="color: var(--primary-400);">{msg}</span>'
 
-                info = gr.HTML(html)
-                extensions_table = gr.HTML('Loading...')
+                with gr.Row():
+                    info = gr.HTML(html)
+
+                with gr.Row(elem_classes="progress-container"):
+                    extensions_table = gr.HTML('Loading...', elem_id="extensions_installed_html")
+
                 ui.load(fn=extension_table, inputs=[], outputs=[extensions_table])
 
                 apply.click(
diff --git a/style.css b/style.css
index 92d3030e5..fb4e2f1f0 100644
--- a/style.css
+++ b/style.css
@@ -517,6 +517,11 @@ table.popup-table .link{
     background: #b4c0cc;
     border-radius: 3px !important;
     top: -20px;
+    width: 100%;
+}
+
+.progress-container{
+    position: relative;
 }
 
 [id$=_results].mobile{

From 3989d7e88bf82d50f5a72d759346070df1bc2097 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:07:15 +0300
Subject: [PATCH 29/43] Merge pull request #12838 from
 bluelovers/pr/file-metadata-path-001

display file metadata `path` , `ss_output_name`
---
 extensions-builtin/Lora/ui_edit_user_metadata.py |  1 +
 modules/ui_extra_networks_user_metadata.py       | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/extensions-builtin/Lora/ui_edit_user_metadata.py b/extensions-builtin/Lora/ui_edit_user_metadata.py
index 390d9dde3..c70119090 100644
--- a/extensions-builtin/Lora/ui_edit_user_metadata.py
+++ b/extensions-builtin/Lora/ui_edit_user_metadata.py
@@ -70,6 +70,7 @@ class LoraUserMetadataEditor(ui_extra_networks_user_metadata.UserMetadataEditor)
         metadata = item.get("metadata") or {}
 
         keys = {
+            'ss_output_name': "Output name:",
             'ss_sd_model_name': "Model:",
             'ss_clip_skip': "Clip skip:",
             'ss_network_module': "Kohya module:",
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index b11622a1a..588f84c75 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -2,10 +2,20 @@ import datetime
 import html
 import json
 import os.path
+from pathlib import Path
 
 import gradio as gr
 
 from modules import generation_parameters_copypaste, images, sysinfo, errors
+from modules.paths_internal import models_path
+
+
+def exclude_root_path(root_path, path):
+    path_object = Path(path)
+    if path_object.is_relative_to(root_path):
+        path_object = path_object.relative_to(root_path)
+
+    return path_object.as_posix()
 
 
 class UserMetadataEditor:
@@ -98,6 +108,7 @@ class UserMetadataEditor:
             stats = os.stat(filename)
             params = [
                 ('Filename: ', os.path.basename(filename)),
+                ('Path: ', exclude_root_path(models_path, filename)),
                 ('File size: ', sysinfo.pretty_bytes(stats.st_size)),
                 ('Hash: ', shorthash),
                 ('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),

From 338d0b610344354f6323d6d5877546696578a13f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:22:06 +0300
Subject: [PATCH 30/43] go back to single path for filenames in extra networks
 metadata dialog

---
 modules/ui_extra_networks_user_metadata.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index 588f84c75..ae972fbb2 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -2,22 +2,13 @@ import datetime
 import html
 import json
 import os.path
-from pathlib import Path
 
 import gradio as gr
 
-from modules import generation_parameters_copypaste, images, sysinfo, errors
+from modules import generation_parameters_copypaste, images, sysinfo, errors, ui_extra_networks
 from modules.paths_internal import models_path
 
 
-def exclude_root_path(root_path, path):
-    path_object = Path(path)
-    if path_object.is_relative_to(root_path):
-        path_object = path_object.relative_to(root_path)
-
-    return path_object.as_posix()
-
-
 class UserMetadataEditor:
 
     def __init__(self, ui, tabname, page):
@@ -99,6 +90,13 @@ class UserMetadataEditor:
 
         return preview
 
+    def relative_path(self, path):
+        for parent_path in self.page.allowed_directories_for_previews():
+            if ui_extra_networks.path_is_parent(parent_path, path):
+                return os.path.relpath(path, parent_path)
+
+        return os.path.basename(path)
+
     def get_metadata_table(self, name):
         item = self.page.items.get(name, {})
         try:
@@ -107,8 +105,7 @@ class UserMetadataEditor:
 
             stats = os.stat(filename)
             params = [
-                ('Filename: ', os.path.basename(filename)),
-                ('Path: ', exclude_root_path(models_path, filename)),
+                ('Filename: ', self.relative_path(filename)),
                 ('File size: ', sysinfo.pretty_bytes(stats.st_size)),
                 ('Hash: ', shorthash),
                 ('Modified: ', datetime.datetime.fromtimestamp(stats.st_mtime).strftime('%Y-%m-%d %H:%M')),

From 06bc1f4f67f9c01808cafd034b8f9761740982f4 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:23:11 +0300
Subject: [PATCH 31/43] Merge pull request #12851 from
 bluelovers/pr/extension-time-001

chore: change extension time format
---
 modules/ui_extensions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 67a243c35..83557d7a0 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -177,7 +177,7 @@ def extension_table():
                 <td>{remote}</td>
                 <td>{ext.branch}</td>
                 <td>{version_link}</td>
-                <td>{time.asctime(time.gmtime(ext.commit_date))}</td>
+                <td>{time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(ext.commit_date))}</td>
                 <td{' class="extension_status"' if ext.remote is not None else ''}>{ext_status}</td>
             </tr>
     """

From 9e7de49fc5931a5d3070b6917e49ea070528c05a Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:28:46 +0300
Subject: [PATCH 32/43] update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a2a874ac..8752efdf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@
  * make progress bar work independently from live preview display which results in it being updated a lot more often
  * forbid Full live preview method for medvram and add a setting to undo the forbidding
  * make it possible to localize tooltips and placeholders
+ * add option to align with sgm repo's sampling implementation ([#12818](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12818))
 
 ### Extensions and API:
  * gradio 3.41.2
@@ -136,6 +137,11 @@
  * don't show hidden samplers in dropdown for XYZ script ([#12780](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12737))
  * fix style editing dialog breaking if it's opened in both img2img and txt2img tabs
  * fix a bug allowing users to bypass gradio and API authentication (reported by vysecurity) 
+ * fix notification not playing when built-in webui tab is inactive ([#12834](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12834))
+ * honor `--skip-install` for extension installers ([#12832](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12832))
+ * don't print blank stdout in extension installers ([#12833](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12832), [#12855](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12855))
+ * do not change quicksettings dropdown option when value returned is `None` ([#12854](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12854))
+ * get progressbar to display correctly in extensions tab
 
 
 ## 1.5.2

From 503bd3fc0fa934cf2bbafdebfc02c1860bc1b8d5 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 08:54:31 +0300
Subject: [PATCH 33/43] keep order in list of checkpoints when loading model
 that doesn't have a checksum

---
 modules/sd_models.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/sd_models.py b/modules/sd_models.py
index 547e93c44..930d0bee5 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -27,6 +27,24 @@ checkpoint_alisases = checkpoint_aliases  # for compatibility with old name
 checkpoints_loaded = collections.OrderedDict()
 
 
+def replace_key(d, key, new_key, value):
+    keys = list(d.keys())
+
+    d[new_key] = value
+
+    if key not in keys:
+        return d
+
+    index = keys.index(key)
+    keys[index] = new_key
+
+    new_d = {k: d[k] for k in keys}
+
+    d.clear()
+    d.update(new_d)
+    return d
+
+
 class CheckpointInfo:
     def __init__(self, filename):
         self.filename = filename
@@ -91,9 +109,11 @@ class CheckpointInfo:
         if self.shorthash not in self.ids:
             self.ids += [self.shorthash, self.sha256, f'{self.name} [{self.shorthash}]', f'{self.name_for_extra} [{self.shorthash}]']
 
-        checkpoints_list.pop(self.title, None)
+        old_title = self.title
         self.title = f'{self.name} [{self.shorthash}]'
         self.short_title = f'{self.name_for_extra} [{self.shorthash}]'
+
+        replace_key(checkpoints_list, old_title, self.title, self)
         self.register()
 
         return self.shorthash

From 87a083d1b23ed0a777432907752980249421783f Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 09:45:12 +0300
Subject: [PATCH 34/43] Merge pull request #12864 from
 AUTOMATIC1111/extension-time-format-time-zone

patch Extension time format in systme time zone
---
 modules/ui_extensions.py                   | 2 +-
 modules/ui_extra_networks_user_metadata.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 83557d7a0..fa831f570 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -177,7 +177,7 @@ def extension_table():
                 <td>{remote}</td>
                 <td>{ext.branch}</td>
                 <td>{version_link}</td>
-                <td>{time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(ext.commit_date))}</td>
+                <td>{datetime.fromtimestamp(ext.commit_date) if ext.commit_date else ""}</td>
                 <td{' class="extension_status"' if ext.remote is not None else ''}>{ext_status}</td>
             </tr>
     """
diff --git a/modules/ui_extra_networks_user_metadata.py b/modules/ui_extra_networks_user_metadata.py
index ae972fbb2..bfec140cc 100644
--- a/modules/ui_extra_networks_user_metadata.py
+++ b/modules/ui_extra_networks_user_metadata.py
@@ -6,7 +6,6 @@ import os.path
 import gradio as gr
 
 from modules import generation_parameters_copypaste, images, sysinfo, errors, ui_extra_networks
-from modules.paths_internal import models_path
 
 
 class UserMetadataEditor:

From 1ac11b3dae49568fc0b3ae6afe6627196a0a001e Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 11:00:29 +0300
Subject: [PATCH 35/43] Merge pull request #12865 from
 AUTOMATIC1111/another-convert-to-system-time-zone

extension update time, convert to system time zone
---
 modules/ui_extensions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index fa831f570..2e8c1d6d2 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -2,7 +2,7 @@ import json
 import os
 import threading
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 
 import git
 
@@ -442,7 +442,7 @@ sort_ordering = [
 
 def get_date(info: dict, key):
     try:
-        return datetime.strptime(info.get(key), "%Y-%m-%dT%H:%M:%SZ").strftime("%Y-%m-%d")
+        return datetime.strptime(info.get(key), "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=timezone.utc).astimezone().strftime("%Y-%m-%d")
     except (ValueError, TypeError):
         return ''
 

From 87cca029d7133b4060650b8ec33fc6772cc2f7dd Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 18:22:50 +0300
Subject: [PATCH 36/43] add an option to choose how to combine hires fix and
 refiner

---
 modules/processing.py         | 16 +++++-----------
 modules/sd_samplers_common.py | 13 +++++++++++--
 modules/shared_options.py     |  1 +
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/processing.py b/modules/processing.py
index 0138e5ac9..f696e9251 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1148,18 +1148,12 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         else:
             decoded_samples = None
 
-        current = shared.sd_model.sd_checkpoint_info
-        try:
-            if self.hr_checkpoint_info is not None:
-                self.sampler = None
-                sd_models.reload_model_weights(info=self.hr_checkpoint_info)
-                devices.torch_gc()
+        with sd_models.SkipWritingToConfig():
+            sd_models.reload_model_weights(info=self.hr_checkpoint_info)
 
-            return self.sample_hr_pass(samples, decoded_samples, seeds, subseeds, subseed_strength, prompts)
-        finally:
-            self.sampler = None
-            sd_models.reload_model_weights(info=current)
-            devices.torch_gc()
+        devices.torch_gc()
+
+        return self.sample_hr_pass(samples, decoded_samples, seeds, subseeds, subseed_strength, prompts)
 
     def sample_hr_pass(self, samples, decoded_samples, seeds, subseeds, subseed_strength, prompts):
         if shared.state.interrupted:
diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 60fa161cc..6c935a38f 100644
--- a/modules/sd_samplers_common.py
+++ b/modules/sd_samplers_common.py
@@ -164,8 +164,17 @@ def apply_refiner(cfg_denoiser):
     if refiner_checkpoint_info is None or shared.sd_model.sd_checkpoint_info == refiner_checkpoint_info:
         return False
 
-    if getattr(cfg_denoiser.p, "enable_hr", False) and not cfg_denoiser.p.is_hr_pass:
-        return False
+    if getattr(cfg_denoiser.p, "enable_hr", False):
+        is_second_pass = cfg_denoiser.p.is_hr_pass
+
+        if opts.hires_fix_refiner_pass == "first pass" and is_second_pass:
+            return False
+
+        if opts.hires_fix_refiner_pass == "second pass" and not is_second_pass:
+            return False
+
+        if opts.hires_fix_refiner_pass != "second pass":
+            cfg_denoiser.p.extra_generation_params['Hires refiner'] = opts.hires_fix_refiner_pass
 
     cfg_denoiser.p.extra_generation_params['Refiner'] = refiner_checkpoint_info.short_title
     cfg_denoiser.p.extra_generation_params['Refiner switch at'] = refiner_switch_at
diff --git a/modules/shared_options.py b/modules/shared_options.py
index 78652ea27..00b273faa 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -146,6 +146,7 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
     "upcast_attn": OptionInfo(False, "Upcast cross attention layer to float32"),
     "randn_source": OptionInfo("GPU", "Random number generator source.", gr.Radio, {"choices": ["GPU", "CPU", "NV"]}, infotext="RNG").info("changes seeds drastically; use CPU to produce the same picture across different videocard vendors; use NV to produce same picture as on NVidia videocards"),
     "tiling": OptionInfo(False, "Tiling", infotext='Tiling').info("produce a tileable picture"),
+    "hires_fix_refiner_pass": OptionInfo("second pass", "Hires fix: which pass to enable refiner for", gr.Radio, {"choices": ["first pass", "second pass", "both passes"]}, infotext="Hires refiner"),
 }))
 
 options_templates.update(options_section(('sdxl', "Stable Diffusion XL"), {

From 135b61bc0bb9fe3ddde5d54a96a03157300c3cbe Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 19:08:04 +0300
Subject: [PATCH 37/43] fix inpainting models in txt2img creating black
 pictures

---
 modules/processing.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/processing.py b/modules/processing.py
index f696e9251..e08b6305f 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -91,8 +91,8 @@ def create_binary_mask(image):
 def txt2img_image_conditioning(sd_model, x, width, height):
     if sd_model.model.conditioning_key in {'hybrid', 'concat'}: # Inpainting models
 
-        # The "masked-image" in this case will just be all zeros since the entire image is masked.
-        image_conditioning = torch.zeros(x.shape[0], 3, height, width, device=x.device)
+        # The "masked-image" in this case will just be all 0.5 since the entire image is masked.
+        image_conditioning = torch.ones(x.shape[0], 3, height, width, device=x.device) * 0.5
         image_conditioning = images_tensor_to_samples(image_conditioning, approximation_indexes.get(opts.sd_vae_encode_method))
 
         # Add the fake full 1s mask to the first dimension.

From 8d54739de5d7618b977202347ada48fe41fef827 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 19:17:27 +0300
Subject: [PATCH 38/43] add information about Restore faces and Tiling into the
 changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8752efdf1..1cd3572c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,8 @@
  * forbid Full live preview method for medvram and add a setting to undo the forbidding
  * make it possible to localize tooltips and placeholders
  * add option to align with sgm repo's sampling implementation ([#12818](https://github.com/AUTOMATIC1111/stable-diffusion-webui/pull/12818))
+ * Restore faces and Tiling generation parameters have been moved to settings out of main UI
+   * if you want to put them back into main UI, use `Options in main UI` setting on the UI page.
 
 ### Extensions and API:
  * gradio 3.41.2

From d0026da4833ce24c0fbb74c6a21fee84cc81da76 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 19:48:47 +0300
Subject: [PATCH 39/43] add --dump-sysinfo, a cmd arg to dump limited sysinfo
 file at startup

---
 launch.py               |  7 +++++++
 modules/cmd_args.py     |  1 +
 modules/launch_utils.py | 13 +++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/launch.py b/launch.py
index e4c2ce99e..f83820d25 100644
--- a/launch.py
+++ b/launch.py
@@ -25,6 +25,13 @@ start = launch_utils.start
 
 
 def main():
+    if args.dump_sysinfo:
+        filename = launch_utils.dump_sysinfo()
+
+        print(f"Sysinfo saved as {filename}. Exiting...")
+
+        exit(0)
+
     launch_utils.startup_timer.record("initial startup")
 
     with launch_utils.startup_timer.subcategory("prepare environment"):
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index f0f361bde..aab62286e 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -16,6 +16,7 @@ parser.add_argument("--test-server", action='store_true', help="launch.py argume
 parser.add_argument("--log-startup", action='store_true', help="launch.py argument: print a detailed log of what's happening at startup")
 parser.add_argument("--skip-prepare-environment", action='store_true', help="launch.py argument: skip all environment preparation")
 parser.add_argument("--skip-install", action='store_true', help="launch.py argument: skip installation of packages")
+parser.add_argument("--dump-sysinfo", action='store_true', help="launch.py argument: dump limited sysinfo file (without information about extensions, options) to disk and quit")
 parser.add_argument("--loglevel", type=str, help="log level; one of: CRITICAL, ERROR, WARNING, INFO, DEBUG", default=None)
 parser.add_argument("--do-not-download-clip", action='store_true', help="do not download CLIP model even if it's not included in the checkpoint")
 parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="base path where all user data is stored")
diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 05488fe63..6e54d0636 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -434,3 +434,16 @@ def start():
         webui.api_only()
     else:
         webui.webui()
+
+
+def dump_sysinfo():
+    from modules import sysinfo
+    import datetime
+
+    text = sysinfo.get()
+    filename = f"sysinfo-{datetime.datetime.utcnow().strftime('%Y-%m-%d-%H-%M')}.txt"
+
+    with open(filename, "w", encoding="utf8") as file:
+        file.write(text)
+
+    return filename

From 0cdbd90d6b1ac19274ae249e17320096df1a5873 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 19:50:47 +0300
Subject: [PATCH 40/43] update bug report template to include sysinfo and not
 include all other fields that are already covered by sysinfo

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 78 +++------------------------
 1 file changed, 7 insertions(+), 71 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d80b24e2b..cf6a2be86 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -26,7 +26,7 @@ body:
     id: steps
     attributes:
       label: Steps to reproduce the problem
-      description: Please provide us with precise step by step information on how to reproduce the bug
+      description: Please provide us with precise step by step instructions on how to reproduce the bug
       value: |
         1. Go to .... 
         2. Press ....
@@ -37,64 +37,14 @@ body:
     id: what-should
     attributes:
       label: What should have happened?
-      description: Tell what you think the normal behavior should be
+      description: Tell us what you think the normal behavior should be
     validations:
       required: true
-  - type: input
-    id: commit
+  - type: textarea
+    id: sysinfo
     attributes:
-      label: Version or Commit where the problem happens
-      description: "Which webui version or commit are you running ? (Do not write *Latest Version/repo/commit*, as this means nothing and will have changed by the time we read your issue. Rather, copy the **Version: v1.2.3** link at the bottom of the UI, or from the cmd/terminal if you can't launch it.)"
-    validations:
-      required: true
-  - type: dropdown
-    id: py-version
-    attributes:
-      label: What Python version are you running on ?
-      multiple: false
-      options:
-        - Python 3.10.x
-        - Python 3.11.x (above, no supported yet)
-        - Python 3.9.x (below, no recommended)
-  - type: dropdown
-    id: platforms
-    attributes:
-      label: What platforms do you use to access the UI ?
-      multiple: true
-      options:
-        - Windows
-        - Linux
-        - MacOS
-        - iOS
-        - Android
-        - Other/Cloud
-  - type: dropdown
-    id: device
-    attributes:
-        label: What device are you running WebUI on?
-        multiple: true
-        options:
-        - Nvidia GPUs (RTX 20 above)
-        - Nvidia GPUs (GTX 16 below)
-        - AMD GPUs (RX 6000 above)
-        - AMD GPUs (RX 5000 below)
-        - CPU
-        - Other GPUs
-  - type: dropdown
-    id: cross_attention_opt
-    attributes:
-      label: Cross attention optimization
-      description: What cross attention optimization are you using, Settings -> Optimizations -> Cross attention optimization
-      multiple: false
-      options:
-        - Automatic
-        - xformers
-        - sdp-no-mem
-        - sdp
-        - Doggettx
-        - V1 
-        - InvokeAI
-        - "None "
+      label: Sysinfo
+      description: System info file, generated by WebUI. You can generate it in settings, on the Sysinfo page. Drag the file into the field to upload it. If you submit your report without including the sysinfo file, the report will be closed. If needed, review the report to make sure it includes no personal information you don't want to share. If you can't start WebUI, you can use --dump-sysinfo commandline argument to generate the file.
     validations:
       required: true
   - type: dropdown
@@ -108,21 +58,7 @@ body:
         - Brave
         - Apple Safari
         - Microsoft Edge
-  - type: textarea
-    id: cmdargs
-    attributes:
-      label: Command Line Arguments
-      description: Are you using any launching parameters/command line arguments (modified webui-user .bat/.sh) ? If yes, please write them below. Write "No" otherwise.
-      render: Shell
-    validations:
-      required: true
-  - type: textarea
-    id: extensions
-    attributes:
-      label: List of extensions
-      description: Are you using any extensions other than built-ins? If yes, provide a list, you can copy it at "Extensions" tab. Write "No" otherwise.
-    validations:
-      required: true
+        - Other
   - type: textarea
     id: logs
     attributes:

From d43333ff7193279acee5d7284b40902af351c9d7 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 21:13:24 +0300
Subject: [PATCH 41/43] fix an issue where VAE would remain in fp16 after an
 auto-switch to fp32

---
 modules/sd_samplers_common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 6c935a38f..58efcad23 100644
--- a/modules/sd_samplers_common.py
+++ b/modules/sd_samplers_common.py
@@ -95,6 +95,8 @@ def images_tensor_to_samples(image, approximation=None, model=None):
     else:
         if model is None:
             model = shared.sd_model
+        model.first_stage_model.to(devices.dtype_vae)
+
         image = image.to(shared.device, dtype=devices.dtype_vae)
         image = image * 2 - 1
         if len(image) > 1:

From ae7291fb49fc4d116c53749c12b7419eb131b12c Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Wed, 30 Aug 2023 21:34:17 +0300
Subject: [PATCH 42/43] fix an issue where using hires fix with refiner on
 first pass with medvram would cause an exception when generating

---
 modules/processing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/processing.py b/modules/processing.py
index e08b6305f..e124e7f0d 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1315,7 +1315,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
             if shared.opts.hires_fix_use_firstpass_conds:
                 self.calculate_hr_conds()
 
-            elif lowvram.is_enabled(shared.sd_model):  # if in lowvram mode, we need to calculate conds right away, before the cond NN is unloaded
+            elif lowvram.is_enabled(shared.sd_model) and shared.sd_model.sd_checkpoint_info == sd_models.select_checkpoint():  # if in lowvram mode, we need to calculate conds right away, before the cond NN is unloaded
                 with devices.autocast():
                     extra_networks.activate(self, self.hr_extra_network_data)
 

From e7965a5eb804a51e949df07c66c0b7c61ab7fa7b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Thu, 31 Aug 2023 07:30:03 +0300
Subject: [PATCH 43/43] Merge pull request #12876 from ljleb/fix-re

Fix generation params regex
---
 modules/generation_parameters_copypaste.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 2ca160554..d39f2ebac 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -9,7 +9,7 @@ from modules.paths import data_path
 from modules import shared, ui_tempdir, script_callbacks, processing
 from PIL import Image
 
-re_param_code = r'\s*([\w ]+):\s*("(?:\\"[^,]|\\"|\\|[^\"])+"|[^,]*)(?:,|$)'
+re_param_code = r'\s*([\w ]+):\s*("(?:\\.|[^\\"])+"|[^,]*)(?:,|$)'
 re_param = re.compile(re_param_code)
 re_imagesize = re.compile(r"^(\d+)x(\d+)$")
 re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")