Merge branch 'AUTOMATIC1111:master' into interrogate

4 files changed, 31 insertions, 12 deletions

diff --git a/modules/api/api.py b/modules/api/api.py
index 5d60fc0a..b1dd14cc 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -22,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:
@@ -56,18 +58,30 @@ def decode_base64_to_image(encoding):
 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):
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 8514fea7..09d8e605 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -67,7 +67,7 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
             pp.image.info["postprocessing"] = infotext

 

         if save_output:

-            images.save_image(pp.image, path=outpath, basename=basename, seed=None, prompt=None, extension=opts.samples_format, info=pp.info, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo, forced_filename=None)

+            images.save_image(pp.image, path=outpath, basename=basename, seed=None, prompt=None, extension=opts.samples_format, info=infotext, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo, forced_filename=None)

 

         if extras_mode != 2 or show_extras_results:

             outputs.append(pp.image)

diff --git a/modules/shared.py b/modules/shared.py
index 63b236c5..d7a18f6a 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -432,6 +432,10 @@ options_templates.update(options_section(('interrogate', "Interrogate Options"),
     "deepbooru_filter_tags": OptionInfo("", "filter out those tags from deepbooru output (separated by comma)"),

 }))

 

+options_templates.update(options_section(('extra_networks', "Extra Networks"), {

+    "extra_networks_default_view": OptionInfo("cards", "Default view for Extra Networks", gr.Dropdown, { "choices": ["cards", "thumbs"] }),

+}))

+

 options_templates.update(options_section(('ui', "User interface"), {

     "return_grid": OptionInfo(True, "Show grid in results for web"),

     "do_not_show_images": OptionInfo(False, "Do not show any images in results for web"),

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index af2b8071..2ddac3d8 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -26,6 +26,7 @@ class ExtraNetworksPage:
         pass

 

     def create_html(self, tabname):

+        view = shared.opts.extra_networks_default_view

         items_html = ''

 

         for item in self.list_items():

@@ -36,7 +37,7 @@ class ExtraNetworksPage:
             items_html = shared.html("extra-networks-no-cards.html").format(dirs=dirs)

 

         res = f"""

-<div id='{tabname}_{self.name}_cards' class='extra-network-cards'>

+<div id='{tabname}_{self.name}_cards' class='extra-network-{view}'>

 {items_html}

 </div>

 """