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

remove reference to legacy opt.hf_token, clean up whitespace in invokeai_configure

Browse Source
This commit is contained in:
Eugene 2023-05-17 20:39:00 -04:00
parent 4e7dd7d3f6
commit f9710dd6ed
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
invokeai/backend/config/invokeai_configure.py
View File

@ -700,12 +700,9 @@ def write_opts(opts: Namespace, init_file: Path):
for key,value in opts.__dict__.items(): for key,value in opts.__dict__.items():
if hasattr(config,key): if hasattr(config,key):
setattr(config,key,value) setattr(config,key,value)
with open(init_file,'w', encoding='utf-8') as file: with open(init_file,'w', encoding='utf-8') as file:
file.write(config.to_yaml()) file.write(config.to_yaml())
if opts.hf_token:
HfLogin(opts.hf_token)
# ------------------------------------- # -------------------------------------
def default_output_dir() -> Path: def default_output_dir() -> Path:
@ -722,7 +719,6 @@ def default_lora_dir() -> Path:
# ------------------------------------- # -------------------------------------
def write_default_options(program_opts: Namespace, initfile: Path): def write_default_options(program_opts: Namespace, initfile: Path):
opt = default_startup_options(initfile) opt = default_startup_options(initfile)
opt.hf_token = HfFolder.get_token()
write_opts(opt, initfile) write_opts(opt, initfile)
# ------------------------------------- # -------------------------------------
@ -733,7 +729,7 @@ def write_default_options(program_opts: Namespace, initfile: Path):
def migrate_init_file(legacy_format:Path): def migrate_init_file(legacy_format:Path):
old = legacy_parser.parse_args([f'@{str(legacy_format)}']) old = legacy_parser.parse_args([f'@{str(legacy_format)}'])
new = InvokeAIAppConfig(conf={}) new = InvokeAIAppConfig(conf={})
fields = list(get_type_hints(InvokeAIAppConfig).keys()) fields = list(get_type_hints(InvokeAIAppConfig).keys())
for attr in fields: for attr in fields:
if hasattr(old,attr): if hasattr(old,attr):
@ -751,7 +747,7 @@ def migrate_init_file(legacy_format:Path):
outfile.write(new.to_yaml()) outfile.write(new.to_yaml())
legacy_format.replace(legacy_format.parent / 'invokeai.init.old') legacy_format.replace(legacy_format.parent / 'invokeai.init.old')
# ------------------------------------- # -------------------------------------
def main(): def main():
parser = argparse.ArgumentParser(description="InvokeAI model downloader") parser = argparse.ArgumentParser(description="InvokeAI model downloader")
@ -822,8 +818,8 @@ def main():
print('** Migrating invokeai.init to invokeai.yaml') print('** Migrating invokeai.init to invokeai.yaml')
migrate_init_file(old_init_file) migrate_init_file(old_init_file)
config = get_invokeai_config() # reread defaults config = get_invokeai_config() # reread defaults
if not config.model_conf_path.exists(): if not config.model_conf_path.exists():
initialize_rootdir(config.root, opt.yes_to_all) initialize_rootdir(config.root, opt.yes_to_all)