Merge branch 'Inspiron' (af547f63) · Commits · github_fork / Stable Diffusion Webui

.gitignore

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,4 +29,3 @@ notification.mp3
		/textual_inversion
		.vscode
		/extensions

stable-diffusion-webui-inspiration @ c4b9f5c2

Original line number	Diff line number	Diff line
		Subproject commit c4b9f5c233c8619ee140b763e706edc26cae0f1d

javascript/ui.js

+2 −22

Original line number	Diff line number	Diff line
		@@ -45,14 +45,14 @@ function switch_to_txt2img(){
		return args_to_array(arguments);
		}

		function switch_to_img2img_img2img(){
		function switch_to_img2img(){
		gradioApp().querySelector('#tabs').querySelectorAll('button')[1].click();
		gradioApp().getElementById('mode_img2img').querySelectorAll('button')[0].click();

		return args_to_array(arguments);
		}

		function switch_to_img2img_inpaint(){
		function switch_to_inpaint(){
		gradioApp().querySelector('#tabs').querySelectorAll('button')[1].click();
		gradioApp().getElementById('mode_img2img').querySelectorAll('button')[1].click();

		@@ -65,26 +65,6 @@ function switch_to_extras(){
		return args_to_array(arguments);
		}

		function extract_image_from_gallery_txt2img(gallery){
		switch_to_txt2img()
		return extract_image_from_gallery(gallery);
		}

		function extract_image_from_gallery_img2img(gallery){
		switch_to_img2img_img2img()
		return extract_image_from_gallery(gallery);
		}

		function extract_image_from_gallery_inpaint(gallery){
		switch_to_img2img_inpaint()
		return extract_image_from_gallery(gallery);
		}

		function extract_image_from_gallery_extras(gallery){
		switch_to_extras()
		return extract_image_from_gallery(gallery);
		}

		function get_tab_index(tabId){
		var res = 0

modules/generation_parameters_copypaste.py

+90 −3

Original line number	Diff line number	Diff line
		import base64
		import io
		import os
		import re
		import gradio as gr
		from modules.shared import script_path
		from modules import shared
		import tempfile
		from PIL import Image, PngImagePlugin

		re_param_code = r'\s([\w ]+):\s("(?:\\\|\"\|[^\"])+"\|[^,]*)(?:,\|$)'
		re_param = re.compile(re_param_code)
		re_params = re.compile(r"^(?:" + re_param_code + "){3,}$")
		re_imagesize = re.compile(r"^(\d+)x(\d+)$")
		type_of_gr_update = type(gr.update())
		paste_fields = {}
		bind_list = []


		def quote(text):
		@@ -20,6 +26,87 @@ def quote(text):
		text = text.replace('"', '\\"')
		return f'"{text}"'


		def image_from_url_text(filedata):
		if type(filedata) == dict and filedata["is_file"]:
		filename = filedata["name"]
		tempdir = os.path.normpath(tempfile.gettempdir())
		normfn = os.path.normpath(filename)
		assert normfn.startswith(tempdir), 'trying to open image file not in temporary directory'

		return Image.open(filename)

		if type(filedata) == list:
		if len(filedata) == 0:
		return None

		filedata = filedata[0]

		if filedata.startswith("data:image/png;base64,"):
		filedata = filedata[len("data:image/png;base64,"):]

		filedata = base64.decodebytes(filedata.encode('utf-8'))
		image = Image.open(io.BytesIO(filedata))
		return image


		def add_paste_fields(tabname, init_img, fields):
		paste_fields[tabname] = {"init_img":init_img, "fields": fields}


		def create_buttons(tabs_list):
		buttons = {}
		for tab in tabs_list:
		buttons[tab] = gr.Button(f"Send to {tab}")
		return buttons


		#if send_generate_info is a tab name, mean generate_info comes from the params fields of the tab
		def bind_buttons(buttons, send_image, send_generate_info):
		bind_list.append([buttons, send_image, send_generate_info])


		def run_bind():
		for buttons, send_image, send_generate_info in bind_list:
		for tab in buttons:
		button = buttons[tab]
		if send_image and paste_fields[tab]["init_img"]:
		if type(send_image) == gr.Gallery:
		button.click(
		fn=lambda x: image_from_url_text(x),
		_js="extract_image_from_gallery",
		inputs=[send_image],
		outputs=[paste_fields[tab]["init_img"]],
		)
		else:
		button.click(
		fn=lambda x:x,
		inputs=[send_image],
		outputs=[paste_fields[tab]["init_img"]],
		)

		if send_generate_info and paste_fields[tab]["fields"] is not None:
		paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration', 'Size-1', 'Size-2']
		if shared.opts.send_seed:
		paste_field_names += ["Seed"]
		if send_generate_info in paste_fields:
		button.click(
		fn=lambda *x:x,
		inputs=[field for field,name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],
		outputs=[field for field,name in paste_fields[tab]["fields"] if name in paste_field_names],
		)

		else:
		connect_paste(button, [(field, name) for field, name in paste_fields[tab]["fields"] if name in paste_field_names], send_generate_info)

		button.click(
		fn=None,
		_js=f"switch_to_{tab}",
		inputs=None,
		outputs=None,
		)


		def parse_generation_parameters(x: str):
		"""parses generation parameters string, the one you see in text field under the picture in UI:
		```
		@@ -67,8 +154,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model

		return res


		def connect_paste(button, paste_fields, input_comp, js=None):
		def connect_paste(button, paste_fields, input_comp):
		def paste_func(prompt):
		if not prompt and not shared.cmd_opts.hide_ui_dir_config:
		filename = os.path.join(script_path, "params.txt")
		@@ -106,7 +192,8 @@ def connect_paste(button, paste_fields, input_comp, js=None):

		button.click(
		fn=paste_func,
		_js=js,
		inputs=[input_comp],
		outputs=[x[0] for x in paste_fields],
		)

modules/shared.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ parser.add_argument("--api", action='store_true', help="use api=True to launch t
		parser.add_argument("--nowebui", action='store_true', help="use api=True to launch the api instead of the webui")
		parser.add_argument("--ui-debug-mode", action='store_true', help="Don't load model to quickly launch UI")
		parser.add_argument("--device-id", type=str, help="Select the default CUDA device to use (export CUDA_VISIBLE_DEVICES=0,1,etc might be needed before)", default=None)
		parser.add_argument("--administrator", action='store_true', help="Administrator rights", default=False)

		cmd_opts = parser.parse_args()
		restricted_opts = {
		@@ -279,6 +280,7 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
		"filter_nsfw": OptionInfo(False, "Filter NSFW content"),
		'CLIP_stop_at_last_layers': OptionInfo(1, "Stop At last layers of CLIP model", gr.Slider, {"minimum": 1, "maximum": 12, "step": 1}),
		"random_artist_categories": OptionInfo([], "Allowed categories for random artists selection when using the Roll button", gr.CheckboxGroup, {"choices": artist_db.categories()}),
		"send_seed": OptionInfo(False, "Send seed when sending prompt or image to other interface"),
		}))

		options_templates.update(options_section(('interrogate', "Interrogate Options"), {

Admin message