diff --git a/ldm/dream/server.py b/ldm/dream/server.py index 96ffd7f2ef..b56e21f6c7 100644 --- a/ldm/dream/server.py +++ b/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: diff --git a/scripts/dream.py b/scripts/dream.py index aec27506c3..4044af7cb8 100755 --- a/scripts/dream.py +++ b/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, diff --git a/static/dream_web/index.css b/static/dream_web/index.css index cbe753d423..51f0f267c3 100644 --- a/static/dream_web/index.css +++ b/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; } diff --git a/static/dream_web/index.html b/static/dream_web/index.html index 628cfb4b6c..1e194c0205 100644 --- a/static/dream_web/index.html +++ b/static/dream_web/index.html @@ -25,6 +25,7 @@
+
Basic options
@@ -39,11 +40,11 @@ - + - +
-
+ -
-
- - - + +
+
+
Image-to-image options
+ + +
- - +
+
Post-processing options
- +