mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
simplify logic around negative seeds
This commit is contained in:
parent
8a0a90d0f3
commit
bb084a844b
ldm
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user