Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "enable outcropping of random JPG/PNG images"

Browse Source 
This reverts commit 48aa6416dc.
This commit is contained in:
Lincoln Stein 2022-11-11 10:30:44 -05:00 committed by GitHub
parent 1fb7b50be7
commit 78f7bef1a3
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ldm/generate.py
View File

@ -566,13 +566,12 @@ class Generate:
args = metadata_from_png(image_path) args = metadata_from_png(image_path)
seed = args.seed seed = args.seed
prompt = args.prompt or '' prompt = args.prompt
if seed == 0: print(f'>> retrieved seed {seed} and prompt "{prompt}" from {image_path}')
seed = random.randrange(0, np.iinfo(np.uint32).max)
opt.seed = seed if not seed:
print(f'>> generated new seed {seed} and prompt "{prompt}" for {image_path}') print('* Could not recover seed for image. Replacing with 42. This will not affect image quality')
else: seed = 42
print(f'>> retrieved seed {seed} and prompt "{prompt}" from {image_path}')
# try to reuse the same filename prefix as the original file. # try to reuse the same filename prefix as the original file.
# we take everything up to the first period # we take everything up to the first period

2
ldm/invoke/generator/base.py
View File

@ -63,7 +63,7 @@ class Generator():
**kwargs **kwargs
) )
results = [] results = []
seed = seed if seed is not None and seed > 0 else self.new_seed() seed = seed if seed is not None else self.new_seed()
first_seed = seed first_seed = seed
seed, initial_noise = self.generate_initial_noise(seed, width, height) seed, initial_noise = self.generate_initial_noise(seed, width, height)

2
ldm/invoke/prompt_parser.py
View File

@ -636,7 +636,7 @@ def split_weighted_subprompts(text, skip_normalize=False)->list:
weight_sum = sum(map(lambda x: x[1], parsed_prompts)) weight_sum = sum(map(lambda x: x[1], parsed_prompts))
if weight_sum == 0: if weight_sum == 0:
print( print(
"* Warning: Subprompt weights add up to zero. Discarding and using even weights instead.") "Warning: Subprompt weights add up to zero. Discarding and using even weights instead.")
equal_weight = 1 / max(len(parsed_prompts), 1) equal_weight = 1 / max(len(parsed_prompts), 1)
return [(x[0], equal_weight) for x in parsed_prompts] return [(x[0], equal_weight) for x in parsed_prompts]
return [(x[0], x[1] / weight_sum) for x in parsed_prompts] return [(x[0], x[1] / weight_sum) for x in parsed_prompts]

5
ldm/invoke/restoration/outcrop.py
View File

@ -28,12 +28,11 @@ class Outcrop(object):
self.generate._set_sampler() self.generate._set_sampler()
def wrapped_callback(img,seed,**kwargs): def wrapped_callback(img,seed,**kwargs):
preferred_seed = orig_opt.seed if orig_opt.seed> 0 else seed image_callback(img,orig_opt.seed,use_prefix=prefix,**kwargs)
image_callback(img,preferred_seed,use_prefix=prefix,**kwargs)
result= self.generate.prompt2image( result= self.generate.prompt2image(
orig_opt.prompt, orig_opt.prompt,
seed = orig_opt.seed if orig_opt.seed>0 else opt.seed, seed = orig_opt.seed, # uncomment to make it deterministic
sampler = self.generate.sampler, sampler = self.generate.sampler,
steps = opt.steps, steps = opt.steps,
cfg_scale = opt.cfg_scale, cfg_scale = opt.cfg_scale,

7
scripts/invoke.py
View File

@ -29,7 +29,6 @@ infile = None
def main(): def main():
"""Initialize command-line parsers and the diffusion model""" """Initialize command-line parsers and the diffusion model"""
global infile global infile
print('* Initializing, be patient...')
opt = Args() opt = Args()
args = opt.parse_args() args = opt.parse_args()
@ -47,6 +46,7 @@ def main():
print('--max_loaded_models must be >= 1; using 1') print('--max_loaded_models must be >= 1; using 1')
args.max_loaded_models = 1 args.max_loaded_models = 1
print('* Initializing, be patient...')
from ldm.generate import Generate from ldm.generate import Generate
# these two lines prevent a horrible warning message from appearing # these two lines prevent a horrible warning message from appearing
@ -662,10 +662,7 @@ def do_postprocess (gen, opt, callback):
def add_postprocessing_to_metadata(opt,original_file,new_file,tool,command): def add_postprocessing_to_metadata(opt,original_file,new_file,tool,command):
original_file = original_file if os.path.exists(original_file) else os.path.join(opt.outdir,original_file) original_file = original_file if os.path.exists(original_file) else os.path.join(opt.outdir,original_file)
new_file = new_file if os.path.exists(new_file) else os.path.join(opt.outdir,new_file) new_file = new_file if os.path.exists(new_file) else os.path.join(opt.outdir,new_file)
try: meta = retrieve_metadata(original_file)['sd-metadata']
meta = retrieve_metadata(original_file)['sd-metadata']
except AttributeError:
meta = retrieve_metadata(new_file)['sd-metadata']
if 'image' not in meta: if 'image' not in meta:
meta = metadata_dumps(opt,seeds=[opt.seed])['image'] meta = metadata_dumps(opt,seeds=[opt.seed])['image']
meta['image'] = {} meta['image'] = {}