Merge branch 'dev' into improve-frontend-responsiveness

1 files changed, 4 insertions, 4 deletions

diff --git a/scripts/poor_mans_outpainting.py b/scripts/poor_mans_outpainting.py
index d8feda00..ea0632b6 100644
--- a/scripts/poor_mans_outpainting.py
+++ b/scripts/poor_mans_outpainting.py
@@ -4,9 +4,9 @@ import modules.scripts as scripts
 import gradio as gr

 from PIL import Image, ImageDraw

 

-from modules import images, processing, devices

+from modules import images, devices

 from modules.processing import Processed, process_images

-from modules.shared import opts, cmd_opts, state

+from modules.shared import opts, state

 

 

 class Script(scripts.Script):

@@ -19,7 +19,7 @@ class Script(scripts.Script):
     def ui(self, is_img2img):

         if not is_img2img:

             return None

-        

+

         pixels = gr.Slider(label="Pixels to expand", minimum=8, maximum=256, step=8, value=128, elem_id=self.elem_id("pixels"))

         mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4, elem_id=self.elem_id("mask_blur"))

         inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='fill', type="index", elem_id=self.elem_id("inpainting_fill"))

@@ -138,7 +138,7 @@ class Script(scripts.Script):
         combined_image = images.combine_grid(grid)

 

         if opts.samples_save:

-            images.save_image(combined_image, p.outpath_samples, "", initial_seed, p.prompt, opts.grid_format, info=initial_info, p=p)

+            images.save_image(combined_image, p.outpath_samples, "", initial_seed, p.prompt, opts.samples_format, info=initial_info, p=p)

 

         processed = Processed(p, [combined_image], initial_seed, initial_info)