Merge remote-tracking branch 'upstream/master' into pr-dev (68a5604c) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/Lora/lora.py

+3 −2

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ import glob
		import os
		import re
		import torch
		from typing import Union

		from modules import shared, devices, sd_models, errors

		@@ -235,7 +236,7 @@ def lora_calc_updown(lora, module, target):
		return updown


		def lora_apply_weights(self: torch.nn.Conv2d \| torch.nn.Linear \| torch.nn.MultiheadAttention):
		def lora_apply_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn.MultiheadAttention]):
		"""
		Applies the currently selected set of Loras to the weights of torch layer self.
		If weights already have this particular set of loras applied, does nothing.
		@@ -295,7 +296,7 @@ def lora_apply_weights(self: torch.nn.Conv2d \| torch.nn.Linear \| torch.nn.Multih
		setattr(self, "lora_current_names", wanted_names)


		def lora_reset_cached_weight(self: torch.nn.Conv2d \| torch.nn.Linear):
		def lora_reset_cached_weight(self: Union[torch.nn.Conv2d, torch.nn.Linear]):
		setattr(self, "lora_current_names", ())
		setattr(self, "lora_weights_backup", None)

javascript/imageviewer.js

+3 −21

Original line number	Diff line number	Diff line
		@@ -32,13 +32,7 @@ function negmod(n, m) {
		function updateOnBackgroundChange() {
		const modalImage = gradioApp().getElementById("modalImage")
		if (modalImage && modalImage.offsetParent) {
		let allcurrentButtons = gradioApp().querySelectorAll(".gallery-item.transition-all.\\!ring-2")
		let currentButton = null
		allcurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		currentButton = elem;
		}
		})
		let currentButton = selected_gallery_button();

		if (currentButton?.children?.length > 0 && modalImage.src != currentButton.children[0].src) {
		modalImage.src = currentButton.children[0].src;
		@@ -50,22 +44,10 @@ function updateOnBackgroundChange() {
		}

		function modalImageSwitch(offset) {
		var allgalleryButtons = gradioApp().querySelectorAll(".gradio-gallery .thumbnail-item")
		var galleryButtons = []
		allgalleryButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		galleryButtons.push(elem);
		}
		})
		var galleryButtons = all_gallery_buttons();

		if (galleryButtons.length > 1) {
		var allcurrentButtons = gradioApp().querySelectorAll(".gradio-gallery .thumbnail-item.selected")
		var currentButton = null
		allcurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		currentButton = elem;
		}
		})
		var currentButton = selected_gallery_button();

		var result = -1
		galleryButtons.forEach(function(v, i) {

javascript/ui.js

+31 −5

Original line number	Diff line number	Diff line
		@@ -7,9 +7,31 @@ function set_theme(theme){
		}
		}

		function all_gallery_buttons() {
		var allGalleryButtons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery].gradio-gallery .thumbnails > .thumbnail-item.thumbnail-small');
		var visibleGalleryButtons = [];
		allGalleryButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		visibleGalleryButtons.push(elem);
		}
		})
		return visibleGalleryButtons;
		}

		function selected_gallery_button() {
		var allCurrentButtons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery].gradio-gallery .thumbnail-item.thumbnail-small.selected');
		var visibleCurrentButton = null;
		allCurrentButtons.forEach(function(elem) {
		if (elem.parentElement.offsetParent) {
		visibleCurrentButton = elem;
		}
		})
		return visibleCurrentButton;
		}

		function selected_gallery_index(){
		var buttons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery] .gallery-item')
		var button = gradioApp().querySelector('[style="display: block;"].tabitem div[id$=_gallery] .gallery-item.\\!ring-2')
		var buttons = all_gallery_buttons();
		var button = selected_gallery_button();

		var result = -1
		buttons.forEach(function(v, i){ if(v==button) { result = i } })
		@@ -18,14 +40,18 @@ function selected_gallery_index(){
		}

		function extract_image_from_gallery(gallery){
		if (gallery.length == 0){
		return [null];
		}
		if (gallery.length == 1){
		return [gallery[0]]
		return [gallery[0]];
		}

		index = selected_gallery_index()

		if (index < 0 \|\| index >= gallery.length){
		return [null]
		// Use the first image in the gallery as the default
		index = 0;
		}

		return [gallery[index]];

modules/scripts.py

+12 −0

Original line number	Diff line number	Diff line
		@@ -553,3 +553,15 @@ def IOComponent_init(self, args, *kwargs):

		original_IOComponent_init = gr.components.IOComponent.__init__
		gr.components.IOComponent.__init__ = IOComponent_init


		def BlockContext_init(self, args, *kwargs):
		res = original_BlockContext_init(self, args, *kwargs)

		add_classes_to_gradio_component(self)

		return res


		original_BlockContext_init = gr.blocks.BlockContext.__init__
		gr.blocks.BlockContext.__init__ = BlockContext_init

style.css

+14 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		--block-background-fill: transparent;
		}

		.block.padded{
		.block.padded:not(.gradio-accordion) {
		padding: 0 !important;
		}

		@@ -65,6 +65,19 @@ div.compact{
		margin-bottom: 0;
		}

		.gradio-dropdown ul.options {
		max-height: 35em;
		z-index: 3000;
		}

		.gradio-dropdown ul.options li.item {
		padding: 0.05em 0;
		}

		.gradio-dropdown ul.options li.item.selected {
		background-color: var(--secondary-500);
		}

		.gradio-dropdown div.wrap.wrap.wrap.wrap{
		box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
		}

Admin message