diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 88d2f12b1..006f08f49 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 88d2f12b1f2015894224ed7f8f4d3a10c1fa514e +Subproject commit 006f08f499bbe69c484f0f1cc332bbf0e75526c2 diff --git a/extensions-builtin/sdnext-kanvas b/extensions-builtin/sdnext-kanvas index d15b31206..1e840033b 160000 --- a/extensions-builtin/sdnext-kanvas +++ b/extensions-builtin/sdnext-kanvas @@ -1 +1 @@ -Subproject commit d15b31206a581e49d0e8b70b375587c046e7f53f +Subproject commit 1e840033b040d8915ddfb5dbf62c80f411bcec0a diff --git a/installer.py b/installer.py index 77193d0de..71cd3207a 100644 --- a/installer.py +++ b/installer.py @@ -478,7 +478,7 @@ def check_diffusers(): t_start = time.time() if args.skip_all: return - target_commit = "85ffcf1db23c0e981215416abd8e8a748bfd86b6" # diffusers commit hash == 0.37.1.dev-0326 + target_commit = "0325ca4c5938a7e300f3e3b9ee7ec85f52d01bb5" # diffusers commit hash == 0.37.1.dev-0331 # if args.use_rocm or args.use_zluda or args.use_directml: # sha = '043ab2520f6a19fce78e6e060a68dbc947edb9f9' # lock diffusers versions for now pkg = package_spec('diffusers') @@ -507,7 +507,7 @@ def check_transformers(): pkg_tokenizers = package_spec('tokenizers') # target_commit = '753d61104116eefc8ffc977327b441ee0c8d599f' # transformers commit hash == 4.57.6 # target_commit = "aad13b87ed59f2afcfaebc985f403301887a35fc" # transformers commit hash == 5.3.0 - target_commit = "c9faacd7d57459157656bdffe049dabb6293f011" # transformers commit hash == 5.3.0.dev-0326 + target_commit = "2dba8e0495974930af02274d75bd182d22cc1686" # transformers commit hash == 5.3.0.dev-0331 if args.use_directml: target_transformers = '4.52.4' target_tokenizers = '0.21.4' diff --git a/modules/image/save.py b/modules/image/save.py index 79e3ca44f..28e64f488 100644 --- a/modules/image/save.py +++ b/modules/image/save.py @@ -61,38 +61,53 @@ def atomically_save_image(): log.warning(f'Save failed: description={filename_txt} {e}') # actual save + exifinfo_dump = piexif.helper.UserComment.dump(exifinfo, encoding="unicode") if image_format == 'PNG': pnginfo_data = PngImagePlugin.PngInfo() for k, v in params.pnginfo.items(): pnginfo_data.add_text(k, str(v)) debug_save(f'Save pnginfo: {params.pnginfo.items()}') - save_args = { 'compress_level': 6, 'pnginfo': pnginfo_data if shared.opts.image_metadata else None } + save_args = { + 'compress_level': 6, + 'pnginfo': pnginfo_data if shared.opts.image_metadata else None, + } elif image_format == 'JPEG': if image.mode == 'RGBA': log.warning('Save: removing alpha channel') image = image.convert("RGB") elif image.mode == 'I;16': image = image.point(lambda p: p * 0.0038910505836576).convert("L") - save_args = { 'optimize': True, 'quality': shared.opts.jpeg_quality } + save_args = { + 'optimize': True, + 'quality': shared.opts.jpeg_quality, + } if shared.opts.image_metadata: debug_save(f'Save exif: {exifinfo}') - save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(exifinfo, encoding="unicode") } }) + save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: exifinfo_dump } }) elif image_format == 'WEBP': if image.mode == 'I;16': image = image.point(lambda p: p * 0.0038910505836576).convert("RGB") - save_args = { 'optimize': True, 'quality': shared.opts.jpeg_quality, 'lossless': shared.opts.webp_lossless } + save_args = { + 'optimize': True, + 'quality': shared.opts.jpeg_quality, + 'lossless': shared.opts.webp_lossless, + } if shared.opts.image_metadata: debug_save(f'Save exif: {exifinfo}') - save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(exifinfo, encoding="unicode") } }) + save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: exifinfo_dump } }) elif image_format == 'JXL': if image.mode == 'I;16': image = image.point(lambda p: p * 0.0038910505836576).convert("RGB") elif image.mode not in {"RGB", "RGBA"}: image = image.convert("RGBA") - save_args = { 'optimize': True, 'quality': shared.opts.jpeg_quality, 'lossless': shared.opts.webp_lossless } + save_args = { + 'optimize': True, + 'quality': shared.opts.jpeg_quality, + 'lossless': shared.opts.webp_lossless, + } if shared.opts.image_metadata: debug_save(f'Save exif: {exifinfo}') - save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(exifinfo, encoding="unicode") } }) + save_args['exif'] = piexif.dump({ "Exif": { piexif.ExifIFD.UserComment: exifinfo_dump } }) else: save_args = { 'quality': shared.opts.jpeg_quality } try: