From bb084a844b59bdf1379d014fc6901f1e6d762f18 Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Sat, 12 Nov 2022 15:39:03 +0000
Subject: [PATCH] simplify logic around negative seeds

---
 ldm/generate.py                   | 18 ++++++------------
 ldm/invoke/restoration/outcrop.py |  2 ++
 2 files changed, 8 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,
diff --git a/ldm/invoke/restoration/outcrop.py b/ldm/invoke/restoration/outcrop.py
index 2587bb5776..1d3c985910 100644
--- a/ldm/invoke/restoration/outcrop.py
+++ b/ldm/invoke/restoration/outcrop.py
@@ -31,6 +31,8 @@ class Outcrop(object):
             preferred_seed = orig_opt.seed if orig_opt.seed >= 0 else seed
             image_callback(img,preferred_seed,use_prefix=prefix,**kwargs)
 
+        print(f'DEBUG: seed={opt.seed or orig_opt.seed}')
+        print(f'DEBUG: prompt={opt.prompt}')
         result= self.generate.prompt2image(
             opt.prompt,
             seed        = opt.seed or orig_opt.seed,