Merge branch 'AUTOMATIC1111:master' into master

39 files changed, 1198 insertions, 675 deletions

diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py
index 6d860224..137e58f7 100644
--- a/extensions-builtin/Lora/lora.py
+++ b/extensions-builtin/Lora/lora.py
@@ -57,6 +57,7 @@ class LoraUpDownModule:
     def __init__(self):

         self.up = None

         self.down = None

+        self.alpha = None

 

 

 def assign_lora_names_to_compvis_modules(sd_model):

@@ -92,6 +93,15 @@ def load_lora(name, filename):
             keys_failed_to_match.append(key_diffusers)

             continue

 

+        lora_module = lora.modules.get(key, None)

+        if lora_module is None:

+            lora_module = LoraUpDownModule()

+            lora.modules[key] = lora_module

+

+        if lora_key == "alpha":

+            lora_module.alpha = weight.item()

+            continue

+

         if type(sd_module) == torch.nn.Linear:

             module = torch.nn.Linear(weight.shape[1], weight.shape[0], bias=False)

         elif type(sd_module) == torch.nn.Conv2d:

@@ -104,17 +114,12 @@ def load_lora(name, filename):
 

         module.to(device=devices.device, dtype=devices.dtype)

 

-        lora_module = lora.modules.get(key, None)

-        if lora_module is None:

-            lora_module = LoraUpDownModule()

-            lora.modules[key] = lora_module

-

         if lora_key == "lora_up.weight":

             lora_module.up = module

         elif lora_key == "lora_down.weight":

             lora_module.down = module

         else:

-            assert False, f'Bad Lora layer name: {key_diffusers} - must end in lora_up.weight or lora_down.weight'

+            assert False, f'Bad Lora layer name: {key_diffusers} - must end in lora_up.weight, lora_down.weight or alpha'

 

     if len(keys_failed_to_match) > 0:

         print(f"Failed to match keys when loading Lora {filename}: {keys_failed_to_match}")

@@ -161,7 +166,7 @@ def lora_forward(module, input, res):
     for lora in loaded_loras:

         module = lora.modules.get(lora_layer_name, None)

         if module is not None:

-            res = res + module.up(module.down(input)) * lora.multiplier

+            res = res + module.up(module.down(input)) * lora.multiplier * (module.alpha / module.up.weight.shape[1] if module.alpha else 1.0)

 

     return res

 

@@ -177,12 +182,12 @@ def lora_Conv2d_forward(self, input):
 def list_available_loras():

     available_loras.clear()

 

-    os.makedirs(lora_dir, exist_ok=True)

+    os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)

 

     candidates = \

-        glob.glob(os.path.join(lora_dir, '**/*.pt'), recursive=True) + \

-        glob.glob(os.path.join(lora_dir, '**/*.safetensors'), recursive=True) + \

-        glob.glob(os.path.join(lora_dir, '**/*.ckpt'), recursive=True)

+        glob.glob(os.path.join(shared.cmd_opts.lora_dir, '**/*.pt'), recursive=True) + \

+        glob.glob(os.path.join(shared.cmd_opts.lora_dir, '**/*.safetensors'), recursive=True) + \

+        glob.glob(os.path.join(shared.cmd_opts.lora_dir, '**/*.ckpt'), recursive=True)

 

     for filename in sorted(candidates):

         if os.path.isdir(filename):

@@ -193,7 +198,6 @@ def list_available_loras():
         available_loras[name] = LoraOnDisk(name, filename)

 

 

-lora_dir = os.path.join(shared.models_path, "Lora")

 available_loras = {}

 loaded_loras = []

 

diff --git a/extensions-builtin/Lora/preload.py b/extensions-builtin/Lora/preload.py
new file mode 100644
index 00000000..863dc5c0
--- /dev/null
+++ b/extensions-builtin/Lora/preload.py
@@ -0,0 +1,6 @@
+import os

+from modules import paths

+

+

+def preload(parser):

+    parser.add_argument("--lora-dir", type=str, help="Path to directory with Lora networks.", default=os.path.join(paths.models_path, 'Lora'))

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 65397890..54a80d36 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -1,3 +1,4 @@
+import json

 import os

 import lora

 

@@ -26,10 +27,10 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
                 "name": name,

                 "filename": path,

                 "preview": preview,

-                "prompt": f"<lora:{name}:1.0>",

+                "prompt": json.dumps(f"<lora:{name}:") + " + opts.extra_networks_default_multiplier + " + json.dumps(">"),

                 "local_preview": path + ".png",

             }

 

     def allowed_directories_for_previews(self):

-        return [lora.lora_dir]

+        return [shared.cmd_opts.lora_dir]

 

diff --git a/extensions-builtin/SwinIR/scripts/swinir_model.py b/extensions-builtin/SwinIR/scripts/swinir_model.py
index 9a74b253..e8783bca 100644
--- a/extensions-builtin/SwinIR/scripts/swinir_model.py
+++ b/extensions-builtin/SwinIR/scripts/swinir_model.py
@@ -8,7 +8,7 @@ from basicsr.utils.download_util import load_file_from_url
 from tqdm import tqdm
 
 from modules import modelloader, devices, script_callbacks, shared
-from modules.shared import cmd_opts, opts
+from modules.shared import cmd_opts, opts, state
 from swinir_model_arch import SwinIR as net
 from swinir_model_arch_v2 import Swin2SR as net2
 from modules.upscaler import Upscaler, UpscalerData
@@ -145,7 +145,13 @@ def inference(img, model, tile, tile_overlap, window_size, scale):
 
     with tqdm(total=len(h_idx_list) * len(w_idx_list), desc="SwinIR tiles") as pbar:
         for h_idx in h_idx_list:
+            if state.interrupted or state.skipped:
+                break
+
             for w_idx in w_idx_list:
+                if state.interrupted or state.skipped:
+                    break
+                
                 in_patch = img[..., h_idx: h_idx + tile, w_idx: w_idx + tile]
                 out_patch = model(in_patch)
                 out_patch_mask = torch.ones_like(out_patch)
diff --git a/html/extra-networks-card.html b/html/extra-networks-card.html
index 1bdf1d27..aa9fca87 100644
--- a/html/extra-networks-card.html
+++ b/html/extra-networks-card.html
@@ -1,8 +1,8 @@
-<div class='card' {preview_html} onclick='return cardClicked({tabname}, {prompt}, {allow_negative_prompt})'>
+<div class='card' {preview_html} onclick={card_clicked}>
 	<div class='actions'>
 		<div class='additional'>
 			<ul>
-				<a href="#" title="replace preview image with currently selected in gallery" onclick='return saveCardPreview(event, {tabname}, {local_preview})'>replace preview</a>
+				<a href="#" title="replace preview image with currently selected in gallery" onclick={save_card_preview}>replace preview</a>
 			</ul>
 		</div>
 		<span class='name'>{name}</span>
diff --git a/html/image-update.svg b/html/image-update.svg
new file mode 100644
index 00000000..3abf12df
--- /dev/null
+++ b/html/image-update.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <filter id='shadow' color-interpolation-filters="sRGB">
+    <feDropShadow flood-color="black" dx="0" dy="0" flood-opacity="0.9" stdDeviation="0.5"/>
+    <feDropShadow flood-color="black" dx="0" dy="0" flood-opacity="0.9" stdDeviation="0.5"/>
+  </filter>
+  <path style="filter:url(#shadow);" fill="#FFFFFF" d="M13.18 19C13.35 19.72 13.64 20.39 14.03 21H5C3.9 21 3 20.11 3 19V5C3 3.9 3.9 3 5 3H19C20.11 3 21 3.9 21 5V11.18C20.5 11.07 20 11 19.5 11C19.33 11 19.17 11 19 11.03V5H5V19H13.18M11.21 15.83L9.25 13.47L6.5 17H13.03C13.14 15.54 13.73 14.22 14.64 13.19L13.96 12.29L11.21 15.83M19 13.5V12L16.75 14.25L19 16.5V15C20.38 15 21.5 16.12 21.5 17.5C21.5 17.9 21.41 18.28 21.24 18.62L22.33 19.71C22.75 19.08 23 18.32 23 17.5C23 15.29 21.21 13.5 19 13.5M19 20C17.62 20 16.5 18.88 16.5 17.5C16.5 17.1 16.59 16.72 16.76 16.38L15.67 15.29C15.25 15.92 15 16.68 15 17.5C15 19.71 16.79 21.5 19 21.5V23L21.25 20.75L19 18.5V20Z" />
+</svg>
diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index cec6a530..619bb1fa 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -1,74 +1,96 @@
-addEventListener('keydown', (event) => {

+function keyupEditAttention(event){

 	let target = event.originalTarget || event.composedPath()[0];

 	if (!target.matches("[id*='_toprow'] textarea.gr-text-input[placeholder]")) return;

 	if (! (event.metaKey || event.ctrlKey)) return;

 

-

-	let plus = "ArrowUp"

-	let minus = "ArrowDown"

-	if (event.key != plus && event.key != minus) return;

+	let isPlus = event.key == "ArrowUp"

+	let isMinus = event.key == "ArrowDown"

+	if (!isPlus && !isMinus) return;

 

 	let selectionStart = target.selectionStart;

 	let selectionEnd = target.selectionEnd;

-	// If the user hasn't selected anything, let's select their current parenthesis block

-	if (selectionStart === selectionEnd) {

+	let text = target.value;

+

+    function selectCurrentParenthesisBlock(OPEN, CLOSE){

+        if (selectionStart !== selectionEnd) return false;

+

 		// Find opening parenthesis around current cursor

-		const before = target.value.substring(0, selectionStart);

-		let beforeParen = before.lastIndexOf("(");

-		if (beforeParen == -1) return;

-		let beforeParenClose = before.lastIndexOf(")");

+		const before = text.substring(0, selectionStart);

+		let beforeParen = before.lastIndexOf(OPEN);

+		if (beforeParen == -1) return  false;

+		let beforeParenClose = before.lastIndexOf(CLOSE);

 		while (beforeParenClose !== -1 && beforeParenClose > beforeParen) {

-			beforeParen = before.lastIndexOf("(", beforeParen - 1);

-			beforeParenClose = before.lastIndexOf(")", beforeParenClose - 1);

+			beforeParen = before.lastIndexOf(OPEN, beforeParen - 1);

+			beforeParenClose = before.lastIndexOf(CLOSE, beforeParenClose - 1);

 		}

 

 		// Find closing parenthesis around current cursor

-		const after = target.value.substring(selectionStart);

-		let afterParen = after.indexOf(")");

-		if (afterParen == -1) return;

-		let afterParenOpen = after.indexOf("(");

+		const after = text.substring(selectionStart);

+		let afterParen = after.indexOf(CLOSE);

+		if (afterParen == -1) return  false;

+		let afterParenOpen = after.indexOf(OPEN);

 		while (afterParenOpen !== -1 && afterParen > afterParenOpen) {

-			afterParen = after.indexOf(")", afterParen + 1);

-			afterParenOpen = after.indexOf("(", afterParenOpen + 1);

+			afterParen = after.indexOf(CLOSE, afterParen + 1);

+			afterParenOpen = after.indexOf(OPEN, afterParenOpen + 1);

 		}

-		if (beforeParen === -1 || afterParen === -1) return;

+		if (beforeParen === -1 || afterParen === -1) return false;

 

 		// Set the selection to the text between the parenthesis

-		const parenContent = target.value.substring(beforeParen + 1, selectionStart + afterParen);

+		const parenContent = text.substring(beforeParen + 1, selectionStart + afterParen);

 		const lastColon = parenContent.lastIndexOf(":");

 		selectionStart = beforeParen + 1;

 		selectionEnd = selectionStart + lastColon;

 		target.setSelectionRange(selectionStart, selectionEnd);

-	}

+		return true;

+    }

+

+	// If the user hasn't selected anything, let's select their current parenthesis block

+    if(! selectCurrentParenthesisBlock('<', '>')){

+        selectCurrentParenthesisBlock('(', ')')

+    }

 

 	event.preventDefault();

 

-	if (selectionStart == 0 || target.value[selectionStart - 1] != "(") {

-		target.value = target.value.slice(0, selectionStart) +

-			"(" + target.value.slice(selectionStart, selectionEnd) + ":1.0)" +

-			target.value.slice(selectionEnd);

+    closeCharacter = ')'

+    delta = opts.keyedit_precision_attention

+

+    if (selectionStart > 0 && text[selectionStart - 1] == '<'){

+        closeCharacter = '>'

+        delta = opts.keyedit_precision_extra

+    } else if (selectionStart == 0 || text[selectionStart - 1] != "(") {

+

+        // do not include spaces at the end

+        while(selectionEnd > selectionStart && text[selectionEnd-1] == ' '){

+            selectionEnd -= 1;

+        }

+        if(selectionStart == selectionEnd){

+            return

+        }

 

-		target.focus();

-		target.selectionStart = selectionStart + 1;

-		target.selectionEnd = selectionEnd + 1;

+        text = text.slice(0, selectionStart) + "(" + text.slice(selectionStart, selectionEnd) + ":1.0)" + text.slice(selectionEnd);

 

-	} else {

-		end = target.value.slice(selectionEnd + 1).indexOf(")") + 1;

-		weight = parseFloat(target.value.slice(selectionEnd + 1, selectionEnd + 1 + end));

-		if (isNaN(weight)) return;

-		if (event.key == minus) weight -= 0.1;

-		if (event.key == plus) weight += 0.1;

+        selectionStart += 1;

+        selectionEnd += 1;

+    }

 

-		weight = parseFloat(weight.toPrecision(12));

+	end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;

+	weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + 1 + end));

+	if (isNaN(weight)) return;

 

-		target.value = target.value.slice(0, selectionEnd + 1) +

-			weight +

-			target.value.slice(selectionEnd + 1 + end - 1);

+	weight += isPlus ? delta : -delta;

+	weight = parseFloat(weight.toPrecision(12));

+	if(String(weight).length == 1) weight += ".0"

 

-		target.focus();

-		target.selectionStart = selectionStart;

-		target.selectionEnd = selectionEnd;

-	}

+	text = text.slice(0, selectionEnd + 1) + weight + text.slice(selectionEnd + 1 + end - 1);

+

+	target.focus();

+	target.value = text;

+	target.selectionStart = selectionStart;

+	target.selectionEnd = selectionEnd;

 

 	updateInput(target)

-});

+}

+

+addEventListener('keydown', (event) => {

+    keyupEditAttention(event);

+});
\ No newline at end of file
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 54ded58c..c5a9adb3 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -13,10 +13,10 @@ function setupExtraNetworksForTab(tabname){
     tabs.appendChild(close)

 

     search.addEventListener("input", function(evt){

-        searchTerm = search.value

+        searchTerm = search.value.toLowerCase()

 

         gradioApp().querySelectorAll('#'+tabname+'_extra_tabs div.card').forEach(function(elem){

-            text = elem.querySelector('.name').textContent

+            text = elem.querySelector('.name').textContent.toLowerCase()

             elem.style.display = text.indexOf(searchTerm) == -1 ? "none" : ""

         })

     });

diff --git a/javascript/hints.js b/javascript/hints.js
index ef410fba..3cf10e20 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -107,7 +107,10 @@ titles = {
     "Hires steps": "Number of sampling steps for upscaled picture. If 0, uses same as for original.",
     "Upscale by": "Adjusts the size of the image by multiplying the original width and height by the selected value. Ignored if either Resize width to or Resize height to are non-zero.",
     "Resize width to": "Resizes image to this width. If 0, width is inferred from either of two nearby sliders.",
-    "Resize height to": "Resizes image to this height. If 0, height is inferred from either of two nearby sliders."
+    "Resize height to": "Resizes image to this height. If 0, height is inferred from either of two nearby sliders.",
+    "Multiplier for extra networks": "When adding extra network such as Hypernetwork or Lora to prompt, use this multiplier for it.",
+    "Discard weights with matching name": "Regular expression; if weights's name matches it, the weights is not written to the resulting checkpoint. Use ^model_ema to discard EMA weights.",
+    "Extra networks tab order": "Comma-separated list of tab names; tabs listed here will appear in the extra networks UI first and in order lsited."
 }
 
 
diff --git a/javascript/ui.js b/javascript/ui.js
index 77256e15..ba72623c 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -104,11 +104,6 @@ function create_tab_index_args(tabId, args){
     return res
 }
 
-function get_extras_tab_index(){
-    const [,,...args] = [...arguments]
-    return [get_tab_index('mode_extras'), get_tab_index('extras_resize_mode'), ...args]
-}
-
 function get_img2img_tab_index() {
     let res = args_to_array(arguments)
     res.splice(-2)
diff --git a/launch.py b/launch.py
index 5afb2956..82094fa0 100644
--- a/launch.py
+++ b/launch.py
@@ -179,7 +179,7 @@ def run_extensions_installers(settings_file):
 def prepare_environment():

     global skip_install

 

-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")

+    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 --extra-index-url https://download.pytorch.org/whl/cu117")

     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

     commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

 

@@ -187,8 +187,6 @@ def prepare_environment():
     clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")

     openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")

 

-    xformers_windows_package = os.environ.get('XFORMERS_WINDOWS_PACKAGE', 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl')

-

     stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git")

     taming_transformers_repo = os.environ.get('TAMING_TRANSFORMERS_REPO', "https://github.com/CompVis/taming-transformers.git")

     k_diffusion_repo = os.environ.get('K_DIFFUSION_REPO', 'https://github.com/crowsonkb/k-diffusion.git')

@@ -210,6 +208,7 @@ def prepare_environment():
     sys.argv, _ = extract_arg(sys.argv, '-f')

     sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test')

     sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')

+    sys.argv, reinstall_torch = extract_arg(sys.argv, '--reinstall-torch')

     sys.argv, update_check = extract_arg(sys.argv, '--update-check')

     sys.argv, run_tests, test_dir = extract_opt(sys.argv, '--tests')

     sys.argv, skip_install = extract_arg(sys.argv, '--skip-install')

@@ -221,7 +220,7 @@ def prepare_environment():
     print(f"Python {sys.version}")

     print(f"Commit hash: {commit}")

     

-    if not is_installed("torch") or not is_installed("torchvision"):

+    if reinstall_torch or not is_installed("torch") or not is_installed("torchvision"):

         run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch")

 

     if not skip_torch_cuda_test:

@@ -239,14 +238,14 @@ def prepare_environment():
     if (not is_installed("xformers") or reinstall_xformers) and xformers:

         if platform.system() == "Windows":

             if platform.python_version().startswith("3.10"):

-                run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")

+                run_pip(f"install -U -I --no-deps xformers==0.0.16rc425", "xformers")

             else:

                 print("Installation of xformers is not supported in this version of Python.")

                 print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")

                 if not is_installed("xformers"):

                     exit(0)

         elif platform.system() == "Linux":

-            run_pip("install xformers", "xformers")

+            run_pip("install xformers==0.0.16rc425", "xformers")

 

     if not is_installed("pyngrok") and ngrok:

         run_pip("install pyngrok", "ngrok")

diff --git a/modules/api/api.py b/modules/api/api.py
index f2e9e884..25c65e57 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -11,10 +11,9 @@ from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from secrets import compare_digest
 
 import modules.shared as shared
-from modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui
+from modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing
 from modules.api.models import *
 from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images
-from modules.extras import run_extras
 from modules.textual_inversion.textual_inversion import create_embedding, train_embedding
 from modules.textual_inversion.preprocess import preprocess
 from modules.hypernetworks.hypernetwork import create_hypernetwork, train_hypernetwork
@@ -23,6 +22,8 @@ from modules.sd_models import checkpoints_list, find_checkpoint_config
 from modules.realesrgan_model import get_realesrgan_models
 from modules import devices
 from typing import List
+import piexif
+import piexif.helper
 
 def upscaler_to_index(name: str):
     try:
@@ -45,32 +46,46 @@ def validate_sampler_name(name):
 
 def setUpscalers(req: dict):
     reqDict = vars(req)
-    reqDict['extras_upscaler_1'] = upscaler_to_index(req.upscaler_1)
-    reqDict['extras_upscaler_2'] = upscaler_to_index(req.upscaler_2)
-    reqDict.pop('upscaler_1')
-    reqDict.pop('upscaler_2')
+    reqDict['extras_upscaler_1'] = reqDict.pop('upscaler_1', None)
+    reqDict['extras_upscaler_2'] = reqDict.pop('upscaler_2', None)
     return reqDict
 
 def decode_base64_to_image(encoding):
     if encoding.startswith("data:image/"):
         encoding = encoding.split(";")[1].split(",")[1]
-    return Image.open(BytesIO(base64.b64decode(encoding)))
+    try:
+        image = Image.open(BytesIO(base64.b64decode(encoding)))
+        return image
+    except Exception as err:
+        raise HTTPException(status_code=500, detail="Invalid encoded image")
 
 def encode_pil_to_base64(image):
     with io.BytesIO() as output_bytes:
 
-        # Copy any text-only metadata
-        use_metadata = False
-        metadata = PngImagePlugin.PngInfo()
-        for key, value in image.info.items():
-            if isinstance(key, str) and isinstance(value, str):
-                metadata.add_text(key, value)
-                use_metadata = True
+        if opts.samples_format.lower() == 'png':
+            use_metadata = False
+            metadata = PngImagePlugin.PngInfo()
+            for key, value in image.info.items():
+                if isinstance(key, str) and isinstance(value, str):
+                    metadata.add_text(key, value)
+                    use_metadata = True
+            image.save(output_bytes, format="PNG", pnginfo=(metadata if use_metadata else None), quality=opts.jpeg_quality)
+
+        elif opts.samples_format.lower() in ("jpg", "jpeg", "webp"):
+            parameters = image.info.get('parameters', None)
+            exif_bytes = piexif.dump({
+                "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(parameters or "", encoding="unicode") }
+            })
+            if opts.samples_format.lower() in ("jpg", "jpeg"):
+                image.save(output_bytes, format="JPEG", exif = exif_bytes, quality=opts.jpeg_quality)
+            else:
+                image.save(output_bytes, format="WEBP", exif = exif_bytes, quality=opts.jpeg_quality)
+
+        else:
+            raise HTTPException(status_code=500, detail="Invalid image format")
 
-        image.save(
-            output_bytes, "PNG", pnginfo=(metadata if use_metadata else None)
-        )
         bytes_data = output_bytes.getvalue()
+
     return base64.b64encode(bytes_data)
 
 def api_middleware(app: FastAPI):
@@ -244,7 +259,7 @@ class Api:
         reqDict['image'] = decode_base64_to_image(reqDict['image'])
 
         with self.queue_lock:
-            result = run_extras(extras_mode=0, image_folder="", input_dir="", output_dir="", save_output=False, **reqDict)
+            result = postprocessing.run_extras(extras_mode=0, image_folder="", input_dir="", output_dir="", save_output=False, **reqDict)
 
         return ExtrasSingleImageResponse(image=encode_pil_to_base64(result[0][0]), html_info=result[1])
 
@@ -260,7 +275,7 @@ class Api:
         reqDict.pop('imageList')
 
         with self.queue_lock:
-            result = run_extras(extras_mode=1, image="", input_dir="", output_dir="", save_output=False, **reqDict)
+            result = postprocessing.run_extras(extras_mode=1, image="", input_dir="", output_dir="", save_output=False, **reqDict)
 
         return ExtrasBatchImagesResponse(images=list(map(encode_pil_to_base64, result[0])), html_info=result[1])
 
@@ -360,13 +375,16 @@ class Api:
         return [{"name": sampler[0], "aliases":sampler[2], "options":sampler[3]} for sampler in sd_samplers.all_samplers]
 
     def get_upscalers(self):
-        upscalers = []
-
-        for upscaler in shared.sd_upscalers:
-            u = upscaler.scaler
-            upscalers.append({"name":u.name, "model_name":u.model_name, "model_path":u.model_path, "model_url":u.model_url})
-
-        return upscalers
+        return [
+            {
+                "name": upscaler.name,
+                "model_name": upscaler.scaler.model_name,
+                "model_path": upscaler.data_path,
+                "model_url": None,
+                "scale": upscaler.scale,
+            }
+            for upscaler in shared.sd_upscalers
+        ]
 
     def get_sd_models(self):
         return [{"title": x.title, "model_name": x.model_name, "hash": x.shorthash, "sha256": x.sha256, "filename": x.filename, "config": find_checkpoint_config(x)} for x in checkpoints_list.values()]
diff --git a/modules/api/models.py b/modules/api/models.py
index 1eb1fcf1..805bd8f7 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -220,6 +220,7 @@ class UpscalerItem(BaseModel):
     model_name: Optional[str] = Field(title="Model Name")
     model_path: Optional[str] = Field(title="Path")
     model_url: Optional[str] = Field(title="URL")
+    scale: Optional[float] = Field(title="Scale")
 
 class SDModelItem(BaseModel):
     title: str = Field(title="Title")
diff --git a/modules/errors.py b/modules/errors.py
index a10e8708..f6b80dbb 100644
--- a/modules/errors.py
+++ b/modules/errors.py
@@ -24,6 +24,18 @@ See https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Features#stable
         """)

 

 

+already_displayed = {}