Merge branch 'dev' into startup-profile (b3390a98) · Commits · github_fork / Stable Diffusion Webui

.eslintrc.js

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -50,13 +50,14 @@ module.exports = {
	globals: {		globals: {
	//script.js		//script.js
	gradioApp: "readonly",		gradioApp: "readonly",
			executeCallbacks: "readonly",
			onAfterUiUpdate: "readonly",
			onOptionsChanged: "readonly",
	onUiLoaded: "readonly",		onUiLoaded: "readonly",
	onUiUpdate: "readonly",		onUiUpdate: "readonly",
	onOptionsChanged: "readonly",
	uiCurrentTab: "writable",		uiCurrentTab: "writable",
	uiElementIsVisible: "readonly",
	uiElementInSight: "readonly",		uiElementInSight: "readonly",
	executeCallbacks: "readonly",		uiElementIsVisible: "readonly",
	//ui.js		//ui.js
	opts: "writable",		opts: "writable",
	all_gallery_buttons: "readonly",		all_gallery_buttons: "readonly",
	@@ -84,5 +85,7 @@ module.exports = {
	// imageviewer.js		// imageviewer.js
	modalPrevImage: "readonly",		modalPrevImage: "readonly",
	modalNextImage: "readonly",		modalNextImage: "readonly",
			// token-counters.js
			setupTokenCounters: "readonly",
	}		}
	};		};

.github/ISSUE_TEMPLATE/bug_report.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -43,8 +43,8 @@ body:
	- type: input		- type: input
	id: commit		id: commit
	attributes:		attributes:
	label: Commit where the problem happens		label: Version or Commit where the problem happens
	description: Which 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 Commit link at the bottom of the UI, or from the cmd/terminal if you can't launch it.)		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:		validations:
	required: true		required: true
	- type: dropdown		- type: dropdown

CHANGELOG.md

+11 −1

Original line number	Original line	Diff line number	Diff line
	## Upcoming 1.3.0		## 1.3.0

	### Features:		### Features:
	* add UI to edit defaults		* add UI to edit defaults
	@@ -8,6 +8,10 @@
	* update extensions table: show branch, show date in separate column, and show version from tags if available		* update extensions table: show branch, show date in separate column, and show version from tags if available
	* TAESD - another option for cheap live previews		* TAESD - another option for cheap live previews
	* allow choosing sampler and prompts for second pass of hires fix - hidden by default, enabled in settings		* allow choosing sampler and prompts for second pass of hires fix - hidden by default, enabled in settings
			* calculate hashes for Lora
			* add lora hashes to infotext
			* when pasting infotext, use infotext's lora hashes to find local loras for `<lora:xxx:1>` entries whose hashes match loras the user has
			* select cross attention optimization from UI

	### Minor:		### Minor:
	* bump Gradio to 3.31.0		* bump Gradio to 3.31.0
	@@ -26,6 +30,8 @@
	* switch from pyngrok to ngrok-py		* switch from pyngrok to ngrok-py
	* lazy-load images in extra networks UI		* lazy-load images in extra networks UI
	* set "Navigate image viewer with gamepad" option to false by default, by request		* set "Navigate image viewer with gamepad" option to false by default, by request
			* change upscalers to download models into user-specified directory (from commandline args) rather than the default models/<...>
			* allow hiding buttons in ui-config.json

	### Extensions:		### Extensions:
	* add /sdapi/v1/script-info api		* add /sdapi/v1/script-info api
	@@ -35,6 +41,8 @@
	* add command and endpoint for graceful server stopping		* add command and endpoint for graceful server stopping
	* add some locals (prompts/seeds/etc) from processing function into the Processing class as fields		* add some locals (prompts/seeds/etc) from processing function into the Processing class as fields
	* rework quoting for infotext items that have commas in them to use JSON (should be backwards compatible except for cases where it didn't work previously)		* rework quoting for infotext items that have commas in them to use JSON (should be backwards compatible except for cases where it didn't work previously)
			* add /sdapi/v1/refresh-loras api checkpoint post request
			* tests overhaul

	### Bug Fixes:		### Bug Fixes:
	* fix an issue preventing the program from starting if the user specifies a bad Gradio theme		* fix an issue preventing the program from starting if the user specifies a bad Gradio theme
	@@ -46,6 +54,8 @@
	* fix inability to merge checkpoint without adding metadata		* fix inability to merge checkpoint without adding metadata
	* fix extra networks' save preview image not adding infotext for jpeg/webm		* fix extra networks' save preview image not adding infotext for jpeg/webm
	* remove blinking effect from text in hires fix and scale resolution preview		* remove blinking effect from text in hires fix and scale resolution preview
			* make links to `http://<...>.git` extensions work in the extension tab
			* fix bug with webui hanging at startup due to hanging git process


	## 1.2.1		## 1.2.1

README.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ A browser interface based on Gradio library for Stable Diffusion.
	- Attention, specify parts of text that the model should pay more attention to		- Attention, specify parts of text that the model should pay more attention to
	- a man in a `((tuxedo))` - will pay more attention to tuxedo		- a man in a `((tuxedo))` - will pay more attention to tuxedo
	- a man in a `(tuxedo:1.21)` - alternative syntax		- a man in a `(tuxedo:1.21)` - alternative syntax
	- select text and press `Ctrl+Up` or `Ctrl+Down` to automatically adjust attention to selected text (code contributed by anonymous user)		- select text and press `Ctrl+Up` or `Ctrl+Down` (or `Command+Up` or `Command+Down` if you're on a MacOS) to automatically adjust attention to selected text (code contributed by anonymous user)
	- Loopback, run img2img processing multiple times		- Loopback, run img2img processing multiple times
	- X/Y/Z plot, a way to draw a 3 dimensional plot of images with different parameters		- X/Y/Z plot, a way to draw a 3 dimensional plot of images with different parameters
	- Textual Inversion		- Textual Inversion

extensions-builtin/LDSR/scripts/ldsr_model.py

+2 −6

Original line number	Original line	Diff line number	Diff line
	import os		import os
	import sys
	import traceback

	from basicsr.utils.download_util import load_file_from_url		from basicsr.utils.download_util import load_file_from_url

	from modules.upscaler import Upscaler, UpscalerData		from modules.upscaler import Upscaler, UpscalerData
	from ldsr_model_arch import LDSR		from ldsr_model_arch import LDSR
	from modules import shared, script_callbacks		from modules import shared, script_callbacks, errors
	import sd_hijack_autoencoder # noqa: F401		import sd_hijack_autoencoder # noqa: F401
	import sd_hijack_ddpm_v1 # noqa: F401		import sd_hijack_ddpm_v1 # noqa: F401

	@@ -51,10 +49,8 @@ class UpscalerLDSR(Upscaler):

	try:		try:
	return LDSR(model, yaml)		return LDSR(model, yaml)

	except Exception:		except Exception:
	print("Error importing LDSR:", file=sys.stderr)		errors.report("Error importing LDSR", exc_info=True)
	print(traceback.format_exc(), file=sys.stderr)
	return None		return None

	def do_upscale(self, img, path):		def do_upscale(self, img, path):

Admin message