Merge branch 'development' of github.com:invoke-ai/InvokeAI into development

This commit is contained in:
Lincoln Stein 2022-09-27 03:18:48 -04:00
commit c2e100e6bf
2 changed files with 7 additions and 6 deletions

View File

@ -672,9 +672,10 @@ def generate_images(generation_parameters, esrgan_parameters, gfpgan_parameters)
and step < generation_parameters["steps"] - 1
):
image = generate.sample_to_image(sample)
path = save_image(
image, generation_parameters, intermediate_path, step_index
)
metadata = parameters_to_generated_image_metadata(generation_parameters)
command = parameters_to_command(generation_parameters)
path = save_image(image, command, metadata, intermediate_path, step_index=step_index, postprocessing=False)
step_index += 1
socketio.emit(
@ -682,7 +683,7 @@ def generate_images(generation_parameters, esrgan_parameters, gfpgan_parameters)
{
"url": os.path.relpath(path),
"mtime": os.path.getmtime(path),
"metadata": generation_parameters,
"metadata": metadata,
},
)
socketio.emit("progressUpdate", progress)

View File

@ -17,7 +17,7 @@ Support] below.
As of version 1.14, environment.yaml will install the Real-ESRGAN package into
the standard install location for python packages, and will put GFPGAN into a
subdirectory of "src" in the stable-diffusion directory. (The reason for this is
subdirectory of "src" in the InvokeAI directory. (The reason for this is
that the standard GFPGAN distribution has a minor bug that adversely affects
image color.) Upscaling with Real-ESRGAN should "just work" without further
intervention. Simply pass the --upscale (-U) option on the dream> command line,
@ -33,7 +33,7 @@ here's how you'd do it using **wget**:
> wget https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.4.pth src/gfpgan/experiments/pretrained_models/
```
Make sure that you're in the stable-diffusion directory when you do this.
Make sure that you're in the InvokeAI directory when you do this.
Alternatively, if you have GFPGAN installed elsewhere, or if you are using an
earlier version of this package which asked you to install GFPGAN in a sibling