From 7304deaffb89b8314d422a7d9eace1be6f8142e2 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Tue, 5 Mar 2024 17:25:16 -0500
Subject: [PATCH] add user watermarks option

---
 CHANGELOG.md      |   5 +++
 html/logo-wm.png  | Bin 0 -> 14328 bytes
 modules/images.py | 101 ++++++++++++++++++++++++++++------------------
 modules/shared.py |   8 +++-
 4 files changed, 73 insertions(+), 41 deletions(-)
 create mode 100644 html/logo-wm.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c2d8e02c..4c1f6f521 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,11 @@
   - *image viewer* now displays image metadata
   - *themes* improve on-the-fly switching
   - *log monitor* flag server warnings/errors and overall improve display
+- **Watermarking**
+  - SD.Next disables all known watermarks in models, but does allow user to set custom watermark  
+  - See *settings -> image options -> watermarking*  
+  - Invisible watermark: using steganogephy  
+  - Image watermark: overlaid on top of image  
 - **Fixes**
   - improve *model cpu offload* compatibility
   - improve *model sequential offload* compatibility
diff --git a/html/logo-wm.png b/html/logo-wm.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bfdbf53ae3f953bf1c9db47ba54300703788d74
GIT binary patch
literal 14328
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

literal 0
HcmV?d00001

diff --git a/modules/images.py b/modules/images.py
index a9060da06..5dc300363 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -7,6 +7,7 @@ import json
 import uuid
 import queue
 import string
+import random
 import hashlib
 import datetime
 import threading
@@ -534,9 +535,9 @@ def atomically_save_image():
         try:
             image_format = Image.registered_extensions()[extension]
         except Exception:
-            shared.log.warning(f'Unknown image format: {extension}')
+            shared.log.warning(f'Saving: unknown image format: {extension}')
             image_format = 'JPEG'
-        if shared.opts.image_watermark_enabled:
+        if shared.opts.image_watermark_enabled or (shared.opts.image_watermark_position != 'none' and shared.opts.image_watermark_image != ''):
             image = set_watermark(image, shared.opts.image_watermark)
         size = os.path.getsize(fn) if os.path.exists(fn) else 0
         shared.log.info(f'Saving: image="{fn}" type={image_format} resolution={image.width}x{image.height} size={size}')
@@ -547,42 +548,33 @@ def atomically_save_image():
                     file.write(f"{exifinfo}\n")
                 shared.log.info(f'Saving: text="{filename_txt}" len={len(exifinfo)}')
             except Exception as e:
-                shared.log.warning(f'Image description save failed: {filename_txt} {e}')
+                shared.log.warning(f'Saving failed: description={filename_txt} {e}')
         # actual save
         exifinfo = (exifinfo or "") if shared.opts.image_metadata else ""
         if image_format == 'PNG':
             pnginfo_data = PngImagePlugin.PngInfo()
             for k, v in params.pnginfo.items():
                 pnginfo_data.add_text(k, str(v))
-            try:
-                image.save(fn, format=image_format, compress_level=6, pnginfo=pnginfo_data if shared.opts.image_metadata else None)
-            except Exception as e:
-                shared.log.error(f'Image save failed: file="{fn}" {e}')
+            save_args = { 'compress_level': 6, 'pnginfo': pnginfo_data if shared.opts.image_metadata else None }
         elif image_format == 'JPEG':
             if image.mode == 'RGBA':
-                shared.log.warning('Saving RGBA image as JPEG: Alpha channel will be lost')
+                shared.log.warning('Saving: removing alpha channel')
                 image = image.convert("RGB")
             elif image.mode == 'I;16':
                 image = image.point(lambda p: p * 0.0038910505836576).convert("L")
             exif_bytes = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(exifinfo, encoding="unicode") } })
-            try:
-                image.save(fn, format=image_format, optimize=True, quality=shared.opts.jpeg_quality, exif=exif_bytes)
-            except Exception as e:
-                shared.log.error(f'Image save failed: file="{fn}" {e}')
+            save_args = { 'optimize': True, 'quality': shared.opts.jpeg_quality, 'exif': exif_bytes if shared.opts.image_metadata else None }
         elif image_format == 'WEBP':
             if image.mode == 'I;16':
                 image = image.point(lambda p: p * 0.0038910505836576).convert("RGB")
             exif_bytes = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(exifinfo, encoding="unicode") } })
-            try:
-                image.save(fn, format=image_format, quality=shared.opts.jpeg_quality, lossless=shared.opts.webp_lossless, exif=exif_bytes)
-            except Exception as e:
-                shared.log.error(f'Image save failed: file="{fn}" {e}')
+            save_args = { 'optimize': True, 'quality': shared.opts.jpeg_quality, 'exif': exif_bytes if shared.opts.image_metadata else None, 'lossless': shared.opts.webp_lossless }
         else:
-            # shared.log.warning(f'Unrecognized image format: {extension} attempting save as {image_format}')
-            try:
-                image.save(fn, format=image_format, quality=shared.opts.jpeg_quality)
-            except Exception as e:
-                shared.log.error(f'Image save failed: file="{fn}" {e}')
+            save_args = { 'quality': shared.opts.jpeg_quality }
+        try:
+            image.save(fn, format=image_format, **save_args)
+        except Exception as e:
+            shared.log.error(f'Saving failed: file="{fn}" format={image_format} {e}')
         if shared.opts.save_log_fn != '' and len(exifinfo) > 0:
             fn = os.path.join(paths.data_path, shared.opts.save_log_fn)
             if not fn.endswith('.json'):
@@ -839,24 +831,55 @@ def flatten(img, bgcolor):
 
 
 def set_watermark(image, watermark):
-    from imwatermark import WatermarkEncoder
-    wm_type = 'bytes'
-    wm_method = 'dwtDctSvd'
-    wm_length = 32
-    length = wm_length // 8
-    info = image.info
-    data = np.asarray(image)
-    encoder = WatermarkEncoder()
-    text = f"{watermark:<{length}}"[:length]
-    bytearr = text.encode(encoding='ascii', errors='ignore')
-    try:
-        encoder.set_watermark(wm_type, bytearr)
-        encoded = encoder.encode(data, wm_method)
-        image = Image.fromarray(encoded)
-        image.info = info
-        shared.log.debug(f'Set watermark: {watermark} method={wm_method} bits={wm_length}')
-    except Exception as e:
-        shared.log.warning(f'Set watermark error: {watermark} method={wm_method} bits={wm_length} {e}')
+    if shared.opts.image_watermark_position != 'none': # visible watermark
+        wm_image = None
+        try:
+            wm_image = Image.open(shared.opts.image_watermark_image)
+        except Exception as e:
+            shared.log.warning(f'Set image watermark: fn="{shared.opts.image_watermark_image}" {e}')
+        if wm_image is not None:
+            if shared.opts.image_watermark_position == 'top/left':
+                position = (0, 0)
+            elif shared.opts.image_watermark_position == 'top/right':
+                position = (image.width - wm_image.width, 0)
+            elif shared.opts.image_watermark_position == 'bottom/left':
+                position = (0, image.height - wm_image.height)
+            elif shared.opts.image_watermark_position == 'bottom/right':
+                position = (image.width - wm_image.width, image.height - wm_image.height)
+            elif shared.opts.image_watermark_position == 'center':
+                position = ((image.width - wm_image.width) // 2, (image.height - wm_image.height) // 2)
+            else:
+                position = (random.randint(0, image.width - wm_image.width), random.randint(0, image.height - wm_image.height))
+            try:
+                for x in range(wm_image.width):
+                    for y in range(wm_image.height):
+                        r, g, b, _a = wm_image.getpixel((x, y))
+                        if not (r == 0 and g == 0 and b == 0):
+                            image.putpixel((x+position[0], y+position[1]), (r, g, b))
+                shared.log.debug(f'Set image watermark: fn="{shared.opts.image_watermark_image}" image={wm_image} position={position}')
+            except Exception as e:
+                shared.log.warning(f'Set image watermark: image={wm_image} {e}')
+
+    if shared.opts.image_watermark_enabled: # invisible watermark
+        from imwatermark import WatermarkEncoder
+        wm_type = 'bytes'
+        wm_method = 'dwtDctSvd'
+        wm_length = 32
+        length = wm_length // 8
+        info = image.info
+        data = np.asarray(image)
+        encoder = WatermarkEncoder()
+        text = f"{watermark:<{length}}"[:length]
+        bytearr = text.encode(encoding='ascii', errors='ignore')
+        try:
+            encoder.set_watermark(wm_type, bytearr)
+            encoded = encoder.encode(data, wm_method)
+            image = Image.fromarray(encoded)
+            image.info = info
+            shared.log.debug(f'Set invisible watermark: {watermark} method={wm_method} bits={wm_length}')
+        except Exception as e:
+            shared.log.warning(f'Set invisible watermark error: {watermark} method={wm_method} bits={wm_length} {e}')
+
     return image
 
 
diff --git a/modules/shared.py b/modules/shared.py
index fd85dcc38..d7afc75fd 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -514,8 +514,6 @@ options_templates.update(options_section(('saving-images', "Image Options"), {
     "image_metadata": OptionInfo(True, "Include metadata"),
     "save_txt": OptionInfo(False, "Create info file per image"),
     "save_log_fn": OptionInfo("", "Update JSON log file per image", component_args=hide_dirs),
-    "image_watermark_enabled": OptionInfo(False, "Include watermark"),
-    "image_watermark": OptionInfo('', "Watermark string"),
     "image_sep_grid": OptionInfo("<h2>Grid Options</h2>", "", gr.HTML),
     "grid_save": OptionInfo(True, "Save all generated image grids"),
     "grid_format": OptionInfo('jpg', 'File format', gr.Dropdown, {"choices": ["jpg", "png", "webp", "tiff", "jp2"]}),
@@ -532,6 +530,12 @@ options_templates.update(options_section(('saving-images', "Image Options"), {
     "save_images_before_color_correction": OptionInfo(False, "Save image before color correction"),
     "save_mask": OptionInfo(False, "Save inpainting mask"),
     "save_mask_composite": OptionInfo(False, "Save inpainting masked composite"),
+
+    "image_sep_watermark": OptionInfo("<h2>Watermarking</h2>", "", gr.HTML),
+    "image_watermark_enabled": OptionInfo(False, "Include invisible watermark"),
+    "image_watermark": OptionInfo('', "Invisible watermark string"),
+    "image_watermark_position": OptionInfo('none', 'Image watermark position', gr.Dropdown, {"choices": ["none", "top/left", "top/right", "bottom/left", "bottom/right", "center", "random"]}),
+    "image_watermark_image": OptionInfo('', "Image watermark file"),
 }))
 
 options_templates.update(options_section(('saving-paths', "Image Naming & Paths"), {