From 67e25624b901695f9958dc25c00db98585e0dcc8 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sat, 12 Nov 2022 15:39:03 +0000 Subject: [PATCH] simplify logic around negative seeds --- ldm/generate.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/ldm/generate.py b/ldm/generate.py index 121ccc4e16..28250695b5 100644 --- a/ldm/generate.py +++ b/ldm/generate.py @@ -563,18 +563,12 @@ class Generate: seed = None prompt = None - args = metadata_from_png(image_path) - if opt.seed is not None: - seed = opt.seed - elif args.seed >= 0: - seed = args.seed - else: - seed = random.randrange(0, np.iinfo(np.uint32).max) + args = metadata_from_png(image_path) + seed = opt.seed or args.seed + if seed is None or seed < 0: + seed = random.randrange(0, np.iinfo(np.uint32).max) - if opt.prompt is not None: - prompt = opt.prompt - else: - prompt = args.prompt + prompt = opt.prompt or args.prompt or '' print(f'>> using seed {seed} and prompt "{prompt}" for {image_path}') @@ -627,7 +621,7 @@ class Generate: opt.seed = seed opt.prompt = prompt - if len(extend_instructions)>0: + if len(extend_instructions) > 0: restorer = Outcrop(image,self,) return restorer.process ( extend_instructions,