fix crash when install-models launched from config script

This commit is contained in:
Lincoln Stein
2023-06-04 14:55:51 -04:00
parent 5f6f38074d
commit cb157ea530
3 changed files with 49 additions and 33 deletions

View File

@ -467,7 +467,7 @@ class editOptsForm(npyscreen.FormMultiPage):
self.nextrely += 1
self.add_widget_intelligent(
npyscreen.FixedText,
value="Directories containing textual inversion and LoRA models (<tab> autocompletes, ctrl-N advances):",
value="Directories containing textual inversion, controlnet and LoRA models (<tab> autocompletes, ctrl-N advances):",
editable=False,
color="CONTROL",
)
@ -493,6 +493,17 @@ class editOptsForm(npyscreen.FormMultiPage):
begin_entry_at=32,
scroll_exit=True,
)
self.controlnet_dir = self.add_widget_intelligent(
npyscreen.TitleFilename,
name=" ControlNets:",
value=str(default_controlnet_dir()),
select_dir=True,
must_exist=False,
use_two_lines=False,
labelColor="GOOD",
begin_entry_at=32,
scroll_exit=True,
)
self.nextrely += 1
self.add_widget_intelligent(
npyscreen.TitleFixedText,
@ -582,6 +593,7 @@ class editOptsForm(npyscreen.FormMultiPage):
"always_use_cpu",
"embedding_dir",
"lora_dir",
"controlnet_dir",
]:
setattr(new_opts, attr, getattr(self, attr).value)
@ -659,6 +671,7 @@ def initialize_rootdir(root: str, yes_to_all: bool = False):
"configs",
"embeddings",
"databases",
"loras",
"controlnets",
"text-inversion-output",
"text-inversion-training-data",
@ -720,6 +733,10 @@ def default_embedding_dir() -> Path:
def default_lora_dir() -> Path:
return config.root / "loras"
# -------------------------------------
def default_controlnet_dir() -> Path:
return config.root / "controlnets"
# -------------------------------------
def write_default_options(program_opts: Namespace, initfile: Path):
opt = default_startup_options(initfile)