Merge branch 'AUTOMATIC1111:master' into master (34c0f499) · Commits · github_fork / Stable Diffusion Webui

extensions-builtin/Lora/lora.py

+20 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,9 @@ import os
		import re
		import torch

		from modules import shared, devices, sd_models
		from modules import shared, devices, sd_models, errors

		metadata_tags_order = {"ss_sd_model_name": 1, "ss_resolution": 2, "ss_clip_skip": 3, "ss_num_train_images": 10, "ss_tag_frequency": 20}

		re_digits = re.compile(r"\d+")
		re_unet_down_blocks = re.compile(r"lora_unet_down_blocks_(\d+)_attentions_(\d+)_(.+)")
		@@ -43,6 +45,23 @@ class LoraOnDisk:
		def __init__(self, name, filename):
		self.name = name
		self.filename = filename
		self.metadata = {}

		_, ext = os.path.splitext(filename)
		if ext.lower() == ".safetensors":
		try:
		self.metadata = sd_models.read_metadata_from_safetensors(filename)
		except Exception as e:
		errors.display(e, f"reading lora {filename}")

		if self.metadata:
		m = {}
		for k, v in sorted(self.metadata.items(), key=lambda x: metadata_tags_order.get(x[0], 999)):
		m[k] = v

		self.metadata = m

		self.ssmd_cover_images = self.metadata.pop('ssmd_cover_images', None) # those are cover images and they are too big to display in UI as text


		class LoraModule:

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
		"search_term": self.search_terms_from_path(lora_on_disk.filename),
		"prompt": json.dumps(f"<lora:{name}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),
		"local_preview": f"{path}.{shared.opts.samples_format}",
		"metadata": json.dumps(lora_on_disk.metadata, indent=4) if lora_on_disk.metadata else None,
		}

		def allowed_directories_for_previews(self):

+2 −0

Original line number	Diff line number	Diff line
		<div class='card' {preview_html} onclick={card_clicked}>
		{metadata_button}

		<div class='actions'>
		<div class='additional'>
		<ul>

+37 −1

Original line number	Diff line number	Diff line
		@@ -103,3 +103,39 @@ function extraNetworksSearchButton(tabs_id, event){
		searchTextarea.value = text
		updateInput(searchTextarea)
		}

		var globalPopup = null;
		var globalPopupInner = null;
		function popup(contents){
		if(! globalPopup){
		globalPopup = document.createElement('div')
		globalPopup.onclick = function(){ globalPopup.style.display = "none"; };
		globalPopup.classList.add('global-popup');

		var close = document.createElement('div')
		close.classList.add('global-popup-close');
		close.onclick = function(){ globalPopup.style.display = "none"; };
		close.title = "Close";
		globalPopup.appendChild(close)

		globalPopupInner = document.createElement('div')
		globalPopupInner.onclick = function(event){ event.stopPropagation(); return false; };
		globalPopupInner.classList.add('global-popup-inner');
		globalPopup.appendChild(globalPopupInner)

		gradioApp().appendChild(globalPopup);
		}

		globalPopupInner.innerHTML = '';
		globalPopupInner.appendChild(contents);

		globalPopup.style.display = "flex";
		}

		function extraNetworksShowMetadata(text){
		elem = document.createElement('pre')
		elem.classList.add('popup-metadata');
		elem.textContent = text;

		popup(elem);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -573,6 +573,11 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
		os.replace(temp_file_path, filename_without_extension + extension)

		fullfn_without_extension, extension = os.path.splitext(params.filename)
		if hasattr(os, 'statvfs'):
		max_name_len = os.statvfs(path).f_namemax
		fullfn_without_extension = fullfn_without_extension[:max_name_len - max(4, len(extension))]
		params.filename = fullfn_without_extension + extension
		fullfn = params.filename
		_atomically_save_image(image, fullfn_without_extension, extension)

		image.already_saved_as = fullfn