optionally scale initial image to fit box defined by width x height

* This functionality is triggered by the --fit option in the CLI (default
false), and by the "fit" checkbox in the WebGUI (default True)

* In addition, this commit contains a number of whitespace changes to
make the code more readable, as well as an attempt to unify the visual
appearance of info and warning messages.

Author: lstein

ldm/dream/image_util.py

@@ -8,51 +8,46 @@ def __init__(self,Image):
 
     def resize(self,width=None,height=None) -> Image:
         """
-        Return a copy of the image resized to width x height.
-        The aspect ratio is maintained, with any excess space
-        filled using black borders (i.e. letterboxed). If
-        neither width nor height are provided, then returns
-        a copy of the original image. If one or the other is
+        Return a copy of the image resized to fit within
+        a box width x height. The aspect ratio is 
+        maintained. If neither width nor height are provided, 
+        then returns a copy of the original image. If one or the other is
         provided, then the other will be calculated from the
         aspect ratio.
 
         Everything is floored to the nearest multiple of 64 so
         that it can be passed to img2img()
         """
         im    = self.image
-
-        if not(width or height):
-            return im.copy()
-
-        ar = im.width/im.height
+        
+        ar = im.width/float(im.height)
 
         # Infer missing values from aspect ratio
-        if not height:          # height missing
+        if not(width or height): # both missing
+            width  = im.width
+            height = im.height
+        elif not height:           # height missing
             height = int(width/ar)
-        if not width:          # width missing
+        elif not width:            # width missing
             width  = int(height*ar)
 
         # rw and rh are the resizing width and height for the image
         # they maintain the aspect ratio, but may not completelyl fill up
         # the requested destination size
-        (rw,rh) = (width,int(width/ar)) if im.width>=im.height else (int(height*ar),width)
+        (rw,rh) = (width,int(width/ar)) if im.width>=im.height else (int(height*ar),height)
 
         #round everything to multiples of 64
         width,height,rw,rh = map(
             lambda x: x-x%64, (width,height,rw,rh)
-            )
+        )
 
-        # resize the original image so that it fits inside the dest
+        # no resize necessary, but return a copy
+        if im.width == width and im.height == height:
+            return im.copy()
+        
+        # otherwise resize the original image so that it fits inside the bounding box
         resized_image = self.image.resize((rw,rh),resample=Image.Resampling.LANCZOS)
-
-        # create new destination image of specified dimensions
-        # and paste the resized image into it centered appropriately
-        new_image = Image.new('RGB',(width,height))
-        new_image.paste(resized_image,((width-rw)//2,(height-rh)//2))
-
-        print(f'>> Resized image size to {width}x{height}')
-
-        return new_image
+        return resized_image
 
 def make_grid(image_list, rows=None, cols=None):
     image_cnt = len(image_list)

ldm/dream/pngwriter.py

@@ -61,6 +61,8 @@ def normalize_prompt(self):
         switches.append(f'-A{opt.sampler_name or t2i.sampler_name}')
         if opt.init_img:
             switches.append(f'-I{opt.init_img}')
+        if opt.fit:
+            switches.append(f'--fit')
         if opt.strength and opt.init_img is not None:
             switches.append(f'-f{opt.strength or t2i.strength}')
         if opt.gfpgan_strength:

ldm/dream/server.py

@@ -70,6 +70,7 @@ def do_POST(self):
         steps = int(post_data['steps'])
         width = int(post_data['width'])
         height = int(post_data['height'])
+        fit    = 'fit' in post_data
         cfgscale = float(post_data['cfgscale'])
         sampler_name  = post_data['sampler']
         gfpgan_strength = float(post_data['gfpgan_strength']) if gfpgan_model_exists else 0
@@ -80,7 +81,7 @@ def do_POST(self):
         seed = self.model.seed if int(post_data['seed']) == -1 else int(post_data['seed'])
 
         self.canceled.clear()
-        print(f"Request to generate with prompt: {prompt}")
+        print(f">> Request to generate with prompt: {prompt}")
         # In order to handle upscaled images, the PngWriter needs to maintain state
         # across images generated by each call to prompt2img(), so we define it in
         # the outer scope of image_done()
@@ -177,10 +178,13 @@ def image_progress(sample, step):
                                             init_img = "./img2img-tmp.png",
                                             strength = strength,
                                             iterations = iterations,
-                                            cfg_scale = cfgscale,
-                                            seed = seed,
-                                            steps = steps,
+                                            cfg_scale  = cfgscale,
+                                            seed       = seed,
+                                            steps      = steps,
                                             sampler_name    = sampler_name,
+                                            width      = width,
+                                            height     = height,
+                                            fit        = fit,
                                             gfpgan_strength=gfpgan_strength,
                                             upscale         = upscale,
                                             step_callback=image_progress,
@@ -192,8 +196,6 @@ def image_progress(sample, step):
             print(f"Canceled.")
             return
 
-        print(f"Prompt generated!")
-
 
 class ThreadingDreamServer(ThreadingHTTPServer):
     def __init__(self, server_address):

ldm/gfpgan/gfpgan_tools.py

@@ -14,7 +14,7 @@
 gfpgan_model_exists = os.path.isfile(model_path)
 
 def _run_gfpgan(image, strength, prompt, seed, upsampler_scale=4):
-    print(f'\n* GFPGAN - Restoring Faces: {prompt} : seed:{seed}')
+    print(f'>> GFPGAN - Restoring Faces: {prompt} : seed:{seed}')
     gfpgan = None
     with warnings.catch_warnings():
         warnings.filterwarnings('ignore', category=DeprecationWarning)
@@ -41,12 +41,12 @@ def _run_gfpgan(image, strength, prompt, seed, upsampler_scale=4):
         except Exception:
             import traceback
 
-            print('Error loading GFPGAN:', file=sys.stderr)
+            print('>> Error loading GFPGAN:', file=sys.stderr)
             print(traceback.format_exc(), file=sys.stderr)
 
     if gfpgan is None:
         print(
-            f'GFPGAN not initialized, it must be loaded via the --gfpgan argument'
+            f'>> GFPGAN not initialized, it must be loaded via the --gfpgan argument'
         )
         return image
 
@@ -129,7 +129,7 @@ def _load_gfpgan_bg_upsampler(bg_upsampler, upsampler_scale, bg_tile=400):
 
 def real_esrgan_upscale(image, strength, upsampler_scale, prompt, seed):
     print(
-        f'\n* Real-ESRGAN Upscaling: {prompt} : seed:{seed} : scale:{upsampler_scale}x'
+        f'>> Real-ESRGAN Upscaling: {prompt} : seed:{seed} : scale:{upsampler_scale}x'
     )
 
     with warnings.catch_warnings():
@@ -143,7 +143,7 @@ def real_esrgan_upscale(image, strength, upsampler_scale, prompt, seed):
         except Exception:
             import traceback
 
-            print('Error loading Real-ESRGAN:', file=sys.stderr)
+            print('>> Error loading Real-ESRGAN:', file=sys.stderr)
             print(traceback.format_exc(), file=sys.stderr)
 
     output, img_mode = upsampler.enhance(