make merge script read invokeai.yaml when default root passed

This commit is contained in:
Lincoln Stein
2023-10-02 21:22:43 -04:00
parent c91429d4ab
commit 63f6c12aa3
2 changed files with 10 additions and 7 deletions

View File

@ -60,9 +60,9 @@ sd-1/main/trinart_stable_diffusion_v2:
description: An SD-1.5 model finetuned with ~40K assorted high resolution manga/anime-style images (2.13 GB)
source: naclbit/trinart_stable_diffusion_v2
recommended: False
sd-1/controlnet/qrcode_monster:
repo_id: monster-labs/control_v1p_sd15_qrcode_monster
subfolder: v2
#sd-1/controlnet/qrcode_monster:
# repo_id: monster-labs/control_v1p_sd15_qrcode_monster
# subfolder: v2
sd-1/controlnet/canny:
source: lllyasviel/control_v11p_sd15_canny
recommended: True

View File

@ -6,10 +6,11 @@ Copyright (c) 2023 Lincoln Stein and the InvokeAI Development Team
"""
import argparse
import curses
import re
import sys
from argparse import Namespace
from pathlib import Path
from typing import Dict, List, Optional, Tuple
from typing import List, Optional, Tuple
import npyscreen
from npyscreen import widget
@ -328,7 +329,7 @@ class mergeModelsForm(npyscreen.FormMultiPageAction):
]
return sorted(models, key=lambda x: x[1])
def _populate_models(self, value: int):
def _populate_models(self, value: List[int]):
base_model = BASE_TYPES[value[0]][0]
self.models = self.get_models(base_model)
self.model_names = [x[1] for x in self.models]
@ -358,8 +359,8 @@ def run_gui(args: Namespace):
mergeapp.run()
args = mergeapp.merge_arguments
merger = ModelMerger(model_manager, config)
merger.merge_diffusion_models_and_save(args)
logger.info(f'Models merged into new model: "{args["merged_model_name"]}".')
merger.merge_diffusion_models_and_save(**vars(args))
logger.info(f'Models merged into new model: "{args.merged_model_name}".')
def run_cli(args: Namespace):
@ -404,6 +405,8 @@ def main():
args = _parse_args()
if args.root_dir:
config.parse_args(["--root", str(args.root_dir)])
else:
config.parse_args([])
try:
if args.front_end: