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

Merge branch 'add-invokeai-initfile' into development

Browse Source
This commit is contained in:
Lincoln Stein
2022-11-08 13:41:11 +00:00
parent 21961f0c32 636620b1d5
commit ededeaed86
7 changed files with 108 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
ldm/invoke/args.py
View File

@ -87,6 +87,7 @@ import json
import hashlib
import os
import re
import sys
import shlex
import copy
import base64
@ -114,7 +115,8 @@ PRECISION_CHOICES = [
# is there a way to pick this up during git commits?
APP_ID = 'invoke-ai/InvokeAI'
APP_VERSION = 'v2.02'
APP_VERSION = 'v2.1.2'
INITFILE = os.path.expanduser('~/.invokeai')
class ArgFormatter(argparse.RawTextHelpFormatter):
# use defined argument order to display usage
@ -141,11 +143,15 @@ class ArgFormatter(argparse.RawTextHelpFormatter):
class PagingArgumentParser(argparse.ArgumentParser):
'''
A custom ArgumentParser that uses pydoc to page its output.
It also supports reading defaults from an init file.
'''
def print_help(self, file=None):
text = self.format_help()
pydoc.pager(text)
def convert_arg_line_to_args(self, arg_line):
return shlex.split(arg_line,comments=True)
class Args(object):
def __init__(self,arg_parser=None,cmd_parser=None):
'''
@ -162,9 +168,16 @@ class Args(object):
def parse_args(self):
'''Parse the shell switches and store.'''
try:
self._arg_switches = self._arg_parser.parse_args()
sysargs = sys.argv[1:]
if os.path.exists(INITFILE):
print(f'>> Initialization file {INITFILE} found. Loading...')
sysargs.insert(0,f'@{INITFILE}')
else:
print(f'>> Initialization file {INITFILE} not found. Applying default settings...')
self._arg_switches = self._arg_parser.parse_args(sysargs)
return self._arg_switches
except:
except Exception as e:
print(f'An exception has occurred: {e}')
return None
def parse_cmd(self,cmd_string):
@ -357,7 +370,7 @@ class Args(object):
This defines all the arguments used on the command line when you launch
the CLI or web backend.
'''
parser = argparse.ArgumentParser(
parser = PagingArgumentParser(
description=
"""
Generate images using Stable Diffusion.
@ -367,6 +380,7 @@ class Args(object):
Other command-line arguments are defaults that can usually be overridden
prompt the command prompt.
""",
fromfile_prefix_chars='@',
)
model_group = parser.add_argument_group('Model selection')
file_group = parser.add_argument_group('Input/output')
@ -397,17 +411,6 @@ class Args(object):
dest='png_compression',
help='level of PNG compression, from 0 (none) to 9 (maximum). Default is 6.'
)
model_group.add_argument(
'--sampler',
'-A',
'-m',
dest='sampler_name',
type=str,
choices=SAMPLER_CHOICES,
metavar='SAMPLER_NAME',
help=f'Switch to a different sampler. Supported samplers: {", ".join(SAMPLER_CHOICES)}',
default='k_lms',
)
model_group.add_argument(
'-F',
'--full_precision',
@ -467,10 +470,61 @@ class Args(object):
type=str,
help='Overwrite the filename format. You can use any argument as wildcard enclosed in curly braces. Default is {prefix}.{seed}.png',
)
render_group.add_argument(
'-s',
'--steps',
type=int,
default=50,
help='Number of steps'
)
render_group.add_argument(
'-W',
'--width',
type=int,
help='Image width, multiple of 64',
)
render_group.add_argument(
'-H',
'--height',
type=int,
help='Image height, multiple of 64',
)
render_group.add_argument(
'-C',
'--cfg_scale',
default=7.5,
type=float,
help='Classifier free guidance (CFG) scale - higher numbers cause generator to "try" harder.',
)
render_group.add_argument(
'--sampler',
'-A',
'-m',
dest='sampler_name',
type=str,
choices=SAMPLER_CHOICES,
metavar='SAMPLER_NAME',
help=f'Set the default sampler. Supported samplers: {", ".join(SAMPLER_CHOICES)}',
default='k_lms',
)
render_group.add_argument(
'-f',
'--strength',
type=float,
help='img2img strength for noising/unnoising. 0.0 preserves image exactly, 1.0 replaces it completely',
)
render_group.add_argument(
'-T',
'-fit',
'--fit',
action=argparse.BooleanOptionalAction,
help='If specified, will resize the input image to fit within the dimensions of width x height (512x512 default)',
)
render_group.add_argument(
'--grid',
'-g',
action='store_true',
action=argparse.BooleanOptionalAction,
help='generate a grid'
)
render_group.add_argument(
@ -599,7 +653,6 @@ class Args(object):
'-s',
'--steps',
type=int,
default=50,
help='Number of steps'
)
render_group.add_argument(
@ -631,7 +684,6 @@ class Args(object):
render_group.add_argument(
'-C',
'--cfg_scale',
default=7.5,
type=float,
help='Classifier free guidance (CFG) scale - higher numbers cause generator to "try" harder.',
)
@ -656,7 +708,7 @@ class Args(object):
render_group.add_argument(
'--grid',
'-g',
action='store_true',
action=argparse.BooleanOptionalAction,
help='generate a grid'
)
render_group.add_argument(
@ -750,8 +802,7 @@ class Args(object):
'-f',
'--strength',
type=float,
help='Strength for noising/unnoising. 0.0 preserves image exactly, 1.0 replaces it completely',
default=0.75,
help='img2img strength for noising/unnoising. 0.0 preserves image exactly, 1.0 replaces it completely',
)
inpainting_group.add_argument(
'-M',

2
ldm/invoke/txt2mask.py
View File

@ -29,7 +29,7 @@ work fine.
import torch
import numpy as np
from clipseg_models.clipseg import CLIPDensePredT
from clipseg.clipseg import CLIPDensePredT
from einops import rearrange, repeat
from PIL import Image, ImageOps
from torchvision import transforms