aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.yml78
-rw-r--r--CHANGELOG.md9
-rw-r--r--launch.py7
-rw-r--r--modules/cmd_args.py1
-rw-r--r--modules/launch_utils.py13
-rw-r--r--modules/processing.py2
-rw-r--r--modules/sd_samplers_common.py2
7 files changed, 40 insertions, 72 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d80b24e2..cf6a2be8 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
- 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
+ - type: textarea
+ id: sysinfo
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:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07798b5a..1cd3572c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,9 @@
* 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))
+ * 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
@@ -135,6 +138,12 @@
* 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)
+ * 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
diff --git a/launch.py b/launch.py
index e4c2ce99..f83820d2 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 f0f361bd..aab62286 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 05488fe6..6e54d063 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
diff --git a/modules/processing.py b/modules/processing.py
index e08b6305..e124e7f0 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)
diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 6c935a38..58efcad2 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: