From 67fbaa7c3106ee1c6461048cbff9111df5af0abc Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Fri, 16 Sep 2022 16:57:54 -0400 Subject: [PATCH 1/3] reconciled conflicting changes to pngwriter call --- backend/server.py | 2 +- ldm/dream/pngwriter.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/server.py b/backend/server.py index 3d24656af0..ef93c5b0d7 100644 --- a/backend/server.py +++ b/backend/server.py @@ -305,7 +305,7 @@ def save_image(image, parameters, output_dir, step_index=None, postprocessing=Fa command = parameters_to_command(parameters) - path = pngwriter.save_image_and_prompt_to_png(image, command, parameters, filename) + path = pngwriter.save_image_and_prompt_to_png(image, command, metadata=parameters, name=filename) return path diff --git a/ldm/dream/pngwriter.py b/ldm/dream/pngwriter.py index 5cda259357..9a2a8bc816 100644 --- a/ldm/dream/pngwriter.py +++ b/ldm/dream/pngwriter.py @@ -34,6 +34,7 @@ class PngWriter: # saves image named _image_ to outdir/name, writing metadata from prompt # returns full path of output def save_image_and_prompt_to_png(self, image, dream_prompt, name, metadata=None): + print(f'self.outdir={self.outdir}, name={name}') path = os.path.join(self.outdir, name) info = PngImagePlugin.PngInfo() info.add_text('Dream', dream_prompt) From 682d74754cac4925b369f5c778b1ee2772ec213a Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 19 Sep 2022 11:53:47 +1000 Subject: [PATCH 2/3] Fixes metadata_loads() #686 --- ldm/dream/args.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldm/dream/args.py b/ldm/dream/args.py index 7d8f473b4a..db6d963645 100644 --- a/ldm/dream/args.py +++ b/ldm/dream/args.py @@ -681,7 +681,10 @@ def metadata_loads(metadata): ''' results = [] try: - images = metadata['sd-metadata']['images'] + if 'grid' in metadata['sd-metadata']: + images = metadata['sd-metadata']['images'] + else: + images = [metadata['sd-metadata']['image']] for image in images: # repack the prompt and variations image['prompt'] = ','.join([':'.join([x['prompt'], str(x['weight'])]) for x in image['prompt']]) From 57577401bd72155cf03069146c879f4d9e5fb86f Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Mon, 19 Sep 2022 11:53:47 +1000 Subject: [PATCH 3/3] Fixes metadata_loads() #686 --- ldm/dream/args.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldm/dream/args.py b/ldm/dream/args.py index 7d8f473b4a..db6d963645 100644 --- a/ldm/dream/args.py +++ b/ldm/dream/args.py @@ -681,7 +681,10 @@ def metadata_loads(metadata): ''' results = [] try: - images = metadata['sd-metadata']['images'] + if 'grid' in metadata['sd-metadata']: + images = metadata['sd-metadata']['images'] + else: + images = [metadata['sd-metadata']['image']] for image in images: # repack the prompt and variations image['prompt'] = ','.join([':'.join([x['prompt'], str(x['weight'])]) for x in image['prompt']])