Web cleanup (#539)

* Refactor generate.py and dream.py

* config file path (models.yaml) is parsed inside Generate() to simplify
API

* Better handling of keyboard interrupts in file loading mode vs
interactive

* Removed oodles of unused variables.

* move nonfunctional inpainting out of the scripts directory

* fix ugly ddim tqdm formatting

* fix embiggen breakage, formatting fixes

ldm/dream/server.py

@@ -22,6 +22,12 @@ def build_opt(post_data, seed, gfpgan_model_exists):
     setattr(opt, 'invert_mask', 'invert_mask' in post_data)
     setattr(opt, 'cfg_scale', float(post_data['cfg_scale']))
     setattr(opt, 'sampler_name', post_data['sampler_name'])
+
+    # embiggen not practical at this point because we have no way of feeding images back into img2img
+    # however, this code is here against that eventuality
+    setattr(opt, 'embiggen', None)
+    setattr(opt, 'embiggen_tiles', None)
+
     setattr(opt, 'gfpgan_strength', float(post_data['gfpgan_strength']) if gfpgan_model_exists else 0)
     setattr(opt, 'upscale', [int(post_data['upscale_level']), float(post_data['upscale_strength'])] if post_data['upscale_level'] != '' else None)
     setattr(opt, 'progress_images', 'progress_images' in post_data)
@@ -155,6 +161,7 @@ class DreamServer(BaseHTTPRequestHandler):
         def image_done(image, seed, upscaled=False):
             name = f'{prefix}.{seed}.png'
             iter_opt = argparse.Namespace(**vars(opt)) # copy
+            print(f'iter_opt = {iter_opt}')
             if opt.variation_amount > 0:
                 this_variation = [[seed, opt.variation_amount]]
                 if opt.with_variations is None:

scripts/dream.py

@@ -620,6 +620,7 @@ def create_cmd_parser():
     )
     parser.add_argument(
         '-embiggen',
+        '--embiggen',
         nargs='+',
         default=None,
         type=float,
@@ -627,6 +628,7 @@ def create_cmd_parser():
     )
     parser.add_argument(
         '-embiggen_tiles',
+        '--embiggen_tiles',
         nargs='+',
         default=None,
         type=int,

static/dream_web/index.css

@@ -91,6 +91,7 @@ header h1 {
 }
 #fieldset-config {
     line-height:2em;
+    background-color: #F0F0F0;
 }
 input[type="number"] {
     width: 60px;
@@ -122,6 +123,9 @@ label {
     cursor: pointer;
     color: red;
 }
+#basic-parameters {
+    background-color: #EEEEEE;
+}
 #txt2img {
     background-color: #DCDCDC;
 }
@@ -129,15 +133,19 @@ label {
     background-color: #EEEEEE;
 }
 #img2img {
-    background-color: #F5F5F5;
+    background-color: #DCDCDC;
 }
 #gfpgan {
-    background-color: #DCDCDC;
+    background-color: #EEEEEE;
 }
 #progress-section {
     background-color: #F5F5F5;
 }
-
+.section-header {
+    text-align: left;
+    font-weight: bold;
+    padding: 0 0 0 0;
+}
 #no-results-message:not(:only-child) {
     display: none;
 }

static/dream_web/index.html

@@ -25,6 +25,7 @@
 	  </div>
         </fieldset>
         <fieldset id="fieldset-config">
+	  <div class="section-header">Basic options</div>
           <label for="iterations">Images to generate:</label>
           <input value="1" type="number" id="iterations" name="iterations" size="4">
           <label for="steps">Steps:</label>
@@ -39,11 +40,11 @@
             <option value="k_dpm_2">KDPM_2</option>
             <option value="k_dpm_2_a">KDPM_2A</option>
             <option value="k_euler">KEULER</option>
-	          <option value="k_euler_a">KEULER_A</option>
+	    <option value="k_euler_a">KEULER_A</option>
             <option value="k_heun">KHEUN</option>
           </select>
           <input type="checkbox" name="seamless" id="seamless">
-	        <label for="seamless">Seamless circular tiling</label>
+	  <label for="seamless">Seamless circular tiling</label>
           <br>
           <label title="Set to multiple of 64" for="width">Width:</label>
           <select id="width" name="width" value="512">
@@ -73,26 +74,28 @@
           <input type="checkbox" name="progress_images" id="progress_images">
 	  <label for="progress_images">Display in-progress images (slower)</label>
 	  <button type="button" id="reset-all">Reset to Defaults</button>
-	  <div id="variations">
+	  <span id="variations">
             <label title="If > 0, generates variations on the initial seed instead of random seeds per iteration. Must be between 0 and 1. Higher values will be more different." for="variation_amount">Variation amount (0 to disable):</label>
             <input value="0" type="number" id="variation_amount" name="variation_amount" step="0.01" min="0" max="1">
             <label title="list of variations to apply, in the format `seed:weight,seed:weight,..." for="with_variations">With variations (seed:weight,seed:weight,...):</label>
             <input value="" type="text" id="with_variations" name="with_variations">
-	  </div>
+	  </span>
-	  <div id="img2img">
+	</fieldset>
-            <label title="Upload an image to use img2img" for="initimg">Initial image:</label>
+	<fieldset id="img2img">
-            <input type="file" id="initimg" name="initimg" accept=".jpg, .jpeg, .png">
+	  <div class="section-header">Image-to-image options</div>
-            <button type="button" id="remove-image">Remove Image</button>
+          <label title="Upload an image to use img2img" for="initimg">Initial image:</label>
+          <input type="file" id="initimg" name="initimg" accept=".jpg, .jpeg, .png">
+          <button type="button" id="remove-image">Remove Image</button>
 	    <br>
 	    <label for="strength">Img2Img Strength:</label>
 	    <input value="0.75" type="number" id="strength" name="strength" step="0.01" min="0" max="1">
 	    <input type="checkbox" id="fit" name="fit" checked>
-	    <label title="Rescale image to fit within requested width and height" for="fit">Fit to width/height:</label>
+	    <label title="Rescale image to fit within requested width and height" for="fit">Fit to width/height</label>
-	  </div>
 	</fieldset>
         <fieldset id="gfpgan">
+	  <div class="section-header">Post-processing options</div>
           <label title="Strength of the gfpgan (face fixing) algorithm." for="gfpgan_strength">GPFGAN Strength (0 to disable):</label>
-          <input value="0.8" min="0" max="1" type="number" id="gfpgan_strength" name="gfpgan_strength" step="0.05">
+          <input value="0.0" min="0" max="1" type="number" id="gfpgan_strength" name="gfpgan_strength" step="0.1">
           <label title="Upscaling to perform using ESRGAN." for="upscale_level">Upscaling Level</label>
           <select id="upscale_level" name="upscale_level" value="">
             <option value="" selected>None</option>
@@ -113,7 +116,7 @@
           <div id="scaling-inprocess-message">
             <i><span>Postprocessing...</span><span id="processing_cnt">1/3</span></i>
           </div>
-        </div>
+        </span>
       </section>
 
       <div id="results">