Merge branch 'dev' into sync-req

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/images.py b/modules/images.py
index e21e554c..09f728df 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -1,6 +1,4 @@
 import datetime

-import sys

-import traceback

 

 import pytz

 import io

@@ -18,6 +16,7 @@ import json
 import hashlib

 

 from modules import sd_samplers, shared, script_callbacks, errors

+from modules.errors import print_error

 from modules.paths_internal import roboto_ttf_file

 from modules.shared import opts

 

@@ -464,8 +463,7 @@ class FilenameGenerator:
                     replacement = fun(self, *pattern_args)

                 except Exception:

                     replacement = None

-                    print(f"Error adding [{pattern}] to filename", file=sys.stderr)

-                    print(traceback.format_exc(), file=sys.stderr)

+                    print_error(f"Error adding [{pattern}] to filename", exc_info=True)

 

                 if replacement == NOTHING_AND_SKIP_PREVIOUS_TEXT:

                     continue

@@ -511,9 +509,12 @@ def save_image_with_geninfo(image, geninfo, filename, extension=None, existing_p
         existing_pnginfo['parameters'] = geninfo

 

     if extension.lower() == '.png':

-        pnginfo_data = PngImagePlugin.PngInfo()

-        for k, v in (existing_pnginfo or {}).items():

-            pnginfo_data.add_text(k, str(v))

+        if opts.enable_pnginfo:

+            pnginfo_data = PngImagePlugin.PngInfo()

+            for k, v in (existing_pnginfo or {}).items():

+                pnginfo_data.add_text(k, str(v))

+        else:

+            pnginfo_data = None

 

         image.save(filename, format=image_format, quality=opts.jpeg_quality, pnginfo=pnginfo_data)

 

@@ -697,8 +698,7 @@ def read_info_from_image(image):
 Negative prompt: {json_info["uc"]}

 Steps: {json_info["steps"]}, Sampler: {sampler}, CFG scale: {json_info["scale"]}, Seed: {json_info["seed"]}, Size: {image.width}x{image.height}, Clip skip: 2, ENSD: 31337"""

         except Exception:

-            print("Error parsing NovelAI image generation parameters:", file=sys.stderr)

-            print(traceback.format_exc(), file=sys.stderr)

+            print_error("Error parsing NovelAI image generation parameters", exc_info=True)

 

     return geninfo, items